Make number of continuous states and event indicators variable

modelica · Nov 7, 2023 · 8111d4d · 8111d4d
1 parent dbd6e0c
commit 8111d4d
Show file tree

Hide file tree

Showing 18 changed files with 236 additions and 134 deletions.
diff --git a/BouncingBall/config.h b/BouncingBall/config.h
@@ -8,9 +8,8 @@
 #define CO_SIMULATION
 #define MODEL_EXCHANGE
 
-// define model size
-#define NX 2
-#define NZ 1
+#define HAS_CONTINUOUS_STATES
+#define HAS_EVENT_INDICATORS
 
 #define SET_FLOAT64
 #define GET_OUTPUT_DERIVATIVE

diff --git a/BouncingBall/model.c b/BouncingBall/model.c
@@ -133,9 +133,6 @@ void eventUpdate(ModelInstance *comp) {
             M(g) = 0;
         }
 
-        // reset previous event indicators
-        getEventIndicators(comp, comp->z, NZ);
-
         comp->valuesOfContinuousStatesChanged = true;
     } else {
         comp->valuesOfContinuousStatesChanged = false;
@@ -146,6 +143,16 @@ void eventUpdate(ModelInstance *comp) {
     comp->nextEventTimeDefined = false;
 }
 
+size_t getNumberOfEventIndicators(ModelInstance* comp) {
+    UNUSED(comp);
+    return 1;
+}
+
+size_t getNumberOfContinuousStates(ModelInstance* comp) {
+    UNUSED(comp);
+    return 2;
+}
+
 void getContinuousStates(ModelInstance *comp, double x[], size_t nx) {
     UNUSED(nx);
     x[0] = M(h);

diff --git a/Clocks/config.h b/Clocks/config.h
@@ -13,10 +13,6 @@
 
 #define DEFAULT_STOP_TIME 3
 
-// define model size
-#define NX 0
-#define NZ 0
-
 #define EVENT_UPDATE
 #define ACTIVATE_CLOCK
 #define GET_INT32

diff --git a/Dahlquist/config.h b/Dahlquist/config.h
@@ -8,9 +8,7 @@
 #define CO_SIMULATION
 #define MODEL_EXCHANGE
 
-// define model size
-#define NX 1
-#define NZ 0
+#define HAS_CONTINUOUS_STATES
 
 #define SET_FLOAT64
 

diff --git a/Dahlquist/model.c b/Dahlquist/model.c
@@ -62,6 +62,11 @@ Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[],
     }
 }
 
