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

Update master branch to work with ccpp-physics master #196

Merged
merged 1 commit into from
Aug 18, 2020
Merged

Update master branch to work with ccpp-physics master #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 42 files
+76 −70 physics/GFS_MP_generic.F90
+21 −19 physics/GFS_PBL_generic.F90
+7 −7 physics/GFS_debug.F90
+6 −6 physics/GFS_rrtmg_post.F90
+74 −82 physics/GFS_rrtmg_pre.F90
+2 −2 physics/GFS_rrtmg_setup.F90
+105 −139 physics/GFS_suite_interstitial.F90
+131 −81 physics/GFS_surface_composites.F90
+28 −2 physics/GFS_surface_composites.meta
+21 −26 physics/GFS_surface_generic.F90
+2 −2 physics/GFS_surface_loop_control.F90
+1 −1 physics/GFS_time_vary_pre.fv3.F90
+3 −3 physics/dcyc2.f
+98 −99 physics/gcm_shoc.F90
+41 −22 physics/gcycle.F90
+4 −3 physics/get_prs_fv3.F90
+308 −305 physics/m_micro.F90
+9 −10 physics/micro_mg3_0.F90
+30 −30 physics/micro_mg_utils.F90
+1 −1 physics/module_nst_model.f90
+41 −50 physics/module_nst_water_prop.f90
+84 −76 physics/moninshoc.f
+226 −216 physics/rascnv.F90
+4 −5 physics/rrtmg_lw_post.F90
+2 −2 physics/rrtmg_lw_pre.F90
+5 −5 physics/rrtmg_sw_post.F90
+3 −3 physics/rrtmg_sw_pre.F90
+25 −9 physics/sfc_cice.f
+36 −0 physics/sfc_cice.meta
+110 −91 physics/sfc_diff.f
+9 −0 physics/sfc_diff.meta
+50 −64 physics/sfc_drv.f
+79 −69 physics/sfc_nst.f
+16 −0 physics/sfc_nst.meta
+20 −31 physics/sfc_ocean.F
+0 −18 physics/sfc_ocean.meta
+84 −67 physics/sfc_sice.f
+33 −31 physics/sfc_sice.meta
+630 −554 physics/sfcsub.F
+27 −23 physics/tridi.f
+89 −82 physics/ugwp_driver_v0.F
+318 −319 physics/wv_saturation.F
6 changes: 6 additions & 0 deletions scm/src/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: zorl (:) => null() !< composite surface roughness in cm
real (kind=kind_phys), pointer :: zorlo (:) => null() !< ocean surface roughness in cm
real (kind=kind_phys), pointer :: zorll (:) => null() !< land surface roughness in cm
real (kind=kind_phys), pointer :: zorli (:) => null() !< ice surface roughness in cm
real (kind=kind_phys), pointer :: zorlw (:) => null() !< wave surface roughness in cm
real (kind=kind_phys), pointer :: fice (:) => null() !< ice fraction over open water grid
! real (kind=kind_phys), pointer :: hprim (:) => null() !< topographic standard deviation in m
real (kind=kind_phys), pointer :: hprime (:,:) => null() !< orographic metrics
Expand Down Expand Up @@ -2169,6 +2171,8 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
allocate (Sfcprop%zorl (IM))
allocate (Sfcprop%zorlo (IM))
allocate (Sfcprop%zorll (IM))
allocate (Sfcprop%zorli (IM))
allocate (Sfcprop%zorlw (IM))
allocate (Sfcprop%fice (IM))
! allocate (Sfcprop%hprim (IM))
allocate (Sfcprop%hprime (IM,Model%nmtvr))
Expand All @@ -2187,6 +2191,8 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
Sfcprop%zorl = clear_val
Sfcprop%zorlo = clear_val
Sfcprop%zorll = clear_val
Sfcprop%zorli = clear_val
Sfcprop%zorlw = clear_val
Sfcprop%fice = clear_val
! Sfcprop%hprim = clear_val
Sfcprop%hprime = clear_val
Expand Down
20 changes: 17 additions & 3 deletions scm/src/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,20 @@
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
[zorli]
standard_name = surface_roughness_length_over_ice
long_name = surface roughness length over ice
units = cm
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
[zorlw]
standard_name = surface_roughness_length_from_wave_model
long_name = surface roughness length from wave model
units = cm
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
[fice]
standard_name = sea_ice_concentration
long_name = ice fraction over open water
Expand Down Expand Up @@ -3626,21 +3640,21 @@
[min_lakeice]
standard_name = lake_ice_minimum
long_name = minimum lake ice value
units = ???
units = frac
dimensions = ()
type = real
kind = kind_phys
[min_seaice]
standard_name = sea_ice_minimum
long_name = minimum sea ice value
units = ???
units = frac
dimensions = ()
type = real
kind = kind_phys
[rho_h2o]
standard_name = density_of_fresh_water
long_name = density of fresh water
units = ???
units = kg m-3
dimensions = ()
type = real
kind = kind_phys
Expand Down