Revert "Revert "Checkpoint, Recover and Restart. refs #1169 closes #2218

"" This reverts commit 5b2bafa29a172ae29705c43159f774a116315bf6. r22903
idaholab · Mar 7, 2014 · 9676198 · 9676198
1 parent dca525d
commit 9676198
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 18 deletions.
diff --git a/modules/combined/tests/LinearStrainHardening/LinearStrainHardeningRestart1.i b/modules/combined/tests/LinearStrainHardening/LinearStrainHardeningRestart1.i
@@ -195,5 +195,5 @@
 #  tecplot = true
   perf_log = true
 
-  num_restart_files = 1
+  num_checkpoint_files = 1
 []
diff --git a/modules/combined/tests/LinearStrainHardening/LinearStrainHardeningRestart2.i b/modules/combined/tests/LinearStrainHardening/LinearStrainHardeningRestart2.i
@@ -182,7 +182,7 @@
 #  num_steps = 100
   dt = 1.5e-3
 
-  restart_file_base = LinearStrainHardeningRestart1_out_restart_0004
+  restart_file_base = LinearStrainHardeningRestart1_out_cp/0004
 []
 
 

diff --git a/modules/combined/tests/adaptive_timestepping/adapt_tstep_function_change_restart1.i b/modules/combined/tests/adaptive_timestepping/adapt_tstep_function_change_restart1.i
@@ -183,5 +183,5 @@
   exodus = true
   perf_log = true
   max_pps_rows_screen = 10
-  num_restart_files = 1
+  num_checkpoint_files = 1
 []
diff --git a/modules/combined/tests/adaptive_timestepping/adapt_tstep_function_change_restart2.i b/modules/combined/tests/adaptive_timestepping/adapt_tstep_function_change_restart2.i
@@ -161,7 +161,7 @@
     dt = 1e6
   [../]
 
-  restart_file_base = adapt_tstep_function_change_restart1_out_restart_0065
+  restart_file_base = adapt_tstep_function_change_restart1_out_cp/0065
 []
 
 [Postprocessors]

diff --git a/modules/combined/tests/adaptive_timestepping/adapt_tstep_grow_dtfunc_restart1.i b/modules/combined/tests/adaptive_timestepping/adapt_tstep_grow_dtfunc_restart1.i
@@ -143,5 +143,5 @@
   interval = 1
   output_initial = true
   exodus = true
-  num_restart_files = 1
+  num_checkpoint_files = 1
 []
diff --git a/modules/combined/tests/adaptive_timestepping/adapt_tstep_grow_dtfunc_restart2.i b/modules/combined/tests/adaptive_timestepping/adapt_tstep_grow_dtfunc_restart2.i
@@ -130,7 +130,7 @@
     time_dt = '1.0, 5.0'
   [../]
 
-  restart_file_base = adapt_tstep_grow_dtfunc_restart1_out_restart_0004
+  restart_file_base = adapt_tstep_grow_dtfunc_restart1_out_cp/0004
 []
 
 [Postprocessors]

diff --git a/modules/combined/tests/adaptive_timestepping/adapt_tstep_grow_init_dt_restart1.i b/modules/combined/tests/adaptive_timestepping/adapt_tstep_grow_init_dt_restart1.i
@@ -144,5 +144,5 @@
   interval = 1
   output_initial = true
   exodus = true
-  num_restart_files = 1
+  num_checkpoint_files = 1
 []
diff --git a/modules/combined/tests/adaptive_timestepping/adapt_tstep_grow_init_dt_restart2.i b/modules/combined/tests/adaptive_timestepping/adapt_tstep_grow_init_dt_restart2.i
@@ -131,7 +131,7 @@
     dt = 1.0
   [../]
 
-  restart_file_base = adapt_tstep_grow_init_dt_restart1_out_restart_0005
+  restart_file_base = adapt_tstep_grow_init_dt_restart1_out_cp/0005
 []
 
 [Postprocessors]
@@ -146,5 +146,5 @@
   interval = 1
   output_initial = true
   exodus = true
-  num_restart_files = 1
+  num_checkpoint_files = 1
 []
diff --git a/modules/combined/tests/adaptive_timestepping/adapt_tstep_shrink_init_dt_restart1.i b/modules/combined/tests/adaptive_timestepping/adapt_tstep_shrink_init_dt_restart1.i
@@ -145,5 +145,5 @@
   interval = 1
   output_initial = true
   exodus = true
-  num_restart_files = 1
+  num_checkpoint_files = 1
 []
diff --git a/modules/combined/tests/adaptive_timestepping/adapt_tstep_shrink_init_dt_restart2.i b/modules/combined/tests/adaptive_timestepping/adapt_tstep_shrink_init_dt_restart2.i
@@ -132,7 +132,7 @@
     dt = 5.0
   [../]
 
-  restart_file_base = adapt_tstep_shrink_init_dt_restart1_out_restart_0001
+  restart_file_base = adapt_tstep_shrink_init_dt_restart1_out_cp/0001
 []
 
 [Postprocessors]

diff --git a/modules/combined/tests/plenum_pressure/plenum_pressure_refab_restart1.i b/modules/combined/tests/plenum_pressure/plenum_pressure_refab_restart1.i
@@ -345,5 +345,5 @@
   elemental_as_nodal = true
   exodus = true
   perf_log = true
-  num_restart_files = 1
+  num_checkpoint_files = 1
 []
diff --git a/modules/combined/tests/plenum_pressure/plenum_pressure_refab_restart2.i b/modules/combined/tests/plenum_pressure/plenum_pressure_refab_restart2.i
@@ -85,13 +85,11 @@
   [./temp]
     order = FIRST
     family = LAGRANGE
-    initial_condition = 70.0
   [../]
 
   [./material_input]
     order = FIRST
     family = LAGRANGE
-    initial_condition = 0
   [../]
 []
 
@@ -314,7 +312,7 @@
   dt = 0.5
   end_time = 2.0
 
-#  restart_file_base = plenum_pressure_refab_restart1_out_restart_0003
+  restart_file_base = plenum_pressure_refab_restart1_out_cp/0003
 []
 
 [Postprocessors]

diff --git a/modules/combined/tests/plenum_pressure/tests b/modules/combined/tests/plenum_pressure/tests
@@ -33,6 +33,5 @@
     exodiff = plenum_pressure_refab_out.e
     exodiff_opts = -TM
     min_parallel = 2
-    cli_args = '--recover plenum_pressure_refab_restart1_out_restart_0003'
   [../]
 []
diff --git a/modules/combined/tests/power_law_creep/power_law_creep_restart1.i b/modules/combined/tests/power_law_creep/power_law_creep_restart1.i
@@ -259,5 +259,5 @@
   exodus = true
   postprocessor_csv = true
   perf_log = true
-  num_restart_files = 1
+  num_checkpoint_files = 1
 []
diff --git a/modules/combined/tests/power_law_creep/power_law_creep_restart2.i b/modules/combined/tests/power_law_creep/power_law_creep_restart2.i
@@ -249,7 +249,7 @@
   end_time = 1.0
   num_steps = 12
   dt = 1.e-1
-  restart_file_base = power_law_creep_restart1_out_restart_0006
+  restart_file_base = power_law_creep_restart1_out_cp/0006
 []
 
 [Output]