ufs-community · aerorahul · Aug 19, 2021 · Aug 23, 2021 · Aug 25, 2021 · Aug 27, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  #url = https://github.com/NOAA-EMC/fv3atm
+  #branch = develop
+  url = https://github.com/climbfuji/fv3atm
+  branch = george_gayno_landmask_bugfix
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -8,7 +8,7 @@ module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
 module load esmf/8_1_1
-module load fms/2020.04.03
+module load fms/2021.03
 
 module load bacio/2.4.1
 module load crtm/2.3.0

diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -8,7 +8,7 @@ module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load pio/2.5.2
 module load esmf/8_1_1-debug
-module load fms/2020.04.03
+module load fms/2021.03
 
 module load bacio/2.4.1
 module load crtm/2.3.0

diff --git a/modulefiles/ufs_hera.gnu b/modulefiles/ufs_hera.gnu
@@ -23,6 +23,9 @@ module load hpc-mpich/3.3.2
 
 module load ufs_common
 
+module unload fms
+module load fms/2021.03-avx
+
 setenv CC mpicc
 setenv CXX mpicxx
 setenv FC mpif90

diff --git a/modulefiles/ufs_hera.intel b/modulefiles/ufs_hera.intel
@@ -23,6 +23,9 @@ module load hpc-impi/2018.0.4
 
 module load ufs_common
 
+module unload fms
+module load fms/2021.03-avx
+
 setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort

diff --git a/modulefiles/ufs_wcoss_cray b/modulefiles/ufs_wcoss_cray
@@ -64,7 +64,7 @@ module load udreg
 module load ugni
 
 module load esmf/811
-module load fms/2020.04.03
+module load fms/2021.03
 
 module swap pmi pmi/5.0.11
 

diff --git a/modulefiles/ufs_wcoss_cray_debug b/modulefiles/ufs_wcoss_cray_debug
@@ -64,7 +64,7 @@ module load udreg
 module load ugni
 
 module load esmf/811-debug
-module load fms/2020.04.03
+module load fms/2021.03
 
 module swap pmi pmi/5.0.11
 

diff --git a/stochastic_physics b/stochastic_physics
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_gaea.intel.log b/tests/RegressionTests_gaea.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/Dockerfile b/tests/ci/Dockerfile
@@ -1,4 +1,4 @@
-From noaaemc/ubuntu-hpc:v1.4b
+From noaaemc/ubuntu-hpc:v1.5b
 
 ENV HOME=/home/builder
 COPY --chown=builder:builder . $HOME/ufs-weather-model

diff --git a/tests/ci/ci.sh b/tests/ci/ci.sh
@@ -81,7 +81,7 @@ elif [ $RUN == "true" ]; then
                 -e "RT_MACHINE=linux.gnu" -e "RT_COMPILER=gnu" \
                 -w "/home/builder/ufs-weather-model/tests" \
                 -v DataVolume:/home/builder/data/NEMSfv3gfs/input-data-20210528 \
-                --shm-size=512m --name my-container noaaemc/ubuntu-hpc:v1.4b \
+                --shm-size=512m --name my-container noaaemc/ubuntu-hpc:v1.5b \
                 /bin/bash -c "./utest -n ${TEST_NAME} -c ${TEST_CASE} -x"
 
   cd $GITHUB_WORKSPACE

diff --git a/tests/edit_inputs.sh b/tests/edit_inputs.sh
@@ -51,14 +51,6 @@ function edit_data_table {
   sed -e "s/FRUNOFF/$FRUNOFF/g"
 }
 
