..

dweindl · Feb 24, 2024 · 71a6f2b · 71a6f2b
1 parent 10940c6
commit 71a6f2b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/model.cpp b/src/model.cpp
@@ -324,13 +324,16 @@ void Model::initialize(
     if (ne)
         initEvents(x, dx, roots_found);
 
-    fw(t0(), x.data(), true);
+    // evaluate static expressions once
+    // (w and dwdw will be evaluated from within dwdp/dwdx)
+    fdwdx(t0(), x.data(), true);
+    fdwdp(t0(), x.data(), true);
 }
 
 void Model::reinitialize(AmiVector& x, realtype t) {
     fx0_fixedParameters(x);
-    // evaluate static expressions
-    // (w will be evaluated from within dwdp/dwdx)
+    // re-evaluate static expressions once
+    // (w and dwdw will be evaluated from within dwdp/dwdx)
     fdwdx(t, x.data(), true);
     fdwdp(t, x.data(), true);
 }