Merge branch 'main' into schwarz_inclined_contact

sandialabs · Feb 5, 2025 · b423f3b · b423f3b
2 parents 3a66d3a + 6015a56
commit b423f3b
Show file tree

Hide file tree

Showing 41 changed files with 18 additions and 44 deletions.
diff --git a/examples/ahead/nonoverlap/clamped/dynamic/clamped.yaml b/examples/ahead/nonoverlap/clamped/dynamic/clamped.yaml
@@ -5,7 +5,6 @@ CSV output interval: 1
 initial time: 0.0
 final time: 1.0e-3
 time step: 1.0e-6
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12

diff --git a/examples/ahead/nonoverlap/cuboid/quasistatic/cuboids.yaml b/examples/ahead/nonoverlap/cuboid/quasistatic/cuboids.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.1
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 32
 relative tolerance: 1.0e-12

diff --git a/examples/ahead/nonoverlap/laser-weld/dynamic/laser-weld.yaml b/examples/ahead/nonoverlap/laser-weld/dynamic/laser-weld.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 0.1
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 256
 relative tolerance: 1.0e-05

diff --git a/examples/ahead/nonoverlap/laser-weld/quasistatic/laser-weld.yaml b/examples/ahead/nonoverlap/laser-weld/quasistatic/laser-weld.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 0.1
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-10

diff --git a/examples/ahead/nonoverlap/notched-cylinder/dynamic/notched-cylinder.yaml b/examples/ahead/nonoverlap/notched-cylinder/dynamic/notched-cylinder.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 32
 relative tolerance: 1.0e-05

diff --git a/examples/ahead/nonoverlap/notched-cylinder/quasistatic/notched-cylinder.yaml b/examples/ahead/nonoverlap/notched-cylinder/quasistatic/notched-cylinder.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.1
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-08

diff --git a/examples/ahead/overlap/clamped/dynamic/clamped.yaml b/examples/ahead/overlap/clamped/dynamic/clamped.yaml
@@ -5,7 +5,6 @@ CSV output interval: 1
 initial time: 0.0
 final time: 1.0e-5
 time step: 1.0e-7
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12

diff --git a/examples/ahead/overlap/cuboid/dynamic-opinf-fom/cuboids.yaml b/examples/ahead/overlap/cuboid/dynamic-opinf-fom/cuboids.yaml
@@ -6,7 +6,6 @@ CSV write sidesets: true
 initial time: 0.0
 final time: 1.0
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12

diff --git a/examples/ahead/overlap/cuboid/dynamic-opinf-rom/cuboids.yaml b/examples/ahead/overlap/cuboid/dynamic-opinf-rom/cuboids.yaml
@@ -4,7 +4,6 @@ Exodus output interval: 1
 initial time: 0.0
 final time: 0.1
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12

diff --git a/examples/ahead/overlap/cuboid/dynamic/cuboids.yaml b/examples/ahead/overlap/cuboid/dynamic/cuboids.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12

diff --git a/examples/ahead/overlap/cuboid/quasistatic/cuboids.yaml b/examples/ahead/overlap/cuboid/quasistatic/cuboids.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.1
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12

diff --git a/examples/ahead/overlap/laser-weld/dynamic/laser-weld.yaml b/examples/ahead/overlap/laser-weld/dynamic/laser-weld.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 0.1
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-10

diff --git a/examples/ahead/overlap/laser-weld/quasistatic/laser-weld.yaml b/examples/ahead/overlap/laser-weld/quasistatic/laser-weld.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 0.1
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-10

diff --git a/examples/ahead/overlap/notched-cylinder/dynamic/notched-cylinder.yaml b/examples/ahead/overlap/notched-cylinder/dynamic/notched-cylinder.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 32
 relative tolerance: 1.0e-05

diff --git a/examples/ahead/overlap/notched-cylinder/quasistatic/notched-cylinder.yaml b/examples/ahead/overlap/notched-cylinder/quasistatic/notched-cylinder.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.1
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12

diff --git a/examples/contact/explicit-dynamic/inclined-cubes/cubes-test1.yaml b/examples/contact/explicit-dynamic/inclined-cubes/cubes-test1.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.0e-06
 time step: 1.e-06
 final time: .001
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: true
 minimum iterations: 1

diff --git a/examples/contact/explicit-dynamic/inclined-cubes/cubes-test2.yaml b/examples/contact/explicit-dynamic/inclined-cubes/cubes-test2.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.0e-06
 time step: 1.e-06
 final time: .001
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: true
 minimum iterations: 1

diff --git a/examples/contact/explicit-dynamic/inclined-cubes/cubes-test3.yaml b/examples/contact/explicit-dynamic/inclined-cubes/cubes-test3.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.0e-06
 time step: 1.e-06
 final time: .001
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: true
 minimum iterations: 1

