Dump error if setReal failed

- #589 - OpenModelica/OMSimulator-testsuite#138
OpenModelica · Jan 23, 2019 · 8ca73ea · 8ca73ea
1 parent 0039095
commit 8ca73ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/OMSimulatorLib/ComponentFMUCS.cpp b/src/OMSimulatorLib/ComponentFMUCS.cpp
@@ -689,7 +689,7 @@ oms_status_enu_t oms::ComponentFMUCS::setRealInputDerivative(const ComRef& cref,
   }
 
   if (!fmu || j < 0)
-    return oms_status_error;
+    return logError_UnknownSignal(getFullCref() + cref);
 
   fmi2_value_reference_t vr = allVariables[j].getValueReference();
   if (order > 0)
@@ -715,7 +715,7 @@ oms_status_enu_t oms::ComponentFMUCS::setBoolean(const ComRef& cref, bool value)
   }
 
   if (!fmu || j < 0)
-    return oms_status_error;
+    return logError_UnknownSignal(getFullCref() + cref);
 
   if (oms_modelState_virgin == getModel()->getModelState())
     booleanStartValues[allVariables[j].getCref()] = value;
@@ -744,7 +744,7 @@ oms_status_enu_t oms::ComponentFMUCS::setInteger(const ComRef& cref, int value)
   }
 
   if (!fmu || j < 0)
-    return oms_status_error;
+    return logError_UnknownSignal(getFullCref() + cref);
 
   if (oms_modelState_virgin == getModel()->getModelState())
     integerStartValues[allVariables[j].getCref()] = value;
@@ -772,7 +772,7 @@ oms_status_enu_t oms::ComponentFMUCS::setReal(const ComRef& cref, double value)
   }
 
   if (!fmu || j < 0)
-    return oms_status_error;
+    return logError_UnknownSignal(getFullCref() + cref);
 
   if (getModel()->validState(oms_modelState_virgin|oms_modelState_enterInstantiation|oms_modelState_instantiated))
     if (allVariables[j].isCalculated() || allVariables[j].isIndependent())

diff --git a/src/OMSimulatorLib/ComponentFMUME.cpp b/src/OMSimulatorLib/ComponentFMUME.cpp
@@ -664,7 +664,7 @@ oms_status_enu_t oms::ComponentFMUME::setBoolean(const ComRef& cref, bool value)
   }
 
   if (!fmu || j < 0)
-    return oms_status_error;
+    return logError_UnknownSignal(getFullCref() + cref);
 
   if (oms_modelState_virgin == getModel()->getModelState())
     booleanStartValues[allVariables[j].getCref()] = value;
@@ -693,7 +693,7 @@ oms_status_enu_t oms::ComponentFMUME::setInteger(const ComRef& cref, int value)
   }
 
   if (!fmu || j < 0)
-    return oms_status_error;
+    return logError_UnknownSignal(getFullCref() + cref);
 
   if (oms_modelState_virgin == getModel()->getModelState())
     integerStartValues[allVariables[j].getCref()] = value;
@@ -721,7 +721,7 @@ oms_status_enu_t oms::ComponentFMUME::setReal(const ComRef& cref, double value)
   }
 
   if (!fmu || j < 0)
-    return oms_status_error;
+    return logError_UnknownSignal(getFullCref() + cref);
 
   if (getModel()->validState(oms_modelState_virgin|oms_modelState_enterInstantiation|oms_modelState_instantiated))
     if (allVariables[j].isCalculated() || allVariables[j].isIndependent())

diff --git a/src/OMSimulatorLib/System.cpp b/src/OMSimulatorLib/System.cpp
@@ -1616,7 +1616,7 @@ oms_status_enu_t oms::System::setBoolean(const ComRef& cref, bool value)
       return oms_status_ok;
     }
 
-  return oms_status_error;
+  return logError_UnknownSignal(getFullCref() + cref);
 }
 
 oms_status_enu_t oms::System::setInteger(const ComRef& cref, int value)
@@ -1642,7 +1642,7 @@ oms_status_enu_t oms::System::setInteger(const ComRef& cref, int value)
       return oms_status_ok;
     }
 
-  return oms_status_error;
+  return logError_UnknownSignal(getFullCref() + cref);
 }
 
 oms_status_enu_t oms::System::setReal(const ComRef& cref, double value)
@@ -1668,7 +1668,7 @@ oms_status_enu_t oms::System::setReal(const ComRef& cref, double value)
       return oms_status_ok;
     }
 
-  return oms_status_error;
+  return logError_UnknownSignal(getFullCref() + cref);
 }
 
 oms_status_enu_t oms::System::getReals(const std::vector<oms::ComRef> &sr, std::vector<double> &values)