Add beta 2020_CAPE_C768 test files; update bcw and 2020 CAPE IN files…

… w/ additional machine paths for input data.

tests-dev/test_cases/exp_conf/2020_CAPE.IN

@@ -25,13 +25,17 @@ if [ $WARM_START = .false. ]; then
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
   elif [ "$HSD_CASE" = "true" ]; then
     if [ ${MACHINE_ID} = hera ]; then
-      cp -r /scratch1/NCEPDEV/nems/role.epic/HSD_INPUT_DATA/FV3_input_data48/INPUT_L127_v2_sfc/* ./INPUT/.
+      cp -r /scratch1/NCEPDEV/nems/role.epic/HSD_INPUT_DATA/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
     elif [ ${MACHINE_ID} = orion ]; then
-     cp -r /work/noaa/epic/role-epic/contrib/HSD_INPUT_DATA/FV3_input_data48/INPUT_L127_v2_sfc/* ./INPUT/. 
+     cp -r /work/noaa/epic/role-epic/contrib/HSD_INPUT_DATA/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/. 
     elif [ ${MACHINE_ID} = hercules ]; then
-     cp -r /work/noaa/epic/role-epic/contrib/HSD_INPUT_DATA/FV3_input_data48/INPUT_L127_v2_sfc/* ./INPUT/.
+     cp -r /work/noaa/epic/role-epic/contrib/HSD_INPUT_DATA/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
     elif [ ${MACHINE_ID} = jet ]; then
-     cp -r /mnt/lfs5/HFIP/hfv3gfs/role.epic/HSD_INPUT_DATA/FV3_input_data48/INPUT_L127_v2_sfc/* ./INPUT/.
+     cp -r /mnt/lfs5/HFIP/hfv3gfs/role.epic/HSD_INPUT_DATA/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
+    elif [ ${MACHINE_ID} = gaea ]; then
+     cp -r /gpfs/f5/epic/world-shared/HSD_INPUT_DATA/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
+    elif [ ${MACHINE_ID} = derecho ]; then
+     cp -r /glade/work/epicufsrt/contrib/HSD_INPUT_DATA/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
     fi 
   else
     cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/.

tests-dev/test_cases/exp_conf/baroclinic_wave.IN

@@ -21,6 +21,10 @@ elif [ ${MACHINE_ID} = hercules ]; then
  cp /work/noaa/epic/role-epic/contrib/HSD_INPUT_DATA/global_hyblev.l128.txt . 
 elif [ ${MACHINE_ID} = jet ]; then
  cp /mnt/lfs5/HFIP/hfv3gfs/role.epic/HSD_INPUT_DATA/global_hyblev.l128.txt .
+elif [ ${MACHINE_ID} = gaea ]; then
+ cp /gpfs/f5/epic/world-shared/HSD_INPUT_DATA/global_hyblev.l128.txt .
+elif [ ${MACHINE_ID} = derecho ]; then
+ cp /glade/work/epicufsrt/contrib/HSD_INPUT_DATA/global_hyblev.l128.txt.
 fi
 
 OPNREQ_TEST=${OPNREQ_TEST:-false}

tests-dev/test_cases/test_cases.yaml

@@ -4,4 +4,5 @@ test_cases_intel:
     option: '-DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON'
   tests:
     - 2020_CAPE: {'project':['daily'],'turnoff':['noaacloud']}
+    - 2020_CAPE_C768: {'project':['daily'],'turnoff':['noaacloud']}
     - baroclinic_wave: {'project':['daily'],'turnoff':['noaacloud']}

tests-dev/test_cases/tests/2020_CAPE_C768

@@ -0,0 +1,59 @@
+###############################################################################
+#
+#  global control test: GFSv16 atmosphere only at C768L127
+#
+###############################################################################
+
+export TEST_DESCR="Compare global control C768L127 results with previous trunk version"
+
+export CNTL_DIR=control_c768
+
+export LIST_FILES="sfcf000.nc \
+                   sfcf003.nc \
+                   atmf000.nc \
+                   atmf003.nc"
+
+export ATMRES=C768
+
+export_fv3
+export_tiled
+export INPES=${INPES_c768}
+export JNPES=${JNPES_c768}
+export atm_omp_num_threads=${THRD_c768}
+export WRITE_GROUP=2
+export WRTTASK_PER_GROUP=80
+export FHMAX=24
+export NPZ=127
+export NPZP=128
+export NPX=769
+export NPY=769
+export SYEAR=2020
+export SMONTH=07
+export SDAY=23
+export SHOUR=00
+export DT_ATMOS=150
+export RESTART_INTERVAL=0
+export CDMBWD=${CDMBWD_c768}
+export OUTPUT_GRID='gaussian_grid'
+export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.true.
+export IAER=5111
+export IOVR=3
+export IMO=3072
+export JMO=1536
+export IDEFLATE=1
+export QUANTIZE_NSD=14
+export ICHUNK3D=${IMO}
+export JCHUNK3D=${JMO}
+export KCHUNK3D=1
+export OUTPUT_FH="3 -1"
+
+export FNALBC="'global_snowfree_albedo.bosu.t1534.3072.1536.rg.grb',"
+export FNVETC="'global_vegtype.igbp.t1534.3072.1536.rg.grb',"
+export FNSOTC="'global_soiltype.statsgo.t1534.3072.1536.rg.grb',"
+export FNABSC="'global_mxsnoalb.uariz.t1534.3072.1536.rg.grb',"
+
+export FV3_RUN=control_run.IN
+export CCPP_SUITE=FV3_GFS_v16
+export INPUT_NML=control.nml.IN

tests-dev/ufs_test.yaml

@@ -437,6 +437,7 @@ test_cases_intel:
     option: '-DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON'
   tests:
     - 2020_CAPE: {'project':['daily'],'turnoff':['noaacloud']}
+      2020_CAPE_C768: {'project':['daily'],'turnoff':['noaacloud']}
     - baroclinic_wave: {'project':['daily'],'turnoff':['noaacloud']}
 atm_gnu:
   build: