Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UFS-dev PR#92 #405

Merged
merged 4 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
branch = main
[submodule "ccpp-physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
#url = https://github.com/NCAR/ccpp-physics
#branch = main
url = https://github.com/grantfirl/ccpp-physics
branch = ufs-dev-PR92
[submodule "CMakeModules"]
path = CMakeModules
url = https://github.com/noaa-emc/CMakeModules
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 42 files
+767 −657 physics/clm_lake.f90
+14 −0 physics/clm_lake.meta
+1 −0 physics/cu_gf_deep.F90
+1 −1 physics/docs/ccpp_doxyfile
+8 −6 physics/docs/ccppsrw_doxyfile
+176 −1 physics/docs/library.bib
+60 −0 physics/docs/pdftxt/CLM_LAKE.txt
+20 −35 physics/docs/pdftxt/CU_GF_deep.txt
+7 −13 physics/docs/pdftxt/GFS_NOAHMP.txt
+0 −3 physics/docs/pdftxt/GFS_SAMFdeep.txt
+20 −13 physics/docs/pdftxt/GFS_SATMEDMFVDIFQ.txt
+46 −0 physics/docs/pdftxt/GFS_UGWPv0.txt
+2 −2 physics/docs/pdftxt/GFS_v16_suite.txt
+4 −3 physics/docs/pdftxt/HRRR_suite.txt
+0 −41 physics/docs/pdftxt/NoahMP.txt
+5 −5 physics/docs/pdftxt/RAP_suite.txt
+335 −0 physics/docs/pdftxt/RE300/FV3_GFS_v16_input.nml
+295 −0 physics/docs/pdftxt/RE300/FV3_HRRR_input.nml
+302 −0 physics/docs/pdftxt/RE300/FV3_RAP_input.nml
+289 −0 physics/docs/pdftxt/RE300/FV3_RRFS_v1beta_input.nml
+295 −0 physics/docs/pdftxt/RE300/FV3_WoFS_v0_input.nml
+330 −0 physics/docs/pdftxt/RE300/namelists/input.nml.FV3_GFS_v16
+298 −0 physics/docs/pdftxt/RE300/namelists/input.nml.FV3_HRRR
+300 −0 physics/docs/pdftxt/RE300/namelists/input.nml.FV3_RAP
+285 −0 physics/docs/pdftxt/RE300/namelists/input.nml.FV3_RRFS_v1beta
+291 −0 physics/docs/pdftxt/RE300/namelists/input.nml.FV3_WoFS_v0
+94 −0 physics/docs/pdftxt/RE300/suite_FV3_GFS_v16.xml
+82 −0 physics/docs/pdftxt/RE300/suite_FV3_HRRR.xml
+90 −0 physics/docs/pdftxt/RE300/suite_FV3_RAP.xml
+84 −0 physics/docs/pdftxt/RE300/suite_FV3_RRFS_v1beta.xml
+80 −0 physics/docs/pdftxt/RE300/suite_FV3_WoFS_v0.xml
+2 −2 physics/docs/pdftxt/RRFS_v1beta_suite.txt
+53 −47 physics/docs/pdftxt/RUCLSM.txt
+14 −13 physics/docs/pdftxt/SRW_all_schemes_list.txt
+10 −2 physics/docs/pdftxt/SRW_mainpage.txt
+12 −4 physics/docs/pdftxt/THOMPSON.txt
+3 −2 physics/docs/pdftxt/WoFS_v0_suite.txt
+0 −0 physics/docs/pdftxt/all_schemes_list.txt
+55 −15 physics/docs/pdftxt/suite_input.nml.txt
+22 −24 physics/module_mp_thompson.F90
+2 −0 physics/module_sf_ruclsm.F90
+7 −5 physics/satmedmfvdifq.F
8 changes: 6 additions & 2 deletions scm/src/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,7 @@ module GFS_typedefs
real(kind_phys) :: clm_lake_depth_default !< minimum lake elevation in clm lake model
logical :: clm_lake_use_lakedepth !< initialize lake from lakedepth
logical :: clm_lake_debug !< verbose debugging in clm_lake
logical :: clm_debug_print !< enables prints in clm_lakedebugging in clm_laki

!--- tuning parameters for physical parameterizations
logical :: ras !< flag for ras convection scheme
Expand Down Expand Up @@ -3452,6 +3453,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
real(kind_phys) :: clm_lake_depth_default = 50 !< default lake depth in clm lake model
logical :: clm_lake_use_lakedepth = .true. !< initialize depth from lakedepth
logical :: clm_lake_debug = .false. !< verbose debugging in clm_lake
logical :: clm_debug_print = .false. !< enables prints in clm_lake

!--- land/surface model parameters
integer :: lsm = 1 !< flag for land surface model to use =0 for osu lsm; =1 for noah lsm; =2 for noah mp lsm; =3 for RUC lsm
Expand Down Expand Up @@ -3698,7 +3700,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!< nstf_name(5) : zsea2 in mm
!--- fractional grid
logical :: frac_grid = .false. !< flag for fractional grid
logical :: frac_ice = .false. !< flag for fractional ice when fractional grid is not in use
logical :: frac_ice = .true. !< flag for lake fractional ice when fractional grid is not in use
logical :: ignore_lake = .true. !< flag for ignoring lakes
real(kind=kind_phys) :: min_lakeice = 0.15d0 !< minimum lake ice value
real(kind=kind_phys) :: min_seaice = 1.0d-11 !< minimum sea ice value
Expand Down Expand Up @@ -3920,7 +3922,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!--- lake model control
lkm, iopt_lake, lakedepth_threshold, lakefrac_threshold, &
clm_lake_depth_default, clm_lake_use_lakedepth, &
clm_lake_debug, use_lake2m, &
clm_lake_debug, clm_debug_print, use_lake2m, &
!--- physical parameterizations
ras, trans_trac, old_monin, cnvgwd, mstrat, moist_adj, &
cscnv, cal_pre, do_aw, do_shoc, shocaftcnv, shoc_cld, &
Expand Down Expand Up @@ -4703,6 +4705,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%clm_lake_depth_default = clm_lake_depth_default
Model%clm_lake_use_lakedepth = clm_lake_use_lakedepth
Model%clm_lake_debug = clm_lake_debug
Model%clm_debug_print = clm_debug_print

! Noah MP options from namelist
!
Expand Down Expand Up @@ -5694,6 +5697,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
print *,' clm_lake_use_lakedepth = ',Model%clm_lake_use_lakedepth
print *,' clm_lake_depth_default = ',Model%clm_lake_depth_default
print *,' clm_lake_debug = ',Model%clm_lake_debug
print *,' clm_debug_print = ',Model%clm_debug_print
print *,' nlevlake_clm_lake = ',Model%nlevlake_clm_lake
print *,' nlevsoil_clm_lake = ',Model%nlevsoil_clm_lake
print *,' nlevsnow_clm_lake = ',Model%nlevsnow_clm_lake
Expand Down
6 changes: 6 additions & 0 deletions scm/src/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -7240,6 +7240,12 @@
units = flag
dimensions = ()
type = logical
[clm_debug_print]
standard_name = flag_for_printing_in_clm_lake_model
long_name = flag for printing in clm lake model
units = flag
dimensions = ()
type = logical
[fire_aux_data_levels]
standard_name = fire_auxiliary_data_extent
long_name = number of levels of fire auxiliary data
Expand Down
Loading