Skip to content

Commit

Permalink
Merge pull request #61 from climbfuji/prepare_for_srwapp_pr_20200720
Browse files Browse the repository at this point in the history 
Update dtc/develop from NOAA-EMC develop 2020/07/21, prepare for SRW App
  • Loading branch information
@climbfuji
climbfuji authored Jul 21, 2020
2 parents 96bb736 + 777ebe0 commit 16b9927
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 126 deletions.
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
Submodule atmos_cubed_sphere updated 7 files
+1 −1 model/fv_control.F90
+289 −347 model/fv_regional_bc.F90
+1 −1 model/multi_gases.F90
+2 −3 tools/external_ic.F90
+0 −3,093 tools/fv_eta.F90_65lyrs
+0 −3,079 tools/fv_eta.F90_NAM_lyrs
+1 −1 tools/test_cases.F90
2 changes: 2 additions & 0 deletions ccpp/config/ccpp_prebuild_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
'FV3/ccpp/physics/physics/sfcsub.F',
'FV3/ccpp/physics/physics/sflx.f',
'FV3/ccpp/physics/physics/set_soilveg.f',
'FV3/ccpp/physics/physics/flake.F90',
'FV3/ccpp/physics/physics/surface_perturbation.F90',
'FV3/ccpp/physics/physics/cu_gf_deep.F90',
'FV3/ccpp/physics/physics/cu_gf_sh.F90',
Expand Down Expand Up @@ -289,6 +290,7 @@
'FV3/ccpp/physics/physics/sfc_diff.f',
'FV3/ccpp/physics/physics/sfc_drv.f',
'FV3/ccpp/physics/physics/sfc_noahmp_drv.f',
'FV3/ccpp/physics/physics/flake_driver.F90',
'FV3/ccpp/physics/physics/sfc_nst.f',
'FV3/ccpp/physics/physics/sfc_ocean.F',
'FV3/ccpp/physics/physics/sfc_sice.f',
Expand Down
2 changes: 0 additions & 2 deletions ccpp/driver/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ clean:
MKDEPENDS = ../../mkDepends.pl
include ../../conf/make.rules

include ./depend

