Add GEFS regression test suite from EP5r2 configuration/case

tests/default_vars.sh

@@ -569,6 +569,7 @@ export MODEL_INITIALIZATION=false
 export WARM_START=.false.
 export READ_INCREMENT=.false.
 export RES_LATLON_DYNAMICS="''"
+export ATM_IGNORE_RST_CKSUM=.false.
 export INCREMENT_FILE_ON_NATIVE_GRID=.false.
 export NGGPS_IC=.true.
 export EXTERNAL_IC=.true.
@@ -583,7 +584,10 @@ export D_CON=1.
 export HORD_XX=5
 export HORD_DP=-5
 export HORD_TR=8
-
+export NUDGE_QV=.true.
+export PERT_CLDS=.false.
+export PERT_MP=.true.
+export PERT_RADTEND=.true.
 # Radiation
 export DO_RRTMGP=.false.
 export DOGP_CLDOPTICS_LUT=.true.

tests/fv3_conf/cpld_control_run.IN

@@ -17,10 +17,10 @@ ICERES=${OCNRES:0:1}.${OCNRES:1}
 
 V2_SFC_FILE=${V2_SFC_FILE:-false}
 
-if [[ $BMIC == .true. ]]; then
-  FV3_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/@[FV3BMIC]/@[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
+if [[ ${BMIC} == .true. ]]; then
+  #FV3_IC=@[INPUTDATA_ROOT]/GEFS/${SYEAR}${SMONTH}${SDAY}${SHOUR}/ #TODO: testing
+  FV3_IC=/scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/GEFS/${SYEAR}${SMONTH}${SDAY}${SHOUR}/
+  MOM_IC=${FV3_IC}; ICE_IC=${FV3_IC}; WAV_IC=${FV3_IC}
 else
   if [[ $ATMRES == C48 ]]; then
      FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
@@ -82,21 +82,16 @@ if [ $WARM_START = .false. ]; then
   cp    ${FV3_IC}/sfc_data*.nc ./INPUT
   cp    ${FV3_IC}/gfs_data*.nc ./INPUT
   cp    ${FV3_IC}/gfs_ctrl.nc ./INPUT
-  if [[ $BMIC == .true. ]]; then
-   cp    ${MOM_IC}/MOM*.nc ./INPUT
-   cp    ${ICE_IC}/cice5_model_@[ICERES].res_${SYEAR}${SMONTH}${SDAY}00.nc ./cice_model.res.nc
+  if [[ $ATMRES == C48 ]]; then
+    cp    ${MOM_IC}/MOM.res.nc ./INPUT
+    cp    ${ICE_IC}/cice_model_@[ICERES].cpc.res_* ./cice_model.res.nc
   else
-    if [[ $ATMRES == C48 ]]; then
-      cp    ${MOM_IC}/MOM.res.nc ./INPUT
-      cp    ${ICE_IC}/cice_model_@[ICERES].cpc.res_* ./cice_model.res.nc
+    if [[ $OCNICE_WARMSTART == .true. ]]; then
+      cp   ${MOM_IC}/mom6.mx@[OCNRES].${SYEAR}${SMONTH}${SDAY}${SHOUR}.warmstart.nc ./INPUT/mom6.warmstart.nc
+      cp   ${ICE_IC}/cice.mx@[OCNRES].${SYEAR}${SMONTH}${SDAY}${SHOUR}.warmstart.nc ./cice.warmstart.nc
     else
-      if [[ $OCNICE_WARMSTART == .true. ]]; then
-        cp   ${MOM_IC}/mom6.mx@[OCNRES].${SYEAR}${SMONTH}${SDAY}${SHOUR}.warmstart.nc ./INPUT/mom6.warmstart.nc
-        cp   ${ICE_IC}/cice.mx@[OCNRES].${SYEAR}${SMONTH}${SDAY}${SHOUR}.warmstart.nc ./cice.warmstart.nc
-      else
-        cp    ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
-        cp    ${ICE_IC}/${OCNRES}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
-      fi
+      cp    ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
+      cp    ${ICE_IC}/${OCNRES}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
     fi
   fi
 else
@@ -127,7 +122,11 @@ else
      else
       cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
       if [[ $ODA_INCUPD == 'True' ]] && [[ $FHROT -le 6 ]]; then
-        cp @[INPUTDATA_ROOT]/MOM6_IC/mom6_increment.nc ./INPUT/mom6_increment.nc
+        if [[ ${BMIC} ]]; then
+          cp ${MOM_IC}/mom6_increment.nc ./INPUT
+        else
+          cp @[INPUTDATA_ROOT]/MOM6_IC/mom6_increment.nc ./INPUT/mom6_increment.nc
+        fi
       fi
      fi
 
@@ -159,20 +158,58 @@ else
      fi
 
   else
-     # C48mx500 warm start from ICs
-     cp    ${FV3_IC}/*.nc ./INPUT
-     cp    ${MOM_IC}/MOM.res.nc ./INPUT
-     cp    ${ICE_IC}/* .
-     cp    @[INPUTDATA_ROOT]/CMEPS_IC/${ATMRES}mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}/* .
+     if [[ ${BMIC} == .true. ]]; then
+       #cp ${FV3_IC}/gfs*.nc ./INPUT
+       cp ${FV3_IC}/fv*.nc ./INPUT
+       cp ${FV3_IC}/sfc_data*.nc ./INPUT
+       cp ${FV3_IC}/phy_data*.nc ./INPUT
+       #cp ${FV3_IC}/coupler.res ./INPUT
+       #coupler.res fv_core.res.nc fv_core.res.tile[1-6].nc fv_srf_wnd.res.tile[1-6].nc fv_tracer.res.tile[1-6].nc phy_data.tile[1-6].nc fv3_increment.nc
+       cp ${MOM_IC}/MOM*.nc ./INPUT
+       cp ${MOM_IC}/mom6_increment.nc ./INPUT
+       cp ${MOM_IC}/interpolate_zgrid_26L.nc ./INPUT
+       cp ${ICE_IC}/cice*nc ./INPUT
+       ls -1 ./INPUT/cice*nc>ice.restart_file
+       cp ${FV3_IC}/*stoch*nc ./INPUT
+       cp ${FV3_IC}/ca_data*nc ./INPUT
+       cp ${FV3_IC}/ufs.cpld.cpl*nc .
+       ls -1 ufs.cpld.cpl*nc>rpointer.cpl
+       cp ${WAV_IC}/ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS} .
+     else
+       # C48mx500 warm start from ICs
+       cp    ${FV3_IC}/*.nc ./INPUT
+       cp    ${MOM_IC}/MOM.res.nc ./INPUT
+       cp    ${ICE_IC}/* .
+       cp    @[INPUTDATA_ROOT]/CMEPS_IC/${ATMRES}mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}/* .
+     fi
   fi
 fi
 
 #inline post
 if [ $WRITE_DOPOST = .true. ]; then
-  cp    ${PATHRT}/parm/post_itag_gfs itag
-  cp    ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
-  cp    ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
-  cp    ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+  if [[ ${BMIC} == .true. ]]; then
+    cp    ${PATHRT}/parm/post_itag_gefs itag
+    #copied "gefs" postxconfig files not working afer UFS #2326 
+    #cp    ${PATHRT}/parm/postxconfig-NT-gefs.txt postxconfig-NT.txt
+    #cp    ${PATHRT}/parm/postxconfig-NT-gefs_FH00.txt postxconfig-NT_FH00.txt
+    cp    ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
+    cp    ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
+    cp    ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+  else
+    cp    ${PATHRT}/parm/post_itag_gfs itag
+    cp    ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
+    cp    ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
+    cp    ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
+  fi
+fi
+
+#prognostic aerosols
+if [ $CPLCHM = .true. ]; then
+  if [[ ${BMIC} == .true. ]]; then
+    ln -sf /scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/GEFS/ExtData .
+  else
+    ln -sf  @[INPUTDATA_ROOT]/GOCART/p8c_5d/ExtData .
+  fi
 fi
 
 #merra2
@@ -185,6 +222,27 @@ if [ $IAER = 1011 ]; then
   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  
+
+#rad_c_gocart
+if [ $IAER = 2011 ]; 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_y14_24/merra2_1423_${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
+
+  DIR_OPT=./ExtData/monochromatic/
+  cp ${DIR_OPT}/optics_BC.v1_3.nc  optics_BC.nc
+  cp ${DIR_OPT}/optics_OC.v1_3.nc  optics_OC.nc 
+  cp ${DIR_OPT}/optics_DU.v15_3.nc optics_DU.nc
+  cp ${DIR_OPT}/optics_SS.v3_3.nc  optics_SS.nc
+  cp ${DIR_OPT}/optics_SU.v1_3.nc  optics_SU.nc
+  cp ${DIR_OPT}/optics_BRC.v1_5.nc  optics_BRC.nc
+  cp ${DIR_OPT}/optics_NI.v2_5.nc  optics_NI.nc
 fi
 
 cp    @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
@@ -200,5 +258,9 @@ fi
 
 #prognostic aerosols
 if [ $CPLCHM = .true. ]; then
-  ln -sf  @[INPUTDATA_ROOT]/GOCART/p8c_5d/ExtData .
+  if [[ ${BMIC} == .true. ]]; then
+    ln -sf /scratch1/NCEPDEV/nems/Nick.Szapiro/tasks/input_data/gefs.v13/stage/GEFS/ExtData . 
+  else
+    ln -sf  @[INPUTDATA_ROOT]/GOCART/p8c_5d/ExtData .
+  fi
 fi

tests/opnReqTest

@@ -230,7 +230,6 @@ run_opnReqTests() {
 			export RTPWD=${RTPWD}
 			export INPUTDATA_ROOT=${INPUTDATA_ROOT}
 			export INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT_WW3}
-			export INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC}
 			export PATHRT=${PATHRT}
 			export PATHTR=${PATHTR}
 			export NEW_BASELINE=${NEW_BASELINE}
@@ -634,7 +633,6 @@ NEW_BASELINE=${STMP}/${USER}/FV3_OPNREQ_TEST/OPNREQ_TEST
 RTPWD=${NEW_BASELINE}
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20240501}
 INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20240214/
-INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207}
 
 rm -rf $NEW_BASELINE
 mkdir -p $NEW_BASELINE