Use BaseModelica.create_odeproblem

Author: AnHeuermann

.github/workflows/test_julia.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        julia-version: [1.11]
+        julia-version: [1.12]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60

TestBaseModelica/src/TestBaseModelica.jl

@@ -6,7 +6,6 @@ import DataFrames
 import SciMLBase
 import OrdinaryDiffEq
 
-include("dump.jl")
 include("settings.jl")
 
 """
@@ -18,47 +17,22 @@ Test coupling of Base Modelica and ModelingToolkit.jl.
 function run_test(base_modelica_file::AbstractString; settings::TestSettings)
   mkpath(abspath(settings.output_directory))
 
-  # Parse Base Modelica
-  parsed_model = nothing
+  # Parse Base Modelica and create ODEProblem
+  ode_problem = nothing
   time_parsing = @elapsed begin
-    parsed_model = BaseModelica.parse_basemodelica(base_modelica_file)
+    ode_problem = BaseModelica.create_odeproblem(base_modelica_file)
   end
   open(settings.time_measurements_file, "w") do file
-    write(file, "BaseModelica.parse_basemodelica, $(time_parsing)\n")
-  end
-
-  # Dump parsed model to file for debugging purpose
-  open(joinpath(settings.output_directory, settings.modelname * "_dump.txt"), "w") do file
-    dump_parsed_model(file, parsed_model)
-  end
-  open(joinpath(settings.output_directory, settings.modelname * ".jl"), "w") do file
-    show(file, parsed_model)
-  end
-
-  # Create ODEProblem
-  ode_problem = nothing
-  time_ODEProblem = @elapsed begin
-    ode_problem = SciMLBase.ODEProblem(
-      parsed_model,
-      [],
-      (settings.solver_settings.start_time, settings.solver_settings.stop_time))
-  end
-  open(settings.time_measurements_file, "a") do file
-    write(file, "SciMLBase.ODEProblem, $(time_ODEProblem)\n")
+    write(file, "BaseModelica.create_odeproblem, $(time_parsing)\n")
   end
 
-  # Simulate
+  # Simulate ODEProblem
   ode_solution = nothing
   time_solve = @elapsed begin
     if isnothing(settings.solver_settings.solver)
-      ode_solution = OrdinaryDiffEq.solve(
-        ode_problem,
-        saveat = settings.solver_settings.interval)
+      ode_solution = OrdinaryDiffEq.solve(ode_problem)
     else
-      ode_solution = OrdinaryDiffEq.solve(
-        ode_problem,
-        settings.solver_settings.solver,
-        saveat = settings.solver_settings.interval)
+      ode_solution = OrdinaryDiffEq.solve(ode_problem, settings.solver_settings.solver)
     end
   end
   open(settings.time_measurements_file, "a") do file

TestBaseModelica/src/dump.jl

@@ -1,5 +1,4 @@
 using Test
 using SafeTestsets
 
-include("dump.jl")
 include("test_parse.jl")

TestBaseModelica/test/dump.jl

@@ -11,43 +11,25 @@ function test_parse_and_simulate_FirstOrder()
   rm(output_directory, force=true, recursive=true)
 
   run_test(base_modelica_file;
-            settings=TestSettings(
-            modelname = modelname,
-            output_directory=output_directory,
-            timeout_parsing = 60))
+    settings=TestSettings(
+    modelname = modelname,
+    output_directory=output_directory,
+    timeout_parsing = 60)
+  )
 
   times_file = joinpath(output_directory, modelname * "_times.csv")
   @test isfile(times_file)
   content = readlines(times_file)
   @info content
-  @test occursin(r"BaseModelica\.parse_basemodelica, [0-9]+\.[0-9]+", content[1])
-  @test occursin(r"SciMLBase\.ODEProblem, [0-9]+\.[0-9]+", content[2])
-  @test occursin(r"OrdinaryDiffEq\.solve, [0-9]+\.[0-9]+", content[3])
-
-  dump_file = joinpath(output_directory, modelname * "_dump.txt")
-  @test isfile(dump_file)
-  @test read(dump_file, String) == """Model: sys
-
-  Equations:
-  1: Differential(t)(x(t)) ~ 1.0 - a*x(t)
-
-  Unknowns:
-  1: (var = x(t), variable_source = :variables, name = :x, variable_type = ModelingToolkit.VARIABLE, irreducible = false, tunable = false, type = Real, default = 0.0)
-
-  Parameters:
-  1: (var = a, variable_source = :parameters, name = :a, variable_type = ModelingToolkit.PARAMETER, irreducible = false, tunable = true, type = Real, default = 1.1)
-  """
-
-  jl_dump_file = joinpath(output_directory, modelname * ".jl")
-  @test isfile(jl_dump_file)
+  @test occursin(r"BaseModelica\.create_odeproblem, [0-9]+\.[0-9]+", content[1])
+  @test occursin(r"OrdinaryDiffEq\.solve, [0-9]+\.[0-9]+", content[2])
 
   result_file = joinpath(output_directory, modelname * "_res.csv")
   @test isfile(result_file)
   df = CSV.read(result_file, DataFrame)
-  filter!(row -> row.time in [0.0, 0.5, 1.0], df)
+  filter!(row -> row.time in [0.0, 1.0], df)
   @test df[1,2] == 0.0
-  @test df[2,2] ≈ 0.38459131104319083
-  @test df[3,2] ≈ 0.6064807012910736
+  @test df[2,2] ≈ 0.6064807012910736
 
   rm(output_directory, force=true, recursive=true)
 end