- removed deprecated numeric initialization approach

- removed simflags: "-iom=*" and "-iim=numeric" - another commit will remove more code that belongs to the numeric initialization approach git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24305 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 29, 2015 · 31db4b3 · 31db4b3
1 parent e10c650
commit 31db4b3
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 2,835 deletions.
diff --git a/Compiler/SimCode/SimCodeUtil.mo b/Compiler/SimCode/SimCodeUtil.mo
@@ -6446,7 +6446,7 @@ algorithm
     case (_, _, _, _, _) equation
       (initialEqs_lst, numberOfInitialEquations, numberOfInitialAlgorithms) = BackendDAEOptimize.collectInitialEquations(inDAE);
       (residual_equations, uniqueEqIndex, tempvars) = createNonlinearResidualEquations(initialEqs_lst, iuniqueEqIndex, itempvars);
-      Error.addCompilerWarning("No system for the symbolic initialization was generated. A method using numerical algorithms will be used instead.");
+      Error.addCompilerError("No system for the symbolic initialization was generated.");
     then (residual_equations, {}, {}, numberOfInitialEquations, numberOfInitialAlgorithms, uniqueEqIndex, tempvars, false);
 
     else equation

diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -92,12 +92,10 @@ RUNTIMEUTIL_HEADERS = \
 ./util/list.h
 
 RUNTIMEINITIALIZATION_HEADERS = \
-./simulation/solver/initialization/initialization.h \
-./simulation/solver/initialization/initialization_data.h
+./simulation/solver/initialization/initialization.h
 
 # RUNTIME_HEADERS_FMU = \
 # ./simulation/solver/initialization/initialization.h \
-# ./simulation/solver/initialization/initialization_data.h \
 # ./simulation/solver/events.h \
 # ./simulation/solver/solver_main.h \
 # ./util/list.h \

diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -501,7 +501,6 @@ int startNonInteractiveSimulation(int argc, char**argv, DATA* data)
   }
 
   string init_initMethod = "";
-  string init_optiMethod = "";
   string init_file = "";
   string init_time_string = "";
   double init_time = 0.0;
@@ -513,9 +512,6 @@ int startNonInteractiveSimulation(int argc, char**argv, DATA* data)
   if(omc_flag[FLAG_IIM]) {
     init_initMethod = omc_flagValue[FLAG_IIM];
   }
-  if(omc_flag[FLAG_IOM]) {
-    init_optiMethod = omc_flagValue[FLAG_IOM];
-  }
   if(omc_flag[FLAG_IIF]) {
     init_file = omc_flagValue[FLAG_IIF];
   }
@@ -531,7 +527,7 @@ int startNonInteractiveSimulation(int argc, char**argv, DATA* data)
     outputVariablesAtEnd = omc_flagValue[FLAG_OUTPUT];
   }
 
-  retVal = callSolver(data, init_initMethod, init_optiMethod, init_file, init_time, init_lambda_steps, outputVariablesAtEnd, cpuTime);
+  retVal = callSolver(data, init_initMethod, init_file, init_time, init_lambda_steps, outputVariablesAtEnd, cpuTime);
 
   if (omc_flag[FLAG_ALARM]) {
     alarm(0);
@@ -631,8 +627,8 @@ int initializeResultData(DATA* simData, int cpuTime)
  * "euler" calls an Euler solver
  * "rungekutta" calls a fourth-order Runge-Kutta Solver
  */
-int callSolver(DATA* simData, string init_initMethod,
-    string init_optiMethod, string init_file, double init_time, int lambda_steps, string outputVariablesAtEnd, int cpuTime)
+int callSolver(DATA* simData, string init_initMethod, string init_file,
+      double init_time, int lambda_steps, string outputVariablesAtEnd, int cpuTime)
 {
   int retVal = -1;
   long i;
@@ -689,7 +685,7 @@ int callSolver(DATA* simData, string init_initMethod,
                         simData->simulationInfo.numSteps, simData->simulationInfo.tolerance, 3);
     } else /* standard solver interface */
 #endif
-      retVal = solver_main(simData, init_initMethod.c_str(), init_optiMethod.c_str(), init_file.c_str(), init_time, lambda_steps, solverID, outVars);
+      retVal = solver_main(simData, init_initMethod.c_str(), init_file.c_str(), init_time, lambda_steps, solverID, outVars);
   }
 
   MMC_CATCH_INTERNAL(mmc_jumper)
@@ -758,11 +754,6 @@ int initRuntimeAndSimulation(int argc, char**argv, DATA *data)
             infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", INIT_METHOD_NAME[j], INIT_METHOD_DESC[j]);
           break;
 
-        case FLAG_IOM:
-          for(j=1; j<IOM_MAX; ++j)
-            infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", OPTI_METHOD_NAME[j], OPTI_METHOD_DESC[j]);
-          break;
-
         case FLAG_S:
           for(j=1; j<S_MAX; ++j) {
             infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", SOLVER_METHOD_NAME[j], SOLVER_METHOD_DESC[j]);

diff --git a/SimulationRuntime/c/simulation/simulation_runtime.h b/SimulationRuntime/c/simulation/simulation_runtime.h
@@ -54,7 +54,7 @@
 extern "C" {
 
 extern int callSolver(DATA* simData, std::string init_initMethod,
-    std::string init_optiMethod, std::string init_file, double init_time, int lambda_steps, std::string outputVariablesAtEnd, int cpuTime);
+    std::string init_file, double init_time, int lambda_steps, std::string outputVariablesAtEnd, int cpuTime);
 
 extern int initializeResultData(DATA* simData, int cpuTime);
 

diff --git a/SimulationRuntime/c/simulation/solver/initialization/CMakeLists.txt b/SimulationRuntime/c/simulation/solver/initialization/CMakeLists.txt
@@ -2,21 +2,9 @@
 # CMakefile for compilation of OMC
 
 # Quellen und Header
-SET(initialization_sources  initialization.c
-                            initialization_data.c
-							method_ipopt.c
-							method_kinsol.c
-							method_newuoa.c
-							method_simplex.c
-							method_nelderMeadEx.c)
+SET(initialization_sources  initialization.c)
 
-SET(initialization_headers  initialization.h
-                            initialization_data.h
-							method_ipopt.h
-							method_kinsol.h
-							method_newuoa.h
-							method_simplex.h
-							method_nelderMeadEx.h)
+SET(initialization_headers  initialization.h)
 
 INCLUDE_DIRECTORIES("${OMCTRUNCHOME}/Compiler/runtime/")