Merge pull request #207 from grantfirl/ozone_fix

Add TKE as a tracer for GFS_v16beta-based suites
NCAR · Sep 28, 2020 · ac96cb7 · ac96cb7
2 parents 21c9101 + 00746e6
commit ac96cb7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/scm/etc/tracer_config/tracers_GFS_v15p2.txt b/scm/etc/tracer_config/tracers_GFS_v15p2.txt
@@ -0,0 +1,8 @@
+"sphum","water_vapor_specific_humidity","kg kg-1"
+"liq_wat","cloud_condensed_water_mixing_ratio","kg kg-1"
+"ice_wat","ice_water_mixing_ratio","kg kg-1"
+"o3mr","ozone_mixing_ratio","kg kg-1"
+"rainwat","rain_water_mixing_ratio","kg kg-1"
+"snowwat","snow_water_mixing_ratio","kg kg-1"
+"graupel","graupel_mixing_ratio","kg kg-1"
+"cld_amt","cloud_fraction","frac"
diff --git a/scm/etc/tracer_config/tracers_GFS_v16beta.txt b/scm/etc/tracer_config/tracers_GFS_v16beta.txt
@@ -0,0 +1,9 @@
+"sphum","water_vapor_specific_humidity","kg kg-1"
+"liq_wat","cloud_condensed_water_mixing_ratio","kg kg-1"
+"ice_wat","ice_water_mixing_ratio","kg kg-1"
+"o3mr","ozone_mixing_ratio","kg kg-1"
+"rainwat","rain_water_mixing_ratio","kg kg-1"
+"snowwat","snow_water_mixing_ratio","kg kg-1"
+"graupel","graupel_mixing_ratio","kg kg-1"
+"cld_amt","cloud_fraction","frac"
+"sgs_tke","turbulent_kinetic_energy","m2 s-2"
diff --git a/scm/src/default_tracers.py b/scm/src/default_tracers.py
@@ -1,14 +1,14 @@
-default_tracers = {"SCM_GFS_v15p2":"tracers_gfdlmp.txt",
-                   "SCM_GFS_v16beta":"tracers_gfdlmp.txt",
-                   "SCM_GFS_v15p2_RRTMGP":"tracers_gfdlmp.txt",
-                   "SCM_GFS_v16beta_RRTMGP":"tracers_gfdlmp.txt",
+default_tracers = {"SCM_GFS_v15p2":"tracers_GFS_v15p2.txt",
+                   "SCM_GFS_v16beta":"tracers_GFS_v16beta.txt",
+                   "SCM_GFS_v15p2_RRTMGP":"tracers_GFS_v15p2.txt",
+                   "SCM_GFS_v16beta_RRTMGP":"tracers_GFS_v16beta.txt",
                    "SCM_csawmg":"tracers_csawmg.txt",
-                   "SCM_GFS_v15p2_no_nsst":"tracers_gfdlmp.txt",
-                   "SCM_GFS_v16beta_no_nsst":"tracers_gfdlmp.txt",
-                   "SCM_GFS_v15p2_noahmp":"tracers_gfdlmp.txt",
-                   "SCM_GFS_v15p2_MYJ":"tracers_gfdlmp.txt",
+                   "SCM_GFS_v15p2_no_nsst":"tracers_GFS_v15p2.txt",
+                   "SCM_GFS_v16beta_no_nsst":"tracers_GFS_v16beta.txt",
+                   "SCM_GFS_v15p2_noahmp":"tracers_GFS_v15p2.txt",
+                   "SCM_GFS_v15p2_MYJ":"tracers_GFS_v15p2.txt",
                    "SCM_GSD_v1":"tracers_gsd.txt",
-                   "SCM_GFS_v15p2_YSU":"tracers_gfdlmp.txt",
-                   "SCM_GFS_v15p2_saYSU":"tracers_gfdlmp.txt",
-                   "SCM_GFS_v15p2_ACM":"tracers_gfdlmp.txt"
+                   "SCM_GFS_v15p2_YSU":"tracers_GFS_v15p2.txt",
+                   "SCM_GFS_v15p2_saYSU":"tracers_GFS_v15p2.txt",
+                   "SCM_GFS_v15p2_ACM":"tracers_GFS_v15p2.txt"
                   }