code updates for one step cold start (#176)

* enable 1-step coldstart option through the use_coldstart flag. * use_coldstart = true will retain the current 2-step coldstart procedure; when set false, a one-step coldstart will be used with ocean_lag for startup. Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
ufs-community · Sep 16, 2020 · f710412 · f710412
1 parent 288ef83
commit f710412
Show file tree

Hide file tree

Showing 19 changed files with 22,792 additions and 18,750 deletions.
diff --git a/FV3 b/FV3
diff --git a/conf/configure.fv3.cheyenne.intel b/conf/configure.fv3.cheyenne.intel
@@ -206,6 +206,6 @@ LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)
-CPPFLAGS += -DFV3_CPLD -traditional
+CPPFLAGS += -traditional
 EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS) $(NETCDF_LIB) $(SIONLIB_LIB)
 endif
diff --git a/conf/configure.fv3.hera.intel b/conf/configure.fv3.hera.intel
@@ -180,6 +180,6 @@ LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)
-CPPFLAGS += -DFV3_CPLD -traditional
+CPPFLAGS += -traditional
 EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS) $(NETCDF_LIB)
 endif
diff --git a/conf/configure.fv3.orion.intel b/conf/configure.fv3.orion.intel
@@ -183,6 +183,6 @@ LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)
-CPPFLAGS += -DFV3_CPLD -traditional
+CPPFLAGS += -traditional
 EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS) $(NETCDF_LIB)
 endif
diff --git a/conf/configure.fv3.wcoss_dell_p3 b/conf/configure.fv3.wcoss_dell_p3
@@ -167,6 +167,6 @@ LDFLAGS += $(LIBS)
 
 ifdef InNemsMakefile
 FFLAGS += $(ESMF_INC)
-CPPFLAGS += -DFV3_CPLD -traditional
+CPPFLAGS += -traditional
 EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS)
 endif
diff --git a/parm/ccpp_ca.nml.IN b/parm/ccpp_ca.nml.IN
@@ -190,7 +190,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type     = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
        do_ca          = @[DO_CA]
        ca_sgs         = @[CA_SGS]
        ca_global      = @[CA_GLOBAL]
@@ -282,17 +283,10 @@
   ISEED_SPPT=3,
 /
 &nam_sfcperts
-  NSFCPERT=6,
-  PERTZ0=-999.,
-  PERTSHC=-999.,
-  PERTZT=-999.,
-  PERTLAI=-999.,
-  PERTVEGF=-999.,
-  PERTALB=-999.,
-  SFC_TAU=21600,
-  SFC_LSCALE=500000,
-  ISEED_SFC=0,
-  SPPT_LAND=.FALSE.,
+  lndp_type      = @[LNDP_TYPE]
+  LNDP_TAU=21600,
+  LNDP_LSCALE=500000,
+  ISEED_LNDP=2010,
 /
 
 &cires_ugwp_nml

diff --git a/parm/ccpp_control.nml.IN b/parm/ccpp_control.nml.IN
@@ -159,8 +159,8 @@
        random_clds    = .true.
        trans_trac     = .false.
        cnvcld         = .true.
-       imfshalcnv     = @[IMFSHALCNV]
-       imfdeepcnv     = @[IMFDEEPCNV]
+       imfshalcnv     = 2
+       imfdeepcnv     = 2
        isatmedmf      = @[ISATMEDMF]
        cdmbgwd        = 3.5,0.25
        prslrd0        = 0.
@@ -194,7 +194,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
@@ -216,16 +217,6 @@
        iseed_ca       = 1
        nsmooth        = 1
        ca_amplitude   = 0.5
-       do_RRTMGP      = @[DO_RRTMGP]
-       active_gases   = 'h2o_co2_o3_n2o_ch4_o2'
-       ngases         = 6
-       lw_file_gas    = 'rrtmgp-data-lw-g256-2018-12-04.nc'
-       lw_file_clouds = 'rrtmgp-cloud-optics-coeffs-lw.nc'
-       sw_file_gas    = 'rrtmgp-data-sw-g224-2018-12-04.nc'
-       sw_file_clouds = 'rrtmgp-cloud-optics-coeffs-sw.nc'
-       rrtmgp_cld_optics = 0
-       rrtmgp_nrghice    = 3
-       rrtmgp_ngauss_ang = 3
 /
 
 &interpolator_nml
