Skip to content

Commit 22613e8

Browse files
DeniseWorthenDeniseWorthen
authored
Clean up input-data directories; Fix MERRA2 input; Add tests on Jet; Update CICE cap & fix time manager (was PR#664) (ufs-community#639)
 * remove un-needed configuration files from input directories * remove unused suites for s2s compiles on intel and gnu * update CICE for nuopc cap updates and time manager fix * add eps_imesh variable and set non-default values for 1deg configurations * implement new variable for CICE RUNTYPE * remove run scripts which are not used in any test * update data_tables as required for merra2 output * add inputs for ugwp and merra2 to cpld_bmark_tiled_run * add readthedocs yaml config file, add custom.css file and fix conf.py * replace un-used test cpld_bmark_wave_v16_noahmp_nsst with cpld_bmark_wave_v16_p7b from release/P7b branch * removes use_frac_grid_input as test setup option * add new test for p7b using noahmp,nsst,merra2,ugwd * change DT_ATMOS to 300s in all bmark_v16 tests * add suite for 7b test and modify rt_35 for 7b
1 parent 6ccea3e commit 22613e8

File tree

92 files changed

+3822
-3370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+3822
-3370
lines changed

‎.readthedocs.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
# Required
6+
version: 2
7+
8+
# Build documentation in the docs/ directory with Sphinx
9+
sphinx:
10+
configuration: doc/UsersGuide/source/conf.py
11+
12+
# Build documentation with MkDocs
13+
#mkdocs:
14+
# configuration: mkdocs.yml
15+
16+
# Optionally build your docs in additional formats such as PDF and ePub
17+
formats: all
18+
19+
# Optionally set the version of Python and requirements required to build your docs
20+
python:
21+
version: 3.7
22+
install:
23+
- requirements: doc/UsersGuide/requirements.txt

‎CICE-interface/CICE

Submodule CICE updated 80 files

‎CICE-interface/cice_files.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ list(APPEND cice_nuopc_cmeps_driver_files
154154
CICE/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
155155
CICE/cicecore/drivers/nuopc/cmeps/ice_scam.F90
156156
CICE/cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90
157+
CICE/cicecore/drivers/nuopc/cmeps/ice_mesh_mod.F90
157158
)
158159

159160
#-- Using NUOPC DMI driver

‎NEMS

‎doc/UsersGuide/source/_static/custom.css

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
@import "default.css";
2+
3+
div.admonition-todo {
4+
border-top: 2px solid red;
5+
border-bottom: 2px solid red;
6+
border-left: 2px solid red;
7+
border-right: 2px solid red;
8+
background-color: #ff6347
9+
}
10+
11+
p.admonition-title {
12+
display: offline;
13+
}
14+
15+
/*p.first.admonition-title {
16+
background-color: #aa6347;
17+
width: 100%;
18+
}
19+
*/

‎doc/UsersGuide/source/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
html_static_path = ['_static']
105105

106106
def setup(app):
107-
app.add_stylesheet('custom.css') # may also be an URL
107+
app.add_css_file('custom.css') # may also be an URL
108108

109109
# Custom sidebar templates, must be a dictionary that maps document names
110110
# to template names.

‎tests/RegressionTests_cheyenne.gnu.log

+89-89
Large diffs are not rendered by default.

‎tests/RegressionTests_cheyenne.intel.log

+492-509
Large diffs are not rendered by default.

‎tests/RegressionTests_gaea.intel.log

+300-300
Large diffs are not rendered by default.

‎tests/RegressionTests_hera.gnu.log

+99-99
Large diffs are not rendered by default.

‎tests/RegressionTests_hera.intel.log

+314-314
Large diffs are not rendered by default.

‎tests/RegressionTests_jet.intel.log

+679-421
Large diffs are not rendered by default.

‎tests/RegressionTests_orion.intel.log

+314-314
Large diffs are not rendered by default.

‎tests/RegressionTests_wcoss_cray.log

+175-175
Large diffs are not rendered by default.

‎tests/RegressionTests_wcoss_dell_p3.log

+314-314
Large diffs are not rendered by default.

‎tests/default_vars.sh

+8-7
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ elif [[ $MACHINE_ID = jet.* ]]; then
202202
THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6; MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
203203
OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
204204

205-
TASKS_cpl_thrd=120; TPN_cpl_thrd=18; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
205+
TASKS_cpl_thrd=120; TPN_cpl_thrd=12; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
206206
THRD_cpl_thrd=2; WPG_cpl_thrd=6; MPB_cpl_thrd="0 77"; APB_cpl_thrd="0 77"
207207
OPB_cpl_thrd="78 107"; IPB_cpl_thrd="108 119"
208208

@@ -357,7 +357,7 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
357357
THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6; MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
358358
OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 383"
359359

360-
TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
360+
TASKS_cpl_thrd=120; TPN_cpl_thrd=24; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
361361
THRD_cpl_thrd=2; WPG_cpl_thrd=6; MPB_cpl_thrd="0 77"; APB_cpl_thrd="0 77"
362362
OPB_cpl_thrd="78 107"; IPB_cpl_thrd="108 119"
363363

@@ -674,14 +674,11 @@ export cap_dbug_flag="0"
674674
export use_coldstart="false"
675675
export use_mommesh="true"
676676
export RUNTYPE='startup'
677+
export CICERUNTYPE='initial'
678+
export eps_imesh='1.0e-1'
677679

678680
# FV3 defaults
679-
# to use new oro and ics created from 1deg ocean mask on c96 tiles
680-
# set frac_grid=.F. but FRAC_GRID_INPUT=.T.
681-
# to repro existing tests set both frac_grid and FRAC_GRID_INPUT to .F.
682-
# to run frac_grid, set both frac_grid and FRAC_GRID_INPUTs to .T.
683681
export FRAC_GRID='.T.'
684-
export FRAC_GRID_INPUT='.T.'
685682
export CCPP_SUITE="FV3_GFS_2017_coupled"
686683
export INPUT_NML=input.mom6_ccpp.nml.IN
687684
export FIELD_TABLE="field_table"
@@ -828,6 +825,8 @@ export cap_dbug_flag="0"
828825
export use_coldstart="false"
829826
export use_mommesh="true"
830827
export RUNTYPE='startup'
828+
export CICERUNTYPE='initial'
829+
export eps_imesh='1.0e-1'
831830
export flux_convergence='0.0'
832831
export flux_iteration='2'
833832
export flux_scheme='0'
@@ -935,6 +934,8 @@ export cap_dbug_flag="0"
935934
export use_coldstart="false"
936935
export use_mommesh="true"
937936
export RUNTYPE='startup'
937+
export CICERUNTYPE='initial'
938+
export eps_imesh='1.0e-1'
938939
export flux_convergence='0.0'
939940
export flux_iteration='2'
940941
export flux_scheme='0'

‎tests/edit_inputs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function edit_ice_in {
1919
-e "s/NY_GLB/$NY_GLB/g" \
2020
-e "s/BLCKX/$BLCKX/g" \
2121
-e "s/BLCKY/$BLCKY/g" \
22-
-e "s/RUNTYPE/$RUNTYPE/g" \
22+
-e "s/CICERUNTYPE/$CICERUNTYPE/g" \
2323
-e "s/RUNID/$RUNID/g" \
2424
-e "s/CICE_HIST_AVG/$CICE_HIST_AVG/g" \
2525
-e "s/RESTART_EXT/$RESTART_EXT/g" \

‎tests/fv3_conf/c96_HAFS_v0_hwrf_run.IN

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ cp @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f7
2929
cp @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
3030
cp @[INPUTDATA_ROOT]/FV3_input_data/*grb .
3131
cp @[INPUTDATA_ROOT]/FV3_input_data/*_table .
32-
cp @[INPUTDATA_ROOT]/FV3_input_data/*configure .
3332

3433
# Copy landuse/soil/vegetation parameter tables for HWRF Noah LSM
3534
cp @[INPUTDATA_ROOT]/FV3_input_data_hafs/GENPARM.TBL .

‎tests/fv3_conf/control_run.IN

-2
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,8 @@ cp @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
7474
cp @[INPUTDATA_ROOT]/${inputdir}/global_o3prdlos.f77 .
7575
cp @[INPUTDATA_ROOT]/${inputdir}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
7676
cp @[INPUTDATA_ROOT]/${inputdir}/*grb .
77-
cp @[INPUTDATA_ROOT]/${inputdir}/data_table .
7877
cp @[INPUTDATA_ROOT]/${inputdir}/diag_table_gfsv16 ./diag_table
7978
cp @[INPUTDATA_ROOT]/${inputdir}/field_table_gfsv16 ./field_table
80-
cp @[INPUTDATA_ROOT]/${inputdir}/*configure .
8179

8280
if [ $NEW_DIAGTABLE != '' ]; then
8381
cp @[INPUTDATA_ROOT]/${inputdir}/$NEW_DIAGTABLE ./diag_table

‎tests/fv3_conf/cpld_bmark_run.IN

+13-27
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
11
mkdir INPUT RESTART history MOM6_OUTPUT
22

3-
if [[ $ATMRES == 'C96' ]]; then
4-
FV3_DIR=FV3_input_data
5-
else
6-
FV3_DIR=FV3_input_data${ATMRES#C}
7-
fi
3+
FV3_DIR=FV3_input_data${ATMRES#C}
84

95
ICERES="${OCNRES:0:1}.${OCNRES:1}"
106

11-
if [[ ${FRAC_GRID_INPUT} = .F. ]]; then
12-
FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]/INPUT
13-
elif [[ @[NPZ] == '127' ]]; then
14-
FV3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]_L@[NPZ]/INPUT
15-
else
16-
FV3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]/INPUT
17-
fi
7+
FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs_p6/@[ATMRES]_L@[NPZ]/INPUT
8+
MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
9+
ICE_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc
1810
#unused unless 35D run is active
19-
WW3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav/gwes_30m
11+
WW3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav_p6/gwes_30m
2012

2113
# FV3 fixed input
14+
cp @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt .
2215
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat .
23-
cp @[INPUTDATA_ROOT]/FV3_input_bm2/INPUT/co2historicaldata_201*.txt .
2416
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/sfc_emissivity_idx.txt .
2517
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/solarconstant_noaa_an.txt .
2618
if [ $OZ_PHYS_NEW = .T. ]; then
@@ -33,14 +25,8 @@ cp @[INPUTDATA_ROOT]/${FV3_DIR}/*grb .
3325
cp @[INPUTDATA_ROOT]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
3426
cp @[INPUTDATA_ROOT]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
3527
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
36-
# NOTE: No L127 FV3_DIR input for non-frac grid input except for C96
37-
if [ ${FRAC_GRID_INPUT} = .F. ]; then
38-
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
39-
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
40-
else
41-
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
42-
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
43-
fi
28+
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
29+
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
4430
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
4531

4632
# MOM6 fixed input
@@ -55,18 +41,18 @@ cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
5541
if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
5642
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
5743
if [[ $RT35D == .T. ]]; then
58-
cp @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
44+
cp ${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
5945
fi
6046
fi
6147

6248
# No restart
6349
if [ $WARM_START = .F. ]; then
6450
# ICs
65-
cp @[INPUTDATA_ROOT]/${FV3_IC}/sfc_data*.nc ./INPUT
66-
cp @[INPUTDATA_ROOT]/${FV3_IC}/gfs_data*.nc ./INPUT
67-
cp @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da/MOM*.nc ./INPUT
51+
cp ${FV3_IC}/sfc_data*.nc ./INPUT
52+
cp ${FV3_IC}/gfs_data*.nc ./INPUT
53+
cp ${MOM_IC}/MOM*.nc ./INPUT
6854
# the BM ICs are still named cice5 and need to remain so until P5.0 is completed
69-
cp @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
55+
cp ${ICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
7056
else
7157
# NOTE: bmark-wave model is not currently tested for restart
7258
# Restart files

‎tests/fv3_conf/cpld_bmark_tiled_run.IN

+30-9
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ fi
88

99
ICERES="${OCNRES:0:1}.${OCNRES:1}"
1010

11-
FV3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]_L@[NPZ]/INPUT
11+
FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs_p7/@[ATMRES]_L@[NPZ]/INPUT
12+
MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
13+
ICE_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc
1214
#unused unless 35D run is active
13-
WW3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav/gwes_30m
15+
WW3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav_p7/gwes_30m
1416

1517
# FV3 fixed input
18+
cp @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt .
1619
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat .
17-
cp @[INPUTDATA_ROOT]/FV3_input_bm2/INPUT/co2historicaldata_201*.txt .
1820
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/sfc_emissivity_idx.txt .
1921
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/solarconstant_noaa_an.txt .
2022
cp @[INPUTDATA_ROOT]/${FV3_DIR}/global_glacier.2x2.grb .
@@ -56,19 +58,19 @@ cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
5658
if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
5759
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
5860
if [[ $RT35D == .T. ]]; then
59-
cp @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
61+
cp ${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
6062
fi
6163
fi
6264

6365
# No restart
6466
if [ $WARM_START = .F. ]; then
6567
# ICs
66-
cp @[INPUTDATA_ROOT]/${FV3_IC}/sfc_data*.nc ./INPUT
67-
cp @[INPUTDATA_ROOT]/${FV3_IC}/gfs_data*.nc ./INPUT
68-
cp @[INPUTDATA_ROOT]/${FV3_IC}/gfs_ctrl.nc ./INPUT
69-
cp @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da/MOM*.nc ./INPUT
68+
cp ${FV3_IC}/sfc_data*.nc ./INPUT
69+
cp ${FV3_IC}/gfs_data*.nc ./INPUT
70+
cp ${FV3_IC}/gfs_ctrl.nc ./INPUT
71+
cp ${MOM_IC}/MOM*.nc ./INPUT
7072
# the BM ICs are still named cice5 and need to remain so until P5.0 is completed
71-
cp @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
73+
cp ${ICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
7274
else
7375
# NOTE: bmark-wave model is not currently tested for restart
7476
# Restart files
@@ -109,3 +111,22 @@ if [ $WRITE_DOPOST = .true. ]; then
109111
cp ${PATHRT}/parm/postxconfig-NT_FH00.txt postxconfig-NT_FH00.txt
110112
cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
111113
fi
114+
115+
#merra2
116+
if [ $IAER = 1011 ]; then
117+
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
118+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
119+
done
120+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
121+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
122+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
123+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat optics_SS.dat
124+
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat
125+
fi
126+
127+
#ugwpv1
128+
if [ $DO_UGWP_V1 = .true. ]; then
129+
cp @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
130+
cp @[INPUTDATA_ROOT]/FV3_input_data384/INPUT_L127/oro_data_ls* ./INPUT
131+
cp @[INPUTDATA_ROOT]/FV3_input_data384/INPUT_L127/oro_data_ss* ./INPUT
132+
fi

‎tests/fv3_conf/cpld_control_run.IN

+2-13
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,8 @@ cp @[INPUTDATA_ROOT]/${FV3_DIR}/*grb .
2727
cp @[INPUTDATA_ROOT]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
2828
cp @[INPUTDATA_ROOT]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
2929
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
30-
# NOTE: No L127 FV3_DIR for non-frac grid input except for C96
31-
if [ ${FRAC_GRID_INPUT} = .F. ]; then
32-
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
33-
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
34-
else
3530
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
3631
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
37-
fi
3832
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
3933

4034
# MOM6 fixed input
@@ -55,13 +49,8 @@ SUFFIX=${RT_SUFFIX}
5549
# No restart
5650
if [ $WARM_START = .F. ]; then
5751
# ICs
58-
if [ ${FRAC_GRID_INPUT} = .F. ]; then
59-
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/sfc_data*.nc ./INPUT
60-
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_data*.nc ./INPUT
61-
else
62-
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/sfc_data*.nc ./INPUT
63-
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_data*.nc ./INPUT
64-
fi
52+
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/sfc_data*.nc ./INPUT
53+
cp @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_data*.nc ./INPUT
6554
cp @[INPUTDATA_ROOT]/MOM6_IC/MOM*.nc ./INPUT
6655
cp @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].res_2016100300.nc ./cice_model.res.nc
6756

‎tests/fv3_conf/cpt_run.IN

-20
This file was deleted.

‎tests/fv3_conf/csawmg3shoc127_run.IN

-20
This file was deleted.

‎tests/fv3_conf/csawmg_run.IN

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ cp @[INPUTDATA_ROOT]/FV3_input_data/*_table .
3636
cp @[INPUTDATA_ROOT]/FV3_input_data/diag_table_mgrs diag_table
3737
#cp @[INPUTDATA_ROOT]/FV3_input_data/field_table_mgrs field_table
3838
cp @[INPUTDATA_ROOT]/FV3_input_data/field_table_csawmg field_table
39-
cp @[INPUTDATA_ROOT]/FV3_input_data/*configure .
4039
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
4140
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
4241
ln -sf merra2C.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc

‎tests/fv3_conf/csawmgshoc_run.IN

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ cp @[INPUTDATA_ROOT]/FV3_input_data/*_table .
1717
cp @[INPUTDATA_ROOT]/FV3_input_data/diag_table_mgtkers diag_table
1818
#cp @[INPUTDATA_ROOT]/FV3_input_data/field_table_mgtkers field_table
1919
cp @[INPUTDATA_ROOT]/FV3_input_data/field_table_csawmgshoc field_table
20-
cp @[INPUTDATA_ROOT]/FV3_input_data/*configure .
2120
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
2221
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
2322
ln -sf merra2C.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc

‎tests/fv3_conf/fv3_gocart.IN

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ cp @[INPUTDATA_ROOT]/FV3_input_data/*_table .
1616
##cp @[INPUTDATA_ROOT]/FV3_input_data/diag_table_gfdlmp diag_table
1717
cp @[INPUTDATA_ROOT]/FV3_input_data/diag_table_aod diag_table
1818
cp @[INPUTDATA_ROOT]/FV3_input_data/field_table_gfdlmp field_table
19-
cp @[INPUTDATA_ROOT]/FV3_input_data/*configure .
2019
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
2120
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
2221
ln -sf merra2C.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc

0 commit comments

Comments
 (0)