Wrapper PR for "Remove optional arguments from CCPP metadata, remove effective radii computation from Thompson MP" and "Fix/improve logic for convective transportable tracers, add GFS_checktracer debugging routine, correct spelling "janic" --> "janjic", fix inconsistent types related with noahmp and log functions", "Modify opnReqTest related scripts for fv3_gsd test"

.github/pull_request_template.md

@@ -7,7 +7,9 @@
 - [ ] An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR 
 are specified below.
 
-- [ ] If new or updated input data is required by this PR, it is clearly stated in the text of the PR.
+- [ ] Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.
+
+- [ ] New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.
 
 ## Instructions: All subsequent sections of text should be filled in as appropriate.
 
@@ -37,6 +39,7 @@ How were these changes tested? What compilers / HPCs was it tested with? Are the
 - [ ] jet.intel
 - [ ] wcoss_cray
 - [ ] wcoss_dell_p3
+- [ ] opnReqTest for newly added/changed feature
 - [ ] CI
 
 ## Dependencies

tests/fv3_conf/gsd_run.IN

@@ -1,12 +1,25 @@
 rm -fr INPUT RESTART
 mkdir INPUT RESTART
+
+OPNREQ_TEST=${OPNREQ_TEST:-false}
+SUFFIX=${RT_SUFFIX}
 if [ $WARM_START = .false. ]; then
   cp -r @[INPUTDATA_ROOT]/FV3_input_data_gsd/FV3_input_data_C96_with_aerosols/* INPUT/
 else
+  if [[ ${OPNREQ_TEST} == true ]]; then
+    SUFFIX=${BL_SUFFIX}
+  fi
+
   cp -r @[INPUTDATA_ROOT]/FV3_input_data_gsd/FV3_input_data_C96_with_aerosols/grid_spec*.nc INPUT/
   cp -r @[INPUTDATA_ROOT]/FV3_input_data_gsd/FV3_input_data_C96_with_aerosols/C96_grid*.nc INPUT/
   cp -r @[INPUTDATA_ROOT]/FV3_input_data_gsd/FV3_input_data_C96_with_aerosols/oro_data*.nc INPUT/
-  cp ../fv3_gsd_coldstart${RT_SUFFIX}/RESTART/* INPUT/
+  #cp ../fv3_gsd_coldstart${RT_SUFFIX}/RESTART/* INPUT/
+  cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
+  for RFILE in INPUT/${RESTART_FILE_PREFIX}.*; do
+    [ -e $RFILE ] || exit 1
+    RFILE_OLD=$(basename $RFILE)
+    mv -f $RFILE INPUT/"${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
+  done
 fi
 
 cp    @[INPUTDATA_ROOT]/FV3_input_data/INPUT/aerosol.dat .

tests/opnReqTests/dbg.sh

@@ -4,7 +4,16 @@ source $PATHRT/opnReqTests/std.sh
 if [[ $application == 'global' ]]; then
   FHMAX=1
   OUTPUT_FH="0 1"
-  LIST_FILES="sfcf000.nc sfcf001.nc atmf000.nc atmf001.nc"
+
+  FHMAX_2D=$(printf "%02d" $FHMAX)
+  if [[ $TEST_NAME == 'fv3_gsd' ]]; then
+    LIST_FILES="sfcf0$FHMAX_2D.tile1.nc sfcf0$FHMAX_2D.tile2.nc sfcf0$FHMAX_2D.tile3.nc \
+                sfcf0$FHMAX_2D.tile4.nc sfcf0$FHMAX_2D.tile5.nc sfcf0$FHMAX_2D.tile6.nc \
+                atmf0$FHMAX_2D.tile1.nc atmf0$FHMAX_2D.tile2.nc atmf0$FHMAX_2D.tile3.nc \
+                atmf0$FHMAX_2D.tile4.nc atmf0$FHMAX_2D.tile5.nc atmf0$FHMAX_2D.tile6.nc"
+  else
+    LIST_FILES="sfcf0$FHMAX_2D.nc sfcf0$FHMAX_2D.nc"
+  fi
 elif [[ $application == 'regional' ]]; then
   echo "Regional application not yet implemented for debug"
   exit 1

tests/opnReqTests/dcp.sh

@@ -2,9 +2,14 @@ set -eu
 source $PATHRT/opnReqTests/std.sh
 
 if [[ $application == 'global' ]]; then
-  temp=$INPES
-  INPES=$JNPES
-  JNPES=$temp
+  if [[ $CI_TEST == 'true' ]]; then
+    temp=$INPES
+    INPES=$JNPES
+    JNPES=$temp
+  else
+    INPES=6
+    JNPES=4
+  fi
 elif [[ $application == 'regional' ]]; then
   if [[ $CI_TEST == 'true' ]]; then
     INPES=10

tests/opnReqTests/rst.sh

@@ -4,18 +4,25 @@ source $PATHRT/opnReqTests/std.sh
 DEP_RUN=${TEST_NAME}
 
 if [[ $application == 'global' ]]; then
-  FHROT=12
+  FHROT=$(( FHMAX/2 ))
   OUTPUT_FH="3 -1"
-  RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHROT  )))0000"
+  if [[ $(( SHOUR + FHROT )) -lt 24 ]]; then
+    RESTART_FILE_PREFIX="${SYEAR}${SMONTH}$(printf "%02d" ${SDAY}).$(printf "%02d" $(( SHOUR + FHROT  )))0000"
+  else
+    RESTART_FILE_PREFIX="${SYEAR}${SMONTH}$(printf "%02d" $((SDAY+1))).$(printf "%02d" $(( SHOUR + FHROT - 24 )))0000"
+  fi
+
+  if [[ ! -z $NSTF_NAME ]]; then
+    second_value=$(echo $NSTF_NAME | cut -d ',' -f 2)
+    if [[ $second_value -eq 1 ]]; then
+      NSTF_NAME=$(echo $NSTF_NAME | awk 'BEGIN{FS=OFS=","} { $2-=1; print}')
+    fi
+  fi
+
 elif [[ $application == 'regional' ]]; then
   echo "Regional application not yet implemented for restart"
   exit 1
 elif [[ $application == 'cpld' ]]; then
-  #if [[ $TEST_NAME == 'cpld_control' ]]; then
-  #  FHROT=12
-  #elif [[ $TEST_NAME == 'cpld_bmark_v16' ]]; then
-  #  FHROT=3
-  #fi
   FHROT=$(( FHMAX/2 ))
 
   CICERUNTYPE='continue'
@@ -36,11 +43,14 @@ MAKE_NH=.F.
 MOUNTAIN=.T.
 NA_INIT=0
 
-LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/phyf00(00|21)\.(tile.\.nc|nemsio|nc) ?//g" \
-                                 | sed -E "s/dynf00(00|21)\.(tile.\.nc|nemsio|nc) ?//g" \
-                                 | sed -E "s/sfcf0(00|21).nc ?//g" | sed -E "s/atmf0(00|21).nc ?//g" \
-                                 | sed -E "s/GFSFLX.GrbF(00|21) ?//g" | sed -E "s/GFSPRS.GrbF(00|21) ?//g" \
+FHMAX_2D=$(printf "%02d" $FHMAX)
+LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/phyf00[0-9][0-9]/phyf00$FHMAX_2D/g" \
+                                 | sed -E "s/dynf00[0-9][0-9]/dynf00$FHMAX_2D/g" \
+                                 | sed -E "s/sfcf0[0-9][0-9]/sfcf0$FHMAX_2D/g" | sed -E "s/atmf0[0-9][0-9]/atmf0$FHMAX_2D/g" \
+                                 | sed -E "s/GFSFLX.GrbF[0-9][0-9]/GFSFLX.GrbF$FHMAX_2D/g" | sed -E "s/GFSPRS.GrbF[0-9][0-9]/GFSPRS.GrbF$FHMAX_2D/g" \
                                  | sed -E "s/atmos_4xdaily\.tile[1-6]\.nc ?//g" | sed -e "s/^ *//" -e "s/ *$//")
+LIST_FILES=$(echo $LIST_FILES | xargs -n1 | sort -u | xargs)
+
 
 (test $CI_TEST == 'true') && source $PATHRT/opnReqTests/cmp_proc_bind.sh
 source $PATHRT/opnReqTests/wrt_env.sh

tests/opnReqTests/std.sh

@@ -8,6 +8,8 @@ if [[ $application == 'global' ]]; then
     WRTTASK_PER_GROUP=12
     TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP))
   fi
+  RESTART_N=$(( FHMAX/2 ))
+  RESTART_INTERVAL="${RESTART_N} -1"
 elif [[ $application == 'regional' ]]; then
   if [[ $CI_TEST == 'true' ]]; then
     INPES=4