ufs-community · climbfuji · Oct 19, 2021 · Oct 13, 2021 · Oct 13, 2021 · Oct 13, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/bensonr/fv3atm
+  branch = dycore
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/ci/repo_check.sh b/tests/ci/repo_check.sh
@@ -13,8 +13,8 @@ result() {
 }
 
 # Declare variables
-declare -A base fv3 mom6 cice ww3 stoch gocart nems cmeps cdeps cmake
-submodules="fv3 mom6 cice ww3 stoch gocart nems cmeps cdeps cmake"
+declare -A base fv3 mom6 cice ww3 stoch gocart nems cmeps cdeps hycom cmake
+submodules="fv3 mom6 cice ww3 stoch gocart nems cmeps cdeps hycom cmake"
 comment=''
 ownerID=$1
 
@@ -60,7 +60,7 @@ cdeps[branch]='develop'
 cdeps[dir]='CDEPS-interface/CDEPS'
 
 hycom[repo]='https://github.com/NOAA-EMC/HYCOM-src'
-hycom[branch]='develop'
+hycom[branch]='emc/develop'
 hycom[dir]='HYCOM-interface/HYCOM'
 
 cmake[repo]='https://github.com/NOAA-EMC/CMakeModules'

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -436,6 +436,9 @@ export NBITS=0
 export IMO=384
 export JMO=190
 
+#input file
+export FIELD_TABLE=field_table_gfsv16
+
 # Coldstart/warmstart
 #rt script for ICs
 export MODEL_INITIALIZATION=false
@@ -933,7 +936,6 @@ export flux_scheme=0
 
 export INPUT_NML=input.mom6.nml.IN
 export MODEL_CONFIGURE=datm_cdeps_configure.IN
-export FIELD_TABLE=field_table
 export DIAG_TABLE=diag_table_template
 
 # atm defaults

diff --git a/tests/fv3_conf/c96_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/c96_HAFS_v0_hwrf_run.IN
@@ -28,7 +28,7 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
 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/diag_table .
 
 # Copy landuse/soil/vegetation parameter tables for HWRF Noah LSM
 cp    @[INPUTDATA_ROOT]/FV3_input_data_hafs/GENPARM.TBL .
@@ -49,30 +49,6 @@ else
   exit 1
 fi
 
-# Copy field table, depending on microphysics choice and whether MYNN/SATMEDMF is used
-if [ $IMP_PHYSICS = 8 ]; then
-  if [ $LTAEROSOL = .true. ]; then
-    if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_gsd field_table
-    else
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_gf_thompson field_table
-    fi
-  else
-    if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-      echo "ERROR, no field table configured for Thompson MP without aerosols but with MYNN or SATMEDMF (need TKE)"
-      exit 1
-    else
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero field_table
-    fi
-  fi
-elif [ $IMP_PHYSICS = 15 ]; then
-  # Copy field table for Ferrier-Aligo MP
-  cp @[INPUTDATA_ROOT]/FV3_input_data_hafs/field_table_FA_nwat4 field_table
-else
-  echo "ERROR, no field table configured for IMP_PHYSICS=${IMP_PHYSICS}"
-  exit 1
-fi
-
 # Thompson or F-A MP lookup tables
 if [ $IMP_PHYSICS = 8 ]; then
   cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qsV2.dat .

diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -99,16 +99,11 @@ else
     cp    @[INPUTDATA_ROOT]/${inputdir}/*grb .
 fi
 cp    @[INPUTDATA_ROOT]/${inputdir}/diag_table_gfsv16 ./diag_table
-cp    @[INPUTDATA_ROOT]/${inputdir}/field_table_gfsv16 ./field_table
 
 if [ $NEW_DIAGTABLE != 'none' ]; then
   cp    @[INPUTDATA_ROOT]/${inputdir}/$NEW_DIAGTABLE ./diag_table
 fi
 
-if [ $NEW_FIELDTABLE != 'none' ]; then
-  cp    @[INPUTDATA_ROOT]/${inputdir}/$NEW_FIELDTABLE ./field_table
-fi
-
 if [ $CPLWAV = .true. ]; then
   cp    @[INPUTDATA_ROOT_WW3]/mod_def.* .
   cp    @[INPUTDATA_ROOT_WW3]/rmp_src* .
@@ -146,19 +141,6 @@ fi
 
 #Thompson
 if [ $IMP_PHYSICS = 8 ]; then
-  if [ $LTAEROSOL = .true. ]; then
-    if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_gsd field_table
-    else
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_gf_thompson field_table
-    fi
-  else
-    if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero_tke field_table
-    else
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero field_table
-    fi
-  fi
   cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qsV2.dat .
   cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qgV2.dat .
   cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/freezeH2O.dat .
@@ -168,7 +150,6 @@ fi
 #prognostic aerosols
 if [ $CPLCHM = .true. ]; then
   cp      ${PATHRT}/parm/gocart/diag_table  .
-  cp      ${PATHRT}/parm/gocart/field_table .
   cp      ${PATHRT}/parm/gocart/*.rc .
   ln -sf  @[INPUTDATA_ROOT]/GOCART/ExtData .
 fi
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -41,7 +41,6 @@ cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile5.
 cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/oro_@[ATMRES].mx@[OCNRES].tile6.nc INPUT/oro_data.tile6.nc
 cp    @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/@[ATMRES]*.nc .
 
-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
 cp    @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/grid_spec.nc ./INPUT/@[ATMRES]_mosaic.nc

diff --git a/tests/fv3_conf/esg_HAFS_v0_hwrf_run.IN b/tests/fv3_conf/esg_HAFS_v0_hwrf_run.IN
@@ -2,7 +2,7 @@ rm -fr INPUT RESTART
 mkdir INPUT RESTART
 
 if [ $WARM_START = .false. ]; then
-  rsync -av @[INPUTDATA_ROOT]/FV3_input_data_regional_esg/ ./
+  rsync -av --exclude 'field_table' @[INPUTDATA_ROOT]/FV3_input_data_regional_esg/ ./
 else
   echo "ERROR, warmstart runs not configured for regional HAFs runs on ESG grid"
   exit 1
@@ -21,27 +21,3 @@ else
   echo "ERROR, no diag table configured for IMP_PHYSICS=${IMP_PHYSICS}"
   exit 1
 fi
-
-# Copy field table, depending on microphysics choice and whether MYNN/SATMEDMF is used
-if [ $IMP_PHYSICS = 8 ]; then
-  if [ $LTAEROSOL = .true. ]; then
-    if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_gsd field_table
-    else
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_gf_thompson field_table
-    fi
-  else
-    if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-      echo "ERROR, no field table configured for Thompson MP without aerosols but with MYNN or SATMEDMF (need TKE)"
-      exit 1
-    else
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero field_table
-    fi
-  fi
-elif [ $IMP_PHYSICS = 15 ]; then
-  # Copy field table for Ferrier-Aligo MP
-  cp @[INPUTDATA_ROOT]/FV3_input_data_hafs/field_table_FA_nwat4 field_table
-else
-  echo "ERROR, no field table configured for IMP_PHYSICS=${IMP_PHYSICS}"
-  exit 1
-fi
diff --git a/tests/fv3_conf/fv3_stretched_run.IN b/tests/fv3_conf/fv3_stretched_run.IN
@@ -1,5 +1,5 @@
 
-rsync -arv @[INPUTDATA_ROOT]/FV3_nest_input_data/. .
+rsync -arv --exclude 'field_table' @[INPUTDATA_ROOT]/FV3_nest_input_data/. .
 rm -rf INPUT RESTART
 mkdir  INPUT RESTART
 

diff --git a/tests/fv3_conf/gfs_v15_run.IN b/tests/fv3_conf/gfs_v15_run.IN
diff --git a/tests/fv3_conf/gfs_v16_flake_run.IN b/tests/fv3_conf/gfs_v16_flake_run.IN
diff --git a/tests/fv3_conf/gfs_v16_run.IN b/tests/fv3_conf/gfs_v16_run.IN
diff --git a/tests/fv3_conf/gfs_v16_run_c192L127.IN b/tests/fv3_conf/gfs_v16_run_c192L127.IN
diff --git a/tests/fv3_conf/gfsv16_csawmg_run.IN b/tests/fv3_conf/gfsv16_csawmg_run.IN
diff --git a/tests/fv3_conf/gsd_run.IN b/tests/fv3_conf/gsd_run.IN
@@ -16,7 +16,7 @@ cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
 cp    @[INPUTDATA_ROOT]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
 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/diag_table .
 
 # Copy diag table file depending on LSM
 if [ $LSM = 1 ] || [ $LSM = 2 ]; then
@@ -29,32 +29,6 @@ elif [ $LSM = 3 ]; then
   fi
 fi
 
-# Copy field table, depending on microphysics choice and whether MYNN/SATMEDMF is used
-if [ $IMP_PHYSICS = 8 ]; then
-  if [ $LTAEROSOL = .true. ]; then
-    if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_gsd field_table
-    else
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_gf_thompson field_table
-    fi
-  else
-    if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero_tke field_table
-    else
-      cp  @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_thompson_noaero field_table
-    fi
-  fi
-elif [ $IMP_PHYSICS = 11 ]; then
-  if [ $DO_MYNNEDMF = .true. ] || [ $SATMEDMF = .true. ]; then
-    cp @[INPUTDATA_ROOT]/FV3_input_data_gsd/field_table_suite2 field_table
-  else
-    cp @[INPUTDATA_ROOT]/FV3_input_data/field_table_gfdlmp field_table
-  fi
-else
-  echo "ERROR, no field table configured for IMP_PHYSICS=${IMP_PHYSICS}"
-  exit 1
-fi
-
 # Thompson MP lookup tables - copy standard and SIONlib tables of precomputed tables
 if [ $IMP_PHYSICS = 8 ]; then
   cp    @[INPUTDATA_ROOT]/FV3_input_data_gsd/qr_acr_qsV2.dat .

diff --git a/tests/fv3_conf/hafs_regional_run.IN b/tests/fv3_conf/hafs_regional_run.IN
@@ -1,4 +1,4 @@
 rm -rf INPUT RESTART
 mkdir  INPUT RESTART
 
-rsync -arv @[INPUTDATA_ROOT]/FV3_hafs_regional_input_data/. .
+rsync -arv --exclude 'field_table' @[INPUTDATA_ROOT]/FV3_hafs_regional_input_data/. .
diff --git a/tests/fv3_conf/regional_run.IN b/tests/fv3_conf/regional_run.IN
@@ -1,4 +1,4 @@
-rsync -arv @[INPUTDATA_ROOT]/FV3_regional_input_data/. .
+rsync -arv --exclude 'field_table' @[INPUTDATA_ROOT]/FV3_regional_input_data/. .
 if [ $WRITE_DOPOST = .true. ]; then
     cp @[INPUTDATA_ROOT]/FV3_regional_input_data/diag_table_lam ./diag_table
 fi

diff --git a/tests/fv3_conf/stretched_run.IN b/tests/fv3_conf/stretched_run.IN
@@ -1,4 +1,4 @@
-rsync -arv @[INPUTDATA_ROOT]/FV3_nest_input_data/. .
+rsync -arv --exclude 'field_table' @[INPUTDATA_ROOT]/FV3_nest_input_data/. .
 rm -rf INPUT RESTART
 mkdir  INPUT RESTART