Merge pull request #429 from grantfirl/ufs-dev-PR139

UFS-dev PR#139
NCAR · Mar 12, 2024 · 245b999 · 245b999
2 parents 07174af + 688ce5e
commit 245b999
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -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'                 ,

diff --git a/ccpp/physics b/ccpp/physics
diff --git a/scm/src/CCPP_typedefs.F90 b/scm/src/CCPP_typedefs.F90
@@ -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()  !<
@@ -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))
@@ -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

diff --git a/scm/src/CCPP_typedefs.meta b/scm/src/CCPP_typedefs.meta
@@ -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
+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