# do not include 'depend' file if the target contains string 'clean'
ifneq (clean,$(findstring clean,$(MAKECMDGOALS)))
-include depend
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 4 files
+1 −1 scripts/ccpp_prebuild.py
+29 −1 scripts/conversion_tools/unit_conversion.py
+1 −1 scripts/metadata2html.py
+2 −2 scripts/mkcap.py
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 54 files
+1 −0 physics/GFS_DCNV_generic.meta
+17 −10 physics/GFS_GWD_generic.meta
+2 −2 physics/GFS_MP_generic.meta
+32 −0 physics/GFS_PBL_generic.meta
+12 −4 physics/GFS_SCNV_generic.meta
+1 −1 physics/GFS_rrtmg_setup.meta
+1 −1 physics/GFS_rrtmgp_setup.meta
+1 −1 physics/GFS_rrtmgp_sw_pre.meta
+22 −22 physics/GFS_stochastics.meta
+5 −5 physics/GFS_suite_interstitial.meta
+17 −4 physics/GFS_surface_composites.F90
+26 −9 physics/GFS_surface_composites.meta
+1 −1 physics/GFS_surface_generic.meta
+5 −4 physics/GFS_time_vary_pre.fv3.F90
+8 −0 physics/GFS_time_vary_pre.fv3.meta
+35 −25 physics/cires_ugwp.meta
+1 −1 physics/cs_conv_aw_adj.meta
+12 −0 physics/cu_gf_driver.meta
+2 −2 physics/dcyc2.meta
+2 −2 physics/drag_suite.meta
+3,281 −0 physics/flake.F90
+393 −0 physics/flake_driver.F90
+346 −0 physics/flake_driver.meta
+1 −1 physics/gcm_shoc.meta
+0 −10 physics/gscond.meta
+1 −1 physics/gwdc.meta
+1 −1 physics/gwdps.meta
+34 −34 physics/lsm_ruc_sfc_sice_interstitial.meta
+2 −2 physics/m_micro.meta
+1 −1 physics/m_micro_interstitial.meta
+1 −1 physics/module_MYJPBL_wrapper.meta
+3 −3 physics/module_MYJSFC_wrapper.meta
+4 −2 physics/module_MYNNPBL_wrapper.F90
+6 −8 physics/module_MYNNPBL_wrapper.meta
+3 −3 physics/module_MYNNSFC_wrapper.meta
+2 −2 physics/module_SGSCloud_RadPre.meta
+10 −0 physics/moninedmf.meta
+1 −1 physics/rascnv.meta
+3 −3 physics/rrtmgp_lw_aerosol_optics.meta
+2 −2 physics/rrtmgp_lw_cloud_optics.meta
+2 −2 physics/rrtmgp_lw_pre.meta
+2 −2 physics/rrtmgp_sw_aerosol_optics.meta
+60 −58 physics/samfdeepcnv.meta
+1 −1 physics/samfshalcnv.meta
+1 −1 physics/sascnvn.meta
+14 −0 physics/satmedmfvdif.meta
+0 −1 physics/sfc_drv_ruc.F90
+475 −472 physics/sfc_drv_ruc.meta
+1 −1 physics/sfc_noahmp_drv.meta
+3 −3 physics/sfc_nst.meta
+4 −2 physics/sfc_ocean.F
+8 −0 physics/sfc_ocean.meta
+1 −1 physics/sfc_sice.meta
+1 −1 physics/shalcnv.meta
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>samfdeepcnv</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
Expand Down
25 changes: 18 additions & 7 deletions ccpp/suites/suite_FV3_GSD_SAR_v1.xml → ccpp/suites/suite_FV3_GFS_v16beta_flake.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GSD_SAR_v1" lib="ccppphys" ver="3">
<suite name="FV3_GFS_v16beta_flake" lib="ccppphys" ver="3">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
<scheme>fv_sat_adj</scheme>
</subcycle>
</group>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand All @@ -13,14 +18,12 @@
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
Expand All @@ -45,6 +48,7 @@
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>flake_driver</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
Expand All @@ -54,7 +58,9 @@
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>mynnedmf_wrapper</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>satmedmfvdifq</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
Expand All @@ -65,11 +71,16 @@
<scheme>h2ophys</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>samfdeepcnv</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>samfshalcnv</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
<scheme>mp_thompson</scheme>
<scheme>mp_thompson_post</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GSD_noah_mynnsfc" lib="ccppphys" ver="3">
<suite name="FV3_GSD_noah_mynnsfc" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GSD_v0_mynnsfc" lib="ccppphys" ver="3">
<suite name="FV3_GSD_v0_mynnsfc" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
83 changes: 0 additions & 83 deletions ccpp/suites/suite_FV3_RRFS_v0.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RRFS_v1beta.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_RRFS_v1beta" lib="ccppphys" ver="3">
<suite name="FV3_RRFS_v1beta" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
30 changes: 23 additions & 7 deletions gfsphysics/GFS_layer/GFS_typedefs.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ module GFS_typedefs
#ifdef CCPP
!--- restart information
logical :: restart !< flag whether this is a coldstart (.false.) or a warmstart/restart (.true.)
logical :: cycling !< flag whether this is a coldstart (.false.) or a cycled run (.true.)
!--- hydrostatic/non-hydrostatic flag
logical :: hydrostatic !< flag whether this is a hydrostatic or non-hydrostatic run
#endif
Expand Down Expand Up @@ -235,6 +234,7 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: oceanfrac(:) => null() !< ocean fraction [0:1]
real (kind=kind_phys), pointer :: landfrac(:) => null() !< land fraction [0:1]
real (kind=kind_phys), pointer :: lakefrac(:) => null() !< lake fraction [0:1]
real (kind=kind_phys), pointer :: lakedepth(:) => null() !< lake depth [ m ]
real (kind=kind_phys), pointer :: tsfc (:) => null() !< surface air temperature in K
!< [tsea in gbphys.f]
real (kind=kind_phys), pointer :: tsfco (:) => null() !< sst in K
Expand Down Expand Up @@ -803,6 +803,9 @@ module GFS_typedefs

logical :: use_ufo !< flag for gcycle surface option

!--- flake model parameters
integer :: lkm !< flag for flake model

