use fixedpoint execute flags for multiapp and transfers when having f…

…ixed point iterations idaholab#28930
YaqiWang · Oct 27, 2024 · f5efecb · f5efecb
1 parent f57b7b8
commit f5efecb
Show file tree

Hide file tree

Showing 34 changed files with 95 additions and 88 deletions.
diff --git a/test/tests/multiapps/picard/function_dt_parent.i b/test/tests/multiapps/picard/function_dt_parent.i
@@ -85,7 +85,7 @@
     app_type = MooseTestApp
     type = TransientMultiApp
     input_files = 'function_dt_sub.i'
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '0 -1 0'
   []
 []

diff --git a/test/tests/multiapps/picard_multilevel/2level_picard/mutilevel_app.i b/test/tests/multiapps/picard_multilevel/2level_picard/mutilevel_app.i
@@ -77,7 +77,7 @@
     app_type = MooseTestApp
     positions = '0 0 0'
     input_files = sub_level1.i
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
     keep_solution_during_restore = true
   []
 []
@@ -88,14 +88,14 @@
     source_variable = u
     variable = u
     to_multi_app = level1-
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
   [v_from_sub]
     type = MultiAppGeneralFieldShapeEvaluationTransfer
     source_variable = v
     variable = v
     from_multi_app = level1-
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
 []
 

diff --git a/test/tests/multiapps/picard_multilevel/fullsolve_multilevel/parent.i b/test/tests/multiapps/picard_multilevel/fullsolve_multilevel/parent.i
@@ -76,7 +76,7 @@
     app_type = MooseTestApp
     positions = '0 0 0'
     input_files = sub_level1.i
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
 
     # We need to disable restoration within the multiapp so that the previous
     # picard iterate is used as the starting solution within each iteration
@@ -90,14 +90,14 @@
     source_variable = u
     variable = u
     to_multi_app = level1-
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
   [v_from_sub]
     type = MultiAppGeneralFieldShapeEvaluationTransfer
     source_variable = v
     variable = v
     from_multi_app = level1-
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
 []
 

diff --git a/test/tests/multiapps/picard_multilevel/multilevel_dt_rejection/parent.i b/test/tests/multiapps/picard_multilevel/multilevel_dt_rejection/parent.i
@@ -71,7 +71,7 @@
     type = TransientMultiApp
     positions = '0 0 0'
     input_files = picard_sub.i
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
 []
 
@@ -99,10 +99,10 @@
 [Postprocessors]
   [time]
     type = TimePostprocessor
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
   [dt]
     type = TimestepSize
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
 []
diff --git a/test/tests/multiapps/picard_multilevel/multilevel_dt_rejection/picard_sub.i b/test/tests/multiapps/picard_multilevel/multilevel_dt_rejection/picard_sub.i
@@ -25,6 +25,7 @@
     variable = w
     source_variable = v
     normal_factor = 0.1
+    execute_on = 'fixedpoint_end'
   []
 []
 
@@ -86,11 +87,11 @@
   []
   [time]
     type = TimePostprocessor
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
   [dt]
     type = TimestepSize
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
   []
 []
 
@@ -111,7 +112,7 @@
     type = TransientMultiApp
     positions = '0 0 0'
     input_files = picard_sub2.i
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
   []
 []
 

diff --git a/test/tests/multiapps/picard_multilevel/picard_parent.i b/test/tests/multiapps/picard_multilevel/picard_parent.i
@@ -79,7 +79,7 @@
     app_type = MooseTestApp
     positions = '0 0 0'
     input_files = picard_sub.i
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
     # The input was originally created with effectively no restore
     # see the changes made for #5554 then reverted in #28115
     no_restore = true

diff --git a/test/tests/multiapps/picard_multilevel/picard_sub.i b/test/tests/multiapps/picard_multilevel/picard_sub.i
@@ -81,7 +81,7 @@
     positions = '0 0 0'
     input_files = picard_sub2.i
     sub_cycling = true
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
   []
 []
 

