fixing simulation flags, mostly ticket:4390

Belonging to [master]: - #2222
OpenModelica · Feb 19, 2018 · 30322f1 · 30322f1
1 parent 0334c25
commit 30322f1
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 105 deletions.
diff --git a/Compiler/runtime/systemimpl.c b/Compiler/runtime/systemimpl.c
@@ -2506,16 +2506,42 @@ char* System_getSimulationHelpTextSphinx(int detailed, int sphinx)
       }
 
       switch(i) {
+
+      case FLAG_IDA_LS:
+        numExtraFlags = IDA_LS_MAX;
+        flagName = IDA_LS_METHOD;
+        flagDesc = IDA_LS_METHOD_DESC;
+        break;
+
+      case FLAG_IIM:
+        numExtraFlags = IIM_MAX;
+        flagName = INIT_METHOD_NAME;
+        flagDesc = INIT_METHOD_DESC;
+        break;
+
+      case FLAG_JACOBIAN:
+        numExtraFlags = JAC_MAX;
+        flagName = JACOBIAN_METHOD;
+        flagDesc = JACOBIAN_METHOD_DESC;
+        break;
+
       case FLAG_LS:
         numExtraFlags = LS_MAX;
         flagName = LS_NAME;
         flagDesc = LS_DESC;
         break;
 
-      case FLAG_NLS:
-        numExtraFlags = NLS_MAX;
-        flagName = NLS_NAME;
-        flagDesc = NLS_DESC;
+      case FLAG_LSS:
+        numExtraFlags = LSS_MAX;
+        flagName = LSS_NAME;
+        flagDesc = LSS_DESC;
+        break;
+
+      case FLAG_LV:
+        firstExtraFlag=firstOMCErrorStream;
+        numExtraFlags = SIM_LOG_MAX;
+        flagName = LOG_STREAM_NAME;
+        flagDesc = LOG_STREAM_DESC;
         break;
 
       case FLAG_NEWTON_STRATEGY:
@@ -2524,19 +2550,19 @@ char* System_getSimulationHelpTextSphinx(int detailed, int sphinx)
         flagDesc = NEWTONSTRATEGY_DESC;
         break;
 
-      case FLAG_LV:
-        firstExtraFlag=firstOMCErrorStream;
-        numExtraFlags = SIM_LOG_MAX;
-        flagName = LOG_STREAM_NAME;
-        flagDesc = LOG_STREAM_DESC;
+      case FLAG_NLS:
+        numExtraFlags = NLS_MAX;
+        flagName = NLS_NAME;
+        flagDesc = NLS_DESC;
         break;
 
-      case FLAG_IIM:
-        numExtraFlags = IIM_MAX;
-        flagName = INIT_METHOD_NAME;
-        flagDesc = INIT_METHOD_DESC;
+      case FLAG_NLS_LS:
+        numExtraFlags = NLS_LS_MAX;
+        flagName = NLS_LS_METHOD;
+        flagDesc = NLS_LS_METHOD_DESC;
         break;
 
+
       case FLAG_S:
         numExtraFlags = S_MAX;
         flagName = NULL;

diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -720,21 +720,65 @@ int initRuntimeAndSimulation(int argc, char**argv, DATA *data, threadData_t *thr
         /* detailed information for some flags */
         switch(i)
         {
-        case FLAG_LV:
-          for(j=firstOMCErrorStream; j<SIM_LOG_MAX; ++j)
-            infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", LOG_STREAM_NAME[j], LOG_STREAM_DESC[j]);
-          break;
-
-        case FLAG_IIM:
-          for(j=1; j<IIM_MAX; ++j)
-            infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", INIT_METHOD_NAME[j], INIT_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]);
-          }
-          break;
+          case FLAG_IDA_LS:
+            for(j=1; j<IDA_LS_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", IDA_LS_METHOD[j], IDA_LS_METHOD_DESC[j]);
+            }
+            break;
+
+          case FLAG_IIM:
+            for(j=1; j<IIM_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", INIT_METHOD_NAME[j], INIT_METHOD_DESC[j]);
+            }
+            break;
+
+          case FLAG_JACOBIAN:
+            for(j=1; j<JAC_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", JACOBIAN_METHOD[j], JACOBIAN_METHOD_DESC[j]);
+            }
+            break;
+
+          case FLAG_LS:
+            for(j=1; j<LS_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", LS_NAME[j], LS_DESC[j]);
+            }
+            break;
+
+          case FLAG_LSS:
+            for(j=1; j<LSS_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", LSS_NAME[j], LSS_DESC[j]);
+            }
+            break;
+
+          case FLAG_LV:
+            for(j=firstOMCErrorStream; j<SIM_LOG_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", LOG_STREAM_NAME[j], LOG_STREAM_DESC[j]);
+            }
+            break;
+
+          case FLAG_NEWTON_STRATEGY:
+            for(j=firstOMCErrorStream; j<NEWTON_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", NEWTONSTRATEGY_NAME[j], NEWTONSTRATEGY_DESC[j]);
+            }
+            break;
+
+          case FLAG_NLS:
+            for(j=firstOMCErrorStream; j<NLS_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", NLS_NAME[j], NLS_DESC[j]);
+            }
+            break;
+
+          case FLAG_NLS_LS:
+            for(j=firstOMCErrorStream; j<NLS_LS_MAX; ++j) {
+              infoStreamPrint(LOG_STDOUT, 0, "%-18s [%s]", NLS_LS_METHOD[j], NLS_LS_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]);
+            }
+            break;
         }
         messageClose(LOG_STDOUT);