Skip to content

Commit

Permalink
Merge pull request #239 from grantfirl/20210304_master_update
Browse files Browse the repository at this point in the history 
implement timestep_init phases and catch up with master of ccpp-physics (2021/03/04)
  • Loading branch information
@grantfirl
grantfirl authored Mar 4, 2021
2 parents 533fc52 + 77d7cdf commit f2f4217
Show file tree
Hide file tree
Showing 29 changed files with 1,306 additions and 932 deletions.
32 changes: 17 additions & 15 deletions ccpp/config/ccpp_prebuild_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
# actual variable definition files
'ccpp/physics/physics/machine.F',
'ccpp/physics/physics/radsw_param.f',
'ccpp/physics/physics/h2o_def.f',
'ccpp/physics/physics/ozne_def.f',
'ccpp/physics/physics/radlw_param.f',
'scm/src/GFS_typedefs.F90',
'scm/src/gmtb_scm_kinds.F90',
Expand Down Expand Up @@ -113,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' ,
Expand Down Expand Up @@ -158,7 +162,6 @@
'ccpp/physics/physics/ozphys_2015.f' ,
'ccpp/physics/physics/precpd.f' ,
'ccpp/physics/physics/phys_tend.F90' ,
'ccpp/physics/physics/tracer_sanitizer.F90' ,
'ccpp/physics/physics/radlw_main.F90' ,
'ccpp/physics/physics/radsw_main.F90' ,
'ccpp/physics/physics/rascnv.F90' ,
Expand All @@ -170,13 +173,12 @@
'ccpp/physics/physics/sfc_diag.f' ,
'ccpp/physics/physics/sfc_diag_post.F90' ,
'ccpp/physics/physics/sfc_drv_ruc.F90' ,
'ccpp/physics/physics/lsm_ruc_sfc_sice_interstitial.F90',
'ccpp/physics/physics/sfc_cice.f' ,
'ccpp/physics/physics/sfc_diff.f' ,
'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' ,
Expand Down Expand Up @@ -212,22 +214,22 @@
DEFAULT_BUILD_DIR = 'scm/bin'

# Auto-generated makefile/cmakefile snippets that contain all type definitions
TYPEDEFS_MAKEFILE = 'ccpp/physics/CCPP_TYPEDEFS.mk'
TYPEDEFS_CMAKEFILE = 'ccpp/physics/CCPP_TYPEDEFS.cmake'
TYPEDEFS_SOURCEFILE = 'ccpp/physics/CCPP_TYPEDEFS.sh'
TYPEDEFS_MAKEFILE = '{build_dir}/ccpp/physics/CCPP_TYPEDEFS.mk'
TYPEDEFS_CMAKEFILE = '{build_dir}/ccpp/physics/CCPP_TYPEDEFS.cmake'
TYPEDEFS_SOURCEFILE = '{build_dir}/ccpp/physics/CCPP_TYPEDEFS.sh'

# Auto-generated makefile/cmakefile snippets that contain all schemes
SCHEMES_MAKEFILE = 'ccpp/physics/CCPP_SCHEMES.mk'
SCHEMES_CMAKEFILE = 'ccpp/physics/CCPP_SCHEMES.cmake'
SCHEMES_SOURCEFILE = 'ccpp/physics/CCPP_SCHEMES.sh'
SCHEMES_MAKEFILE = '{build_dir}/ccpp/physics/CCPP_SCHEMES.mk'
SCHEMES_CMAKEFILE = '{build_dir}/ccpp/physics/CCPP_SCHEMES.cmake'
SCHEMES_SOURCEFILE = '{build_dir}/ccpp/physics/CCPP_SCHEMES.sh'

# Auto-generated makefile/cmakefile snippets that contain all caps
CAPS_MAKEFILE = 'ccpp/physics/CCPP_CAPS.mk'
CAPS_CMAKEFILE = 'ccpp/physics/CCPP_CAPS.cmake'
CAPS_SOURCEFILE = 'ccpp/physics/CCPP_CAPS.sh'
CAPS_MAKEFILE = '{build_dir}/ccpp/physics/CCPP_CAPS.mk'
CAPS_CMAKEFILE = '{build_dir}/ccpp/physics/CCPP_CAPS.cmake'
CAPS_SOURCEFILE = '{build_dir}/ccpp/physics/CCPP_CAPS.sh'

