- fix inconsistent flags iim and iom

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

Author: lochel

SimulationRuntime/c/simulation/simulation_runtime.cpp

@@ -72,6 +72,7 @@
 #include "nonlinearSystem.h"
 #include "rtclock.h"
 #include "../../../Compiler/runtime/config.h"
+#include "initialization.h"
 
 #ifdef _OMC_QSS_LIB
   #include "solver_qss/solver_qss.h"
@@ -772,10 +773,24 @@ int initRuntimeAndSimulation(int argc, char**argv, DATA *data)
 
         /* detailed information for some flags */
         INDENT(LOG_STDOUT);
-        if(i == FLAG_LV)
+        if(FLAG_LV == i)
         {
           for(j=firstOMCErrorStream; j<LOG_MAX; ++j)
-            INFO2(LOG_STDOUT, "  %-18s [%s]", LOG_STREAM_NAME[j], LOG_STREAM_DESC[j]);
+            INFO2(LOG_STDOUT, "%-18s [%s]", LOG_STREAM_NAME[j], LOG_STREAM_DESC[j]);
+        }
+        else if(FLAG_IIM == i)
+        {
+          for(j=1; j<IIM_MAX; ++j)
+            INFO2(LOG_STDOUT, "%-18s [%s]", initMethodStr[j], initMethodDescStr[j]);
+        }
+        else if(FLAG_IOM == i)
+        {
+          for(j=1; j<IOM_MAX; ++j)
+            INFO2(LOG_STDOUT, "%-18s [%s]", optiMethodStr[j], optiMethodDescStr[j]);
+        }
+        else if(FLAG_S == i)
+        {
+          /* TODO */
         }
         RELEASE(LOG_STDOUT);
 

SimulationRuntime/c/simulation/solver/initialization/initialization.c

@@ -55,59 +55,6 @@
 #include <math.h>
 #include <string.h>
 
-enum INIT_INIT_METHOD
-{
-  IIM_UNKNOWN = 0,
-  IIM_NONE,
-  IIM_NUMERIC,
-  IIM_SYMBOLIC,
-  IIM_MAX
-};
-
-static const char *initMethodStr[IIM_MAX] = {
-  "unknown",
-  "none",
-  "numeric",
-  "symbolic"
-};
-static const char *initMethodDescStr[IIM_MAX] = {
-  "unknown",
-  "no initialization method",
-  "solves the initialization problem numerically",
-  "solves the initialization problem symbolically - default"
-};
-
-enum INIT_OPTI_METHOD
-{
-  IOM_UNKNOWN = 0,
-  IOM_SIMPLEX,
-  IOM_NEWUOA,
-  IOM_NELDER_MEAD_EX,
-  IOM_KINSOL,
-  IOM_KINSOL_SCALED,
-  IOM_IPOPT,
-  IOM_MAX
-};
-
-static const char *optiMethodStr[IOM_MAX] = {
-  "unknown",
-  "simplex",
-  "newuoa",
-  "nelder_mead_ex",
-  "kinsol",
-  "kinsol_scaled",
-  "ipopt"
-};
-static const char *optiMethodDescStr[IOM_MAX] = {
-  "unknown",
-  "Nelder-Mead method",
-  "Brent's method",
-  "Nelder-Mead method with global homotopy (see -ils for global homotopy) - default",
-  "sundials/kinsol",
-  "sundials/kinsol with scaling",
-  "Interior Point OPTimizer"
-};
-
 /*! \fn int reportResidualValue(INIT_DATA *initData)
  *
  *  return 1: if funcValue >  1e-5

SimulationRuntime/c/simulation/solver/initialization/initialization.h

@@ -43,6 +43,58 @@
 extern "C"
 {
 #endif
+  enum INIT_INIT_METHOD
+  {
+    IIM_UNKNOWN = 0,
+    IIM_NONE,
+    IIM_NUMERIC,
+    IIM_SYMBOLIC,
+    IIM_MAX
+  };
+
+  static const char *initMethodStr[IIM_MAX] = {
+    "unknown",
+    "none",
+    "numeric",
+    "symbolic"
+  };
+  static const char *initMethodDescStr[IIM_MAX] = {
+    "unknown",
+    "no initialization method",
+    "solves the initialization problem numerically",
+    "solves the initialization problem symbolically - default"
+  };
+
+  enum INIT_OPTI_METHOD
+  {
+    IOM_UNKNOWN = 0,
+    IOM_SIMPLEX,
+    IOM_NEWUOA,
+    IOM_NELDER_MEAD_EX,
+    IOM_KINSOL,
+    IOM_KINSOL_SCALED,
+    IOM_IPOPT,
+    IOM_MAX
+  };
+
+  static const char *optiMethodStr[IOM_MAX] = {
+    "unknown",
+    "simplex",
+    "newuoa",
+    "nelder_mead_ex",
+    "kinsol",
+    "kinsol_scaled",
+    "ipopt"
+  };
+  static const char *optiMethodDescStr[IOM_MAX] = {
+    "unknown",
+    "Nelder-Mead method",
+    "Brent's method",
+    "Nelder-Mead method with global homotopy (see -ils for global homotopy) - default",
+    "sundials/kinsol",
+    "sundials/kinsol with scaling",
+    "Interior Point OPTimizer"
+  };
 
   extern void dumpInitialization(INIT_DATA *initData);
   extern int reportResidualValue(INIT_DATA *initData);

SimulationRuntime/c/util/simulation_options.c

@@ -98,11 +98,11 @@ const char *FLAG_DETAILED_DESC[FLAG_MAX+1] = {
   /* FLAG_F */                     "value specifies a new setup XML file to the generated simulation code",
   /* FLAG_HELP */                  "get detailed information that specifies the command-line flag\n  e.g. -help=f prints detailed information for command-line flag f",
   /* FLAG_IIF */                   "value specifies an external file for the initialization of the model",