diff --git a/test/tests/multiapps/picard_postprocessor/steady_main.i b/test/tests/multiapps/picard_postprocessor/steady_main.i
@@ -42,6 +42,7 @@
     type = SideAverageValue
     variable = u
     boundary = right
+    execute_on = 'fixedpoint_end'
   []
   [average]
     type = ElementAverageValue
@@ -77,7 +78,7 @@
     positions = '0 0 0'
     input_files = steady_sub.i
     clone_parent_mesh = true
-    execute_on = 'timestep_begin'
+    execute_on = 'fixedpoint_begin'
     # we keep the full postprocessor output history of the subapp
     keep_full_output_history = true
 

diff --git a/test/tests/multiapps/picard_postprocessor/tests b/test/tests/multiapps/picard_postprocessor/tests
@@ -52,7 +52,7 @@
       type = 'CSVDiff'
       input = 'transient_main.i'
       csvdiff = 'app_begin_transfer_begin.csv app_begin_transfer_begin_sub0_csv.csv'
-      cli_args = 'Transfers/left_from_sub/execute_on=timestep_begin Transfers/right_to_sub/execute_on=timestep_begin Outputs/file_base=app_begin_transfer_begin'
+      cli_args = 'Transfers/left_from_sub/execute_on=fixedpoint_begin Transfers/right_to_sub/execute_on=fixedpoint_begin Outputs/file_base=app_begin_transfer_begin'
       detail = 'with the sub-app and the postprocessor transfers executed at the beginning of each time step,'
     []
     [app_begin_transfers_end]
@@ -61,22 +61,22 @@
       csvdiff = 'app_begin_transfer_end.csv app_begin_transfer_end_sub0_csv.csv'
       allow_warnings = true
       recover = false
-      cli_args = 'Transfers/left_from_sub/execute_on=timestep_end Transfers/right_to_sub/execute_on=timestep_end Outputs/file_base=app_begin_transfer_end'
+      cli_args = 'Transfers/left_from_sub/execute_on=fixedpoint_end Transfers/right_to_sub/execute_on=fixedpoint_end Outputs/file_base=app_begin_transfer_end'
       detail = 'with the sub-app executed at the beginning of each time step and postprocessor transfers executed at the end of each timestep,'
     []
     [app_end_transfers_begin]
       type = 'CSVDiff'
       input = 'transient_main.i'
       csvdiff = 'app_end_transfer_begin.csv app_end_transfer_begin_sub0_csv.csv'
       allow_warnings = true
-      cli_args = 'MultiApps/sub/execute_on=timestep_end Transfers/left_from_sub/execute_on=timestep_begin Transfers/right_to_sub/execute_on=timestep_begin Outputs/file_base=app_end_transfer_begin'
+      cli_args = 'MultiApps/sub/execute_on=fixedpoint_end Transfers/left_from_sub/execute_on=fixedpoint_begin Transfers/right_to_sub/execute_on=fixedpoint_begin Outputs/file_base=app_end_transfer_begin'
       detail = 'with the sub-app executed at the end of each time step and postprocessor transfers executed at the beginning of each timestep,'
     []
     [app_end_transfers_end]
       type = 'CSVDiff'
       input = 'transient_main.i'
       csvdiff = 'app_end_transfer_end.csv app_end_transfer_end_sub0_csv.csv'
-      cli_args = 'MultiApps/sub/execute_on=timestep_end Transfers/left_from_sub/execute_on=timestep_end Transfers/right_to_sub/execute_on=timestep_end Outputs/file_base=app_end_transfer_end'
+      cli_args = 'MultiApps/sub/execute_on=fixedpoint_end Transfers/left_from_sub/execute_on=fixedpoint_end Transfers/right_to_sub/execute_on=fixedpoint_end Outputs/file_base=app_end_transfer_end'
       detail = 'with the sub-app and the postprocessor transfers executed at the end of each time step.'
     []
 
@@ -92,23 +92,23 @@
       input = 'transient_main.i'
       csvdiff = 'app_begin_transfer_end_picard_sub.csv app_begin_transfer_end_picard_sub_sub0_csv.csv'
       allow_warnings = true
