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.

Sign up for GitHub

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#139 #429

Merged
merged 4 commits into from
Mar 12, 2024
Merged

UFS-dev PR#139 #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
084b408
changes to work with ufs-dev PR#139
grantfirl Feb 9, 2024
99f3654
update ccpp/physics and .gitmodules
grantfirl Mar 11, 2024
85f442b
Merge branch 'main' into ufs-dev-PR139
grantfirl Mar 11, 2024
688ce5e
update ccpp/physics and .gitmodules
grantfirl Mar 12, 2024
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: 3 additions & 3 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@
'ccpp/physics/physics/noahmpdrv.F90' ,
'ccpp/physics/physics/flake_driver.F90' ,
'ccpp/physics/physics/clm_lake.f90' ,
'ccpp/physics/physics/sfc_nst_pre.f' ,
'ccpp/physics/physics/sfc_nst.f' ,
'ccpp/physics/physics/sfc_nst_post.f' ,
'ccpp/physics/physics/sfc_nst_pre.f90' ,
'ccpp/physics/physics/sfc_nst.f90' ,
'ccpp/physics/physics/sfc_nst_post.f90' ,
'ccpp/physics/physics/sfc_ocean.F' ,
'ccpp/physics/physics/sfc_sice.f' ,
'ccpp/physics/physics/mp_fer_hires.F90' ,
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 21 files
+64 −5 physics/GFS_MP_generic_post.F90
+66 −0 physics/GFS_MP_generic_post.meta
+0 −37 physics/GFS_phys_time_vary.fv3.F90
+3 −1 physics/GFS_surface_composites_pre.F90
+22 −10 physics/clm_lake.f90
+31 −8 physics/clm_lake.meta
+1 −23 physics/cu_gf_driver_post.F90
+0 −40 physics/cu_gf_driver_post.meta
+912 −907 physics/module_nst_model.f90
+73 −60 physics/module_nst_parameters.f90
+405 −433 physics/module_nst_water_prop.f90
+6 −16 physics/module_sf_ruclsm.F90
+2 −2 physics/physcons.F90
+3 −1 physics/sfc_diff.f
+7 −0 physics/sfc_diff.meta
+0 −696 physics/sfc_nst.f
+664 −0 physics/sfc_nst.f90
+0 −93 physics/sfc_nst_post.f
+87 −0 physics/sfc_nst_post.f90
+0 −96 physics/sfc_nst_pre.f
+89 −0 physics/sfc_nst_pre.f90
3 changes: 3 additions & 0 deletions scm/src/CCPP_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ module CCPP_typedefs
logical, pointer :: flag_cice(:) => null() !<
logical, pointer :: flag_guess(:) => null() !<
logical, pointer :: flag_iter(:) => null() !<
logical, pointer :: flag_lakefreeze(:) => null() !<
real (kind=kind_phys), pointer :: ffmm_ice(:) => null() !<
real (kind=kind_phys), pointer :: ffmm_land(:) => null() !<
real (kind=kind_phys), pointer :: ffmm_water(:) => null() !<
Expand Down Expand Up @@ -539,6 +540,7 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model)
allocate (Interstitial%flag_cice (IM))
allocate (Interstitial%flag_guess (IM))
allocate (Interstitial%flag_iter (IM))
allocate (Interstitial%flag_lakefreeze (IM))
allocate (Interstitial%ffmm_ice (IM))
allocate (Interstitial%ffmm_land (IM))
allocate (Interstitial%ffmm_water (IM))
Expand Down Expand Up @@ -1235,6 +1237,7 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model)
Interstitial%flag_cice = .false.
Interstitial%flag_guess = .false.
Interstitial%flag_iter = .true.
Interstitial%flag_lakefreeze = .false.
Interstitial%ffmm_ice = Model%huge
Interstitial%ffmm_land = Model%huge
Interstitial%ffmm_water = Model%huge
Expand Down
6 changes: 6 additions & 0 deletions scm/src/CCPP_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,12 @@
units = flag
dimensions = (horizontal_loop_extent)
type = logical
[flag_lakefreeze]
standard_name = flag_for_lake_water_freeze
long_name = flag for lake water freeze
units = flag
dimensions = (horizontal_loop_extent)
type = logical
[ffmm_water]
standard_name = Monin_Obukhov_similarity_function_for_momentum_over_water
long_name = Monin-Obukhov similarity function for momentum over water
Expand Down
Loading