updated calc and plot scripts and coupling data

cjvogl · Aug 17, 2019 · b4aa929 · b4aa929
1 parent 8b15e39
commit b4aa929
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 26 deletions.
diff --git a/components/homme/scripts_for_paper/calc_convergence_test_gravitywave_withHV.py b/components/homme/scripts_for_paper/calc_convergence_test_gravitywave_withHV.py
@@ -10,9 +10,8 @@
 outpath = sys.argv[1]
 
 methodList = ['KGU35', 'ARS232', 'DBM453', 'ARS222', 'ARS233', 'ARS343', \
-              'ARS443', 'ARK324', 'ARK436', 'SSP3333b', 'SSP3333c']
-
-methodList = ['ARK437']
+              'ARS443', 'ARK324', 'ARK436', 'SSP3333b', 'SSP3333c',
+              'GSA222', 'SSP2232', 'ARK548', 'ARK437']
 
 # read in reference solution
 fileRef = outpath + '/output_tsteptype5_tstep0.000390625_nmax768000/dcmip2012_test31.nc'

diff --git a/components/homme/scripts_for_paper/calc_largest_acceptable_timestep_baroclinicinstability.py b/components/homme/scripts_for_paper/calc_largest_acceptable_timestep_baroclinicinstability.py
@@ -36,6 +36,8 @@
 for method in methodList:
   print method
   currentList = dtList + [] # make a copy of dtList
+  if (method == 'ARK548'):
+    currentList.append(320)
 
   # Obtain surface pressure error from solution at largest timestep
   success = False

diff --git a/components/homme/scripts_for_paper/calc_largest_coupling_timestep_baroclinicinstability.py b/components/homme/scripts_for_paper/calc_largest_coupling_timestep_baroclinicinstability.py
@@ -14,6 +14,7 @@
               'IMKG252a', 'IMKG252b', 'IMKG253a', 'IMKG253b', 'IMKG254a', 
               'IMKG254b', 'IMKG254c', 'IMKG343a', 'GSA222', 'SSP2232',
               'ARK548', 'ARK437']
+methodList = ['ARK548',]
 
 dtList = [300, 270, 240, 216, 200, 192, 180, 160, 150, 135, 120, 100, 50, 20 ,10]
 
@@ -39,6 +40,9 @@
   print method
   currentList = dtList + [] # make a copy of dtList
 
+  if (method == 'ARK548'):
+    currentList.append(320)
+
   success = False
   dt = np.amax(currentList)
   exceed = np.inf

diff --git a/components/homme/scripts_for_paper/data/largest_coupling_timestep_baroclinicinstability.txt b/components/homme/scripts_for_paper/data/largest_coupling_timestep_baroclinicinstability.txt
@@ -1,21 +1 @@
-     ARS232 120  0
-     ARS222  50 24
-     ARS233 200 11
-     ARS343 200  0
-     ARS443 135  0
-     ARK324 240  0
-     ARK436 216  0
-     DBM453 300  3
-   SSP3333b 200 11
-   SSP3333c 200 11
-IMEX-KG232a 100 57
-IMEX-KG232b 200 71
-IMEX-KG242a 160  0
-IMEX-KG242b 240  0
-IMEX-KG243a 270  0
-IMEX-KG252a 160 38
-IMEX-KG252b 300 61
-IMEX-KG253a 200 55
-IMEX-KG254a 300 61
-IMEX-KG254b 300 61
-IMEX-KG343a 270 55
+     ARK548 320  3
diff --git a/components/homme/scripts_for_paper/plot_convergence_test_gravitywave_withHV.py b/components/homme/scripts_for_paper/plot_convergence_test_gravitywave_withHV.py
@@ -6,8 +6,8 @@
 matplotlib.rcParams.update({'font.size':22})
 
 methodList = ['KGU35', 'ARS232', 'DBM453', 'ARS222', 'ARS233', 'ARS343', \
-              'ARS443', 'ARK324', 'ARK436', 'SSP3333b', 'SSP3333c']
-methodList = ['GSA222', 'SSP2232', 'ARK548']
+              'ARS443', 'ARK324', 'ARK436', 'SSP3333b', 'SSP3333c',
+              'GSA222', 'SSP2232', 'ARK548', 'ARK437']
 
 epsilon_times_1000 = 2.220446049250313e-13
 roundoff = epsilon_times_1000*768.0