Consolidate simulation types and methods

sandialabs · Feb 6, 2025 · 32c4fcd · 32c4fcd
1 parent bda72a5
commit 32c4fcd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 32 deletions.
diff --git a/src/simulation.jl b/src/simulation.jl
@@ -5,7 +5,33 @@
 # top-level Norma.jl directory.
 using YAML
 
-include("simulation_def.jl")
+abstract type Simulation end
+
+include("constitutive_def.jl")
+include("ics_bcs_def.jl")
+include("model_def.jl")
+include("time_integrator_def.jl")
+include("solver_def.jl")
+include("schwarz_def.jl")
+
+mutable struct SingleDomainSimulation <: Simulation
+    name::String
+    params::Dict{String,Any}
+    integrator::TimeIntegrator
+    solver::Solver
+    model::Model
+    failed::Bool
+end
+
+mutable struct MultiDomainSimulation <: Simulation
+    name::String
+    params::Dict{String,Any}
+    schwarz_controller::SchwarzController
+    subsims::Vector{SingleDomainSimulation}
+    subsim_name_index_map::Dict{String,Int64}
+    failed::Bool
+end
+
 include("model.jl")
 include("time_integrator.jl")
 include("solver.jl")

diff --git a/src/simulation_def.jl b/src/simulation_def.jl