catch up with develop branch of FV3 and ccpp-physics master

NCAR · Mar 4, 2021 · 77d7cdf · 77d7cdf
1 parent 75258e2
commit 77d7cdf
Show file tree

Hide file tree

Showing 23 changed files with 879 additions and 671 deletions.
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -115,6 +115,8 @@
     'ccpp/physics/physics/cires_ugwp_post.F90'              ,
     'ccpp/physics/physics/unified_ugwp.F90'                 ,
     'ccpp/physics/physics/unified_ugwp_post.F90'            ,
+    'ccpp/physics/physics/ugwpv1_gsldrag.F90'               ,
+    'ccpp/physics/physics/ugwpv1_gsldrag_post.F90'          ,
     'ccpp/physics/physics/cnvc90.f'                         ,
     'ccpp/physics/physics/cs_conv.F90'                      ,
     'ccpp/physics/physics/cs_conv_aw_adj.F90'               ,
@@ -176,7 +178,7 @@
     'ccpp/physics/physics/sfc_drv.f'                        ,
     'ccpp/physics/physics/sfc_noah_wrfv4_interstitial.F90'  ,
     'ccpp/physics/physics/sfc_noah_wrfv4.F90'               ,
-    'ccpp/physics/physics/sfc_noahmp_drv.f'                 ,
+    'ccpp/physics/physics/sfc_noahmp_drv.F90'               ,
     'ccpp/physics/physics/flake_driver.F90'                 ,
     'ccpp/physics/physics/sfc_nst.f'                        ,
     'ccpp/physics/physics/sfc_ocean.F'                      ,

diff --git a/ccpp/physics b/ccpp/physics
diff --git a/ccpp/physics_namelists/input_GFS_v16beta.nml → ccpp/physics_namelists/input_GFS_v16.nml b/ccpp/physics_namelists/input_GFS_v16beta.nml → ccpp/physics_namelists/input_GFS_v16.nml
diff --git a/...cs_namelists/input_GFS_v16beta_RRTMGP.nml → ...hysics_namelists/input_GFS_v16_RRTMGP.nml b/...cs_namelists/input_GFS_v16beta_RRTMGP.nml → ...hysics_namelists/input_GFS_v16_RRTMGP.nml
diff --git a/...elists/input_GFS_v16beta_RRTMGP_LWjac.nml → ..._namelists/input_GFS_v16_RRTMGP_LWjac.nml b/...elists/input_GFS_v16beta_RRTMGP_LWjac.nml → ..._namelists/input_GFS_v16_RRTMGP_LWjac.nml
diff --git a/ccpp/suites/suite_SCM_GFS_v16beta.xml → ccpp/suites/suite_SCM_GFS_v16.xml b/ccpp/suites/suite_SCM_GFS_v16beta.xml → ccpp/suites/suite_SCM_GFS_v16.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v16beta" version="1">
+<suite name="SCM_GFS_v16" version="1">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v16beta_RRTMGP.xml → ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml b/ccpp/suites/suite_SCM_GFS_v16beta_RRTMGP.xml → ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v16beta_RRTMGP" version="1">
+<suite name="SCM_GFS_v16_RRTMGP" version="1">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/...uites/suite_SCM_GFS_v16beta_RRTMGP_ps.xml → ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml b/...uites/suite_SCM_GFS_v16beta_RRTMGP_ps.xml → ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v16beta_RRTMGP_ps" version="1">
+<suite name="SCM_GFS_v16_RRTMGP_ps" version="1">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/.../suites/suite_SCM_GFS_v16beta_no_nsst.xml → ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml b/.../suites/suite_SCM_GFS_v16beta_no_nsst.xml → ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v16beta_no_nsst" version="1">
+<suite name="SCM_GFS_v16_no_nsst" version="1">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/...ites/suite_SCM_GFS_v16beta_no_nsst_ps.xml → ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml b/...ites/suite_SCM_GFS_v16beta_no_nsst_ps.xml → ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v16beta_no_nsst_ps" version="1">
+<suite name="SCM_GFS_v16_no_nsst_ps" version="1">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v16beta_ps.xml → ccpp/suites/suite_SCM_GFS_v16_ps.xml b/ccpp/suites/suite_SCM_GFS_v16beta_ps.xml → ccpp/suites/suite_SCM_GFS_v16_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v16beta_ps" version="1">
+<suite name="SCM_GFS_v16_ps" version="1">
   <group name="time_vary">
     <subcycle loop="1">
       <scheme>GFS_time_vary_pre</scheme>

diff --git a/scm/etc/scripts/plot_configs/all_vars_test_twpice.ini b/scm/etc/scripts/plot_configs/all_vars_test_twpice.ini
@@ -1,5 +1,5 @@
-gmtb_scm_datasets = output_twpice_SCM_GFS_v15p2/output.nc, output_twpice_SCM_GSD_v1/output.nc,
-gmtb_scm_datasets_labels = GFSv15p2, GSDv1
+gmtb_scm_datasets = output_twpice_SCM_GFS_v15p2/output.nc, output_twpice_SCM_GFS_v16/output.nc, output_twpice_SCM_GSD_v1/output.nc, output_twpice_SCM_csawmg/output.nc, output_twpice_SCM_RRFS_v1beta/output.nc
+gmtb_scm_datasets_labels = GFSv15p2, GFSv16, GSDv1, csawmg, RRFSv1b
 plot_dir = plots_all_vars_twpice/
 obs_file = ../data/raw_case_input/twp180iopsndgvarana_v2.1_C3.c1.20060117.000000.cdf
 obs_compare = True
