Changeset 12187

Timestamp:

Dec 20, 2018 3:19:01 PM (12 months ago)

Author:

Christian Andersson

Message:

Added a solver used for when there a no states in the model. Related to ticket:5720

Location:

branches/dev-cw-ii/RuntimeLibrary/src

Files:

• fmi2/fmi2_cs.c (modified) (1 diff)
• fmi2/fmi2_me.c (modified) (1 diff)
• jmi/CMakeLists.txt (modified) (2 diffs)
• jmi/jmi_ode_no_state.c (added)
• jmi/jmi_ode_no_state.h (added)
• jmi/jmi_ode_solver.c (modified) (2 diffs)
• jmi/jmi_ode_solver.h (modified) (1 diff)

branches/dev-cw-ii/RuntimeLibrary/src/fmi2/fmi2_cs.c

@@ -260 +260 @@
     
     /* Evaluate the derivatives */
-    if (sizes.states > 0) {
-        retval = fmi2_get_derivatives(cs_data->fmix_me, rhs, sizes.states);
-        if (retval != fmi2OK) {
-            return -1;
-        }
+    retval = fmi2_get_derivatives(cs_data->fmix_me, rhs, sizes.states);
+    if (retval != fmi2OK) {
+        return -1;
     }
     

branches/dev-cw-ii/RuntimeLibrary/src/fmi2/fmi2_me.c

@@ -274 +274 @@
         /* These options for the solver need to be found in a better way. */
         options = jmi_ode_solver_default_options();
-        options.method                  = jmi->options.cs_solver;
+        if (ode_problem->sizes.states > 0) {
+            options.method                  = jmi->options.cs_solver;
+        } else {
+            options.method                  = JMI_ODE_NO_STATE;
+        }
         options.euler_options.step_size = jmi->options.cs_step_size;
         options.cvode_options.rel_tol   = jmi->options.cs_rel_tol;

branches/dev-cw-ii/RuntimeLibrary/src/jmi/CMakeLists.txt

@@ -68 +68 @@
     jmi_ode_cvode.h
     jmi_ode_euler.h
+    jmi_ode_no_state.h
     jmi_ode_solver.h
     jmi_ode_solver_impl.h
@@ -74 +75 @@
     jmi_ode_cvode.c
     jmi_ode_euler.c
+    jmi_ode_no_state.c
     jmi_ode_solver.c
     jmi_ode_problem.c

branches/dev-cw-ii/RuntimeLibrary/src/jmi/jmi_ode_solver.c

@@ -22 +22 @@
 #include "jmi_ode_euler.h"
 #include "jmi_ode_cvode.h"
+#include "jmi_ode_no_state.h"
 #include "jmi_math.h"
 
@@ -75 +76 @@
         solver->solve = jmi_ode_euler_solve;
         solver->delete_solver = jmi_ode_euler_delete;
+    }
+        break;
+    case JMI_ODE_NO_STATE: {
+        jmi_ode_no_state_t* integrator;    
+        flag = jmi_ode_no_state_new(&integrator, solver);
+        solver->integrator = integrator;
+        solver->solve = jmi_ode_no_state_solve;
+        solver->delete_solver = jmi_ode_no_state_delete;
     }
         break;

branches/dev-cw-ii/RuntimeLibrary/src/jmi/jmi_ode_solver.h

@@ -39 +39 @@
 typedef enum {
     JMI_ODE_CVODE,
-    JMI_ODE_EULER
+    JMI_ODE_EULER,
+    JMI_ODE_NO_STATE
 } jmi_ode_method_t;