Removed optional initialization

This removes obsolete code that was introduced to make numeric initialization available as fall-back solution if the symbolic initialization failed. Since the numeric initialization is removed for some time, this should be removed as well.
OpenModelica · Jun 25, 2015 · f2102e3 · f2102e3
1 parent 8927383
commit f2102e3
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 96 deletions.
diff --git a/Compiler/BackEnd/BackendQSS.mo b/Compiler/BackEnd/BackendQSS.mo
@@ -1000,7 +1000,7 @@ algorithm
       list<SimCode.SimEqSystem> allEquations,startValueEquations,nominalValueEquations,minValueEquations,maxValueEquations,parameterEquations,removedEquations,algorithmAndEquationAsserts,jacobianEquations;
       list<SimCode.SimEqSystem> equationsForZeroCrossings;
       list<SimCode.StateSet> stateSets;
-      Boolean useSymbolicInitialization, useHomotopy;
+      Boolean useHomotopy;
       list<SimCode.SimEqSystem> initialEquations, removedInitialEquations;
       list<DAE.Constraint> constraints;
       list<DAE.ClassAttributes> classAttributes;
@@ -1026,7 +1026,7 @@ algorithm
       list<DAE.ClockKind> baseClocks;
 
     case (SimCode.SIMCODE( modelInfo, literals, recordDecls, externalFunctionIncludes, allEquations, odeEquations, algebraicEquations, partitionsKind, baseClocks,
-                           useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations,
+                           useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations,
                            minValueEquations, maxValueEquations, parameterEquations, removedEquations, algorithmAndEquationAsserts, equationsForZeroCrossings,
                            jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses, discreteModelVars,
                            extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, hpcomData, varToArrayIndexMapping,
@@ -1035,7 +1035,7 @@ algorithm
       {eqs} = odeEquations;
       eqs = List.map1(eqs,replaceZC,zc_exps);
     then SimCode.SIMCODE( modelInfo, literals, recordDecls, externalFunctionIncludes, allEquations, {eqs}, algebraicEquations, partitionsKind, baseClocks,
-                          useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations,
+                          useHomotopy, initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations,
                           minValueEquations, maxValueEquations, parameterEquations, removedEquations, algorithmAndEquationAsserts, equationsForZeroCrossings,
                           jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses, discreteModelVars,
                           extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, hpcomData, varToArrayIndexMapping,

diff --git a/Compiler/BackEnd/HpcOmScheduler.mo b/Compiler/BackEnd/HpcOmScheduler.mo
@@ -3420,7 +3420,7 @@ protected
                             maxValueEquations, parameterEquations, removedEquations, algorithmAndEquationAsserts,
                             jacobianEquations, equationsForZeroCrossings;
   list<SimCode.StateSet> stateSets;
-  Boolean useSymbolicInitialization, useHomotopy;
+  Boolean useHomotopy;
   list<SimCode.SimEqSystem> initialEquations, removedInitialEquations, odes;
   list<DAE.Constraint> constraints;
   list<DAE.ClassAttributes> classAttributes;
@@ -3465,7 +3465,7 @@ protected
 
 algorithm
   SimCode.SIMCODE( modelInfo, literals, recordDecls, externalFunctionIncludes, allEquations, odeEquations,
-                   algebraicEquations, partitionsKind, baseClocks, useSymbolicInitialization, useHomotopy,
+                   algebraicEquations, partitionsKind, baseClocks, useHomotopy,
                    initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations,
                    minValueEquations, maxValueEquations, parameterEquations, removedEquations,
                    algorithmAndEquationAsserts,equationsForZeroCrossings, jacobianEquations, stateSets, constraints,
@@ -3514,7 +3514,7 @@ algorithm
                               numOptimizeConstraints, numOptimizeFinalConstraints );
   modelInfo := SimCode.MODELINFO(name,description,directory,varInfo,vars,functions,labels, maxDer);
   simCodeOut := SimCode.SIMCODE( modelInfo, literals, recordDecls, externalFunctionIncludes, allEquations, odeEquations,
-                                 algebraicEquations, partitionsKind, baseClocks, useSymbolicInitialization, useHomotopy,
+                                 algebraicEquations, partitionsKind, baseClocks, useHomotopy,
                                  initialEquations, removedInitialEquations, startValueEquations, nominalValueEquations,
                                  minValueEquations, maxValueEquations, parameterEquations, removedEquations,
                                  algorithmAndEquationAsserts, equationsForZeroCrossings, jacobianEquations, stateSets,

diff --git a/Compiler/BackEnd/Initialization.mo b/Compiler/BackEnd/Initialization.mo
@@ -78,7 +78,7 @@ protected import SimCodeUtil;
 public function solveInitialSystem "author: lochel
   This function generates a algebraic system of equations for the initialization and solves it."
   input BackendDAE.BackendDAE inDAE "simulation system";
-  output Option<BackendDAE.BackendDAE> outInitDAE "initialization system";
+  output BackendDAE.BackendDAE outInitDAE "initialization system";
   output Boolean outUseHomotopy;
   output list<BackendDAE.Equation> outRemovedInitialEquations;
   output list<BackendDAE.Var> outPrimaryParameters "already sorted";
@@ -256,15 +256,12 @@ algorithm
       BackendDump.dumpCompShort(initdae);
     end if;
 
-    outInitDAE := SOME(initdae);
+    outInitDAE := initdae;
     outUseHomotopy := useHomotopy;
     outRemovedInitialEquations := removedEqns;
   else
-    outInitDAE := NONE();
-    outUseHomotopy := false;
-    outRemovedInitialEquations := {};
-    outPrimaryParameters := {};
-    outAllPrimaryParameters := {};
+    Error.addCompilerError("No system for the symbolic initialization was generated");
+    fail();
   end try;
 end solveInitialSystem;
 

diff --git a/Compiler/BackEnd/Vectorization.mo b/Compiler/BackEnd/Vectorization.mo
@@ -1891,7 +1891,7 @@ algorithm
       list<SimCode.SimEqSystem> allEquations;
       list<list<SimCode.SimEqSystem>> odeEquations;
       list<list<SimCode.SimEqSystem>> algebraicEquations;
-      Boolean useSymbolicInitialization, useHomotopy;
+      Boolean useHomotopy;
       list<SimCode.SimEqSystem> initialEquations, removedInitialEquations;
       list<SimCode.SimEqSystem> startValueEquations;
       list<SimCode.SimEqSystem> nominalValueEquations;
@@ -1927,7 +1927,7 @@ algorithm
 
     case (SimCode.SIMCODE( modelInfo, literals, recordDecls, externalFunctionIncludes,
                            allEquations, odeEquations, algebraicEquations, partitionsKind, baseClocks,
-                           useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations,
+                           useHomotopy, initialEquations, removedInitialEquations, startValueEquations,
                            nominalValueEquations, minValueEquations, maxValueEquations,
                            parameterEquations, removedEquations, algorithmAndEquationAsserts, equationsForZeroCrossings,
                            jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings,
@@ -1936,7 +1936,7 @@ algorithm
                            varToIndexMapping, crefToSimVarHT, backendMapping, modelStruct ), _)
       then SimCode.SIMCODE( modelInfo, literals, recordDecls, externalFunctionIncludes,
                             allEquations, odeEquations, algebraicEquations, partitionsKind, baseClocks,
-                            useSymbolicInitialization, useHomotopy, initEqs, removedInitialEquations, startValueEquations,
+                            useHomotopy, initEqs, removedInitialEquations, startValueEquations,
                             nominalValueEquations, minValueEquations, maxValueEquations,
                             parameterEquations, removedEquations, algorithmAndEquationAsserts,equationsForZeroCrossings,
                             jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings,

diff --git a/Compiler/SimCode/HpcOmSimCodeMain.mo b/Compiler/SimCode/HpcOmSimCodeMain.mo
@@ -98,7 +98,6 @@ algorithm
       list<list<SimCode.SimEqSystem>> odeEquations;         // --> functionODE
       list<list<SimCode.SimEqSystem>> algebraicEquations;   // --> functionAlgebraics
       list<SimCode.SimEqSystem> residuals;                  // --> initial_residual
-      Boolean useSymbolicInitialization;                    // true if a system to solve the initial problem symbolically is generated, otherwise false
       Boolean useHomotopy;                                  // true if homotopy(...) is used during initialization
       list<SimCode.SimEqSystem> initialEquations;           // --> initial_equations
       list<SimCode.SimEqSystem> removedInitialEquations;    // --> functionRemovedInitialEquations
@@ -199,7 +198,7 @@ algorithm
           SimCodeUtil.createSimCode( inBackendDAE, inClassName, filenamePrefix, inString11, functions,
                                      externalFunctionIncludes, includeDirs, libs,libPaths, simSettingsOpt, recordDecls, literals, args );
       SimCode.SIMCODE( modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations,
-                       partitionsKind, baseClocks, useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations,
+                       partitionsKind, baseClocks, useHomotopy, initialEquations, removedInitialEquations, startValueEquations,
                        nominalValueEquations, minValueEquations, maxValueEquations, parameterEquations, removedEquations, algorithmAndEquationAsserts,
                        zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
                        discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, _,
@@ -345,7 +344,7 @@ algorithm
       (scheduleOde,simCode,taskGraphOdeScheduled,taskGraphDataOdeScheduled,sccSimEqMapping) = createSchedule(taskGraphOdeSimplified,taskGraphDataOdeSimplified,sccSimEqMapping,simVarMapping,filenamePrefix,numProc,simCode,scheduledTasksOde,"ODE system");
 
       SimCode.SIMCODE( modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations,
-                       partitionsKind, baseClocks, useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations,
+                       partitionsKind, baseClocks, useHomotopy, initialEquations, removedInitialEquations, startValueEquations,
                        nominalValueEquations, minValueEquations, maxValueEquations, parameterEquations, removedEquations, algorithmAndEquationAsserts,
                        zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
                        discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, _, varToArrayIndexMapping,
@@ -384,7 +383,7 @@ algorithm
 
       hpcomData = HpcOmSimCode.HPCOMDATA(SOME((scheduleOde, scheduleDae)), optTmpMemoryMap);
       simCode = SimCode.SIMCODE( modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations,
-                                 partitionsKind, baseClocks, useSymbolicInitialization, useHomotopy, initialEquations, removedInitialEquations, startValueEquations,
+                                 partitionsKind, baseClocks, useHomotopy, initialEquations, removedInitialEquations, startValueEquations,
                                  nominalValueEquations, minValueEquations, maxValueEquations, parameterEquations, removedEquations, algorithmAndEquationAsserts,
                                  zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
                                  discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, hpcomData,

diff --git a/Compiler/SimCode/SimCode.mo b/Compiler/SimCode/SimCode.mo
@@ -91,7 +91,6 @@ uniontype SimCode
     list<list<SimEqSystem>> algebraicEquations;
     list<BackendDAE.BaseClockPartitionKind> partitionsKind;
     list<DAE.ClockKind> baseClocks;
-    Boolean useSymbolicInitialization "true if a system to solve the initial problem symbolically is generated, otherwise false";
     Boolean useHomotopy "true if homotopy(...) is used during initialization";
     list<SimEqSystem> initialEquations;
     list<SimEqSystem> removedInitialEquations;