@@ -93,12 +93,6 @@ time_series_resample = True
       vars = rad_eff_rad_ql, rad_eff_rad_qi, rad_eff_rad_qr, rad_eff_rad_qs
       vars_labels = 'cloud liquid effective radius','cloud ice effective radius','rain effective radius','snow effective radius'
       x_label = '$\mu m$'
-    [[[rad_heating_rate]]]
-      vars = sw_rad_heating_rate, lw_rad_heating_rate
-      vars_labels = 'SW heating rate','LW heating rate'
-      x_label = '$K day^{-1}$'
-      conversion_factor = 8.64E4
-
 
   [[profiles_instant]]
 

diff --git a/scm/etc/scripts/plot_configs/arm_sgp_summer_1997_A_all_suites.ini b/scm/etc/scripts/plot_configs/arm_sgp_summer_1997_A_all_suites.ini
@@ -1,5 +1,5 @@
-gmtb_scm_datasets = output_arm_sgp_summer_1997_A_SCM_GFS_v15p2/output.nc, output_arm_sgp_summer_1997_A_SCM_GFS_v16beta/output.nc, output_arm_sgp_summer_1997_A_SCM_csawmg/output.nc, output_arm_sgp_summer_1997_A_SCM_GSD_v1/output.nc, 
-gmtb_scm_datasets_labels = GFSv15p2, GFSv16beta, csawmg, GSDv1
+gmtb_scm_datasets = output_arm_sgp_summer_1997_A_SCM_GFS_v15p2/output.nc, output_arm_sgp_summer_1997_A_SCM_GFS_v16/output.nc, output_arm_sgp_summer_1997_A_SCM_csawmg/output.nc, output_arm_sgp_summer_1997_A_SCM_GSD_v1/output.nc, 
+gmtb_scm_datasets_labels = GFSv15p2, GFSv16, csawmg, GSDv1
 plot_dir = plots_arm_sgp_summer_1997_A/
 obs_file = ../data/raw_case_input/sgp3hIOPsndgBasedV2.0_ConstrVarAnaX1.c1.19970618.000000.cdf
 obs_compare = True

diff --git a/scm/etc/scripts/plot_configs/supported_suites.ini b/scm/etc/scripts/plot_configs/supported_suites.ini
@@ -1,5 +1,5 @@
-gmtb_scm_datasets = output_twpice_SCM_GFS_v15p2/output.nc, output_twpice_SCM_GFS_v16beta/output.nc, output_twpice_SCM_GSD_v1/output.nc, output_twpice_SCM_csawmg/output.nc
-gmtb_scm_datasets_labels = GFSv15.2, GFSv16beta, GSDv1, csawmg
+gmtb_scm_datasets = output_twpice_SCM_GFS_v15p2/output.nc, output_twpice_SCM_GFS_v16/output.nc, output_twpice_SCM_GSD_v1/output.nc, output_twpice_SCM_csawmg/output.nc
+gmtb_scm_datasets_labels = GFSv15.2, GFSv16, GSDv1, csawmg
 plot_dir = plots_supported_suites/
 obs_file = ../data/raw_case_input/twp180iopsndgvarana_v2.1_C3.c1.20060117.000000.cdf
 obs_compare = True

diff --git a/scm/etc/scripts/plot_configs/twpice_all_suites.ini b/scm/etc/scripts/plot_configs/twpice_all_suites.ini
@@ -1,4 +1,4 @@
-gmtb_scm_datasets = output_twpice_SCM_GFS_v15p2/output.nc, output_twpice_SCM_GFS_v16beta/output.nc, output_twpice_SCM_GSD_v1/output.nc, output_twpice_SCM_csawmg/output.nc, output_twpice_SCM_RRFS_v1beta/output.nc
+gmtb_scm_datasets = output_twpice_SCM_GFS_v15p2/output.nc, output_twpice_SCM_GFS_v16/output.nc, output_twpice_SCM_GSD_v1/output.nc, output_twpice_SCM_csawmg/output.nc, output_twpice_SCM_RRFS_v1beta/output.nc
 gmtb_scm_datasets_labels = GFSv15.2, GFSv16b, GSDv1, csawmg, RRFSv1b
 plot_dir = plots_twpice_all_suites/
 obs_file = ../data/raw_case_input/twp180iopsndgvarana_v2.1_C3.c1.20060117.000000.cdf

diff --git a/...etc/tracer_config/tracers_GFS_v16beta.txt → scm/etc/tracer_config/tracers_GFS_v16.txt b/...etc/tracer_config/tracers_GFS_v16beta.txt → scm/etc/tracer_config/tracers_GFS_v16.txt