Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit cd4ed05

Browse files
lochelOpenModelica-Hudson
authored andcommitted
Fix some error messages
1 parent 16c107e commit cd4ed05

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,8 @@ fmi2Status fmi2SetReal(fmi2Component c, const fmi2ValueReference vr[], size_t nv
697697
return fmi2Error;
698698
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetReal: nvr = %d", nvr)
699699
// no check whether setting the value is allowed in the current state
700-
for (i = 0; i < nvr; i++) {
700+
for (i = 0; i < nvr; i++)
701+
{
701702
if (vrOutOfRange(comp, "fmi2SetReal", vr[i], NUMBER_OF_REALS+NUMBER_OF_STATES))
702703
return fmi2Error;
703704
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetReal: #r%d# = %.16g", vr[i], value[i])
@@ -715,15 +716,16 @@ fmi2Status fmi2SetInteger(fmi2Component c, const fmi2ValueReference vr[], size_t
715716
int meStates = modelInstantiated|modelInitializationMode|modelEventMode;
716717
int csStates = modelInstantiated|modelInitializationMode|modelEventMode|modelContinuousTimeMode;
717718

718-
if (invalidState(comp, "fmi2SetReal", meStates, csStates))
719+
if (invalidState(comp, "fmi2SetInteger", meStates, csStates))
719720
return fmi2Error;
720721
if (nvr > 0 && nullPointer(comp, "fmi2SetInteger", "vr[]", vr))
721722
return fmi2Error;
722723
if (nvr > 0 && nullPointer(comp, "fmi2SetInteger", "value[]", value))
723724
return fmi2Error;
724725
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetInteger: nvr = %d", nvr)
725726

726-
for (i = 0; i < nvr; i++) {
727+
for (i = 0; i < nvr; i++)
728+
{
727729
if (vrOutOfRange(comp, "fmi2SetInteger", vr[i], NUMBER_OF_INTEGERS))
728730
return fmi2Error;
729731
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetInteger: #i%d# = %d", vr[i], value[i])
@@ -740,15 +742,16 @@ fmi2Status fmi2SetBoolean(fmi2Component c, const fmi2ValueReference vr[], size_t
740742
int meStates = modelInstantiated|modelInitializationMode|modelEventMode;
741743
int csStates = modelInstantiated|modelInitializationMode|modelEventMode|modelContinuousTimeMode;
742744

743-
if (invalidState(comp, "fmi2SetReal", meStates, csStates))
745+
if (invalidState(comp, "fmi2SetBoolean", meStates, csStates))
744746
return fmi2Error;
745747
if (nvr>0 && nullPointer(comp, "fmi2SetBoolean", "vr[]", vr))
746748
return fmi2Error;
747749
if (nvr>0 && nullPointer(comp, "fmi2SetBoolean", "value[]", value))
748750
return fmi2Error;
749751
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetBoolean: nvr = %d", nvr)
750752

751-
for (i = 0; i < nvr; i++) {
753+
for (i = 0; i < nvr; i++)
754+
{
752755
if (vrOutOfRange(comp, "fmi2SetBoolean", vr[i], NUMBER_OF_BOOLEANS))
753756
return fmi2Error;
754757
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetBoolean: #b%d# = %s", vr[i], value[i] ? "true" : "false")
@@ -766,19 +769,19 @@ fmi2Status fmi2SetString(fmi2Component c, const fmi2ValueReference vr[], size_t
766769
int meStates = modelInstantiated|modelInitializationMode|modelEventMode;
767770
int csStates = modelInstantiated|modelInitializationMode|modelEventMode|modelContinuousTimeMode;
768771

769-
if (invalidState(comp, "fmi2SetReal", meStates, csStates))
772+
if (invalidState(comp, "fmi2SetString", meStates, csStates))
770773
return fmi2Error;
771774
if (nvr>0 && nullPointer(comp, "fmi2SetString", "vr[]", vr))
772775
return fmi2Error;
773776
if (nvr>0 && nullPointer(comp, "fmi2SetString", "value[]", value))
774777
return fmi2Error;
775778
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetString: nvr = %d", nvr)
776779

777-
for (i = 0; i < nvr; i++) {
780+
for (i = 0; i < nvr; i++)
781+
{
778782
if (vrOutOfRange(comp, "fmi2SetString", vr[i], NUMBER_OF_STRINGS))
779783
return fmi2Error;
780784
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetString: #s%d# = '%s'", vr[i], value[i])
781-
782785
if (setString(comp, vr[i], value[i]) != fmi2OK) // to be implemented by the includer of this file
783786
return fmi2Error;
784787
}

0 commit comments

Comments
 (0)