-      cli_args = "Transfers/left_from_sub/execute_on=timestep_end Transfers/right_to_sub/execute_on=timestep_end Executioner/transformed_postprocessors='' MultiApps/sub/transformed_postprocessors='from_main' Outputs/file_base=app_begin_transfer_end_picard_sub"
+      cli_args = "Transfers/left_from_sub/execute_on=fixedpoint_end Transfers/right_to_sub/execute_on=fixedpoint_end Executioner/transformed_postprocessors='' MultiApps/sub/transformed_postprocessors='from_main' Outputs/file_base=app_begin_transfer_end_picard_sub"
       detail = 'for updating the subapp postprocessor with the sub-app executed at the beginning of each time step and variable transfers executed at the end of each timestep,'
     []
     [app_end_transfers_begin_picard_sub]
       type = 'CSVDiff'
       input = 'transient_main.i'
       csvdiff = 'app_end_transfer_begin_picard_sub.csv'
       allow_warnings = true
-      cli_args = "MultiApps/sub/execute_on=timestep_end Transfers/left_from_sub/execute_on=timestep_begin Transfers/right_to_sub/execute_on=timestep_begin Executioner/transformed_postprocessors='' MultiApps/sub/transformed_postprocessors='from_main' Outputs/file_base=app_end_transfer_begin_picard_sub"
+      cli_args = "MultiApps/sub/execute_on=fixedpoint_end Transfers/left_from_sub/execute_on=fixedpoint_begin Transfers/right_to_sub/execute_on=fixedpoint_begin Executioner/transformed_postprocessors='' MultiApps/sub/transformed_postprocessors='from_main' Outputs/file_base=app_end_transfer_begin_picard_sub"
       detail = 'for updating the subapp postprocessor with the sub-app executed at the end of each time step and variable transfers executed at the beginning of each timestep,'
     []
     [app_end_transfers_end_picard_sub]
       type = 'CSVDiff'
       input = 'transient_main.i'
       csvdiff = 'app_end_transfer_end_picard_sub.csv'
       allow_warnings = true
-      cli_args = "MultiApps/sub/execute_on=timestep_end Transfers/left_from_sub/execute_on=timestep_end Transfers/right_to_sub/execute_on=timestep_end Executioner/transformed_postprocessors='' MultiApps/sub/transformed_postprocessors='from_main' Outputs/file_base=app_end_transfer_end_picard_sub"
+      cli_args = "MultiApps/sub/execute_on=fixedpoint_end Transfers/left_from_sub/execute_on=fixedpoint_end Transfers/right_to_sub/execute_on=fixedpoint_end Executioner/transformed_postprocessors='' MultiApps/sub/transformed_postprocessors='from_main' Outputs/file_base=app_end_transfer_end_picard_sub"
       detail = 'and for updating the subapp postprocessor with the sub-app and the variable transfers executed at the end of each time step.'
     []
   []

diff --git a/test/tests/multiapps/picard_postprocessor/transient_main.i b/test/tests/multiapps/picard_postprocessor/transient_main.i
@@ -50,6 +50,7 @@
     type = SideAverageValue
     variable = u
     boundary = right
+    execute_on = 'fixedpoint_begin'
   []
   [average]
     type = ElementAverageValue
@@ -84,7 +85,7 @@
     positions = '0 0 0'
     input_files = 'transient_sub.i'
     clone_parent_mesh = true
-    execute_on = 'timestep_begin'
+    execute_on = 'fixedpoint_begin'
     # The input was originally created with effectively no restore
     # see the changes made for #5554 then reverted in #28115
     no_restore = true

