Intermediateresults (#116)

DARPA-ASKEM · Sep 18, 2023 · 1d4c836 · 1d4c836
1 parent c2c95b7
commit 1d4c836
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/SimulationService.jl b/src/SimulationService.jl
@@ -18,7 +18,7 @@ import JSON3
 import JSONSchema
 import LinearAlgebra: norm
 import MathML
-import ModelingToolkit: @parameters, substitute, Differential, Num, @variables, ODESystem, ODEProblem, ODESolution, structural_simplify, states, observed
+import ModelingToolkit: @parameters, substitute, Differential, Num, @variables, ODESystem, ODEProblem, ODESolution, structural_simplify, states, observed, parameters
 import OpenAPI
 import Oxygen
 import Pkg

diff --git a/src/operations.jl b/src/operations.jl
@@ -122,8 +122,12 @@ end
 function (o::IntermediateResults)(integrator)
     if o.last_callback + o.every ≤ Dates.now()
         o.last_callback = Dates.now()
-        (; iter, t, u, uprev) = integrator
-        publish_to_rabbitmq(; iter=iter, time=t, params=u, abserr=norm(u - uprev), id=o.id,
+        (; iter, f, t, u, p) = integrator
+
+        state_dict = Dict(states(f.sys) .=> u)
+        param_dict = Dict(parameters(f.sys) .=> p)
+
+        publish_to_rabbitmq(; iter=iter, time=t, state=state_dict, params = param_dict, id=o.id,
             retcode=SciMLBase.check_error(integrator))
     end
     EasyModelAnalysis.DifferentialEquations.u_modified!(integrator, false)