- set a uniform stop criterion for all initialization methods

- always prompt an error, if the initialization fails


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

Author: lochel

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

@@ -104,8 +104,8 @@
   int kinsol_initialization(INIT_DATA *initData)
   {
     long i;
-    double fnormtol  = 1.e-9;     /* function tolerance */
-    double scsteptol = 1.e-9;     /* step tolerance */
+    double fnormtol  = 1.e-12;     /* function tolerance */
+    double scsteptol = 1.e-12;     /* step tolerance */
 
     long int nni = 0, nfe = 0, nje = 0, nfeD = 0;
 

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

@@ -104,8 +104,8 @@ static void leastSquare(long *nz, double *z, double *funcValue)
 int newuoa_initialization(INIT_DATA *initData)
 {
   long IPRINT = DEBUG_STREAM(LOG_INIT) ? 1000 : 0;
-  long MAXFUN = 5000 * initData->nVars;
-  double RHOEND = 1.0e-6;
+  long MAXFUN = 1000 * initData->nVars;
+  double RHOEND = 1.0e-12;
   double RHOBEG = 10;     /* This should be about one tenth of the greatest
                              expected value of a variable. Perhaps the nominal
                              value can be used for this. */

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

@@ -127,8 +127,8 @@ int simplex_initialization(INIT_DATA* initData)
 
   /* Set max. no. of function evaluations = 5000, print every 100. */
 
-  MAXF = 5000 * initData->nVars;
-  IPRINT = DEBUG_STREAM(LOG_INIT) ? 1000 : -1;
+  MAXF = 1000 * initData->nVars;
+  IPRINT = DEBUG_STREAM(LOG_INIT) ? MAXF/10 : -1;
 
   /* Set value for stopping criterion.   Stopping occurs when the
   * standard deviation of the values of the objective function at

SimulationRuntime/c/simulation/solver/solver_main.c

@@ -172,13 +172,13 @@ int solver_main(DATA* data, const char* init_initMethod,
 
   if(initialization(data, init_initMethod, init_optiMethod, init_file, init_time))
   {
-    WARNING(LOG_SOLVER, "| solver | Error in initialization. Storing results and exiting.");
+    WARNING(LOG_STDOUT, "Error in initialization. Storing results and exiting.\nUse -lv LOG_INIT for more information.");
     simInfo->stopTime = simInfo->startTime;
   }
 
   /* adrpo: write the parameter data in the file once again after bound parameters and initialization! */
   sim_result_writeParameterData(&(data->modelData));
-  INFO(LOG_SOLVER, "| solver | Wrote parameters to the file after initialization (for output formats that support this)");
+  INFO(LOG_SOLVER, "Wrote parameters to the file after initialization (for output formats that support this)");
   if (DEBUG_STREAM(LOG_DEBUG))
     printParameters(data);