Fixed #2763

* Override start values of inputs using external input file if available * Initialize inputs with its start value
OpenModelica · Sep 15, 2015 · 7101208 · 7101208
1 parent a2f905b
commit 7101208
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -888,6 +888,7 @@ template simulationFile(SimCode simCode, String guid)
        <%symbolName(modelNamePrefixStr,"functionDAE")%>,
        <%symbolName(modelNamePrefixStr,"input_function")%>,
        <%symbolName(modelNamePrefixStr,"input_function_init")%>,
+       <%symbolName(modelNamePrefixStr,"input_function_updateStartValues")%>,
        <%symbolName(modelNamePrefixStr,"output_function")%>,
        <%symbolName(modelNamePrefixStr,"function_storeDelayed")%>,
        <%symbolName(modelNamePrefixStr,"updateBoundVariableAttributes")%>,
@@ -1511,14 +1512,26 @@ template functionInput(ModelInfo modelInfo, String modelNamePrefix)
       TRACE_PUSH
 
       <%vars.inputVars |> SIMVAR(__) hasindex i0 =>
-        '$P$ATTRIBUTE<%cref(name)%>.start = data->simulationInfo.inputVars[<%i0%>];'
+        'data->simulationInfo.inputVars[<%i0%>] = $P$ATTRIBUTE<%cref(name)%>.start;'
         ;separator="\n"
       %>
 
       TRACE_POP
       return 0;
     }
 
+    int <%symbolName(modelNamePrefix,"input_function_updateStartValues")%>(DATA *data, threadData_t *threadData)
+    {
+      TRACE_PUSH
+
+      <%vars.inputVars |> SIMVAR(__) hasindex i0 =>
+        '$P$ATTRIBUTE<%cref(name)%>.start = data->simulationInfo.inputVars[<%i0%>];'
+        ;separator="\n"
+      %>
+
+      TRACE_POP
+      return 0;
+    }
     >>
   end match
 end functionInput;

diff --git a/SimulationRuntime/c/openmodelica_func.h b/SimulationRuntime/c/openmodelica_func.h
@@ -110,6 +110,7 @@ int (*functionDAE)(DATA *data, threadData_t*);
 /* functions for input and output */
 int (*input_function)(DATA*, threadData_t*);
 int (*input_function_init)(DATA*, threadData_t*);
+int (*input_function_updateStartValues)(DATA*, threadData_t*);
 int (*output_function)(DATA*, threadData_t*);
 
 /* function for storing value histories of delayed expressions

diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -388,7 +388,6 @@ int freeSolverData(DATA* data, SOLVER_INFO* solverInfo)
  */
 int initializeModel(DATA* data, threadData_t *threadData, const char* init_initMethod,
     const char* init_file, double init_time, int lambda_steps)
-
 {
   int retValue = 0;
 
@@ -397,12 +396,10 @@ int initializeModel(DATA* data, threadData_t *threadData, const char* init_initM
   copyStartValuestoInitValues(data);
 
   /* read input vars */
+  data->callback->input_function_init(data, threadData);
   externalInputUpdate(data);
+  data->callback->input_function_updateStartValues(data, threadData);
   data->callback->input_function(data, threadData);
-  /* update start values for inputs if input is set */
-  if(data->simulationInfo.external_input.active){
-    data->callback->input_function_init(data, threadData);
-  }
 
   data->localData[0]->timeValue = simInfo->startTime;