UPDATE: restart test updated

AetherModel · Feb 26, 2025 · cf3089b · cf3089b
1 parent 0f94f7e
commit cf3089b
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 32 deletions.
diff --git a/tests/restarts/aether.first.json b/tests/restarts/aether.first.json
@@ -5,19 +5,37 @@
 	"iVerbose" : 0,
 	"dt" : 10.0},
 
-    "GeoBlockSize" : {
-	"nLons" : 18,
-	"nLats" : 18,
-	"nAlts" : 50},
+    "neuGrid" : {
+	"nLons" : 12,
+	"nLats" : 12,
+	"nAlts" : 30},
+
+    "ionGrid": {
+        "dAltStretch": 0.2,
+        "LatStretch": 1,
+        "Shape": "dipole",
+        "nLonsPerBlock": 18,
+        "nLatsPerBlock" : 18,
+        "nAlts":36,
+        "LatMax":88,
+        "MinAlt": 80.0,
+        "MinApex": 125.0
+        },
 
     "StartTime" : [2011, 3, 20, 0, 0, 0],
-    "EndTime" : [2011, 3, 20, 0, 15, 0],
+    "EndTime" : [2011, 3, 20, 0, 5, 0],
 
     "Electrodynamics" : {
-	"File" : "UA/inputs/b20110320n_omni.bin"},
+        "Potential" : "Weimer05",
+        "DiffuseAurora" : "fta",
+        "File": "UA/inputs/b20110320n_omni.bin"},
 
     "OmniwebFiles" : ["UA/inputs/omni_20110319.txt"],
 
+    "Outputs" : {
+	"type" : ["states"],
+	"dt" : [60]},
+
     "Restart" : {
 	"do" : false,
 	"dt" : 900.0}

diff --git a/tests/restarts/aether.second.json b/tests/restarts/aether.second.json
@@ -5,21 +5,9 @@
 	"iVerbose" : 0,
 	"dt" : 10.0},
 
-    "GeoBlockSize" : {
-	"nLons" : 18,
-	"nLats" : 18,
-	"nAlts" : 50},
-
-    "StartTime" : [2011, 3, 20, 0, 0, 0],
-    "EndTime" : [2011, 3, 20, 0, 30, 0],
+    "EndTime" : [2011, 3, 20, 0, 10, 0],
 
-    "Electrodynamics" : {
-	"File" : "UA/inputs/b20110320n_omni.bin"},
-
-    "OmniwebFiles" : ["UA/inputs/omni_20110319.txt"],
-
     "Restart" : {
-	"do" : true,
-	"dt" : 900.0}
+	"do" : true}
 
 }
diff --git a/tests/restarts/aether.whole.json b/tests/restarts/aether.whole.json
@@ -5,19 +5,37 @@
 	"iVerbose" : 0,
 	"dt" : 10.0},
 
-    "GeoBlockSize" : {
-	"nLons" : 18,
-	"nLats" : 18,
-	"nAlts" : 50},
+    "neuGrid" : {
+	"nLons" : 12,
+	"nLats" : 12,
+	"nAlts" : 30},
+
+    "ionGrid": {
+        "dAltStretch": 0.2,
+        "LatStretch": 1,
+        "Shape": "dipole",
+        "nLonsPerBlock": 18,
+        "nLatsPerBlock" : 18,
+        "nAlts":36,
+        "LatMax":88,
+        "MinAlt": 80.0,
+        "MinApex": 125.0
+        },
 
     "StartTime" : [2011, 3, 20, 0, 0, 0],
-    "EndTime" : [2011, 3, 20, 0, 30, 0],
+    "EndTime" : [2011, 3, 20, 0, 10, 0],
 
     "Electrodynamics" : {
-	"File" : "UA/inputs/b20110320n_omni.bin"},
+        "Potential" : "Weimer05",
+        "DiffuseAurora" : "fta",
+        "File": "UA/inputs/b20110320n_omni.bin"},
 
     "OmniwebFiles" : ["UA/inputs/omni_20110319.txt"],
 
+    "Outputs" : {
+	"type" : ["states"],
+	"dt" : [60]},
+
     "Restart" : {
 	"do" : false,
 	"dt" : 900.0}

diff --git a/tests/restarts/run_test.sh b/tests/restarts/run_test.sh
@@ -7,20 +7,25 @@ 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]:
-aether_plot_simple.py -var=density_O -alt=250 3DALL_20110320_003000.nc
+aether_plot_simple.py -var=density_O -alt=250 3DALG_20110320_00*.nc
 # Tn:
-aether_plot_simple.py -var=Temperature_neutral -alt=250 3DALL_20110320_003000.nc
+aether_plot_simple.py -var=Temperature_neutral -alt=250 3DALG_20110320_00*.nc
 # [e-]
-aether_plot_simple.py -var=density_e- -alt=250 3DALL_20110320_003000.nc
+aether_plot_simple.py -var=density_e- -alt=120 3DALG_20110320_00*.nc
+# East Velocity
+aether_plot_simple.py -var=velocity_east_neutral -alt=250 3DALG_20110320_00*.nc
 
 cd ../../..
 
@@ -32,11 +37,13 @@ cp ../aether.whole.json ./aether.json
 cd UA/output
 ../../../../../srcPython/postAether.py -alt=-1 -rm
 # [O]:
-aether_plot_simple.py -var=density_O -alt=250 3DALL_20110320_003000.nc
+aether_plot_simple.py -var=density_O -alt=250 3DALG_20110320_00*.nc
 # Tn:
-aether_plot_simple.py -var=Temperature_neutral -alt=250 3DALL_20110320_003000.nc
+aether_plot_simple.py -var=Temperature_neutral -alt=250 3DALG_20110320_00*.nc
 # [e-]
-aether_plot_simple.py -var=density_e- -alt=250 3DALL_20110320_003000.nc
+aether_plot_simple.py -var=density_e- -alt=120 3DALG_20110320_00*.nc
+# East Velocity
+aether_plot_simple.py -var=velocity_east_neutral -alt=250 3DALG_20110320_00*.nc
 
 cd ../../..