Consolidate Schwarz types and methods.

src/schwarz.jl

@@ -3,6 +3,47 @@
 # the U.S. Government retains certain rights in this software. This software
 # is released under the BSD license detailed in the file license.txt in the
 # top-level Norma.jl directory.
+
+mutable struct SolidSchwarzController <: SchwarzController
+    num_domains::Int64
+    minimum_iterations::Int64
+    maximum_iterations::Int64
+    absolute_tolerance::Float64
+    relative_tolerance::Float64
+    absolute_error::Float64
+    relative_error::Float64
+    initial_time::Float64
+    final_time::Float64
+    time_step::Float64
+    time::Float64
+    prev_time::Float64
+    same_step::Bool
+    num_stops::Int64
+    stop::Int64
+    converged::Bool
+    iteration_number::Int64
+    stop_disp::Vector{Vector{Float64}}
+    stop_velo::Vector{Vector{Float64}}
+    stop_acce::Vector{Vector{Float64}}
+    stop_∂Ω_f::Vector{Vector{Float64}}
+    schwarz_disp::Vector{Vector{Float64}}
+    schwarz_velo::Vector{Vector{Float64}}
+    schwarz_acce::Vector{Vector{Float64}}
+    time_hist::Vector{Vector{Float64}}
+    disp_hist::Vector{Vector{Vector{Float64}}}
+    velo_hist::Vector{Vector{Vector{Float64}}}
+    acce_hist::Vector{Vector{Vector{Float64}}}
+    ∂Ω_f_hist::Vector{Vector{Vector{Float64}}}
+    relaxation_parameter::Float64
+    naive_stabilized::Bool
+    lambda_disp::Vector{Vector{Float64}}
+    lambda_velo::Vector{Vector{Float64}}
+    lambda_acce::Vector{Vector{Float64}}
+    schwarz_contact::Bool
+    active_contact::Bool
+    contact_hist::Vector{Bool}
+end
+
 function SolidSchwarzController(params::Dict{String,Any})
     num_domains = length(params["domains"])
     minimum_iterations = params["minimum iterations"]

src/simulation.jl

@@ -3,16 +3,17 @@
 # the U.S. Government retains certain rights in this software. This software
 # is released under the BSD license detailed in the file license.txt in the
 # top-level Norma.jl directory.
+
 using YAML
 
 abstract type Simulation end
+abstract type SchwarzController end
 
 include("constitutive.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