Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 FV3
Submodule FV3 updated from 0975bb to 6bc61d
2 changes: 1 addition & 1 deletion conf/configure.fv3.cheyenne.intel
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion conf/configure.fv3.hera.intel
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion conf/configure.fv3.orion.intel
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion conf/configure.fv3.wcoss_dell_p3
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,6 @@ LDFLAGS += $(LIBS)

ifdef InNemsMakefile
FFLAGS += $(ESMF_INC)
CPPFLAGS += -DFV3_CPLD -traditional
CPPFLAGS += -traditional
EXTLIBS = $(NCEPLIBS) $(ESMF_LIB) $(LDFLAGS)
endif
18 changes: 6 additions & 12 deletions parm/ccpp_ca.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down
32 changes: 8 additions & 24 deletions parm/ccpp_control.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion parm/ccpp_gfdlmp.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 8 additions & 14 deletions parm/input.mom6_ccpp.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion stochastic_physics
Loading