!--- tuning parameters for physical parameterizations
logical :: ras !< flag for ras convection scheme
logical :: flipv !< flag for vertical direction flip (ras)
Expand Down Expand Up @@ -1125,7 +1128,6 @@ module GFS_typedefs
#ifdef CCPP
logical :: first_time_step !< flag signaling first time step for time integration routine
logical :: restart !< flag whether this is a coldstart (.false.) or a warmstart/restart (.true.)
logical :: cycling !< flag whether this is a coldstart (.false.) or a cycled run (.true.)
logical :: hydrostatic !< flag whether this is a hydrostatic or non-hydrostatic run
#endif
integer :: jdat(1:8) !< current forecast date and time
Expand Down Expand Up @@ -2208,6 +2210,7 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
allocate (Sfcprop%oceanfrac(IM))
allocate (Sfcprop%landfrac (IM))
allocate (Sfcprop%lakefrac (IM))
allocate (Sfcprop%lakedepth(IM))
allocate (Sfcprop%tsfc (IM))
allocate (Sfcprop%tsfco (IM))
allocate (Sfcprop%tsfcl (IM))
Expand All @@ -2225,6 +2228,7 @@ subroutine sfcprop_create (Sfcprop, IM, Model)
Sfcprop%oceanfrac = clear_val
Sfcprop%landfrac = clear_val
Sfcprop%lakefrac = clear_val
Sfcprop%lakedepth = clear_val
Sfcprop%tsfc = clear_val
Sfcprop%tsfco = clear_val
Sfcprop%tsfcl = clear_val
Expand Down Expand Up @@ -2890,7 +2894,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
logical :: aux2d_time_avg(1:naux2dmax) = .false. !< flags for time averaging of auxiliary 2d arrays
logical :: aux3d_time_avg(1:naux3dmax) = .false. !< flags for time averaging of auxiliary 3d arrays

logical :: cycling = .false. !< flag to activate extra cycling procedures
real(kind=kind_phys) :: fhcyc = 0. !< frequency for surface data cycling (hours)
integer :: thermodyn_id = 1 !< valid for GFS only for get_prs/phi
integer :: sfcpress_id = 1 !< valid for GFS only for get_prs/phi
Expand Down Expand Up @@ -3059,6 +3062,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &

logical :: use_ufo = .false. !< flag for gcycle surface option

!--- flake model parameters
integer :: lkm = 0 !< flag for flake model

!--- tuning parameters for physical parameterizations
logical :: ras = .false. !< flag for ras convection scheme
logical :: flipv = .true. !< flag for vertical direction flip (ras)
Expand Down Expand Up @@ -3352,6 +3358,10 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
! Noah MP options
iopt_dveg,iopt_crs,iopt_btr,iopt_run,iopt_sfc, iopt_frz, &
iopt_inf, iopt_rad,iopt_alb,iopt_snf,iopt_tbot,iopt_stc, &

!--- lake model control
lkm, &

!--- 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 @@ -3796,6 +3806,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%isot = isot
Model%use_ufo = use_ufo

!--- flake model parameters
Model%lkm = lkm

! Noah MP options from namelist
!
Model%iopt_dveg = iopt_dveg
Expand Down Expand Up @@ -4164,7 +4177,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
#ifdef CCPP
Model%first_time_step = .true.
Model%restart = restart
Model%cycling = cycling
Model%hydrostatic = hydrostatic
#endif
Model%jdat(1:8) = jdat(1:8)
Expand Down Expand Up @@ -4336,6 +4348,10 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
' ignore_lake=',ignore_lake
print *,' min_lakeice=',Model%min_lakeice,' min_seaice=',Model%min_seaice, &
'min_lake_height=',Model%min_lake_height

print *, 'flake model parameters'
print *, 'lkm : ', Model%lkm

if (Model%nstf_name(1) > 0 ) then
print *,' NSSTM is active '
print *,' nstf_name(1)=',Model%nstf_name(1)
Expand Down Expand Up @@ -4920,6 +4936,9 @@ subroutine control_print(Model)

print *, ' use_ufo : ', Model%use_ufo
print *, ' '
print *, 'flake model parameters'
print *, 'lkm : ', Model%lkm
print *, ' '
print *, 'tuning parameters for physical parameterizations'
print *, ' ras : ', Model%ras
if (Model%ras) then
Expand Down Expand Up @@ -5128,7 +5147,6 @@ subroutine control_print(Model)
print *, ' sec : ', Model%sec
print *, ' first_time_step : ', Model%first_time_step
print *, ' restart : ', Model%restart
print *, ' cycling : ', Model%cycling
print *, ' hydrostatic : ', Model%hydrostatic
#endif
endif
Expand Down Expand Up @@ -5783,7 +5801,6 @@ end subroutine diag_create
subroutine diag_rad_zero(Diag, Model)
class(GFS_diag_type) :: Diag
type(GFS_control_type), intent(in) :: Model
integer :: i

Diag%fluxr = zero
Diag%topfsw%upfxc = zero
Expand All @@ -5806,7 +5823,6 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center)
logical,optional, intent(in) :: linit, iauwindow_center

logical set_totprcp
integer :: i

!--- In/Out
Diag%srunoff = zero
Expand Down
Loading

0 comments on commit 16b9927

Please sign in to comment.