MAIN: get restarts working again

Author: aaronjridley

tests/restarts/aether.first.json

@@ -3,18 +3,20 @@
 
     "Debug" : {
 	"iVerbose" : 0,
-	"dt" : 60.0},
-
-    "Mysetting" : {
-	"setting1" : "this_is_an_example",
-	"setting2" : 42,
-	"setting3" : true},
+	"dt" : 10.0},
 
+    "GeoBlockSize" : {
+	"nLons" : 18,
+	"nLats" : 18,
+	"nAlts" : 50},
+    
     "StartTime" : [2011, 3, 20, 0, 0, 0],
-    "EndTime" : [2011, 3, 20, 0, 45, 0],
+    "EndTime" : [2011, 3, 20, 0, 15, 0],
 
+    "Electrodynamics" : {
+	"File" : "UA/inputs/b20110320n_omni.bin"},
+    
     "OmniwebFiles" : ["UA/inputs/omni_20110319.txt"],
-    "ElectrodynamicsFile" : "UA/inputs/b20110320n_omni.bin",
 
     "Restart" : {
 	"do" : false,

tests/restarts/aether.second.json

@@ -3,18 +3,20 @@
 
     "Debug" : {
 	"iVerbose" : 0,
-	"dt" : 60.0},
-
-    "Mysetting" : {
-	"setting1" : "this_is_an_example",
-	"setting2" : 42,
-	"setting3" : true},
+	"dt" : 10.0},
 
+    "GeoBlockSize" : {
+	"nLons" : 18,
+	"nLats" : 18,
+	"nAlts" : 50},
+    
     "StartTime" : [2011, 3, 20, 0, 0, 0],
-    "EndTime" : [2011, 3, 20, 1, 0, 0],
+    "EndTime" : [2011, 3, 20, 0, 30, 0],
 
+    "Electrodynamics" : {
+	"File" : "UA/inputs/b20110320n_omni.bin"},
+    
     "OmniwebFiles" : ["UA/inputs/omni_20110319.txt"],
-    "ElectrodynamicsFile" : "UA/inputs/b20110320n_omni.bin",
 
     "Restart" : {
 	"do" : true,

tests/restarts/aether.whole.json

@@ -3,18 +3,20 @@
 
     "Debug" : {
 	"iVerbose" : 0,
-	"dt" : 60.0},
-
-    "Mysetting" : {
-	"setting1" : "this_is_an_example",
-	"setting2" : 42,
-	"setting3" : true},
+	"dt" : 10.0},
 
+    "GeoBlockSize" : {
+	"nLons" : 18,
+	"nLats" : 18,
+	"nAlts" : 50},
+    
     "StartTime" : [2011, 3, 20, 0, 0, 0],
-    "EndTime" : [2011, 3, 20, 1, 0, 0],
+    "EndTime" : [2011, 3, 20, 0, 30, 0],
 
+    "Electrodynamics" : {
+	"File" : "UA/inputs/b20110320n_omni.bin"},
+    
     "OmniwebFiles" : ["UA/inputs/omni_20110319.txt"],
-    "ElectrodynamicsFile" : "UA/inputs/b20110320n_omni.bin",
 
     "Restart" : {
 	"do" : false,

tests/restarts/run_test.sh

@@ -2,38 +2,41 @@
 
 rm -rf run.halves run.whole
 
-cp -R ../../share/run ./run.whole
-cd run.whole
-cp ../aether.whole.json ./aether.json
+cp -R ../../share/run ./run.halves
+cd run.halves
+# first part of the run
+cp ../aether.first.json ./aether.json
+./aether
+cd UA ; rm -f restartIn ; cp -R restartOut restartIn ; cd ..
+# second part of the run
+cp ../aether.second.json ./aether.json
 ./aether
 # plot the output
 cd UA/output
+../../../../../srcPython/postAether.py -alt=-1 -rm
+
 # [O]:
-run_plot_model_results.py -var=3 -alt=250 3DALL_20110320_010000.nc
+aether_plot_simple.py -var=density_O -alt=250 3DALL_20110320_003000.nc
 # Tn:
-run_plot_model_results.py -var=14 -alt=250 3DALL_20110320_010000.nc
+aether_plot_simple.py -var=Temperature_neutral -alt=250 3DALL_20110320_003000.nc
 # [e-]
-run_plot_model_results.py -var=23 -alt=250 3DALL_20110320_010000.nc
+aether_plot_simple.py -var=density_e- -alt=250 3DALL_20110320_003000.nc
 
 cd ../../..
 
-cp -R ../../share/run ./run.halves
-cd run.halves
-# first part of the run
-cp ../aether.first.json ./aether.json
-./aether
-cd UA ; rm -f restartIn ; cp -R restartOut restartIn ; cd ..
-# second part of the run
-cp ../aether.second.json ./aether.json
+cp -R ../../share/run ./run.whole
+cd run.whole
+cp ../aether.whole.json ./aether.json
 ./aether
 # plot the output
 cd UA/output
+../../../../../srcPython/postAether.py -alt=-1 -rm
 # [O]:
-run_plot_model_results.py -var=3 -alt=250 3DALL_20110320_010000.nc
+aether_plot_simple.py -var=density_O -alt=250 3DALL_20110320_003000.nc
 # Tn:
-run_plot_model_results.py -var=14 -alt=250 3DALL_20110320_010000.nc
+aether_plot_simple.py -var=Temperature_neutral -alt=250 3DALL_20110320_003000.nc
 # [e-]
-run_plot_model_results.py -var=23 -alt=250 3DALL_20110320_010000.nc
+aether_plot_simple.py -var=density_e- -alt=250 3DALL_20110320_003000.nc
 
 cd ../../..