Only reassign start value if it has been overwritten

OpenModelica · Mar 6, 2017 · 4f66de9 · 4f66de9
1 parent ae9b4cf
commit 4f66de9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -2946,6 +2946,7 @@ template functionUpdateBoundVariableAttributes(SimCode simCode, list<SimEqSystem
       <<
       <%crefAttributes(cref)%>.min = <%cref(cref)%>;
         infoStreamPrint(LOG_INIT, 0, "%s(min=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.min);
+      <%cref(cref)%> = <%crefAttributes(cref)%>.start;
       >>
       ;separator="\n"
     %>
@@ -2959,6 +2960,7 @@ template functionUpdateBoundVariableAttributes(SimCode simCode, list<SimEqSystem
       <<
       <%crefAttributes(cref)%>.max = <%cref(cref)%>;
         infoStreamPrint(LOG_INIT, 0, "%s(max=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.max);
+      <%cref(cref)%> = <%crefAttributes(cref)%>.start;
       >>
       ;separator="\n"
     %>
@@ -2972,6 +2974,7 @@ template functionUpdateBoundVariableAttributes(SimCode simCode, list<SimEqSystem
       <<
       <%crefAttributes(cref)%>.nominal = <%cref(cref)%>;
         infoStreamPrint(LOG_INIT, 0, "%s(nominal=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.nominal);
+      <%cref(cref)%> = <%crefAttributes(cref)%>.start;
       >>
       ;separator="\n"
     %>

diff --git a/SimulationRuntime/c/simulation/solver/initialization/initialization.c b/SimulationRuntime/c/simulation/solver/initialization/initialization.c
@@ -574,7 +574,6 @@ int initialization(DATA *data, threadData_t *threadData, const char* pInitMethod
   if(!(pInitFile && strcmp(pInitFile, ""))) {
     data->callback->updateBoundParameters(data, threadData);
     data->callback->updateBoundVariableAttributes(data, threadData);
-    setAllVarsToStart(data);
   }
 
   /* update static data of linear/non-linear system solvers */