Address @rwcarlsen review

Use command line arguments to simplify interface value tests, #16099
idaholab · Nov 12, 2020 · 8000835 · 8000835
1 parent 6bc998e
commit 8000835
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 364 deletions.
diff --git a/test/tests/postprocessors/element_integral_var_pps/tests b/test/tests/postprocessors/element_integral_var_pps/tests
@@ -10,23 +10,23 @@
       input = 'initial_pps.i'
       exodiff = 'out_initial_pps.e'
 
-      detail = 'during the initial setup step and'
+      detail = 'during the initial setup step'
     []
 
     [pps_old_test]
       type = 'Exodiff'
       input = 'pps_old_value.i'
       exodiff = 'pps_old_value_out.e'
 
-      detail = 'at the end of each time step, for both FE and'
+      detail = 'and at the end of each time step, for FE variables'
     []
 
     [pps_old_test_fv]
       type = 'Exodiff'
       input = 'pps_old_value_fv.i'
       exodiff = 'pps_old_value_fv_out.e'
 
-      detail = 'FV variables.'
+      detail = 'and FV variables.'
     []
   []
 []
diff --git a/test/tests/postprocessors/interface_value/gold/InterfaceAverageVariableValuePostprocessor.e b/test/tests/postprocessors/interface_value/gold/InterfaceAverageVariableValuePostprocessor.e
diff --git a/...tests/postprocessors/interface_value/gold/InterfaceAverageVariableValuePostprocessor_fe.e b/...tests/postprocessors/interface_value/gold/InterfaceAverageVariableValuePostprocessor_fe.e
diff --git a/test/tests/postprocessors/interface_value/gold/InterfaceIntegralVariableValuePostprocessor.e b/test/tests/postprocessors/interface_value/gold/InterfaceIntegralVariableValuePostprocessor.e
diff --git a/...tegral_variable_value_postprocessor_out.e → ...ceIntegralVariableValuePostprocessor_fe.e b/...tegral_variable_value_postprocessor_out.e → ...ceIntegralVariableValuePostprocessor_fe.e
diff --git a/...stprocessors/interface_value/gold/interface_average_variable_value_postprocessor_fv_out.e b/...stprocessors/interface_value/gold/interface_average_variable_value_postprocessor_fv_out.e
diff --git a/.../postprocessors/interface_value/gold/interface_average_variable_value_postprocessor_out.e b/.../postprocessors/interface_value/gold/interface_average_variable_value_postprocessor_out.e
diff --git a/...tprocessors/interface_value/gold/interface_integral_variable_value_postprocessor_fv_out.e b/...tprocessors/interface_value/gold/interface_integral_variable_value_postprocessor_fv_out.e
diff --git a/.../tests/postprocessors/interface_value/interface_average_variable_value_postprocessor_fv.i b/.../tests/postprocessors/interface_value/interface_average_variable_value_postprocessor_fv.i
diff --git a/...ce_average_variable_value_postprocessor.i → ...terface_fe_variable_value_postprocessor.i b/...ce_average_variable_value_postprocessor.i → ...terface_fe_variable_value_postprocessor.i
@@ -1,3 +1,5 @@
+postprocessor_type = InterfaceAverageVariableValuePostprocessor
+
 [Mesh]
   [gen]
     type = GeneratedMeshGenerator
@@ -107,47 +109,47 @@
 
 [Postprocessors]
   [./diffusivity_average]
-    type = InterfaceAverageVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = average
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_jump_primary_secondary]
-    type = InterfaceAverageVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = jump_primary_minus_secondary
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_jump_secondary_primary]
-    type = InterfaceAverageVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = jump_secondary_minus_primary
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_jump_abs]
-    type = InterfaceAverageVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = jump_abs
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_primary]
-    type = InterfaceAverageVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = primary
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_secondary]
-    type = InterfaceAverageVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = secondary
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
@@ -162,5 +164,6 @@
 []
 
 [Outputs]
+  file_base = ${raw ${postprocessor_type} _fe}
   exodus = true
 []
diff --git a/...ntegral_variable_value_postprocessor_fv.i → ...terface_fv_variable_value_postprocessor.i b/...ntegral_variable_value_postprocessor_fv.i → ...terface_fv_variable_value_postprocessor.i
@@ -1,3 +1,5 @@
+postprocessor_type = InterfaceAverageVariableValuePostprocessor
+
 [Mesh]
   [gen]
     type = GeneratedMeshGenerator
@@ -106,47 +108,47 @@
 
 [Postprocessors]
   [./diffusivity_average]
-    type = InterfaceIntegralVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = average
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_jump_primary_secondary]
-    type = InterfaceIntegralVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = jump_primary_minus_secondary
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_jump_secondary_primary]
-    type = InterfaceIntegralVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = jump_secondary_minus_primary
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_jump_abs]
-    type = InterfaceIntegralVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = jump_abs
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_primary]
-    type = InterfaceIntegralVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = primary
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
     execute_on = TIMESTEP_END
     boundary = 'interface'
   [../]
   [./diffusivity_secondary]
-    type = InterfaceIntegralVariableValuePostprocessor
+    type = ${postprocessor_type}
     interface_value_type = secondary
     variable = diffusivity_1
     neighbor_variable = diffusivity_2
@@ -165,5 +167,6 @@
 []
 
 [Outputs]
+  file_base = ${postprocessor_type}
   exodus = true
 []