# Directory where to put all auto-generated physics caps
CAPS_DIR = 'ccpp/physics/physics'
CAPS_DIR = '{build_dir}/ccpp/physics/physics'

# Directory where the suite definition files are stored
SUITES_DIR = 'ccpp/suites'
Expand Down Expand Up @@ -297,7 +299,7 @@
'rrtmgp_sw_rte_run' : [
'components_of_surface_downward_shortwave_fluxes',
],
},
},
'GFS_rrtmgp_sw_post' : {
'GFS_rrtmgp_sw_post_run' : [
'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
Expand Down Expand Up @@ -325,4 +327,4 @@
HTML_VARTABLE_FILE = 'ccpp/physics/CCPP_VARIABLES_SCM.html'

# LaTeX document containing the provided vs requested CCPP variables
LATEX_VARTABLE_FILE = 'ccpp/framework/doc/DevelopersGuide/CCPP_VARIABLES_SCM.tex'
LATEX_VARTABLE_FILE = 'ccpp/framework/doc/DevelopersGuide/CCPP_VARIABLES_SCM.tex'
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 4 files
+5 −2 scripts/ccpp_prebuild.py
+11 −1 scripts/common.py
+15 −33 scripts/metadata_parser.py
+66 −38 scripts/mkstatic.py
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 126 files
0 ccpp/physics_namelists/input_GFS_v16beta.nml → ccpp/physics_namelists/input_GFS_v16.nml
View file
File renamed without changes.
0 ...cs_namelists/input_GFS_v16beta_RRTMGP.nml → ...hysics_namelists/input_GFS_v16_RRTMGP.nml
View file
File renamed without changes.
0 ...elists/input_GFS_v16beta_RRTMGP_LWjac.nml → ..._namelists/input_GFS_v16_RRTMGP_LWjac.nml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta.xml → ccpp/suites/suite_SCM_GFS_v16.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_RRTMGP.xml → ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...uites/suite_SCM_GFS_v16beta_RRTMGP_ps.xml → ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion .../suites/suite_SCM_GFS_v16beta_no_nsst.xml → ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...ites/suite_SCM_GFS_v16beta_no_nsst_ps.xml → ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_ps.xml → ccpp/suites/suite_SCM_GFS_v16_ps.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
3 changes: 0 additions & 3 deletions ccpp/suites/suite_SCM_GSD_v1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_ruc</scheme>
<scheme>lsm_ruc_sfc_sice_pre</scheme>
<scheme>sfc_sice</scheme>
<scheme>lsm_ruc_sfc_sice_post</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
Expand Down
10 changes: 2 additions & 8 deletions scm/etc/scripts/plot_configs/all_vars_test_twpice.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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]]

Expand Down
4 changes: 2 additions & 2 deletions scm/etc/scripts/plot_configs/arm_sgp_summer_1997_A_all_suites.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions scm/etc/scripts/plot_configs/supported_suites.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scm/etc/scripts/plot_configs/twpice_all_suites.ini
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...etc/tracer_config/tracers_GFS_v16beta.txt → scm/etc/tracer_config/tracers_GFS_v16.txt
View file
File renamed without changes.
4 changes: 3 additions & 1 deletion scm/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ endif("${SUITES}" STREQUAL "")
string(REGEX REPLACE "(.+),$" "\\1" SUITES ${SUITES})
# Run CCPP prebuild.py
message (STATUS "Running ccpp_prebuild.py for CCPP")
# Make the directories where the ccpp_prebuild.py script wants to write caps and make snippets
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics/physics)
execute_process(
COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py --suites=${SUITES} --builddir=${CMAKE_CURRENT_BINARY_DIR}/..
COMMAND ccpp/framework/scripts/ccpp_prebuild.py --config=ccpp/config/ccpp_prebuild_config.py --suites=${SUITES} --builddir=${CMAKE_CURRENT_BINARY_DIR}
OUTPUT_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.out
ERROR_FILE ${PROJECT_BINARY_DIR}/ccpp_prebuild.err
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../..
Expand Down
Loading

0 comments on commit f2f4217

Please sign in to comment.