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

code updates for one step cold start #176

Merged
merged 15 commits into from
Sep 16, 2020
Merged

code updates for one step cold start #176

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
61b7b4b
update fv3,mom6,stochastic_physics and parm files
junwang-noaa Sep 8, 2020
2b09e05
update default_vars.sh
junwang-noaa Sep 9, 2020
c1ec98d
add a onestep cold start case
junwang-noaa Sep 9, 2020
405c32f
update nems.configure file for 1 step run
junwang-noaa Sep 9, 2020
d730a1d
update RT files for cpld_fv3_ccpp_mom6_cice_cmeps_1stepcold_atm_flux
junwang-noaa Sep 10, 2020
69af6f5
update nems configure for 1step run
junwang-noaa Sep 10, 2020
71725ad
update 1step test to run 2 days
junwang-noaa Sep 11, 2020
fe95ff8
update fv3 and remove the FV3_CPLD compile option
junwang-noaa Sep 15, 2020
b73ccde
add RT log files on hera
junwang-noaa Sep 15, 2020
4f3c201
update orion log files
junwang-noaa Sep 15, 2020
df3b80b
change CNTLMED_DIR for 1 step run and update log files on hera and dell
junwang-noaa Sep 16, 2020
25ca3a4
update RT log files on orion
junwang-noaa Sep 16, 2020
c95fcd5
merge to s2s 9/9/2020 version
junwang-noaa Sep 16, 2020
9d93c79
update dell compile log
junwang-noaa Sep 16, 2020
5164be7
point fv3 back to NOAA-EMC
junwang-noaa Sep 16, 2020
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/junwang-noaa/fv3atm
branch = fv3_cmepsIC
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS.git
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 22 files
+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
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 5 files
+92 −83 config_src/nuopc_driver/mom_cap.F90
+4 −4 config_src/nuopc_driver/mom_cap_methods.F90
+3 −2 config_src/nuopc_driver/mom_ocean_model_nuopc.F90
+1 −1 config_src/nuopc_driver/mom_surface_forcing_nuopc.F90
+3 −1 src/framework/MOM_restart.F90
2 changes: 1 addition & 1 deletion conf/configure.fv3.cheyenne.intel
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Open in desktop
Submodule stochastic_physics updated from a8e2cc to ffdd19
Loading