From 5f5735e718926d98b7fe82e00595fc5500920951 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 23 Jul 2020 09:03:48 -0600 Subject: [PATCH] Prepare for SRW App release (update develop from NCAR dtc/develop 2020/07/21) (#147) - remove `include ./depend` from several GNU makefiles (from @DusanJovic-NOAA) - correct CCPP version number in several suite definition files - GFS_typedefs.F90: allow using `iopt_snf == 4` for other microphysics schemes than GFDL MP (required for RRFS, needs NoahMP and Thompson) --- atmos_cubed_sphere | 2 +- ccpp/driver/makefile | 2 - ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml | 2 +- ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml | 2 +- ccpp/suites/suite_FV3_RRFS_v1beta.xml | 82 ++++++++++++++++++++++ gfsphysics/GFS_layer/GFS_typedefs.F90 | 6 +- gfsphysics/makefile | 2 - ipd/makefile | 2 - 8 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 ccpp/suites/suite_FV3_RRFS_v1beta.xml diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index b108ed294..8b59ebc03 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit b108ed294f4c9f98233a23a37408db664f6344e5 +Subproject commit 8b59ebc039dafe1c20ed6dd21cb38ca564852b98 diff --git a/ccpp/driver/makefile b/ccpp/driver/makefile index ccbae2c50..c64441135 100644 --- a/ccpp/driver/makefile +++ b/ccpp/driver/makefile @@ -64,8 +64,6 @@ clean: MKDEPENDS = ../../mkDepends.pl include ../../conf/make.rules -include ./depend - # do not include 'depend' file if the target contains string 'clean' ifneq (clean,$(findstring clean,$(MAKECMDGOALS))) -include depend diff --git a/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml b/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml index 72f1b659f..f2da9d4e8 100644 --- a/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml +++ b/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml @@ -1,6 +1,6 @@ - + diff --git a/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml b/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml index 50680a893..f1c22a774 100644 --- a/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml +++ b/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml @@ -1,6 +1,6 @@ - + diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/suite_FV3_RRFS_v1beta.xml new file mode 100644 index 000000000..3bff7b39d --- /dev/null +++ b/ccpp/suites/suite_FV3_RRFS_v1beta.xml @@ -0,0 +1,82 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + rrtmg_lw_post + GFS_rrtmg_post + + + + + GFS_suite_interstitial_phys_reset + GFS_suite_stateout_reset + get_prs_fv3 + GFS_suite_interstitial_1 + GFS_surface_generic_pre + GFS_surface_composites_pre + dcyc2t3 + GFS_surface_composites_inter + GFS_suite_interstitial_2 + + + + mynnsfc_wrapper + GFS_surface_loop_control_part1 + sfc_nst_pre + sfc_nst + sfc_nst_post + noahmpdrv + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + GFS_GWD_generic_pre + drag_suite + GFS_GWD_generic_post + rayleigh_damp + GFS_suite_stateout_update + ozphys_2015 + h2ophys + get_phi_fv3 + GFS_suite_interstitial_3 + GFS_suite_interstitial_4 + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90 index 0af959b02..70a565a36 100644 --- a/gfsphysics/GFS_layer/GFS_typedefs.F90 +++ b/gfsphysics/GFS_layer/GFS_typedefs.F90 @@ -4340,9 +4340,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & stop endif - if (Model%lsm == Model%lsm_noahmp .and. Model%iopt_snf == 4) then - if (Model%imp_physics /= Model%imp_physics_gfdl) stop 'iopt_snf == 4 must use GFDL MP' - endif +! if (Model%lsm == Model%lsm_noahmp .and. Model%iopt_snf == 4) then +! if (Model%imp_physics /= Model%imp_physics_gfdl) stop 'iopt_snf == 4 must use GFDL MP' +! endif print *,' nst_anl=',Model%nst_anl,' use_ufo=',Model%use_ufo,' frac_grid=',Model%frac_grid,& ' ignore_lake=',ignore_lake diff --git a/gfsphysics/makefile b/gfsphysics/makefile index 9f25780c8..2ae58e317 100644 --- a/gfsphysics/makefile +++ b/gfsphysics/makefile @@ -266,8 +266,6 @@ clean: MKDEPENDS = ../mkDepends.pl include ../conf/make.rules -include ./depend - # do not include 'depend' file if the target contains string 'clean' ifneq (clean,$(findstring clean,$(MAKECMDGOALS))) -include depend diff --git a/ipd/makefile b/ipd/makefile index 88cc6cbd1..ed4a2749b 100644 --- a/ipd/makefile +++ b/ipd/makefile @@ -51,8 +51,6 @@ clean: MKDEPENDS = ../mkDepends.pl include ../conf/make.rules -include ./depend - # do not include 'depend' file if the target contains string 'clean' ifneq (clean,$(findstring clean,$(MAKECMDGOALS))) -include depend