Skip to content

Commit 7cec900

Browse files
scrasmussengrantfirlVanderleiVargas-NOAAQingfu-LiuClaraDraper-NOAA
authored
ufs-dev PR#365 (NCAR#1225)
* update standard names to move Xgrs to physics_timestep_initial* and remove *_of_new_state (default name refers to 'current' value) * fix a few unchanged standard names * change some timestep_initial variables to general variables; make satmedmfvdifq return new tendencies and new tendency application block in GFS_PBL_generic_post * Refactor physics tendency calculations - Added tendency variables (`ten_t`, `ten_u`, `ten_v`) for temperature and wind tendencies in SAMF deep and shallow convection schemes. - Updated relevant `.meta` files to reflect changes in variable intent (`inout` -> `in` where appropriate) and added tendencies. - Modified Interstitials (`GFS_DCNV_generic_post`, `GFS_DCNV_generic_pre`, `GFS_SCNV_generic_post`, `GFS_SCNV_generic_pre`) to directly use tendencies instead of saved state variables. - Removed redundant saved variables (`save_u`, `save_v`, `save_t`). - Added `delt` to post interstitials. * update unified_ugwp, ugwpv1, and drag_suite to use new tendency code * save tendency work with GFS_photochemistry * add tracer tendency changes to convection; fix typos in GFS_photochemistry * fix typo in samfdeepcnv.f * save tendency work with Thompson MP * save tendency work with radiation * add FMS to ccpp-physics CMakeLists.txt for fv3 * add initial setting of state in GFS_time_vary_pre.fv3; fix horizontal_dimension in GFS_time_vary_pre.scm * fix metadata in GFS_time_vary_pre.fv3 * add momentum tendency output to mp_thompson and fix intent in metadata * fix array size bug in mp_thompson.F90; cleanup dtend code using new tendency paradigm; cleanup saving of states no longer needed * fix improperly-merged conflict resolution in GFS_photochemistry.F90 * fix access of ntlnc/ntinc access of tracer array when missing * convert many RAD, PBL, GWD, CONV, and MP schemes to return tendencies * convert MG micro and Arakawa-Wu adjustment schemes * convert MYNNEDMF PBL scheme to return tendencies * add changes to MYNN EDMF PBL * add back divide-by-zero bugfix in module_sf_noahmp_glacier.F90 that was removed recently * remove obsolete interstitial schemes * fix 2 minor compilation issues after testing with UFS RTs * fix bug in MG MP * fix near-surface air temperature standard name in GFS_surface_composites_pre * apply tendency cleanup to GFDLMPv3 and TEMPO * fix compilation error * fix typo in TEMPO * debug sgscloud_radpre/post * remove tendency application code from rrtmg_lw/sw_post * change thmpsn to thompson to fix compilation error * fix compilation errors in GFS_radiation_post.F90 * remove Zhao-Carr cloud schemes and combine Xu-Randall cloud fraction calculations * fix array size problem in cs_conv.F90 * refactor RAS tendencies * fix compilation error in rascnv.F90 * change Xu-Randall cloud fraction scheme to be elemental * Fixed too-high lower bound for SMC Deleted code associated with already removed print statements Deleted excess comments. * use new cld_frac_XuRandall function from module_radiation_clouds in RRTMGP scheme * Tidy-up for PR. * modify the cld_frac_XuRandall function call in RRTMGP scheme * Changes to the post L-IAU checks: * Change tfreeze to match that in NoahMP * Only set SLC to SMC if temp newly > tfreez * add the repository update to this PR * Revert "add the repository update to this PR" This reverts commit 565d62c. * fix bug in GFDLMPv3 tendency implementation * remove the printing tests * remove Zhao-Carr schemes from modules in the UFS_SCM_NEPTUNE directory * remove Zhao-Carr microphysics scheme from physics/MP directory * Chagne to not using ozone physics DDT when not active * fix hail tendency changes from reviewer suggestions * fix indexing bug in cu_tiedtke caught in code review * changes to RAS tendency application update code from code review * check for flag_for_generic_tendency_due_to_gravity_wave_drag before computing diagnostic tendencies in drag_suite * fix diagnostic tendency bug in physics/GWD/ugwpv1_gsldrag.F90 * remove unused arguments in physics/GWD/ugwpv1_gsldrag_post.F90 * fix tendency diagnostics in physics/GWD/unified_ugwp.F90 * fix merge problem in mp_thompson.meta * add arguments to drag_suite_run called outside of ccpp entry point * initialize dclw variables in cu_ntiedtke * fix loop bounds for ten_q in cu_gf_driver.F90 * fix loop bounds in cu_c3_driver * fix new_q typo in mp_fer_hires.F90 * deallocate locally-allocated variables in MP schemes * update zeroing logic in m_micro_post after review * Update for 10m wind option in fire_behavior module * remove non-ASCII character in canopy_levs.F90 (from previous PR) * Updates to progomega option of saSAS convection scheme * Correction * correction 2 * fix line in SHOC where a tracer was being updated directly * remove old_ozone array since it was not being used * deallocate local variables in satmedmfvdifq at end of run phase * save temperature before modification to pass in to diagnostics in GFS_radiation_post * Remove goto in physics/MP/Morrison_Gettelman/aer_cloud.F * Remove goto in physics/Radiation/radiation_clouds.f * fix diagnostic temp tendency in GFS_MP_generic.F90 for when radar is/isn't available * Correct parameter setting in samfshalcnv to pass debug runs * Name END DO * Remove goto physics/MP/calpreciptype.f90 * Remove goto physics/MP/Morrison_Gettelman/cldwat2m_micro.F * Start goto physics/SFC_Models/Land/RUC/module_sf_ruclsm.F90 * Remove goto physics/SFC_Layer/UFS/module_nst_model.f90 * address saturation vapor pressure out of bounds error in hafs_4_nest RT * update long names to remove 'updated by physics'; change prognostic updraft standard names * remove additional references to Zhao-Carr microphysics * remove Zhao-Carr references from GFS_scnv_generic_post * fix deallocation statement in Thompson MP * Remove go to physics/CONV/C3/cu_c3_sh.F90 * Remove go to physics/PBL/MYJ/module_BL_MYJPBL.F90 * Remove goto physics/MP/Morrison_Gettelman/wv_saturation.F * Again physics/MP/Morrison_Gettelman/wv_saturation.F * physics/MP/Morrison_Gettelman/wv_saturation.F * Typo * Remove goto physics/CONV/C3/cu_c3_deep.F90 * Remove go to physics/CONV/RAS/rascnv.F90 * Typo rascnv.F90 * physics/SFC_Layer/GFDL/gfdl_sfc_layer.F90 * physics/CONV/Grell_Freitas/cu_gf_sh.F90 * Typo module_BL_MYJPBL.F90 * physics/SFC_Layer/MYJ/module_SF_JSFC.F90 * First pass physics/CONV/Grell_Freitas/cu_gf_deep.F90 * physics/CONV/Grell_Freitas/cu_gf_deep.F90 * physics/GWD/ugwp_driver_v0.F * physics/MP/Thompson/module_mp_thompson.F90 * physics/PBL/MYNN_EDMF/module_bl_mynn.F90 * physics/MP/GFDL/v1_2019/gfdl_cloud_microphys_mod.F90 * physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3_mod.F90 * Fix compile physics/Radiation/radiation_clouds.f * Compile fixes * Fix for 73 character limit line * Compile fix * Start physics/SFC_Models/Land/RUC/module_sf_ruclsm.F90 * physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90 * fix additional warnings * Fix compile hafsw wcoss2 * Revert rascnv so control_ras_intel b4b on wcoss2 * Use 10-m intepolated winds in the explicit in-canopy diffusion of tracers. Remove hpbl/kpbl update due to explicit in-canopy diffusion. * Clean up commented out code. Correct a truncated source line. * Bug in gcycle error message * Comment out the integrated-canopy meteorology effect. Keep the lines for future PR with the canopy met effects. --------- Co-authored-by: Grant Firl <grant.firl@noaa.gov> Co-authored-by: VanderleiVargas-NOAA <vanderlei.vargas@noaa.gov> Co-authored-by: Qingfu Liu <Qingfu.Liu@noaa.gov> Co-authored-by: Clara.Draoper-NOAA <clara.draper@noaa.gov> Co-authored-by: Dustin Swales <dustin.swales@noaa.gov> Co-authored-by: Michael Kavulich, Jr <kavulich@ucar.edu> Co-authored-by: Lisa <lisa.bengtsson@noaa.gov> Co-authored-by: Nicholas Szapiro <149816583+NickSzapiro-NOAA@users.noreply.github.com> Co-authored-by: Rhae Sung Kim <rhaesung.kim@noaa.gov> Co-authored-by: Nick Szapiro <nick.szapiro@noaa.gov> Co-authored-by: Nick Szapiro <nick.szapiro@clogin06.cactus.wcoss2.ncep.noaa.gov> Co-authored-by: iri01 <i.t.ivanova@gmail.com> Co-authored-by: iri01 <129897017+iri01@users.noreply.github.com> Co-authored-by: Grant Firl <grant@Macbook-Air-M4.local> Co-authored-by: Tracy <hertneky@ucar.edu>
1 parent 8a6cd13 commit 7cec900

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,17 +866,18 @@ subroutine GFS_phys_time_vary_timestep_init (
866866
jday = 0
867867
call w3doxdat(jdat,jdow,jdoy,jday)
868868
rjday = jdoy + jdat(5) / 24.
869-
if (rjday < ozphys%time(1)) rjday = rjday + 365.
870869

871870
!> - Update ozone concentration.
872871
if (ntoz > 0) then
872+
if (rjday < ozphys%time(1)) rjday = rjday + 365.
873873
call find_photochem_time_index(ozphys%ntime, ozphys%time, rjday, n1, n2)
874874

875875
call ozphys%update_o3prog(jindx1_o3, jindx2_o3, ddy_o3, rjday, n1, n2, ozpl)
876876
endif
877877

878878
!> - Update stratospheric h2o concentration.
879879
if (h2o_phys) then
880+
if (rjday < h2ophys%time(1)) rjday = rjday + 365.
880881
call find_photochem_time_index(h2ophys%ntime, h2ophys%time, rjday, n1, n2)
881882

882883
call h2ophys%update(jindx1_h, jindx2_h, ddy_h, rjday, n1, n2, h2opl)

physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ subroutine gcycle (me, nthrds, nx, ny, isc, jsc, nsst, tile_num, nlunit, fn_nml,
253253
inquire (file=trim(fn_nml),exist=exists)
254254
if (.not. exists) then
255255
errflg = 1
256-
errmsg = 'ERROR(gcycle): namelist file: ',trim(fn_nml),' does not exist.'
256+
errmsg = 'ERROR(gcycle): namelist file: '//trim(fn_nml)//' does not exist.'
257257
return
258258
else
259259
open (unit=nlunit, file=trim(fn_nml), action='READ', status='OLD', iostat=ios)

0 commit comments

Comments
 (0)