From e7687f4f59ad53575578493de87ed11d89765274 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 13 Dec 2021 07:04:37 -0700 Subject: [PATCH] Merge NOAA-GSL gsl/develop into develop, update CCPP SDFs (#435) * Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics for gsl/develop branch * RUC ice for gsl/develop (replaces #54 and #56) (#60) Implementation of RUC LSM ice model in CCPP * Squash-merge climbfuji:rucice_gfsv16dzmin into gsl/develop * Fix bug in gfsphysics/GFS_layer/GFS_typedefs.F90 from merge * Remove lsm_ruc_sfc_sice from suite FV3_GSD_v0_unified_ugwp_suite and update submodule pointer for ccpp-physics * Remove sfc_sice from ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-physics Co-authored-by: Dom Heinzeller * Update gsl/develop from develop 2020/12/08 (#61) * Fix for updating stochastic physics on separate time-step. (#199) This bug fix allows the random patterns in the stochastic physics persist the for a period of time (defined as SKEBINT,SPPTINT, etc.) before calculating new patterns. The fix is to move the allocation of the saved variables into the init section of stochastic_physics_wrapper, and remove the deallocates in the run section. * Bug fixes in (1) running with frac_grid=T and GFDL MP and (2) restarting with frac_grid=T (#204) * -- Pointing to Moorthi's modifications in ccpp/physics, which fixed the crash when running GFDL MP with frac_grid=T; -- Not setting fice to zero in order to leave lake ice untouched; -- Restart in the coupled model with the default physics is reproducible, if bad water temperature is only filtered at initial time; Co-authored-with: Shrinivas Moorthi Co-authored-with: Denise Worthen * Revert change to .gitmodules and update submodule pointer for ccpp-physics Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: shansun6 <48043606+shansun6@users.noreply.github.com> * Update submodule pointer for ccpp-physics - MYNN surface layer updates and bugfixes (#63) * Land stochastic perturbations (wrapper PR for #65) (#68) * Move initialization of stochastic physics after the physics initialization in CCPP. * Add albedo variables to land perturbations with lndp_type=2 option. Change to accommodate soil perturbations with RUC LSM. * Max/min soil moisture variables are introduced via GFS_Control_type variables instead of through the use of namelist_soilveg*. This is a more flexible way for different LSMs. * Added pores and resid variables for max/min soil moisture to GFS_typedefs.f90. * Remove tracer_sanitizer from all suites and from CCPP prebuild config * Add namelist option to apply land surface perturbations at every time step, clean up stochastic_physics/stochastic_physics_wrapper.F90 Co-authored-by: tanyasmirnova * Stochastic land perturbations: add roughness length over land to the perturbed variables (#70) * Added roughness length over land to the perturbed variables. * Bugfix in gfsphysics/GFS_layer/GFS_typedefs.F90: remove Diag%cldcov, in particular the reset call because the variable is not allocated Co-authored-by: Dom Heinzeller * Update gsl/develop from develop 2021/02/22 (#73) * Fix for updating stochastic physics on separate time-step. (#199) This bug fix allows the random patterns in the stochastic physics persist the for a period of time (defined as SKEBINT,SPPTINT, etc.) before calculating new patterns. The fix is to move the allocation of the saved variables into the init section of stochastic_physics_wrapper, and remove the deallocates in the run section. * Bug fixes in (1) running with frac_grid=T and GFDL MP and (2) restarting with frac_grid=T (#204) * -- Pointing to Moorthi's modifications in ccpp/physics, which fixed the crash when running GFDL MP with frac_grid=T; -- Not setting fice to zero in order to leave lake ice untouched; -- Restart in the coupled model with the default physics is reproducible, if bad water temperature is only filtered at initial time; Co-authored-with: Shrinivas Moorthi Co-authored-with: Denise Worthen * jedi-ufs with ccpp-physics submodule update (contains #201) (#211) * updated CMakeLists.txt * Changes for JEDI linking/control * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Revert change to .gitmodules and update submodule pointer for ccpp-physics Co-authored-by: Mark Potts * Final-final GFS v16 updates / restart reproducibility bugfixes (#212) * updates the submodule pointer for ccpp-physics for the final-final (!) GFS v16 physics updates * fixes a bug in io/FV3GFS_io.F90 to obtain restart reproducibility for uncoupled and coupled runs - contributed by @SMoorthi-emc Co-authored-by: Shrinivas.Moorthi * RRTMGP coupling to Thompson MP in ccpp-physics (#208) * Updated physics. Added infrastructure to FV3 to handle new GP capabilities. Thompson MP, LW scattering, Use of LW-jacobian to update surface tendencies. * Some small changes to work with physics improvements to RRTMGP. * RRTMGP working with Thompson MP. * Updated .gitmodules. * Updated physics. New interstitials. * Synced with NCAR/master * Updated ccpp-physics * Updated physics submodule. * Cleanup * Update physics * Updated physics submodule pointer. * Updated physics submodule hash. * Minor bug fixes to CCPP UGWP (update submodule pointer for ccpp-physics) (#216) Update the submodule pointer for ccpp-physics for minor bugfixes in CCPP's Unified Gravity Wave Drag parameterization. * Remove IPD (step 1) (#215) Remove all IPD source files that are not needed to compile with CCPP. Update gfsphysics/CMakeLists.txt and gfsphysics/GFS_layer/GFS_driver.F90 so that the code compiles after removing IPD sources. Also: update submodule pointer for GFDL_atmos_cubed_sphere to include PR NOAA-EMC/GFDL_atmos_cubed_sphere#48 ("Removed use of mpp_node for use with FMS 2020.04"). * Update submodule pointers for ccpp-framework (ccpp_prebuild bugfix) and ccpp-physics (RRTMGP GFDL-MP bugfix) (#218) Update the submodule pointers for ccpp-framework and ccpp-physics for the changes described in NCAR/ccpp-framework#343 and NCAR/ccpp-physics#536. * Remove unnecessary SIMD instruction sets from ccpp/CMakeLists.txt (#220) * Remove additional/unnecessary SIMD instruction sets from ccpp/CMakeLists.txt * Implementation of CCPP timestep_init and timestep_final phases (#217) - replace calls to CCPP step `time_vary` with `timestep_init` in `atmos_model.F90`, add call to CCPP step `timestep_final` - update `ccpp/driver/CCPP_driver.F90` with calls to CCPP `timestep_init` and `timestep_final` - add `h2o_def.f` and `ozne_def.` to `ccpp_prebuild_config.py` - update of `gfsphysics/GFS_layer/GFS_typedefs.F90`: cleanup work for o3 and h2o physics (required by the updates to the CCPP time vary physics) - update metadata in `gfsphysics/GFS_layer/GFS_typedefs.meta` for the above changes, and clean up the index used for the surface wind enhancement due to convection in the `phy_f2d` array (use proper index, not just the last entry in the array) * add radiation_clouds_thompson_dependency in ccpp physics (#225) * using radiation_clouds_thompson_dependency ccpp physics branch * point to ccpp master branch * Remove IPD steps 3 and 5 (#224) * Implementation of CCPP timestep_init and timestep_final phases in fv3atm; cleanup work in GFS_typedefs for o3 and h2o physics as a result of the changes to the time vary physics in CCPP * Use proper index variable for surface wind enhancement due to convection in phy_f2d array in GFS_typedefs.{F90,meta}, move code to clear diagnostic buckets using GFS DDT bound procedures from atmos_model.F90 to CCPP_driver.F90 * First step of cleanup process: remove CCPP preprocessor directives, remove parts of unused IPD code, update cmake build system, Delete IPD source code, Replace IPD DDTs with GFS DDTs, Bugfix in atmos_model.F90; add missing call to GFS_externaldiag_populate, Move contents of gfsphysics/{CCPP_layer,GFS_layer} to ccpp/{data,driver}, entirely deleted IPD typedefs, Rename module GFS_driver to GFS_init * Fix indentation in ccpp/data/CMakeLists.txt and ccpp/driver/CMakeLists.txt * Add logic to set DYN32 depending on 32BIT setting * Pass preprocessor directive GFS_TYPES to dycore to enable use of GFS data types * Compile GFS_diagnostics.F90 without optimization, this leads to out of memory errors on wcoss_dell_p3 * Add CCPP rrtmgp fix (#237) * ccpp physics merged with top of master * point back to ccpp master branch * Update develop from NOAA-GSL: RUC ice, MYNN sfclay, stochastic land perturbations (#239) * Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics for gsl/develop branch * RUC ice for gsl/develop (replaces #54 and #56) (#60) Implementation of RUC LSM ice model in CCPP * Fix bug in gfsphysics/GFS_layer/GFS_typedefs.F90 from merge * Remove lsm_ruc_sfc_sice from suite FV3_GSD_v0_unified_ugwp_suite and update submodule pointer for ccpp-physics * Remove sfc_sice from ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml * Update gsl/develop from develop 2020/12/08 (#61) * Fix for updating stochastic physics on separate time-step. (#199) This bug fix allows the random patterns in the stochastic physics persist the for a period of time (defined as SKEBINT,SPPTINT, etc.) before calculating new patterns. The fix is to move the allocation of the saved variables into the init section of stochastic_physics_wrapper, and remove the deallocates in the run section. * Bug fixes in (1) running with frac_grid=T and GFDL MP and (2) restarting with frac_grid=T (#204) * -- Pointing to Moorthi's modifications in ccpp/physics, which fixed the crash when running GFDL MP with frac_grid=T; -- Not setting fice to zero in order to leave lake ice untouched; -- Restart in the coupled model with the default physics is reproducible, if bad water temperature is only filtered at initial time; Co-authored-with: Shrinivas Moorthi Co-authored-with: Denise Worthen * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Update submodule pointer for ccpp-physics - MYNN surface layer updates and bugfixes (#63) * Land stochastic perturbations (wrapper PR for #65) (#68) * Move initialization of stochastic physics after the physics initialization in CCPP. * Add albedo variables to land perturbations with lndp_type=2 option. Change to accommodate soil perturbations with RUC LSM. * Max/min soil moisture variables are introduced via GFS_Control_type variables instead of through the use of namelist_soilveg*. This is a more flexible way for different LSMs. * Added pores and resid variables for max/min soil moisture to GFS_typedefs.f90. * Remove tracer_sanitizer from all suites and from CCPP prebuild config * Add namelist option to apply land surface perturbations at every time step, clean up stochastic_physics/stochastic_physics_wrapper.F90 * Stochastic land perturbations: add roughness length over land to the perturbed variables (#70) * Added roughness length over land to the perturbed variables. * Bugfix in gfsphysics/GFS_layer/GFS_typedefs.F90: remove Diag%cldcov, in particular the reset call because the variable is not allocated * Update .gitmodules and submodule pointer for GFDL_atmos_cubed_sphere for code review and testing * Revert change to .gitmodules for ccpp-physics, update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for GFDL_atmos_cubed_sphere Co-authored-by: DomHeinzeller <58610420+DomHeinzeller@users.noreply.github.com> Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: shansun6 <48043606+shansun6@users.noreply.github.com> Co-authored-by: tanyasmirnova * Dycore change to add an option to zero-gradient BC for height advection and change dz_min as a namelist input (#232) * Point dycore to a personal branch * Point to new version of dycore * Update the dycore version * Update the dycore version * Point to NOAA-EMC dev/emc dycore branch * Remove gnumake build remnants, change v16beta to v16 (#234) * Remove gnumake files * Replace v16beta with v16 for all CCPP suites * Remove unused CCPP_INCLUDE_DIRS/CCPP_LIB_DIRS from ccpp/CMakeLists.txt * Move LSM vegetation lookup tables into CCPP, clean up RUC snow cover on ice initialization (remove IPD step 2) (#244) * Move LSM vegetation lookup tables into CCPP, clean up RUC snow cover on ice initialization * Revert change to .gitmodules and update submodule pointer for ccpp-physics * UGWP v0 v1 combined (#241) * .gitmodules/gsl atmos-cubed cccp-fram cccp/physics * update fv3atm from NOAA-EMC Jan 9 * new suite_FV3_GFS_v16b_ugwpv1.xml and modifications Jan 11/2021 * Added new logical flag do_ugwp_v0_nst_only which allows non-stationary drag from ugwp_v0 to be run with GSL drag suite * Fix formatting in ccpp/data/GFS_typedefs.* * Clean up allocation of arrays in ccpp/data/GFS_typedefs.F90, add active attribute (pass 1) to ccpp/data/GFS_typedefs.meta, strip trailing whitespaces from both * Update and cleanup of metadata for UGWPv0, UGWPv1, drag suite * Reorganize UGWP diagnostic variables in data/GFS_typedefs.{F90,meta} * Bugfix for uninitialized data in ccpp/data/GFS_typedefs.F90 * Update submodule pointer for ccpp-physics * Allocate 3d diagnostic arrays as dummy arrays if not used Co-authored-by: valery.yudin Co-authored-by: Michael Toy * SDF for GFSv16 with Thompson (#238) * SDF for GFSv16 with Thompson * Delete suite_FV3_GFS_v16beta_thompson.xml * update to new commit of Thompson MP in ccpp physics Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: shansun6 <48043606+shansun6@users.noreply.github.com> Co-authored-by: Mark Potts Co-authored-by: Shrinivas.Moorthi Co-authored-by: dustinswales Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> Co-authored-by: XiaqiongZhou-NOAA <48254930+XiaqiongZhou-NOAA@users.noreply.github.com> Co-authored-by: valery.yudin Co-authored-by: Michael Toy Co-authored-by: XiaSun-NOAA <58949533+XiaSun-NOAA@users.noreply.github.com> * Remove inconsistencies in computation of air density with Thompson MP (#74) * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Update thompson mp 20210213 (#567) for gsl/develop (#75) * Add logical convert_dry_rho for Thompson MP, hardcoded to false * Initialize all variables to NaN in ccpp-physics in DEBUG mode * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-framework and ccpp-physics * &gfs_physics_nml print_diff_pgr=.true. will print per-timestep pgr change stats * point to sam's repository for atmos_cubed_sphere * Add units and lat/lon to per-timestep pgr stats * Rebase atmos_cubed_sphere to NOAA-GFDL dev/emc branch * Print mean pgr change as hPa/hr and other pgr data as bars. * Remove changes from atmos_cubed_sphere and simplify atmos_model.F90 changes. * print mean abs change instead of mean change in pgr * Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics for code review and testing * Revert change to .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics * clarify one print * More 3D diagnostic tendencies (#76) Add diagnostic tendencies for all tracers. Move all d*3dt variables into a 4D sparse array stored as `dtend(i,k,dtidx(tracer,process))` to reduce memory usage. * Fix incorrect units in dtend metadata (#82) * Fix incorrect units in dtend metadata * Make the tracer tendency units mandatory. * Add SO2 tendency units (#86) * Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-framework and ccpp-physics * dtend: add missing tendencies and fix bugs in convection tendencies (#92) * Fix incorrect units in dtend metadata * Point to corresponding ccpp/physics branch * fixes to dtend support: 1. Store rtg (AKA clw AKA qtr) instead of gq0 in DCNV and SCNV pre/post for schemes that use convective transport. Tracers handled solely by convective transport (ones not in rtg) are reported as convective transport tendencies. Tendencies for variables in rtg are reported as dcnv and scnv tendencies. 2. Report TKE tendencies from gfs v16 PBL. 3. Add diagnostic tendencies to drag_suite 4. Only report rayleigh damping tendencies if rayleigh damping is enabled 5. List all possible diagnostic tendencies, even if they are not enabled. In the output, label them "selected" or "disabled." 6. Add phys_tend to the fv3_rap suite. * Merge gsl/develop into ccpp/physics * Add phys_tend to suite_FV3_GSD_SAR and remove some debug prints * Remove some debug prints and commented-out code. * Correct error in dtend variable availability list print. * Enable convtrans diagnostic tendencies for number concentrations and qrimef. * Disable cnvtrans diagnostic tendencies for schemes that do their own diagnostic tendency reporting. * Point to gsl repositories * Update .gitmodules for code review and regression testing * Formatting changes in ccpp/data/GFS_typedefs.F90 * Update submodule pointer for ccpp-physics * Update submodule pointer for ccpp-physics * Point update_gsl_develop_from_develop_20210531 to NOAA-GSL branches of ccpp/physics and ccpp/framework * GF aerosols updates and tunings * GF aerosol updates and tunings from physics * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Update submodule pointer for ccpp-physics * Update submodule pointer for ccpp-physics * Update submodule pointer for ccpp-physics * Make aod_gf and cactiv_m work appriopriately for restarts Minor code cleanup * Add missing metadata for new GF arrays * Bug fix in ccpp/driver/GFS_restart.F90 for GF * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Add missing active attribute for aod_gf in ccpp/data/GFS_typedefs.meta * Update submodule pointer for ccpp-physics * Update submodule pointer for ccpp-physocs * Change name of sfc_name2(39) from 'weasd' to 'weasdl' in io/FV3GFS_io.F90 * Revert change to .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Changed dimensions of variables tsnow_land and sncovr_ice from horizontal_dimension to horizontal_loop_extent * Added Flake to two suites: FV3_GSD_v0 and FV3_HRRR. * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Update to ccpp/data/GFS_typedefs.meta following CCPP standard names update * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointers for ccpp-physics and ccpp-framework * Revert change to .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics * Turn on GF aerosol-awareness Tune clwdet (cloud water detrainment) Make evfact (evaporation factor) and radiation factor scale-aware * Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics for code review and testing * Switch back to NCAR ccpp-framework main, abandon NOAA-GSL fork * Update submodule pointer for ccpp-physics * Update submodule pointer for ccpp/physics * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Update .gitmodules and submodule pointer for ccpp-physics for code review aand testing * Update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Update submodule pointer for ccpp-physics * Revert .gitmodules and update submodule pointer for ccpp-physics * Revert change to .gitmodules and update submodule pointer for ccpp-physics * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Revert .gitmodules and update submodule pointer for ccpp-physics * Update CCPP metadata and several suite defiition files for new GSL regression tests * Bug fix for compiling with Intel on macOS, remove clutter from stdout in io/FV3GFS_io.F90 * Update .gitmodules and submodule pointer for ccpp-physics for code review and testing * Rename GSL suites to RAP suites, add new RAP suites * rename suite FV3_GSD_v0 to FV3_RAP_noah_sfcdiff_cires_ugwp, delete suite FV3_SAR * Update submodule pointer for ccpp-physics * Address reviewer comments * Update submodule pointer for ccpp-physics * Revert .gitmodules and update submodule pointer for ccpp-physics Co-authored-by: DomHeinzeller <58610420+DomHeinzeller@users.noreply.github.com> Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com> Co-authored-by: shansun6 <48043606+shansun6@users.noreply.github.com> Co-authored-by: tanyasmirnova Co-authored-by: tanyasmirnova <38667904+tanyasmirnova@users.noreply.github.com> Co-authored-by: Mark Potts Co-authored-by: Shrinivas.Moorthi Co-authored-by: dustinswales Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> Co-authored-by: XiaqiongZhou-NOAA <48254930+XiaqiongZhou-NOAA@users.noreply.github.com> Co-authored-by: valery.yudin Co-authored-by: Michael Toy Co-authored-by: XiaSun-NOAA <58949533+XiaSun-NOAA@users.noreply.github.com> Co-authored-by: samuel.trahan Co-authored-by: Samuel Trahan (NOAA contractor) <39415369+SamuelTrahanNOAA@users.noreply.github.com> Co-authored-by: hannah barnes Co-authored-by: Hannah C Barnes <38660891+hannahcbarnes@users.noreply.github.com> --- ccpp/data/GFS_typedefs.F90 | 9 ++ ccpp/data/GFS_typedefs.meta | 55 +++++++---- ccpp/driver/GFS_restart.F90 | 14 ++- ccpp/physics | 2 +- ccpp/suites/suite_FV3_GSD_SAR.xml | 85 ---------------- ccpp/suites/suite_FV3_GSD_noah.xml | 96 ------------------- ccpp/suites/suite_FV3_GSD_v0.xml | 95 ------------------ ccpp/suites/suite_FV3_HRRR.xml | 2 - ...v0_RRTMGP.xml => suite_FV3_RAP_RRTMGP.xml} | 7 +- ...nnsfc.xml => suite_FV3_RAP_cires_ugwp.xml} | 2 +- ccpp/suites/suite_FV3_RAP_flake.xml | 91 ++++++++++++++++++ ..._suite_noah.xml => suite_FV3_RAP_noah.xml} | 7 +- ...suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml} | 4 +- ...ag_suite.xml => suite_FV3_RAP_sfcdiff.xml} | 2 +- ...ite.xml => suite_FV3_RAP_unified_ugwp.xml} | 4 +- ccpp/suites/suite_FV3_RRFS_v1alpha.xml | 84 ---------------- io/FV3GFS_io.F90 | 10 +- 17 files changed, 171 insertions(+), 398 deletions(-) delete mode 100644 ccpp/suites/suite_FV3_GSD_SAR.xml delete mode 100644 ccpp/suites/suite_FV3_GSD_noah.xml delete mode 100644 ccpp/suites/suite_FV3_GSD_v0.xml rename ccpp/suites/{suite_FV3_GSD_v0_RRTMGP.xml => suite_FV3_RAP_RRTMGP.xml} (95%) rename ccpp/suites/{suite_FV3_GSD_v0_mynnsfc.xml => suite_FV3_RAP_cires_ugwp.xml} (98%) create mode 100644 ccpp/suites/suite_FV3_RAP_flake.xml rename ccpp/suites/{suite_FV3_GSD_v0_unified_ugwp_suite_noah.xml => suite_FV3_RAP_noah.xml} (94%) rename ccpp/suites/{suite_FV3_GSD_noah_mynnsfc.xml => suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml} (97%) rename ccpp/suites/{suite_FV3_GSD_v0_drag_suite.xml => suite_FV3_RAP_sfcdiff.xml} (98%) rename ccpp/suites/{suite_FV3_GSD_v0_unified_ugwp_suite.xml => suite_FV3_RAP_unified_ugwp.xml} (97%) delete mode 100644 ccpp/suites/suite_FV3_RRFS_v1alpha.xml diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 541d34e18..3be66033f 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -283,6 +283,7 @@ module GFS_typedefs !-- In/Out real (kind=kind_phys), pointer :: conv_act(:) => null() !< convective activity counter for Grell-Freitas + real (kind=kind_phys), pointer :: conv_act_m(:)=> null() !< midlevel convective activity counter for Grell-Freitas real (kind=kind_phys), pointer :: hice (:) => null() !< sea ice thickness real (kind=kind_phys), pointer :: weasd (:) => null() !< water equiv of accumulated snow depth (kg/m**2) !< over land and sea ice @@ -1425,6 +1426,8 @@ module GFS_typedefs real (kind=kind_phys), pointer :: prevst (:,:) => null() !< real (kind=kind_phys), pointer :: prevsq (:,:) => null() !< integer, pointer :: cactiv (:) => null() !< convective activity memory contour + integer, pointer :: cactiv_m (:) => null() !< mid-level convective activity memory contour + real (kind=kind_phys), pointer :: aod_gf (:) => null() !--- MYNN prognostic variables that can't be in the Intdiag or Interstitial DDTs real (kind=kind_phys), pointer :: CLDFRA_BL (:,:) => null() ! @@ -2706,7 +2709,9 @@ subroutine sfcprop_create (Sfcprop, IM, Model) end if if (Model%imfdeepcnv == Model%imfdeepcnv_gf) then allocate (Sfcprop%conv_act(IM)) + allocate (Sfcprop%conv_act_m(IM)) Sfcprop%conv_act = zero + Sfcprop%conv_act_m = zero end if end subroutine sfcprop_create @@ -6047,7 +6052,11 @@ subroutine tbd_create (Tbd, IM, Model) if (Model%imfdeepcnv == Model%imfdeepcnv_gf) then allocate(Tbd%cactiv(IM)) + allocate(Tbd%cactiv_m(IM)) + allocate(Tbd%aod_gf(IM)) Tbd%cactiv = zero + Tbd%cactiv_m = zero + Tbd%aod_gf = zero end if !--- MYNN variables: diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 213338275..f95931c1b 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -809,6 +809,14 @@ type = real kind = kind_phys active = (control_for_deep_convection_scheme == identifier_for_grell_freitas_deep_convection) +[conv_act_m] + standard_name = consecutive_calls_for_grell_freitas_mid_level_convection + long_name = Memory counter for GF midlevel + units = none + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys + active = (control_for_deep_convection_scheme == identifier_for_grell_freitas_deep_convection) [hice] standard_name = sea_ice_thickness long_name = sea ice thickness @@ -5796,6 +5804,14 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_aerosol_tracers_MG) type = real kind = kind_phys +[aod_gf] + standard_name = aerosol_optical_depth_for_grell_freitas_deep_convection + long_name = aerosol optical depth used in Grell-Freitas Convective Parameterization + units = none + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys + active = (control_for_deep_convection_scheme == identifier_for_grell_freitas_deep_convection) [imap] standard_name = map_of_block_column_number_to_global_i_index long_name = map of local index ix to global index i for this block @@ -6051,6 +6067,13 @@ dimensions = (horizontal_loop_extent) type = integer active = (control_for_deep_convection_scheme == identifier_for_grell_freitas_deep_convection) +[cactiv_m] + standard_name = counter_for_grell_freitas_mid_level_convection + long_name = mid-level convective activity memory + units = none + dimensions = (horizontal_loop_extent) + type = integer + active = (control_for_deep_convection_scheme == identifier_for_grell_freitas_deep_convection) [CLDFRA_BL] standard_name = subgrid_scale_cloud_area_fraction_in_atmosphere_layer long_name = subgrid cloud fraction from PBL scheme @@ -7369,7 +7392,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22) [dvdt_ogw] standard_name = tendency_of_y_wind_due_to_mesoscale_orographic_gravity_wave_drag long_name = y momentum tendency from meso scale ogw @@ -7377,7 +7400,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22) [du_ogwcol] standard_name = vertically_integrated_x_momentum_flux_due_to_mesoscale_orographic_gravity_wave_drag long_name = integrated x momentum flux from meso scale ogw @@ -7385,7 +7408,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22) [dv_ogwcol] standard_name = vertically_integrated_y_momentum_flux_due_to_mesoscale_orographic_gravity_wave_drag long_name = integrated y momentum flux from meso scale ogw @@ -7393,7 +7416,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22) [dudt_obl] standard_name = tendency_of_x_momentum_due_to_blocking_drag long_name = x momentum tendency from blocking drag @@ -7401,7 +7424,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22) [dvdt_obl] standard_name = tendency_of_y_momentum_due_to_blocking_drag long_name = y momentum tendency from blocking drag @@ -7409,7 +7432,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22) [du_oblcol] standard_name = vertically_integrated_x_momentum_flux_due_to_blocking_drag long_name = integrated x momentum flux from blocking drag @@ -7417,7 +7440,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22) [dv_oblcol] standard_name = vertically_integrated_y_momentum_flux_due_to_blocking_drag long_name = integrated y momentum flux from blocking drag @@ -7425,7 +7448,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [dudt_oss] standard_name = tendency_of_x_momentum_due_to_small_scale_gravity_wave_drag long_name = x momentum tendency from small scale gwd @@ -7433,7 +7456,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [dvdt_oss] standard_name = tendency_of_y_momentum_due_to_small_scale_gravity_wave_drag long_name = y momentum tendency from small scale gwd @@ -7441,7 +7464,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [du_osscol] standard_name = vertically_integrated_x_momentum_flux_due_to_small_scale_gravity_wave_drag long_name = integrated x momentum flux from small scale gwd @@ -7449,7 +7472,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [dv_osscol] standard_name = vertically_integrated_y_momentum_flux_due_to_small_scale_gravity_wave_drag long_name = integrated y momentum flux from small scale gwd @@ -7457,7 +7480,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [dudt_ofd] standard_name = tendency_of_x_momentum_due_to_form_drag long_name = x momentum tendency from form drag @@ -7465,7 +7488,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [dvdt_ofd] standard_name = tendency_of_y_momentum_due_to_form_drag long_name = y momentum tendency from form drag @@ -7473,7 +7496,7 @@ dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [du_ofdcol] standard_name = vertically_integrated_x_momentum_flux_due_to_form_drag long_name = integrated x momentum flux from form drag @@ -7481,7 +7504,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [dv_ofdcol] standard_name = vertically_integrated_y_momentum_flux_due_to_form_drag long_name = integrated y momentum flux from form drag @@ -7489,7 +7512,7 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys - active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33 .or. control_for_drag_suite_gravity_wave_drag==22 .or. control_for_drag_suite_gravity_wave_drag==3 .or. control_for_drag_suite_gravity_wave_drag==2) + active = (flag_for_ugwp_version_1 .or. control_for_drag_suite_gravity_wave_drag==33) [dv3dt_ngw] standard_name = time_integral_of_change_in_y_wind_due_to_nonstationary_gravity_wave long_name = time integral of change in y wind due to NGW diff --git a/ccpp/driver/GFS_restart.F90 b/ccpp/driver/GFS_restart.F90 index b697dfb90..e4c4061f1 100644 --- a/ccpp/driver/GFS_restart.F90 +++ b/ccpp/driver/GFS_restart.F90 @@ -98,8 +98,8 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & Restart%num2d = 3 + Model%ntot2d + Model%nctp + ndiag_rst ! GF - if (Model%imfdeepcnv == 3) then - Restart%num2d = Restart%num2d + 1 + if (Model%imfdeepcnv == Model%imfdeepcnv_gf) then + Restart%num2d = Restart%num2d + 3 endif ! CA if (Model%imfdeepcnv == 2 .and. Model%do_ca) then @@ -206,6 +206,16 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & do nb = 1,nblks Restart%data(nb,num)%var2p => Sfcprop(nb)%conv_act(:) enddo + num = num + 1 + Restart%name2d(num) = 'gf_2d_conv_act_m' + do nb = 1,nblks + Restart%data(nb,num)%var2p => Sfcprop(nb)%conv_act_m(:) + enddo + num = num + 1 + Restart%name2d(num) = 'aod_gf' + do nb = 1,nblks + Restart%data(nb,num)%var2p => Tbd(nb)%aod_gf(:) + enddo endif ! NoahMP if (Model%lsm == Model%lsm_noahmp) then diff --git a/ccpp/physics b/ccpp/physics index fb752d447..4865cba04 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit fb752d4475044bdc332619b5280f116369b64c04 +Subproject commit 4865cba04432d64f95b58b52428c18e8ef22d863 diff --git a/ccpp/suites/suite_FV3_GSD_SAR.xml b/ccpp/suites/suite_FV3_GSD_SAR.xml deleted file mode 100644 index f2b38d577..000000000 --- a/ccpp/suites/suite_FV3_GSD_SAR.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - 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 - GFS_radiation_surface - 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 - - - - sfc_diff - GFS_surface_loop_control_part1 - sfc_nst_pre - sfc_nst - sfc_nst_post - lsm_ruc - GFS_surface_loop_control_part2 - - - - GFS_surface_composites_post - sfc_diag - sfc_diag_post - GFS_surface_generic_post - mynnedmf_wrapper - GFS_GWD_generic_pre - cires_ugwp - cires_ugwp_post - GFS_GWD_generic_post - 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 - phys_tend - - - - - GFS_stochastics - - - - diff --git a/ccpp/suites/suite_FV3_GSD_noah.xml b/ccpp/suites/suite_FV3_GSD_noah.xml deleted file mode 100644 index ad30ae4c2..000000000 --- a/ccpp/suites/suite_FV3_GSD_noah.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - 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 - GFS_radiation_surface - 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 - - - - sfc_diff - GFS_surface_loop_control_part1 - sfc_nst_pre - sfc_nst - sfc_nst_post - lsm_noah - 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 - cires_ugwp - cires_ugwp_post - GFS_GWD_generic_post - GFS_suite_stateout_update - ozphys_2015 - h2ophys - get_phi_fv3 - GFS_suite_interstitial_3 - GFS_DCNV_generic_pre - cu_gf_driver_pre - cu_gf_driver - GFS_DCNV_generic_post - GFS_SCNV_generic_pre - GFS_SCNV_generic_post - GFS_suite_interstitial_4 - cnvc90 - GFS_MP_generic_pre - mp_thompson_pre - - - mp_thompson - - - mp_thompson_post - GFS_MP_generic_post - cu_gf_driver_post - maximum_hourly_diagnostics - phys_tend - - - - - GFS_stochastics - - - - diff --git a/ccpp/suites/suite_FV3_GSD_v0.xml b/ccpp/suites/suite_FV3_GSD_v0.xml deleted file mode 100644 index 1a0857422..000000000 --- a/ccpp/suites/suite_FV3_GSD_v0.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - 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 - GFS_radiation_surface - 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 - - - - sfc_diff - GFS_surface_loop_control_part1 - sfc_nst_pre - sfc_nst - sfc_nst_post - lsm_ruc - GFS_surface_loop_control_part2 - - - - GFS_surface_composites_post - sfc_diag - sfc_diag_post - GFS_surface_generic_post - mynnedmf_wrapper - GFS_GWD_generic_pre - cires_ugwp - cires_ugwp_post - GFS_GWD_generic_post - GFS_suite_stateout_update - ozphys_2015 - h2ophys - get_phi_fv3 - GFS_suite_interstitial_3 - GFS_DCNV_generic_pre - cu_gf_driver_pre - cu_gf_driver - GFS_DCNV_generic_post - GFS_SCNV_generic_pre - GFS_SCNV_generic_post - GFS_suite_interstitial_4 - cnvc90 - GFS_MP_generic_pre - mp_thompson_pre - - - mp_thompson - - - mp_thompson_post - GFS_MP_generic_post - cu_gf_driver_post - maximum_hourly_diagnostics - phys_tend - - - - - GFS_stochastics - - - - diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/suite_FV3_HRRR.xml index 6fd18617d..d3408f0ba 100644 --- a/ccpp/suites/suite_FV3_HRRR.xml +++ b/ccpp/suites/suite_FV3_HRRR.xml @@ -62,10 +62,8 @@ ozphys_2015 h2ophys get_phi_fv3 - GFS_suite_interstitial_3 GFS_suite_interstitial_4 - GFS_MP_generic_pre mp_thompson_pre mp_thompson diff --git a/ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml b/ccpp/suites/suite_FV3_RAP_RRTMGP.xml similarity index 95% rename from ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml rename to ccpp/suites/suite_FV3_RAP_RRTMGP.xml index a9056b6fa..83542fae6 100644 --- a/ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml +++ b/ccpp/suites/suite_FV3_RAP_RRTMGP.xml @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ - sfc_diff + mynnsfc_wrapper GFS_surface_loop_control_part1 sfc_nst_pre sfc_nst @@ -66,8 +66,7 @@ GFS_surface_generic_post mynnedmf_wrapper GFS_GWD_generic_pre - cires_ugwp - cires_ugwp_post + drag_suite GFS_GWD_generic_post GFS_suite_stateout_update ozphys_2015 diff --git a/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml similarity index 98% rename from ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml rename to ccpp/suites/suite_FV3_RAP_cires_ugwp.xml index 2f59d0671..7f43ed2b8 100644 --- a/ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml +++ b/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml @@ -1,6 +1,6 @@ - + diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/suite_FV3_RAP_flake.xml new file mode 100644 index 000000000..734f6dd89 --- /dev/null +++ b/ccpp/suites/suite_FV3_RAP_flake.xml @@ -0,0 +1,91 @@ + + + + + + + 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 + GFS_radiation_surface + 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 + lsm_ruc + flake_driver + 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 + GFS_suite_stateout_update + ozphys_2015 + h2ophys + get_phi_fv3 + GFS_suite_interstitial_3 + GFS_DCNV_generic_pre + cu_gf_driver_pre + cu_gf_driver + GFS_DCNV_generic_post + GFS_SCNV_generic_pre + GFS_SCNV_generic_post + GFS_suite_interstitial_4 + cnvc90 + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + cu_gf_driver_post + maximum_hourly_diagnostics + phys_tend + + + + + GFS_stochastics + + + + diff --git a/ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite_noah.xml b/ccpp/suites/suite_FV3_RAP_noah.xml similarity index 94% rename from ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite_noah.xml rename to ccpp/suites/suite_FV3_RAP_noah.xml index 1fabc9e50..dd4eb76f9 100644 --- a/ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite_noah.xml +++ b/ccpp/suites/suite_FV3_RAP_noah.xml @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - sfc_diff + mynnsfc_wrapper GFS_surface_loop_control_part1 sfc_nst_pre sfc_nst @@ -57,8 +57,7 @@ GFS_surface_generic_post mynnedmf_wrapper GFS_GWD_generic_pre - unified_ugwp - unified_ugwp_post + drag_suite GFS_GWD_generic_post GFS_suite_stateout_update ozphys_2015 diff --git a/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml similarity index 97% rename from ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml rename to ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml index 2dc671612..f849a2b62 100644 --- a/ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml +++ b/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - mynnsfc_wrapper + sfc_diff GFS_surface_loop_control_part1 sfc_nst_pre sfc_nst diff --git a/ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml similarity index 98% rename from ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml rename to ccpp/suites/suite_FV3_RAP_sfcdiff.xml index d8547ff19..82acb849a 100644 --- a/ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml +++ b/ccpp/suites/suite_FV3_RAP_sfcdiff.xml @@ -1,6 +1,6 @@ - + diff --git a/ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml similarity index 97% rename from ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml rename to ccpp/suites/suite_FV3_RAP_unified_ugwp.xml index 04e987eb7..b79398ef7 100644 --- a/ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml +++ b/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml @@ -1,6 +1,6 @@ - + @@ -40,7 +40,7 @@ - sfc_diff + mynnsfc_wrapper GFS_surface_loop_control_part1 sfc_nst_pre sfc_nst diff --git a/ccpp/suites/suite_FV3_RRFS_v1alpha.xml b/ccpp/suites/suite_FV3_RRFS_v1alpha.xml deleted file mode 100644 index b3622828e..000000000 --- a/ccpp/suites/suite_FV3_RRFS_v1alpha.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - 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 - GFS_radiation_surface - 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 - - - - sfc_diff - 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 - cires_ugwp - cires_ugwp_post - GFS_GWD_generic_post - 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 - phys_tend - - - - - GFS_stochastics - - - - diff --git a/io/FV3GFS_io.F90 b/io/FV3GFS_io.F90 index 157e51102..3827ccb68 100644 --- a/io/FV3GFS_io.F90 +++ b/io/FV3GFS_io.F90 @@ -783,7 +783,11 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain, warm_sta !--- allocate the various containers needed for restarts allocate(sfc_name2(nvar_s2m+nvar_s2o+nvar_s2mp+nvar_s2r)) allocate(sfc_name3(0:nvar_s3+nvar_s3mp)) - allocate(sfc_var2(nx,ny,nvar_s2m+nvar_s2o+nvar_s2mp+nvar_s2r),sfc_var3ice(nx,ny,Model%kice)) + allocate(sfc_var2(nx,ny,nvar_s2m+nvar_s2o+nvar_s2mp+nvar_s2r)) + ! Note that this may cause problems with RUC LSM for coldstart runs from GFS data + ! if the initial conditions do contain this variable, because Model%kice is 9 for + ! RUC LSM, but tiice in the initial conditions will only have two vertical layers + allocate(sfc_var3ice(nx,ny,Model%kice)) if (Model%lsm == Model%lsm_noah .or. Model%lsm == Model%lsm_noahmp .or. (.not.warm_start)) then allocate(sfc_var3(nx,ny,Model%lsoil,nvar_s3)) @@ -2787,8 +2791,8 @@ subroutine fv3gfs_diag_output(time, diag, atm_block, nx, ny, levs, ntcw, ntoz, & !--- !--- skipping other 3D variables with the following else statement !--- - if(mpp_pe()==mpp_root_pe())print *,'in,fv3gfs_io. 3D fields, idx=',idx,'varname=',trim(diag(idx)%name), & - 'lcnvfac=',lcnvfac, 'levo=',levo,'nx=',nx,'ny=',ny +! if(mpp_pe()==mpp_root_pe())print *,'in,fv3gfs_io. 3D fields, idx=',idx,'varname=',trim(diag(idx)%name), & +! 'lcnvfac=',lcnvfac, 'levo=',levo,'nx=',nx,'ny=',ny do k=1, levo do j = 1, ny jj = j + jsc -1