separate initialization of free variables from initialization of bound variables

- CodegenCpp.tpl: split initialize method in a backwards compatible way
- FMU2Wrapper.cpp: exploit new initialize methods
- FMUWrapper.cpp: revert to before r25374, as FMI1 should not get new features


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25395 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: rfranke

Compiler/Template/CodegenCpp.tpl

@@ -119,6 +119,8 @@ let initeqs = generateEquationMemberFuncDecls(initialEquations,"initEquation")
     virtual bool initial();
     virtual void setInitial(bool);
     virtual void initialize();
+    virtual void initializeFreeVariables();
+    virtual void initializeBoundVariables();
     virtual void initEquations();
 
   private:
@@ -5073,6 +5075,13 @@ case SIMCODE(modelInfo = MODELINFO(__))  then
    let initialequations  = functionInitialEquations(initialEquations,simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation, false)
    <<
    void <%lastIdentOfPath(modelInfo.name)%>Initialize::initialize()
+   {
+      initializeFreeVariables();
+      initializeBoundVariables();
+      saveAll();
+   }
+
+   void <%lastIdentOfPath(modelInfo.name)%>Initialize::initializeFreeVariables()
    {
       _discrete_events = _event_handling->initialize(this);
       //create and initialize Algloopsolvers
@@ -5102,20 +5111,23 @@ case SIMCODE(modelInfo = MODELINFO(__))  then
       initializeDerVars();
        /*external vars decls*/
       initializeExternalVar();
-      <%initFunctions%>
-
-
-
 
       //init event handling
       <%initEventHandling%>
       //init alg loop vars
       <%initAlgloopvars%>
 
-    #if defined(__TRICORE__) || defined(__vxworks)
-    //init inputs
-    stepStarted(0.0);
-    #endif
+   #if defined(__TRICORE__) || defined(__vxworks)
+      //init inputs
+      stepStarted(0.0);
+   #endif
+   }
+
+   void <%lastIdentOfPath(modelInfo.name)%>Initialize::initializeBoundVariables()
+   {
+      //bound start values
+      <%initFunctions%>
+
       //init equations
       initEquations();
 
@@ -5128,11 +5140,9 @@ case SIMCODE(modelInfo = MODELINFO(__))  then
       }
 
       //initialAnalyticJacobian();
-      saveAll();
 
       <%functionInitDelay(delayedExps,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)%>
-
-    }
+   }
 
    void <%lastIdentOfPath(modelInfo.name)%>Initialize::initEquations()
    {

SimulationRuntime/cpp/Include/FMU/FMUWrapper.cpp

@@ -22,7 +22,6 @@ FMUWrapper::FMUWrapper(fmiString instanceName, fmiString GUID,
   _model = boost::shared_ptr<MODEL_CLASS>
       (new MODEL_CLASS(&_global_settings, solver_factory, boost::shared_ptr<ISimData>(new SimData())));
   _model->setInitial(true);
-  _model->initialize(); // set default start values
   _tmp_real_buffer.resize(_model->getDimReal());
   _tmp_int_buffer.resize(_model->getDimInteger());
   _tmp_bool_buffer.resize(_model->getDimBoolean());
@@ -129,8 +128,9 @@ fmiStatus FMUWrapper::setString(const fmiValueReference vr[], size_t nvr,
 /*  of the model equations */
 fmiStatus FMUWrapper::initialize(fmiBoolean toleranceControlled, fmiReal relativeTolerance, fmiEventInfo& eventInfo)
 {
+  // TODO: here is some code duplication to SimulationRuntime/cpp/Core/Solver/Initailization.cpp 
+  _model->initialize(); 
   _model->setInitial(true);
-  _model->initEquations(); // initialize dependent variables
 
   bool restart=true;
   int iter=0;

SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp

@@ -77,7 +77,7 @@ FMU2Wrapper::FMU2Wrapper(fmi2String instanceName, fmi2String GUID,
     (new MODEL_CLASS(&_global_settings, solver_factory,
                      boost::shared_ptr<ISimData>(new SimData())));
   _model->setInitial(true);
-  _model->initialize(); // set default start values
+  _model->initializeFreeVariables();
   _string_buffer.resize(_model->getDimString());
 }
 
@@ -161,7 +161,7 @@ fmi2Status FMU2Wrapper::reset()
 void FMU2Wrapper::updateModel()
 {
   if (_model->initial())
-    _model->initEquations(); // initial equations and calculated parameters
+    _model->initializeBoundVariables();
   _model->evaluateAll();     // derivatives and algebraic variables
   _need_update = false;
 }
@@ -199,7 +199,7 @@ fmi2Status FMU2Wrapper::completedIntegratorStep(fmi2Boolean noSetFMUStatePriorTo
                                                 fmi2Boolean *terminateSimulation)
 {
   _model->saveAll();
-  *enterEventMode = false;
+  *enterEventMode = fmi2False;
   *terminateSimulation = fmi2False;
   return fmi2OK;
 }