refs #2: Legalize fmiTerminate calls in error state

This is a workaround for modelica-tools/FMUComplianceChecker#26
beutlich · Mar 22, 2021 · d580f0b · d580f0b
1 parent ac2587a
commit d580f0b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/LastLib/Resources/Last.fmu b/LastLib/Resources/Last.fmu
diff --git a/LastLib/Resources/binaries/linux64/Last.so b/LastLib/Resources/binaries/linux64/Last.so
diff --git a/LastLib/Resources/binaries/win32/Last.dll b/LastLib/Resources/binaries/win32/Last.dll
diff --git a/LastLib/Resources/binaries/win64/Last.dll b/LastLib/Resources/binaries/win64/Last.dll
diff --git a/LastLib/Resources/sources/fmuTemplate.c b/LastLib/Resources/sources/fmuTemplate.c
@@ -71,8 +71,8 @@ static fmiBoolean invalidState(ModelInstance* comp, const char* f, int statesExp
         comp->state = modelError;
         comp->functions.logger(comp, comp->instanceName, fmiError, "error",
                 "%s: Illegal call sequence.", f);
-        if (comp->state < 1<<4) {
-            comp->functions.logger(comp, comp->instanceName, fmiError, "error",
+        if (comp->loggingOn && comp->state < 1<<4) {
+            comp->functions.logger(comp, comp->instanceName, fmiOK, "log",
                     "%s must not be called in FMU state %s. "
                     "Expected FMU state(s): %s.", f, stateNames[state], stateNames[statesExpected]);
         }
@@ -187,7 +187,7 @@ static fmiStatus init(char* fname, fmiComponent c, fmiBoolean toleranceControlle
 // fname is fmiTerminate or fmiTerminateSlave
 static fmiStatus terminate(char* fname, fmiComponent c){
     ModelInstance* comp = (ModelInstance *)c;
-    if (invalidState(comp, fname, modelInitialized))
+    if (invalidState(comp, fname, modelInitialized|modelError))
          return fmiError;
     if (comp->loggingOn) comp->functions.logger(c, comp->instanceName, fmiOK, "log", fname);
     comp->state = modelTerminated;