Refactoring non-linear solvers

OMCompiler/SimulationRuntime/c/openmodelica_types.h

@@ -139,6 +139,14 @@ typedef struct base_array_s base_array_t;
 typedef base_array_t string_array_t;
 
 typedef signed char modelica_boolean;
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
 typedef base_array_t boolean_array_t;
 
 typedef double modelica_real;

OMCompiler/SimulationRuntime/c/simulation/solver/cvode_solver.c

@@ -48,19 +48,8 @@
 #include "epsilon.h"
 
 
-
 #ifdef WITH_SUNDIALS
 
-/* Macros for better readability */
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
 #define CVODE_LMM_MAX 2
 const char *CVODE_LMM_NAME[CVODE_LMM_MAX + 1] = {
     "undefined",

OMCompiler/SimulationRuntime/c/simulation/solver/dassl.c

@@ -495,6 +495,8 @@ int printCurrentStatesVector(int logLevel, double* states, DATA* data, double ti
   return 0;
 }
 
+// TODO AHeu: Remove millionths definition of a simple vector print function
+
 /* \fn printVector(int logLevel, double* y, DATA* data, double time)
  *
  * \param [in] [logLevel]

OMCompiler/SimulationRuntime/c/simulation/solver/ida_solver.h

@@ -55,19 +55,6 @@
 /* readability */
 #define MINIMAL_SCALE_FACTOR 1e-8
 
-#ifndef booleantype
-#define booleantype int
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-
 typedef struct IDA_USERDATA
 {
   DATA* data;