Changeset c9e6dd3 in OpenModelica

Timestamp:

2022-05-18T10:13:51+02:00 (2 years ago)

Author:

AnHeuermann <andreas.heuermann@…>

Children:

5211c46

Parents:

e4b7953

Message:

Re-calculate stepSize if start/stop time was overwritten

Location:

OMCompiler/SimulationRuntime/c/simulation

Files:

• simulation_input_xml.c (modified) (6 diffs)
• solver/perform_simulation.c.inc (modified) (1 diff)

OMCompiler/SimulationRuntime/c/simulation/simulation_input_xml.c

@@ -207 +207 @@
 
 // function to handle command line settings override
-void doOverride(omc_ModelInput *mi, MODEL_DATA* modelData, const char* override, const char* overrideFile);
+modelica_boolean doOverride(omc_ModelInput *mi, MODEL_DATA *modelData, const char *override, const char *overrideFile);
 
 static const double REAL_MIN = -DBL_MAX;
@@ -528 +528 @@
   override = omc_flagValue[FLAG_OVERRIDE];
   overrideFile = omc_flagValue[FLAG_OVERRIDE_FILE];
-  doOverride(&mi, modelData, override, overrideFile);
+  modelica_boolean reCalcStepSize = doOverride(&mi, modelData, override, overrideFile);
 
   /* read all the DefaultExperiment values */
@@ -539 +539 @@
   infoStreamPrint(LOG_SIMULATION, 0, "stopTime = %g", simulationInfo->stopTime);
 
-  read_value_real(findHashStringString(mi.de,"stepSize"), &(simulationInfo->stepSize), (simulationInfo->stopTime - simulationInfo->startTime) / 500);
+  if (reCalcStepSize) {
+    simulationInfo->stepSize = (simulationInfo->stopTime - simulationInfo->startTime) / 500;
+    warningStreamPrint(LOG_STDOUT, 1, "Start or stop time was overwritten, but no new integrator step size was provided.");
+    infoStreamPrint(LOG_STDOUT, 0, "Re-calculating step size for 500 intervals.");
+    infoStreamPrint(LOG_STDOUT, 0, "Add `stepSize=<value>` to `-override=` or override file to silence this warning.");
+    messageClose(LOG_STDOUT);
+  } else {
+    read_value_real(findHashStringString(mi.de,"stepSize"), &(simulationInfo->stepSize), (simulationInfo->stopTime - simulationInfo->startTime) / 500);
+  }
   infoStreamPrint(LOG_SIMULATION, 0, "stepSize = %g", simulationInfo->stepSize);
 
@@ -942 +950 @@
 }
 
-void doOverride(omc_ModelInput *mi, MODEL_DATA *modelData, const char *override, const char *overrideFile)
+modelica_boolean doOverride(omc_ModelInput *mi, MODEL_DATA *modelData, const char *override, const char *overrideFile)
 {
   omc_CommandLineOverrides *mOverrides = NULL;
   omc_CommandLineOverridesUses *mOverridesUses = NULL, *it = NULL, *ittmp = NULL;
   mmc_sint_t i;
+  modelica_boolean changedStartStop = 0 /* false */;
+  modelica_boolean changedStepSize = 0 /* false */;
+  modelica_boolean reCalcStepSize = 0 /* false */;
   char* overrideStr1 = NULL, *overrideStr2 = NULL, *overrideStr = NULL;
   if((override != NULL) && (overrideFile != NULL)) {
@@ -1081 +1092 @@
     }
 
-    // now we have all overrides in mOverrides, override mi now
+    // Now we have all overrides in mOverrides, override mi now
+    // Also check if we need to re-calculate stepSize (start / stop time changed, but stepSize not)
     for (i=0; i<sizeof(strs)/sizeof(char*); i++) {
       if (findHashStringStringNull(mOverrides, strs[i])) {
         addHashStringString(&mi->de, strs[i], getOverrideValue(mOverrides, &mOverridesUses, strs[i]));
+        if (i==1 /* startTime */ || i ==2 /* stopTime */ ) {
+          changedStartStop = 1 /* true */;
+        }
+        if (i==3 /* stepSize */) {
+          changedStepSize = 1 /* true */;
+        }
       }
+    }
+    if(changedStartStop && ! changedStepSize) {
+      reCalcStepSize = 1 /* true */;
     }
 
@@ -1159 +1180 @@
     infoStreamPrint(LOG_SOLVER, 0, "NO override given on the command line.");
   }
+
+  return reCalcStepSize;
 }
 

OMCompiler/SimulationRuntime/c/simulation/solver/perform_simulation.c.inc

@@ -506 +506 @@
         }
 
-        solverInfo->currentStepSize = (double)(__currStepNo*(simInfo->stopTime-simInfo->startTime))/(simInfo->numSteps) + simInfo->startTime - solverInfo->currentTime;
+        if(simInfo->numSteps == 0) {
+          if(fabs(simInfo->stopTime-simInfo->startTime) < 1e-16) {
+            solverInfo->currentStepSize = 0;
+          } else {
+            errorStreamPrint(LOG_STDOUT, 1, "Number of integrator steps to do is 0, but experiment start time is not equal stop time.");
+            infoStreamPrint(LOG_STDOUT, 0, "start time: %f, stop time: %f, integrator step size: %f",simInfo->startTime, simInfo->stopTime, simInfo->stepSize);
+            messageClose(LOG_STDOUT);
+            errorStreamPrint(LOG_STDOUT, 0, "model terminate | Integrator failed. | Simulation terminated at time %g", solverInfo->currentTime);
+            retValue = -1;
+            break;
+          }
+        } else {
+          solverInfo->currentStepSize = (double)(__currStepNo*(simInfo->stopTime-simInfo->startTime))/(simInfo->numSteps) + simInfo->startTime - solverInfo->currentTime;
+        }
 
         solverInfo->lastdesiredStep = solverInfo->currentTime + solverInfo->currentStepSize;