diff --git a/examples/contact/explicit-dynamic/inclined-cubes/cubes-test4.yaml b/examples/contact/explicit-dynamic/inclined-cubes/cubes-test4.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.0e-06
 time step: 1.e-06
 final time: .001
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: true
 minimum iterations: 1

diff --git a/examples/contact/implicit-dynamic/2_bars/bars.yaml b/examples/contact/implicit-dynamic/2_bars/bars.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.0e-06
 time step: 1.e-08
 final time: 3.0e-06
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: false
 minimum iterations: 1

diff --git a/examples/contact/implicit-dynamic/3_bars/bars.yaml b/examples/contact/implicit-dynamic/3_bars/bars.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.0e-06
 time step: 1.e-07
 final time: 5.0e-06
-same time step for domains: true
 relaxation parameter: 1.0
 minimum iterations: 1
 maximum iterations: 32

diff --git a/examples/contact/implicit-dynamic/inclined-cubes/cubes-test1.yaml b/examples/contact/implicit-dynamic/inclined-cubes/cubes-test1.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.e-4
 time step: 1.e-4
 final time: 3.0
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: false
 minimum iterations: 1

diff --git a/examples/contact/implicit-dynamic/inclined-cubes/cubes-test2.yaml b/examples/contact/implicit-dynamic/inclined-cubes/cubes-test2.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.e-4
 time step: 1.e-4
 final time: 3.0
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: false
 minimum iterations: 1

diff --git a/examples/contact/implicit-dynamic/inclined-cubes/cubes-test3.yaml b/examples/contact/implicit-dynamic/inclined-cubes/cubes-test3.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.e-4
 time step: 1.e-4
 final time: 3.0
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: false
 minimum iterations: 1

diff --git a/examples/contact/implicit-dynamic/inclined-cubes/cubes-test4.yaml b/examples/contact/implicit-dynamic/inclined-cubes/cubes-test4.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: -1.e-4
 time step: 1.e-4
 final time: 3.0
-same time step for domains: true
 relaxation parameter: 1.0
 naive stabilized: false
 minimum iterations: 1

diff --git a/examples/contact/static/cubes/cubes.yaml b/examples/contact/static/cubes/cubes.yaml
@@ -3,7 +3,6 @@ domains: ["cube-1.yaml", "cube-2.yaml"]
 initial time: -4.0
 final time: 4.0
 time step: 1.0
-same time step for domains: false
 relaxation parameter: 0.5
 minimum iterations: 1
 maximum iterations: 16

diff --git a/examples/contact/static/inclined-cubes/cubes-test1.yaml b/examples/contact/static/inclined-cubes/cubes-test1.yaml
@@ -3,7 +3,6 @@ domains: ["cube-test1-1.yaml", "cube-test1-2.yaml"]
 initial time: -4.0
 final time: 4.0
 time step: 1.0
-same time step for domains: false
 relaxation parameter: 0.5
 minimum iterations: 1
 maximum iterations: 16

diff --git a/examples/contact/static/inclined-cubes/cubes-test2.yaml b/examples/contact/static/inclined-cubes/cubes-test2.yaml
@@ -3,7 +3,6 @@ domains: ["cube-test2-1.yaml", "cube-test2-2.yaml"]
 initial time: -4.0
 final time: 4.0
 time step: 1.0
-same time step for domains: false
 relaxation parameter: 0.5
 minimum iterations: 1
 maximum iterations: 16

diff --git a/examples/contact/static/inclined-cubes/cubes-test3.yaml b/examples/contact/static/inclined-cubes/cubes-test3.yaml
@@ -3,7 +3,6 @@ domains: ["cube-test3-1.yaml", "cube-test3-2.yaml"]
 initial time: -4.0
 final time: 4.0
 time step: 1.0
-same time step for domains: false
 relaxation parameter: 0.5
 minimum iterations: 1
 maximum iterations: 16

diff --git a/examples/contact/static/inclined-cubes/cubes-test4.yaml b/examples/contact/static/inclined-cubes/cubes-test4.yaml
@@ -3,7 +3,6 @@ domains: ["cube-test4-1.yaml", "cube-test4-2.yaml"]
 initial time: -4.0
 final time: 4.0
 time step: 1.0
-same time step for domains: false
 relaxation parameter: 0.5
 minimum iterations: 1
 maximum iterations: 16

diff --git a/examples/contact/transfer_operators/transfer.yaml b/examples/contact/transfer_operators/transfer.yaml
@@ -3,7 +3,6 @@ domains: ["src.yaml", "dst.yaml"]
 initial time: -1.0
 final time: 1.0
 time step: 1.0
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12