+size_t getNumberOfContinuousStates(ModelInstance* comp) {
+    UNUSED(comp);
+    return 1;
+}
+
 void getContinuousStates(ModelInstance *comp, double x[], size_t nx) {
     UNUSED(nx);
     x[0] = M(x);

diff --git a/Feedthrough/config.h b/Feedthrough/config.h
@@ -12,9 +12,6 @@
 #define CO_SIMULATION
 #define MODEL_EXCHANGE
 
-#define NX 0
-#define NZ 0
-
 #define GET_FLOAT32
 #define GET_FLOAT64
 #define GET_INT8

diff --git a/Feedthrough/model.c b/Feedthrough/model.c
@@ -530,7 +530,6 @@ Status setUInt16(ModelInstance* comp, ValueReference vr, const uint16_t values[]
     return OK;
 }
 
-
 Status setInt32(ModelInstance* comp, ValueReference vr, const int32_t values[], size_t nValues, size_t* index) {
 
     ASSERT_NVALUES(1);

diff --git a/LinearTransform/config.h b/LinearTransform/config.h
@@ -7,10 +7,6 @@
 #define MODEL_IDENTIFIER LinearTransform
 #define INSTANTIATION_TOKEN "{D773325B-AB94-4630-BF85-643EB24FCB78}"
 
-// define model size
-#define NX 0
-#define NZ 0
-
 #define CO_SIMULATION
 #define MODEL_EXCHANGE
 

diff --git a/Resource/config.h b/Resource/config.h
@@ -8,10 +8,6 @@
 #define CO_SIMULATION
 #define MODEL_EXCHANGE
 
-// define model size
-#define NX 0
-#define NZ 0
-
 #define GET_INT32
 
 #define FIXED_SOLVER_STEP 1

diff --git a/Stair/config.h b/Stair/config.h
@@ -8,10 +8,6 @@
 #define CO_SIMULATION
 #define MODEL_EXCHANGE
 
-// define model size
-#define NX 0
-#define NZ 0
-
 #define GET_INT32
 #define EVENT_UPDATE
 

diff --git a/VanDerPol/config.h b/VanDerPol/config.h
@@ -8,9 +8,7 @@
 #define CO_SIMULATION
 #define MODEL_EXCHANGE
 
-// define model size
-#define NX 2
-#define NZ 0
+#define HAS_CONTINUOUS_STATES
 
 #define SET_FLOAT64
 

diff --git a/VanDerPol/model.c b/VanDerPol/model.c
@@ -74,6 +74,11 @@ Status setFloat64(ModelInstance* comp, ValueReference vr, const double values[],
     }
 }
 
+size_t getNumberOfContinuousStates(ModelInstance* comp) {
+    UNUSED(comp);
+    return 2;
+}
+
 void getContinuousStates(ModelInstance *comp, double x[], size_t nx) {
     UNUSED(nx);
     x[0] = M(x0);

diff --git a/examples/jacobian.c b/examples/jacobian.c
@@ -4,6 +4,7 @@
 
 #include "util.h"
 
+#define NX 2
 
 int main(int argc, char* argv[]) {
 
@@ -12,9 +13,8 @@ int main(int argc, char* argv[]) {
     size_t i, j;
     fmi3Float64 time = 0;
 
-    size_t nx = NX;
-    fmi3ValueReference vr_x[]  = { vr_x0, vr_x1 };
-    fmi3ValueReference vr_dx[] = { vr_der_x0, vr_der_x1 };
+    fmi3ValueReference vr_x[NX]  = { vr_x0, vr_x1 };
+    fmi3ValueReference vr_dx[NX] = { vr_der_x0, vr_der_x1 };
 
     // variables:
     fmi3Float64 x[NX];
@@ -34,7 +34,7 @@ int main(int argc, char* argv[]) {
 
     CALL(FMI3EnterContinuousTimeMode(S));
 
-    CALL(FMI3GetContinuousStates(S, x, nx));
+    CALL(FMI3GetContinuousStates(S, x, NX));
 
     // tag::JacobianVariables[]
     // from the XML file:
@@ -54,14 +54,14 @@ int main(int argc, char* argv[]) {
 
     // set time, states and inputs
     CALL(FMI3SetTime(S, time));
-    CALL(FMI3SetContinuousStates(S, x, nx));
+    CALL(FMI3SetContinuousStates(S, x, NX));
     // fmi3Set{VariableType}(s, ...)
 
     // if required at this step, compute the Jacobian as a dense matrix
-    for (i = 0; i < nx; i++) {
+    for (i = 0; i < NX; i++) {
         // construct the Jacobian matrix column wise
-        CALL(FMI3GetDirectionalDerivative(S, vr_dx, nx, &vr_x[i], 1, &dk, 1, c, nx));
-        for (j = 0; j < nx; j++) {
+        CALL(FMI3GetDirectionalDerivative(S, vr_dx, NX, &vr_x[i], 1, &dk, 1, c, NX));
+        for (j = 0; j < NX; j++) {
             J[j][i] = c[j];
         }
     }
@@ -73,9 +73,9 @@ int main(int argc, char* argv[]) {
     assert(J[1][1] == -3);
 
     // tag::GetJacobianAdjoint[]
-    for (i = 0; i < nx; i++) {
+    for (i = 0; i < NX; i++) {
         // construct the Jacobian matrix column wise
-        CALL(FMI3GetAdjointDerivative(S, &vr_dx[i], 1, vr_x, nx, &dk, 1, &J[i][0], nx));
+        CALL(FMI3GetAdjointDerivative(S, &vr_dx[i], 1, vr_x, NX, &dk, 1, &J[i][0], NX));
     }
     // end::GetJacobianAdjoint[]
 

diff --git a/include/model.h b/include/model.h
@@ -140,18 +140,22 @@ typedef struct {
 
     ModelData modelData;
 
-#if NZ > 0
-    // event indicators
-    double z[NZ];
-#endif
-
     // internal solver steps
     uint64_t nSteps;
 
     // Co-Simulation
     bool earlyReturnAllowed;
     bool eventModeUsed;
 
+    // solver
+    size_t nz;
+    double* z;
+    double* prez;
+
+    size_t nx;
+    double* x;
+    double* dx;
+
 } ModelInstance;
 
 ModelInstance *createModelInstance(
@@ -166,6 +170,8 @@ ModelInstance *createModelInstance(
 
 void freeModelInstance(ModelInstance *comp);
 
+void exitInitializationMode(ModelInstance* comp);
+
 void reset(ModelInstance* comp);
 
 void setStartValues(ModelInstance* comp);
@@ -208,6 +214,8 @@ Status getInterval(ModelInstance* comp, ValueReference vr, double* interval, int
 
 Status activateModelPartition(ModelInstance* comp, ValueReference vr, double activationTime);
 
+size_t getNumberOfEventIndicators(ModelInstance* comp);
+size_t getNumberOfContinuousStates(ModelInstance* comp);
 void getContinuousStates(ModelInstance *comp, double x[], size_t nx);
 void setContinuousStates(ModelInstance *comp, const double x[], size_t nx);
 void getDerivatives(ModelInstance *comp, double dx[], size_t nx);