-  /* FLAG_IIM */                   "value specifies the initialization method\n  none\n  numeric\n  symbolic",
+  /* FLAG_IIM */                   "value specifies the initialization method",
   /* FLAG_IIT */                   "value specifies a time for the initialization of the model",
   /* FLAG_ILS */                   "value specifies the number of steps for homotopy method (required: -iim=symbolic) or\n'start value homotopy' method (required: -iim=numeric -iom=nelder_mead_ex)",
   /* FLAG_INTERACTIVE */           "specify interactive simulation",
-  /* FLAG_IOM */                   "value specifies the initialization optimization method\n  nelder_mead_ex\n  simplex\n  newuoa",
+  /* FLAG_IOM */                   "value specifies the initialization optimization method",
   /* FLAG_L */                     "value specifies a time where the linearization of the model should be performed",
   /* FLAG_LS */                    "value specifies the linear solver method\n  lapack",
   /* FLAG_LV */                    "value specifies the logging level",
@@ -114,7 +114,7 @@ const char *FLAG_DETAILED_DESC[FLAG_MAX+1] = {
   /* FLAG_OVERRIDE_FILE */         "will override the variables or the simulation settings in the XML setup file with the values from the file\n  note that: -overrideFile CANNOT be used with -override\n  use when variables for -override are too many and do not fit in command line size\n  overrideFileName contains lines of the form: var1=start1",
   /* FLAG_PORT */                  "value specifies interactive simulation port",
   /* FLAG_R */                     "value specifies a new result file than the default Model_res.mat",
-  /* FLAG_S */                     "value specifies the solver\n  dassl\n  euler\n  rungekutta\n  inline-euler\n  inline-rungekutta\n  dasslwort\n  dasslSymJac\n  dasslNumJac\n  dasslColorSymJac\n  dasslInternalNumJac\n  qss",
+  /* FLAG_S */                     "value specifies the solver",
   /* FLAG_W */                     "shows all warnings even if a related log-stream is inactive",
 
   "FLAG_MAX"