diff --git a/examples/debug-cases/2-cuboid-symmetry-bc/nonoverlap/cuboids.yaml b/examples/debug-cases/2-cuboid-symmetry-bc/nonoverlap/cuboids.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.1
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 64
 relative tolerance: 1.0e-13

diff --git a/examples/debug-cases/2-cuboid-symmetry-bc/overlap/cuboids.yaml b/examples/debug-cases/2-cuboid-symmetry-bc/overlap/cuboids.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 0.1
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 64
 relative tolerance: 1.0e-13

diff --git a/examples/debug-cases/3-cuboid-symmetry-bc-bottom-fixed/nonoverlap/cuboids.yaml b/examples/debug-cases/3-cuboid-symmetry-bc-bottom-fixed/nonoverlap/cuboids.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 0.5
 time step: 0.1
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 64
 relative tolerance: 1.0e-13

diff --git a/examples/debug-cases/3-cuboid-symmetry-bc-bottom-fixed/overlap/cuboids.yaml b/examples/debug-cases/3-cuboid-symmetry-bc-bottom-fixed/overlap/cuboids.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 0.5
 time step: 0.1
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 64
 relative tolerance: 1.0e-13

diff --git a/examples/debug-cases/cylinder/nonoverlap/cylinder.yaml b/examples/debug-cases/cylinder/nonoverlap/cylinder.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 0.1
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 64
 relative tolerance: 1.0e-09

diff --git a/examples/debug-cases/cylinder/overlap/cylinder.yaml b/examples/debug-cases/cylinder/overlap/cylinder.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 0.1
 time step: 0.01
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 64
 relative tolerance: 1.0e-09

diff --git a/examples/nonoverlap/static-same-time-step/cuboids/cuboids.yaml b/examples/nonoverlap/static-same-time-step/cuboids/cuboids.yaml
@@ -5,7 +5,6 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 1.0
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 64
 relative tolerance: 1.0e-13

diff --git a/examples/overlap/static-same-time-step/cuboids/cuboids.yaml b/examples/overlap/static-same-time-step/cuboids/cuboids.yaml
@@ -5,8 +5,7 @@ CSV output interval: 0
 initial time: 0.0
 final time: 1.0
 time step: 1.0
-same time step for domains: true
 minimum iterations: 1
 maximum iterations: 16
 relative tolerance: 1.0e-12
-absolute tolerance: 1.0e-08
+absolute tolerance: 1.0e-08
diff --git a/src/evolve.jl b/src/evolve.jl
@@ -246,6 +246,17 @@ function regress_time(sim::SingleDomainSimulation)
     sim.integrator.stop -= 1
 end
 
+function regress_time(sim::MultiDomainSimulation)
+    sim.schwarz_controller.time = sim.schwarz_controller.prev_time
+    stop = sim.schwarz_controller.stop - 1
+    final_time = sim.schwarz_controller.final_time
+    initial_time = sim.schwarz_controller.initial_time
+    num_stops = sim.schwarz_controller.num_stops
+    prev_time = (final_time - initial_time) * Float64(stop) / Float64(num_stops - 1) + initial_time
+    sim.schwarz_controller.prev_time = prev_time
+    sim.schwarz_controller.stop = stop
+end
+
 function start_runtimer(sim::SingleDomainSimulation)
     sim.integrator.runtime_step = time()
 end

diff --git a/src/simulation.jl b/src/simulation.jl
@@ -76,7 +76,7 @@ function MultiDomainSimulation(params::Dict{String,Any})
     initial_time = params["initial time"]
     final_time = params["final time"]
     time_step = params["time step"]
-    same_step = get(params, "same time step for domains", false)
+    same_step = true
     exodus_interval = get(params, "Exodus output interval", 1)
     csv_interval = get(params, "CSV output interval", 0)
     sim_type = "none"
@@ -88,12 +88,13 @@ function MultiDomainSimulation(params::Dict{String,Any})
         subparams["name"] = domain_name
         subparams["time integrator"]["initial time"] = initial_time
         subparams["time integrator"]["final time"] = final_time
-        if same_step == true
-            subparams["time integrator"]["time step"] = time_step
-        end
+        subparams["time integrator"]["time step"] = time_step
         subparams["Exodus output interval"] = exodus_interval
         subparams["CSV output interval"] = csv_interval
         subsim = SingleDomainSimulation(subparams)
+        if subsim.integrator.time_step ≠ time_step
+            same_step = false
+        end
         params[domain_name] = subsim.params
         subsim_type =
             get_analysis_type(subsim.integrator) * " " * subparams["model"]["type"]
@@ -107,6 +108,7 @@ function MultiDomainSimulation(params::Dict{String,Any})
         subsim_index += 1
     end
     params["subdomains type"] = sim_type
+    params["same time step for domains"] = same_step
     schwarz_controller = create_schwarz_controller(params)
     failed = false
     sim = MultiDomainSimulation(