- nonlinear solver: don't start solver if is already solved.

   - now LossyGearDemo2 does work.
 - minor changes (fix some debug outputs and correct test)


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

Author: Willi Braun

SimulationRuntime/c/math-support/nonlinearSolverHybrd.c

@@ -191,6 +191,15 @@ int solveHybrd(DATA *data, int sysNumber) {
     }
   }
 
+  /* check if system is already solved then do nothing */
+  wrapper_fvec_hybrd(&solverData->n, systemData->nlsx,  solverData->fvec, &solverData->info,  data);
+  xerror = enorm_(&solverData->n, solverData->fvec);
+  /* solution found */
+  if (xerror <= local_tol) {
+      success = 1;
+  }
+ 
+
   /* start solving loop */
   while (!giveUp && !success) {
 

SimulationRuntime/c/simulation/solver/dassl.c

@@ -513,7 +513,7 @@ int function_ZeroCrossingsDASSL(fortran_integer *neqm, double *t, double *y,
     for (i=0; i < *ng; i++) {
       if (data->simulationInfo.zeroCrossings[i] != gout[i]){
         INFO_AL1("|                 | %s", zeroCrossingDescription[i]);
-        INFO_AL2("|                 | changed :  %s <> %s", (data->simulationInfo.zeroCrossings[i]>0)?"TRUE ":"FALSE", (gout[i]>0)?"TRUE ":"FALSE");
+        INFO_AL2("|                 | changed :  %s -> %s", (data->simulationInfo.zeroCrossings[i]>0)?"TRUE ":"FALSE", (gout[i]>0)?"TRUE ":"FALSE");
       }
     }
   }

SimulationRuntime/c/simulation/solver/events.c

@@ -398,7 +398,7 @@ modelica_boolean checkForNewEvent(DATA* data, LIST *eventList)
         {
           if (DEBUG_FLAG(LOG_EVENTS | LOG_ZEROCROSSINGS)){
             INFO_AL1("|        | %s", zeroCrossingDescription[i]);
-            INFO_AL2("|        | changed: %s -> %s", (data->simulationInfo.zeroCrossings[i]>0)?"TRUE ":"FALSE", (data->simulationInfo.zeroCrossingsPre[i]>0)?"TRUE ":"FALSE");
+            INFO_AL2("|        | changed: %s -> %s", (data->simulationInfo.zeroCrossingsPre[i]>0)?"TRUE ":"FALSE", (data->simulationInfo.zeroCrossings[i]>0)?"TRUE ":"FALSE");
           }
           listPushFront(eventList, &(data->simulationInfo.zeroCrossingIndex[i]));
         }