-function edit_diag_table {
-  sed -e "s/YMD/$SYEAR$SMONTH$SDAY/g" \
-      -e "s/ATMRES/$ATMRES/g" \
-      -e "s/SYEAR/$SYEAR/g" \
-      -e "s/SMONTH/$SMONTH/g" \
-      -e "s/SDAY/$SDAY/g"
-}
-
 function edit_ww3_input {
 
   SDATEWW3="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"

diff --git a/tests/fv3_conf/compile_slurm.IN_gaea b/tests/fv3_conf/compile_slurm.IN_gaea
@@ -2,8 +2,9 @@
 #SBATCH -e err
 #SBATCH -o out
 #SBATCH --account=@[ACCNR]
-#SBATCH --qos=@[QUEUE]
-#SBATCH --clusters=@[PARTITION]
+##SBATCH --qos=@[QUEUE]
+#SBATCH --clusters=es
+#SBATCH --partition=eslogin
 #SBATCH --nodes=1
 #SBATCH --ntasks-per-node=8
 #SBATCH --time=30

diff --git a/tests/parm/diag_table_bmark_v16_merra2_template b/tests/parm/diag_table_bmark_v16_merra2_template
@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[YMD].@[SHOUR]Z.@[ATMRES].64bit.non-mono
+@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
 
 "fv3_history",    0,  "hours",  1,  "hours",  "time"
 "fv3_history2d",  0,  "hours",  1,  "hours",  "time"

diff --git a/tests/parm/diag_table_bmark_v16_template b/tests/parm/diag_table_bmark_v16_template
@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[YMD].@[SHOUR]Z.@[ATMRES].64bit.non-mono
+@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
 
 "fv3_history",    0,  "hours",  1,  "hours",  "time"
 "fv3_history2d",  0,  "hours",  1,  "hours",  "time"

diff --git a/tests/parm/diag_table_template b/tests/parm/diag_table_template
@@ -1,5 +1,5 @@
-YMD.00Z.ATMRES.64bit.non-mono
-SYEAR SMONTH SDAY 00 0 0
+@[YMD].@[SHOUR]Z.@[ATMRES].64bit.non-mono
+@[SYEAR] @[SMONTH] @[SDAY] @[SHOUR] 0 0
 
 "grid_spec",              -1,  "months",   1, "days",  "time"
 "atmos_4xdaily",           6,  "hours",    1, "days",  "time"
@@ -36,7 +36,7 @@ SYEAR SMONTH SDAY 00 0 0
  "ocean_model", "SSV",       "SSV",      "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
  "ocean_model", "frazil",    "frazil",   "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
  "ocean_model", "ePBL_h_ML", "ePBL",     "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
- "ocean_model", "MLD_003",   "MLD_003",  "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2 
+ "ocean_model", "MLD_003",   "MLD_003",  "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
  "ocean_model", "MLD_0125",  "MLD_0125", "ocn%4yr%2mo%2dy%2hr","all",.true.,"none",2
 
 # save daily SST

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -60,7 +60,7 @@ COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_
 RUN     | control_rrtmgp                                                                                                          |                                         | fv3 |
 #RUN     | control_rrtmgp_2threads                                                                                                 |                                         |     |
 #RUN     | control_rrtmgp_c192                                                                                                     |                                         | fv3 |
-RUN     | control_csawmg                                                                                                          |                                         | fv3 |
+RUN     | control_csawmg                                                                                                          | - gaea.intel                            | fv3 |
 RUN     | control_csawmgt                                                                                                         |                                         | fv3 |
 RUN     | control_flake                                                                                                           |                                         | fv3 |
 RUN     | control_ugwpv1                                                                                                          |                                         | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -239,7 +239,7 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   module load ecflow
   ECFLOW_START=ecflow_start.sh
 
-  QUEUE=batch 
+  QUEUE=batch
   COMPILE_QUEUE=batch
 
   #ACCNR=fv3-cpu
@@ -415,14 +415,14 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210812
+BL_DATE=20210830
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}}
 fi
 
-INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210717}
+INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210825}
 INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20210621
 INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20210717}
 

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -120,7 +120,7 @@ if [[ $DATM_NEMS = 'true' ]] || [[ $DATM_CDEPS = 'true' ]] || [[ $S2S = 'true' ]
   if [[ $HAFS = 'false' ]]; then
     edit_ice_in     < ${PATHRT}/parm/ice_in_template > ice_in
     edit_mom_input  < ${PATHRT}/parm/${MOM_INPUT:-MOM_input_template_$OCNRES} > INPUT/MOM_input
-    edit_diag_table < ${PATHRT}/parm/${DIAG_TABLE:-diag_table_template} > diag_table
+    atparse         < ${PATHRT}/parm/${DIAG_TABLE:-diag_table_template} > diag_table
     edit_data_table < ${PATHRT}/parm/data_table_template > data_table
   fi
 fi
+4 −2		.gitmodules
+2 −0		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+2 −0		atmos_model.F90
+8 −6		ccpp/data/GFS_typedefs.F90
+1 −1		ccpp/physics
+471 −217		io/FV3GFS_io.F90