@@ -296,17 +287,10 @@
   ISEED_SPPT=3,
 /
 &nam_sfcperts
-  NSFCPERT=6,
-  PERTZ0=-999.,
-  PERTSHC=-999.,
-  PERTZT=-999.,
-  PERTLAI=-999.,
-  PERTVEGF=-999.,
-  PERTALB=-999.,
-  SFC_TAU=21600,
-  SFC_LSCALE=500000,
-  ISEED_SFC=0,
-  SPPT_LAND=.FALSE.,
+  lndp_type      = @[LNDP_TYPE]
+  LNDP_TAU=21600,
+  LNDP_LSCALE=500000,
+  ISEED_LNDP=2010,
 /
 
 &cires_ugwp_nml

diff --git a/parm/ccpp_gfdlmp.nml.IN b/parm/ccpp_gfdlmp.nml.IN
@@ -155,7 +155,9 @@
        trans_trac     = .false.
        cnvcld         = .true.
        imfshalcnv     = @[IMFSHALCNV]
+       hwrf_samfshal  = @[HWRF_SAMFSHAL]
        imfdeepcnv     = @[IMFDEEPCNV]
+       hwrf_samfdeep  = @[HWRF_SAMFDEEP]
        cdmbgwd        = 3.5,0.25
        prslrd0        = 0.
        ivegsrc        = 1
@@ -188,7 +190,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
 /
 
 &gfdl_cloud_microphysics_nml

diff --git a/parm/input.mom6_ccpp.nml.IN b/parm/input.mom6_ccpp.nml.IN
@@ -159,8 +159,8 @@
        random_clds    = .true.
        trans_trac     = .false.
        cnvcld         = .true.
-       imfshalcnv     = @[IMFSHALCNV]
-       imfdeepcnv     = @[IMFDEEPCNV]
+       imfshalcnv     = 2
+       imfdeepcnv     = 2
        isatmedmf      = @[ISATMEDMF]
        cdmbgwd        = 3.5,0.25
        prslrd0        = 0.
@@ -195,7 +195,8 @@
        do_sppt        = @[DO_SPPT]
        do_shum        = @[DO_SHUM]
        do_skeb        = @[DO_SKEB]
-       do_sfcperts    = @[DO_SFCPERTS]
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
        do_ca          = .false.
        ca_sgs         = .false.
        nca            = 1
@@ -287,17 +288,10 @@
   ISEED_SPPT=3,
 /
 &nam_sfcperts
-  NSFCPERT=6,
-  PERTZ0=-999.,
-  PERTSHC=-999.,
-  PERTZT=-999.,
-  PERTLAI=-999.,
-  PERTVEGF=-999.,
-  PERTALB=-999.,
-  SFC_TAU=21600,
-  SFC_LSCALE=500000,
-  ISEED_SFC=0,
-  SPPT_LAND=.FALSE.,
+  lndp_type      = @[LNDP_TYPE]
+  LNDP_TAU=21600,
+  LNDP_LSCALE=500000,
+  ISEED_LNDP=2010,
 /
 
 &cires_ugwp_nml

diff --git a/stochastic_physics b/stochastic_physics
+2 −2		.gitmodules
+18 −6		atmos_model.F90
+4 −3		ccpp/CMakeLists.txt
+21 −169		ccpp/config/ccpp_prebuild_config.py
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+103 −20		cpl/module_cap_cpl.F90
+3 −1		cpl/module_cplfields.F90
+35 −9		fv3_cap.F90
+5 −0		gfsphysics/CCPP_layer/CCPP_data.meta
+10 −0		gfsphysics/CCPP_layer/CCPP_typedefs.meta
+0 −1		gfsphysics/CMakeLists.txt
+1 −0		gfsphysics/GFS_layer/GFS_driver.F90
+26 −29		gfsphysics/GFS_layer/GFS_physics_driver.F90
+13 −8		gfsphysics/GFS_layer/GFS_radiation_driver.F90
+26 −32		gfsphysics/GFS_layer/GFS_typedefs.F90
+401 −54		gfsphysics/GFS_layer/GFS_typedefs.meta
+1 −1		gfsphysics/physics/GFS_debug.F90
+3 −3		gfsphysics/physics/radiation_surface.f
+3 −3		gfsphysics/physics/sfc_drv.f
+1 −1		stochastic_physics/makefile
+79 −16		stochastic_physics/stochastic_physics_wrapper.F90