Use modelica_booleans (OpenModelica#12204)

adrpo · Apr 5, 2024 · ff4a0ea · ff4a0ea
1 parent 3ad175e
commit ff4a0ea
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 28 deletions.
diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/irksco.c b/OMCompiler/SimulationRuntime/c/simulation/solver/irksco.c
@@ -198,7 +198,7 @@ int rk_imp_step(DATA* data, threadData_t* threadData, SOLVER_INFO* solverInfo, d
   sData->timeValue = irkscoData->radauTime + irkscoData->radauStepSize;
   solverInfo->currentTime = sData->timeValue;
 
-  newtonData->initialized = 1;
+  newtonData->initialized = TRUE;
   newtonData->numberOfIterations = 0;
   newtonData->numberOfFunctionEvaluations = 0;
   newtonData->n = n*irkscoData->ordersize;

diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHomotopy.c b/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHomotopy.c
@@ -73,7 +73,7 @@ extern int dgesv_(int *n, int *nrhs, doublereal *a, int *lda, int *ipiv, doubler
  */
 typedef struct DATA_HOMOTOPY
 {
-  int initialized; /* 1 = initialized, else = 0*/
+  modelica_boolean initialized;
 
   size_t n; /* dimension; n == size */
   size_t m; /* dimension: m == size+1 */
@@ -169,7 +169,7 @@ DATA_HOMOTOPY* allocateHomotopyData(size_t size, NLS_USERDATA* userData)
   DATA_HOMOTOPY* homotopyData = (DATA_HOMOTOPY*) malloc(sizeof(DATA_HOMOTOPY));
   assertStreamPrint(NULL, NULL != homotopyData, "allocationHomotopyData() failed!");
 
-  homotopyData->initialized = 0;
+  homotopyData->initialized = FALSE;
   homotopyData->n = size;
   homotopyData->m = size + 1;
   homotopyData->xtol_sqrd = newtonXTol*newtonXTol;

diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c b/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.c
@@ -64,7 +64,7 @@ DATA_HYBRD* allocateHybrdData(size_t size, NLS_USERDATA* userData)
   DATA_HYBRD* hybrdData = (DATA_HYBRD*) malloc(sizeof(DATA_HYBRD));
   assertStreamPrint(NULL, hybrdData != NULL, "allocationHybrdData() failed!");
 
-  hybrdData->initialized = 0;
+  hybrdData->initialized = FALSE;
   hybrdData->resScaling = (double*) malloc(size*sizeof(double));
   hybrdData->fvecScaled = (double*) malloc(size*sizeof(double));
   hybrdData->useXScaling = 1;
@@ -328,7 +328,7 @@ static void wrapper_fvec_hybrj(const integer *n_p, const double* x, double* f, d
   threadData_t* threadData = userData->threadData;
   NONLINEAR_SYSTEM_DATA* systemData = userData->nlsData;
   DATA_HYBRD* hybrdData = (DATA_HYBRD*)(systemData->solverData);
-  int continuous = data->simulationInfo->solveContinuous;
+  modelica_boolean continuous = data->simulationInfo->solveContinuous;
   RESIDUAL_USERDATA resUserData = {.data=data, .threadData=threadData, .solverData=userData->solverData};
 
   switch(*iflag)
@@ -364,7 +364,7 @@ static void wrapper_fvec_hybrj(const integer *n_p, const double* x, double* f, d
   case 2:
     /* set residual function continuous for jacobian calculation */
     if(continuous)
-      data->simulationInfo->solveContinuous = 0;
+      data->simulationInfo->solveContinuous = FALSE;
 
     if(ACTIVE_STREAM(LOG_NLS_RES))
       infoStreamPrint(LOG_NLS_RES, 0, "-- begin calculating jacobian --");
@@ -404,7 +404,7 @@ static void wrapper_fvec_hybrj(const integer *n_p, const double* x, double* f, d
     }
     /* reset residual function again */
     if(continuous)
-      data->simulationInfo->solveContinuous = 1;
+      data->simulationInfo->solveContinuous = TRUE;
 
     /* performance measurement and statistics */
     systemData->jacobianTime += rt_ext_tp_tock(&(systemData->jacobianTimeClock));
@@ -439,7 +439,7 @@ NLS_SOLVER_STATUS solveHybrd(DATA *data, threadData_t *threadData, NONLINEAR_SYS
   double local_tol = 1e-12;
   double initial_factor = hybrdData->factor;
   int nfunc_evals = 0;
-  int continuous = 1;
+  modelica_boolean continuous = TRUE;
   int nonContinuousCase = 0;
 
   int giveUp = 0;
@@ -524,13 +524,8 @@ NLS_SOLVER_STATUS solveHybrd(DATA *data, threadData_t *threadData, NONLINEAR_SYS
       printVector(hybrdData->x, hybrdData->n, LOG_NLS_V, "Iteration variable values (scaled)");
     }
 
-    /* set residual function continuous
-     */
-    if(continuous) {
-      data->simulationInfo->solveContinuous = 1;
-    } else {
-      data->simulationInfo->solveContinuous = 0;
-    }
+    /* set residual function continuous */
+    data->simulationInfo->solveContinuous = continuous;
 
     giveUp = 1;
 
@@ -591,15 +586,8 @@ NLS_SOLVER_STATUS solveHybrd(DATA *data, threadData_t *threadData, NONLINEAR_SYS
       }
     }
 
-    /* set residual function continuous */
-    if(continuous)
-    {
-      data->simulationInfo->solveContinuous = 0;
-    }
-    else
-    {
-      data->simulationInfo->solveContinuous = 1;
-    }
+    /* reset residual function continuous */
+    data->simulationInfo->solveContinuous = !continuous;
 
     /* re-scaling x vector */
     if(hybrdData->useXScaling)
@@ -621,7 +609,7 @@ NLS_SOLVER_STATUS solveHybrd(DATA *data, threadData_t *threadData, NONLINEAR_SYS
         if(scaling)
           hybrdData->useXScaling = 0;
 
-        data->simulationInfo->solveContinuous = 0;
+        data->simulationInfo->solveContinuous = FALSE;
 
         /* try */
 #ifndef OMC_EMCC
@@ -893,7 +881,7 @@ NLS_SOLVER_STATUS solveHybrd(DATA *data, threadData_t *threadData, NONLINEAR_SYS
       retries++;
 
       /* try to solve a discontinuous system */
-      continuous = 0;
+      continuous = FALSE;
 
       nonContinuousCase = 1;
       memcpy(relationsPreBackup, data->simulationInfo->relationsPre, sizeof(modelica_boolean)*data->modelData->nRelations);
@@ -914,7 +902,7 @@ NLS_SOLVER_STATUS solveHybrd(DATA *data, threadData_t *threadData, NONLINEAR_SYS
       if(!scaling)
         hybrdData->useXScaling = 1;
 
-      continuous = 1;
+      continuous = TRUE;
       hybrdData->factor = initial_factor;
 
       retries = 0;

diff --git a/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.h b/OMCompiler/SimulationRuntime/c/simulation/solver/nonlinearSolverHybrd.h
@@ -44,7 +44,7 @@ extern "C" {
 
 typedef struct DATA_HYBRD
 {
-  int initialized; /* 1 = initialized, else = 0*/
+  modelica_boolean initialized;
   double* resScaling;
   int useXScaling;
   double* xScalefactors;