diff --git a/test/tests/multiapps/relaxation/bad_relax_factor_parent.i b/test/tests/multiapps/relaxation/bad_relax_factor_parent.i
@@ -90,7 +90,7 @@
   [sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
     positions = '0 0 0'
     input_files = picard_relaxed_sub.i
   []

diff --git a/test/tests/multiapps/relaxation/picard_parent.i b/test/tests/multiapps/relaxation/picard_parent.i
@@ -88,7 +88,7 @@
   [sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
     positions = '0 0 0'
     input_files = picard_relaxed_sub.i
     # The input was originally created with effectively no restore

diff --git a/test/tests/multiapps/relaxation/picard_relaxed_array_parent.i b/test/tests/multiapps/relaxation/picard_relaxed_array_parent.i
@@ -109,7 +109,7 @@
 [MultiApps]
   [sub]
     type = TransientMultiApp
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
     input_files = picard_relaxed_array_sub.i
   []
 []

diff --git a/test/tests/multiapps/relaxation/picard_relaxed_parent.i b/test/tests/multiapps/relaxation/picard_relaxed_parent.i
@@ -90,7 +90,7 @@
   [sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
     positions = '0 0 0'
     input_files = picard_relaxed_sub.i
     # The input was originally created with effectively no restore

diff --git a/test/tests/multiapps/relaxation/sub_relaxed_parent.i b/test/tests/multiapps/relaxation/sub_relaxed_parent.i
@@ -88,7 +88,7 @@
   [sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
     positions = '0 0 0'
     input_files = sub_relaxed_sub.i
     transformed_variables = v

diff --git a/test/tests/multiapps/secant/tests b/test/tests/multiapps/secant/tests
@@ -62,7 +62,7 @@
       input = 'transient_main.i'
       csvdiff = 'app_begin_transfer_end.csv app_begin_transfer_end_sub0_csv.csv'
       allow_warnings = true
-      cli_args = 'Transfers/v_from_sub/execute_on=timestep_end Transfers/u_to_sub/execute_on=timestep_end Outputs/file_base=app_begin_transfer_end'
+      cli_args = 'Transfers/v_from_sub/execute_on=fixedpoint_end Transfers/u_to_sub/execute_on=fixedpoint_end Outputs/file_base=app_begin_transfer_end'
       detail = 'with the sub-app executed at the beginning of each time step and variable transfers executed at the end of each timestep,'
     []
 
@@ -71,15 +71,15 @@
       input = 'transient_main.i'
       csvdiff = 'app_end_transfer_begin.csv app_end_transfer_begin_sub0_csv.csv'
       allow_warnings = true
-      cli_args = 'MultiApps/sub/execute_on=timestep_end Transfers/v_from_sub/execute_on=timestep_begin Transfers/u_to_sub/execute_on=timestep_begin Outputs/file_base=app_end_transfer_begin'
+      cli_args = 'MultiApps/sub/execute_on=fixedpoint_end Transfers/v_from_sub/execute_on=fixedpoint_begin Transfers/u_to_sub/execute_on=fixedpoint_begin Outputs/file_base=app_end_transfer_begin'
       detail = 'with the sub-app executed at the end of each time step and variable transfers executed at the beginning of each timestep,'
     []
 
     [app_end_transfers_end]
       type = 'CSVDiff'
       input = 'transient_main.i'
       csvdiff = 'app_end_transfer_end.csv app_end_transfer_end_sub0_csv.csv'
-      cli_args = 'MultiApps/sub/execute_on=timestep_end Transfers/v_from_sub/execute_on=timestep_end Transfers/u_to_sub/execute_on=timestep_end Outputs/file_base=app_end_transfer_end'
+      cli_args = 'MultiApps/sub/execute_on=fixedpoint_end Transfers/v_from_sub/execute_on=fixedpoint_end Transfers/u_to_sub/execute_on=fixedpoint_end Outputs/file_base=app_end_transfer_end'
       detail = 'with the sub-app and the variable transfers executed at the end of each time step.'
     []
 
@@ -96,7 +96,7 @@
       input = 'transient_main.i'
       csvdiff = 'app_begin_transfer_end_secant_sub.csv app_begin_transfer_end_secant_sub_sub0_csv.csv'
       allow_warnings = true
-      cli_args = "Transfers/v_from_sub/execute_on=timestep_end Transfers/u_to_sub/execute_on=timestep_end Executioner/transformed_variables='' MultiApps/sub/transformed_variables='v' Outputs/file_base=app_begin_transfer_end_secant_sub"
+      cli_args = "Transfers/v_from_sub/execute_on=fixedpoint_end Transfers/u_to_sub/execute_on=fixedpoint_end Executioner/transformed_variables='' MultiApps/sub/transformed_variables='v' Outputs/file_base=app_begin_transfer_end_secant_sub"
       detail = 'for when updating the subapp variables with the sub-app executed at the beginning of each time step and variable transfers executed at the end of each timestep,'
     []
 
@@ -105,15 +105,15 @@
       input = 'transient_main.i'
       csvdiff = 'app_end_transfer_begin_secant_sub.csv'
       allow_warnings = true
-      cli_args = "MultiApps/sub/execute_on=timestep_end Transfers/v_from_sub/execute_on=timestep_begin Transfers/u_to_sub/execute_on=timestep_begin Executioner/transformed_variables='' MultiApps/sub/transformed_variables='v' Outputs/file_base=app_end_transfer_begin_secant_sub"
+      cli_args = "MultiApps/sub/execute_on=fixedpoint_end Transfers/v_from_sub/execute_on=fixedpoint_begin Transfers/u_to_sub/execute_on=fixedpoint_begin Executioner/transformed_variables='' MultiApps/sub/transformed_variables='v' Outputs/file_base=app_end_transfer_begin_secant_sub"
       detail = 'for updating the subapp variables with the sub-app executed at the end of each time step and variable transfers executed at the beginning of each timestep,'
     []
 
     [app_end_transfers_end_secant_sub]
       type = 'CSVDiff'
       input = 'transient_main.i'
       csvdiff = 'app_end_transfer_end_secant_sub.csv'
-      cli_args = "MultiApps/sub/execute_on=timestep_end Transfers/v_from_sub/execute_on=timestep_end Transfers/u_to_sub/execute_on=timestep_end Executioner/transformed_variables='' MultiApps/sub/transformed_variables='v' Outputs/file_base=app_end_transfer_end_secant_sub"
+      cli_args = "MultiApps/sub/execute_on=fixedpoint_end Transfers/v_from_sub/execute_on=fixedpoint_end Transfers/u_to_sub/execute_on=fixedpoint_end Executioner/transformed_variables='' MultiApps/sub/transformed_variables='v' Outputs/file_base=app_end_transfer_end_secant_sub"
       detail = 'and for updating the subapp variables with the sub-app and the variable transfers executed at the end of each time step.'
     []
   []

diff --git a/test/tests/multiapps/secant/transient_main.i b/test/tests/multiapps/secant/transient_main.i
@@ -82,7 +82,7 @@
     positions = '0 0 0'
     input_files = 'transient_sub.i'
     clone_parent_mesh = true
-    execute_on = 'timestep_begin'
+    execute_on = 'fixedpoint_begin'
     # The input was originally created with effectively no restore
     # see the changes made for #5554 then reverted in #28115
     no_restore = true
@@ -95,13 +95,13 @@
     from_multi_app = sub
     source_variable = v
     variable = v
-    execute_on = 'timestep_begin'
+    execute_on = 'fixedpoint_begin'
   []
   [u_to_sub]
     type = MultiAppGeneralFieldNearestLocationTransfer
     to_multi_app = sub
     source_variable = u
     variable = u
-    execute_on = 'timestep_begin'
+    execute_on = 'fixedpoint_begin'
   []
 []
diff --git a/test/tests/multiapps/secant_postprocessor/steady_main.i b/test/tests/multiapps/secant_postprocessor/steady_main.i
@@ -42,6 +42,7 @@
     type = SideAverageValue
     variable = u
     boundary = right
+    execute_on = 'fixedpoint_begin'
   []
   [average]
     type = ElementAverageValue
@@ -76,7 +77,7 @@
     positions = '0 0 0'
     input_files = steady_sub.i
     clone_parent_mesh = true
-    execute_on = 'timestep_begin'
+    execute_on = 'fixedpoint_begin'
     # we keep the full postprocessor output history of the subapp
     keep_full_output_history = true