SedInstance: allow to pass some initial conditions to the JavaScript …

…binding version of the `run()` method. This is to be reverted after ISAN.
opencor · Jul 2, 2024 · f310a08 · f310a08
1 parent 9eed30c
commit f310a08
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 0 deletions.
diff --git a/src/api/libopencor/sedinstance.h b/src/api/libopencor/sedinstance.h
@@ -50,6 +50,9 @@ class LIBOPENCOR_EXPORT SedInstance: public Logger
      */
 
     void run();
+#ifdef __EMSCRIPTEN__
+    void addInitialCondition(const std::string &pParameter, double pValue); //---ISAN---
+#endif
 
     /**
      * @brief Return the tasks.

diff --git a/src/bindings/javascript/sed.cpp b/src/bindings/javascript/sed.cpp
@@ -65,6 +65,7 @@ void sedApi()
     emscripten::class_<libOpenCOR::SedInstance, emscripten::base<libOpenCOR::Logger>>("SedInstance")
         .smart_ptr<libOpenCOR::SedInstancePtr>("SedInstance")
         .function("run", &libOpenCOR::SedInstance::run)
+        .function("addInitialCondition", &libOpenCOR::SedInstance::addInitialCondition) //---ISAN---
         .function("tasks", &libOpenCOR::SedInstance::tasks);
 
     // SedInstanceTask API.

diff --git a/src/sed/sedinstance.cpp b/src/sed/sedinstance.cpp
@@ -88,6 +88,15 @@ void SedInstance::Impl::run()
     }
 }
 
+#ifdef __EMSCRIPTEN__
+void SedInstance::Impl::addInitialCondition(const std::string &pParameter, double pValue) //---ISAN---
+{
+    for (const auto &task : mTasks) {
+        task->pimpl()->addInitialCondition(pParameter, pValue);
+    }
+}
+#endif
+
 SedInstanceTaskPtrs SedInstance::Impl::tasks() const
 {
     return mTasks;
@@ -118,6 +127,13 @@ void SedInstance::run()
     pimpl()->run();
 }
 
+#ifdef __EMSCRIPTEN__
+void SedInstance::addInitialCondition(const std::string &pParameter, double pValue) //---ISAN---
+{
+    pimpl()->addInitialCondition(pParameter, pValue);
+}
+#endif
+
 SedInstanceTaskPtrs SedInstance::tasks() const
 {
     return pimpl()->tasks();

diff --git a/src/sed/sedinstance_p.h b/src/sed/sedinstance_p.h
@@ -32,6 +32,7 @@ class SedInstance::Impl: public Logger::Impl
     explicit Impl(const SedDocumentPtr &pDocument, bool pCompiled);
 
     void run();
+    void addInitialCondition(const std::string &pParameter, double pValue); //---ISAN---
 
     SedInstanceTaskPtrs tasks() const;
 };

diff --git a/src/sed/sedinstancetask.cpp b/src/sed/sedinstancetask.cpp
@@ -153,6 +153,44 @@ void SedInstanceTask::Impl::trackResults(size_t pIndex)
     }
 }
 
+namespace {
+
+std::string name(const libcellml::VariablePtr &pVariable, char pSeparator = '.') //---ISAN---
+{
+    auto component = std::dynamic_pointer_cast<libcellml::Component>(pVariable->parent());
+
+    return component->name() + pSeparator + pVariable->name();
+}
+
+} // namespace
+
+void SedInstanceTask::Impl::applyInitialConditions() //---ISAN---
+{
+    for (const auto &[key, value] : mInitialConditions) {
+        bool initialConditionSet = false;
+
+        for (const auto &state : mAnalyserModel->states()) {
+            if (name(state->variable(), '/') == key) {
+                mStates[state->index()] = value;
+
+                initialConditionSet = true;
+
+                break;
+            }
+        }
+
+        if (!initialConditionSet) {
+            for (const auto &variable : mAnalyserModel->variables()) {
+                if (name(variable->variable(), '/') == key) {
+                    mVariables[variable->index()] = value;
+
+                    break;
+                }
+            }
+        }
+    }
+}
+
 void SedInstanceTask::Impl::initialise()
 {
     // Initialise our model, which means that for an ODE/DAE model we need to initialise our states, rates, and
@@ -177,6 +215,9 @@ void SedInstanceTask::Impl::initialise()
         } else {
 #endif
             mRuntime->initialiseInterpretedVariablesForDifferentialModel()(mStates, mRates, mVariables);
+
+            applyInitialConditions(); //---ISAN---
+
             mRuntime->computeInterpretedComputedConstants()(mVariables);
             mRuntime->computeInterpretedRates()(mVoi, mStates, mRates, mVariables);
             mRuntime->computeInterpretedVariablesForDifferentialModel()(mVoi, mStates, mRates, mVariables);
@@ -292,6 +333,11 @@ void SedInstanceTask::Impl::run()
     }
 }
 
+void SedInstanceTask::Impl::addInitialCondition(const std::string &pParameter, double pValue) //---ISAN---
+{
+    mInitialConditions[pParameter] = pValue;
+}
+
 Doubles SedInstanceTask::Impl::state(size_t pIndex) const
 {
     if (pIndex >= mAnalyserModel->stateCount()) {
@@ -319,6 +365,7 @@ Doubles SedInstanceTask::Impl::variable(size_t pIndex) const
     return mResults.variables[pIndex];
 }
 
+/*---ISAN---
 namespace {
 
 std::string name(const libcellml::VariablePtr &pVariable)
@@ -329,6 +376,7 @@ std::string name(const libcellml::VariablePtr &pVariable)
 }
 
 } // namespace
+*/
 
 Doubles SedInstanceTask::Impl::voi() const
 {

diff --git a/src/sed/sedinstancetask_p.h b/src/sed/sedinstancetask_p.h
@@ -45,6 +45,8 @@ class SedInstanceTask::Impl: public Logger::Impl
     SolverNlaPtr mNlaSolver;
     bool mCompiled = true;
 
+    std::map<std::string, double> mInitialConditions; //---ISAN---
+
     double mVoi = 0.0;
     double *mStates = nullptr;
     double *mRates = nullptr;
@@ -62,9 +64,13 @@ class SedInstanceTask::Impl: public Logger::Impl
 
     void trackResults(size_t pIndex);
 
+    void applyInitialConditions(); //---ISAN---
+
     void initialise();
     void run();
 
+    void addInitialCondition(const std::string &pParameter, double pValue); //---ISAN---
+
     Doubles state(size_t pIndex) const;
     Doubles rate(size_t pIndex) const;
     Doubles variable(size_t pIndex) const;