Clean up input-data directories; Fix MERRA2 input; Add tests on Jet; …

…Update CICE cap & fix time manager (was PR#664) (#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

.readthedocs.yaml

@@ -0,0 +1,23 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: doc/UsersGuide/source/conf.py
+
+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: doc/UsersGuide/requirements.txt

CICE-interface/cice_files.cmake

@@ -154,6 +154,7 @@ list(APPEND cice_nuopc_cmeps_driver_files
   CICE/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
   CICE/cicecore/drivers/nuopc/cmeps/ice_scam.F90
   CICE/cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90
+  CICE/cicecore/drivers/nuopc/cmeps/ice_mesh_mod.F90
 )
 
 #-- Using NUOPC DMI driver

doc/UsersGuide/source/_static/custom.css

@@ -0,0 +1,19 @@
+@import "default.css";
+
+div.admonition-todo {
+border-top: 2px solid red;
+border-bottom: 2px solid red;
+border-left: 2px solid red;
+border-right: 2px solid red;
+background-color: #ff6347
+}
+
+p.admonition-title {
+    display: offline;
+}
+
+/*p.first.admonition-title {
+background-color: #aa6347;
+width: 100%;
+}
+*/

doc/UsersGuide/source/conf.py

@@ -104,7 +104,7 @@
 html_static_path = ['_static']
 
 def setup(app):
-    app.add_stylesheet('custom.css')  # may also be an URL
+    app.add_css_file('custom.css')  # may also be an URL
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.

tests/default_vars.sh

@@ -202,7 +202,7 @@ elif [[ $MACHINE_ID = jet.* ]]; then
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
   OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203"
 
-  TASKS_cpl_thrd=120; TPN_cpl_thrd=18; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
+  TASKS_cpl_thrd=120; TPN_cpl_thrd=12; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
 
@@ -357,7 +357,7 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6;  MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149"
   OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 383"
 
-  TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
+  TASKS_cpl_thrd=120; TPN_cpl_thrd=24; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
   THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 77";  APB_cpl_thrd="0 77"
   OPB_cpl_thrd="78 107";  IPB_cpl_thrd="108 119"
 
@@ -674,14 +674,11 @@ export cap_dbug_flag="0"
 export use_coldstart="false"
 export use_mommesh="true"
 export RUNTYPE='startup'
+export CICERUNTYPE='initial'
+export eps_imesh='1.0e-1'
 
 # FV3 defaults
-# to use new oro and ics created from 1deg ocean mask on c96 tiles
-# set frac_grid=.F. but FRAC_GRID_INPUT=.T.
-# to repro existing tests set both frac_grid and FRAC_GRID_INPUT to .F.
-# to run frac_grid, set both frac_grid and FRAC_GRID_INPUTs to .T.
 export FRAC_GRID='.T.'
-export FRAC_GRID_INPUT='.T.'
 export CCPP_SUITE="FV3_GFS_2017_coupled"
 export INPUT_NML=input.mom6_ccpp.nml.IN
 export FIELD_TABLE="field_table"
@@ -828,6 +825,8 @@ export cap_dbug_flag="0"
 export use_coldstart="false"
 export use_mommesh="true"
 export RUNTYPE='startup'
+export CICERUNTYPE='initial'
+export eps_imesh='1.0e-1'
 export flux_convergence='0.0'
 export flux_iteration='2'
 export flux_scheme='0'
@@ -935,6 +934,8 @@ export cap_dbug_flag="0"
 export use_coldstart="false"
 export use_mommesh="true"
 export RUNTYPE='startup'
+export CICERUNTYPE='initial'
+export eps_imesh='1.0e-1'
 export flux_convergence='0.0'
 export flux_iteration='2'
 export flux_scheme='0'

tests/edit_inputs.sh

@@ -19,7 +19,7 @@ function edit_ice_in {
       -e "s/NY_GLB/$NY_GLB/g" \
       -e "s/BLCKX/$BLCKX/g" \
       -e "s/BLCKY/$BLCKY/g" \
-      -e "s/RUNTYPE/$RUNTYPE/g" \
+      -e "s/CICERUNTYPE/$CICERUNTYPE/g" \
       -e "s/RUNID/$RUNID/g" \
       -e "s/CICE_HIST_AVG/$CICE_HIST_AVG/g" \
       -e "s/RESTART_EXT/$RESTART_EXT/g" \

tests/fv3_conf/c96_HAFS_v0_hwrf_run.IN

@@ -29,7 +29,6 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f7
 cp    @[INPUTDATA_ROOT]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
 cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/*_table .
-cp    @[INPUTDATA_ROOT]/FV3_input_data/*configure .
 
 # Copy landuse/soil/vegetation parameter tables for HWRF Noah LSM
 cp    @[INPUTDATA_ROOT]/FV3_input_data_hafs/GENPARM.TBL .

tests/fv3_conf/control_run.IN

@@ -74,10 +74,8 @@ cp    @[INPUTDATA_ROOT]/${inputdir}/INPUT/solarconstant_noaa_an.txt .
 cp    @[INPUTDATA_ROOT]/${inputdir}/global_o3prdlos.f77 .
 cp    @[INPUTDATA_ROOT]/${inputdir}/global_h2o_pltc.f77 ./global_h2oprdlos.f77
 cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .
-cp    @[INPUTDATA_ROOT]/${inputdir}/data_table .
 cp    @[INPUTDATA_ROOT]/${inputdir}/diag_table_gfsv16 ./diag_table
 cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_gfsv16 ./field_table
-cp    @[INPUTDATA_ROOT]/${inputdir}/*configure .
 
 if [ $NEW_DIAGTABLE != '' ]; then
   cp    @[INPUTDATA_ROOT]/${inputdir}/$NEW_DIAGTABLE ./diag_table

tests/fv3_conf/cpld_bmark_run.IN

@@ -1,26 +1,18 @@
 mkdir INPUT RESTART history MOM6_OUTPUT
 
-if [[ $ATMRES == 'C96' ]]; then
-  FV3_DIR=FV3_input_data
-else
-  FV3_DIR=FV3_input_data${ATMRES#C}
-fi
+FV3_DIR=FV3_input_data${ATMRES#C}
 
 ICERES="${OCNRES:0:1}.${OCNRES:1}"
 
-if [[ ${FRAC_GRID_INPUT} = .F. ]]; then
-  FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]/INPUT
-elif [[ @[NPZ] == '127' ]]; then
-  FV3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]_L@[NPZ]/INPUT
-else
-  FV3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]/INPUT
-fi
+FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs_p6/@[ATMRES]_L@[NPZ]/INPUT
+MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
+ICE_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc
 #unused unless 35D run is active
-WW3_IC=FV3_input_frac/BM_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav/gwes_30m
+WW3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav_p6/gwes_30m
 
 # FV3 fixed input
+cp    @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_bm2/INPUT/co2historicaldata_201*.txt .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/sfc_emissivity_idx.txt .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/solarconstant_noaa_an.txt .
 if [ $OZ_PHYS_NEW = .T. ]; then
@@ -33,14 +25,8 @@ cp    @[INPUTDATA_ROOT]/${FV3_DIR}/*grb .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
 cp    @[INPUTDATA_ROOT]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
-# NOTE: No L127 FV3_DIR input for non-frac grid input except for C96
-if [ ${FRAC_GRID_INPUT} = .F. ]; then
-  cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
-  cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
-else
-  cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
-  cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
-fi
+cp    @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
+cp    @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
 
 # MOM6 fixed input
@@ -55,18 +41,18 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   if [[ $RT35D == .T. ]]; then
-   cp   @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
+   cp   ${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
   fi
 fi
 
 # No restart
 if [ $WARM_START = .F. ]; then
   # ICs
-  cp    @[INPUTDATA_ROOT]/${FV3_IC}/sfc_data*.nc ./INPUT
-  cp    @[INPUTDATA_ROOT]/${FV3_IC}/gfs_data*.nc ./INPUT
-  cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da/MOM*.nc ./INPUT
+  cp    ${FV3_IC}/sfc_data*.nc ./INPUT
+  cp    ${FV3_IC}/gfs_data*.nc ./INPUT
+  cp    ${MOM_IC}/MOM*.nc ./INPUT
   # the BM ICs are still named cice5 and need to remain so until P5.0 is completed
-  cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
+  cp    ${ICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
 else
   # NOTE: bmark-wave model is not currently tested for restart
   # Restart files

tests/fv3_conf/cpld_bmark_tiled_run.IN

@@ -8,13 +8,15 @@ fi
 
 ICERES="${OCNRES:0:1}.${OCNRES:1}"
 
-FV3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs/@[ATMRES]_L@[NPZ]/INPUT
+FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/gfs_p7/@[ATMRES]_L@[NPZ]/INPUT
+MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
+ICE_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc
 #unused unless 35D run is active
-WW3_IC=FV3_input_frac/BM7_IC/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav/gwes_30m
+WW3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/wav_p7/gwes_30m
 
 # FV3 fixed input
+cp    @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat .
-cp    @[INPUTDATA_ROOT]/FV3_input_bm2/INPUT/co2historicaldata_201*.txt .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/sfc_emissivity_idx.txt .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/solarconstant_noaa_an.txt .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/global_glacier.2x2.grb .
@@ -56,19 +58,19 @@ cp    @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .
 if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   if [[ $RT35D == .T. ]]; then
-   cp   @[INPUTDATA_ROOT]/${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
+   cp   ${WW3_IC}/*.000000.restart.gwes_30m ./restart.gwes_30m
   fi
 fi
 
 # No restart
 if [ $WARM_START = .F. ]; then
   # ICs
-  cp    @[INPUTDATA_ROOT]/${FV3_IC}/sfc_data*.nc ./INPUT
-  cp    @[INPUTDATA_ROOT]/${FV3_IC}/gfs_data*.nc ./INPUT
-  cp    @[INPUTDATA_ROOT]/${FV3_IC}/gfs_ctrl.nc ./INPUT
-  cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da/MOM*.nc ./INPUT
+  cp    ${FV3_IC}/sfc_data*.nc ./INPUT
+  cp    ${FV3_IC}/gfs_data*.nc ./INPUT
+  cp    ${FV3_IC}/gfs_ctrl.nc ./INPUT
+  cp    ${MOM_IC}/MOM*.nc ./INPUT
   # the BM ICs are still named cice5 and need to remain so until P5.0 is completed
-  cp    @[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
+  cp    ${ICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
 else
   # NOTE: bmark-wave model is not currently tested for restart
   # Restart files
@@ -109,3 +111,22 @@ if [ $WRITE_DOPOST = .true. ]; then
   cp    ${PATHRT}/parm/postxconfig-NT_FH00.txt postxconfig-NT_FH00.txt
   cp    ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
 fi
+
+#merra2
+if [ $IAER = 1011 ]; then
+  for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
+    cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
+  done
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat  optics_SS.dat
+  cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat  optics_SU.dat
+fi
+
+#ugwpv1
+if [ $DO_UGWP_V1 = .true. ]; then
+  cp    @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
+  cp    @[INPUTDATA_ROOT]/FV3_input_data384/INPUT_L127/oro_data_ls* ./INPUT
+  cp    @[INPUTDATA_ROOT]/FV3_input_data384/INPUT_L127/oro_data_ss* ./INPUT
+fi

tests/fv3_conf/cpld_control_run.IN

@@ -27,14 +27,8 @@ cp    @[INPUTDATA_ROOT]/${FV3_DIR}/*grb .
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/@[FIELD_TABLE] ./field_table
 cp    @[INPUTDATA_ROOT]/CPL_FIX/a@[ATMRES]o@[OCNRES]/grid_spec.nc ./INPUT
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/@[ATMRES]_grid*.nc ./INPUT
-# NOTE: No L127 FV3_DIR for non-frac grid input except for C96
-if [ ${FRAC_GRID_INPUT} = .F. ]; then
-  cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/oro_data*.nc ./INPUT
-  cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_ctrl.nc ./INPUT
-else
   cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/oro_data*.nc ./INPUT
   cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_ctrl.nc ./INPUT
-fi
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc
 
 # MOM6 fixed input
@@ -55,13 +49,8 @@ SUFFIX=${RT_SUFFIX}
 # No restart
 if [ $WARM_START = .F. ]; then
   # ICs
-  if [ ${FRAC_GRID_INPUT} = .F. ]; then
-   cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/sfc_data*.nc ./INPUT
-   cp  @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/gfs_data*.nc ./INPUT
-  else
-   cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/sfc_data*.nc ./INPUT
-   cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_data*.nc ./INPUT
-  fi
+  cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/sfc_data*.nc ./INPUT
+  cp  @[INPUTDATA_ROOT]/FV3_input_frac/@[ATMRES]_L@[NPZ].mx@[OCNRES]_frac/gfs_data*.nc ./INPUT
   cp  @[INPUTDATA_ROOT]/MOM6_IC/MOM*.nc ./INPUT
   cp  @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].res_2016100300.nc ./cice_model.res.nc
 

tests/fv3_conf/csawmg_run.IN

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

tests/fv3_conf/csawmgshoc_run.IN

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

tests/fv3_conf/fv3_gocart.IN

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