ufs-community · zach1221 · Aug 14, 2023 · Jun 21, 2023 · Jun 21, 2023 · Jun 21, 2023
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/DeniseWorthen/fv3atm
+  branch = feature/signs_units
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
@@ -16,12 +18,16 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CMEPS
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS
+  branch = feature/signs_units
 [submodule "HYCOM"]
   path = HYCOM-interface/HYCOM
-  url = https://github.com/NOAA-EMC/HYCOM-src
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/HYCOM-src
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/HYCOM-src
+  branch = feature/signs_units
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
   url = https://github.com/NOAA-EMC/MOM6

diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/FV3 b/FV3
diff --git a/HYCOM-interface/HYCOM b/HYCOM-interface/HYCOM
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20230804
+export BL_DATE=20230809
 
diff --git a/tests/ci/Dockerfile b/tests/ci/Dockerfile
@@ -1,4 +1,4 @@
-From noaaepic/ubuntu20.04-gnu9.3-hpc-stack:v1.2
+From noaaepic/ubuntu20.04-gnu9.3-hpc-stack:v2.0
 
 CMD ["/bin/bash"]
 

diff --git a/tests/compare_ncfile.py b/tests/compare_ncfile.py
diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -132,7 +132,7 @@ RUN | rrfs_v1beta                                       |
 RUN | rrfs_v1nssl                                       |                            | baseline |
 RUN | rrfs_v1nssl_nohailnoccn                           |                            | baseline |
 RUN | rrfs_smoke_conus13km_hrrr_warm                    |                            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm_qr                 |                            |          |
+RUN | rrfs_smoke_conus13km_hrrr_warm_qr                 | - cheyenne                            |          |
 RUN | rrfs_smoke_conus13km_hrrr_warm_2threads           |                            |          |
 RUN | rrfs_conus13km_hrrr_warm                          |                            | baseline |
 RUN | rrfs_smoke_conus13km_radar_tten_warm              |                            | baseline |
@@ -141,7 +141,7 @@ RUN | rrfs_smoke_conus13km_radar_tten_warm              |
 #RUN | rrfs_smoke_conus13km_hrrr_warm_restart           |                            |          | rrfs_smoke_conus13km_hrrr_warm
 # Just to make sure restart doesn't crash again:
 RUN | rrfs_smoke_conus13km_hrrr_warm_restart_mismatch   |                            | baseline | rrfs_smoke_conus13km_hrrr_warm
-RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch |                           |          | rrfs_smoke_conus13km_hrrr_warm_qr
+RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | - cheyenne                          |          | rrfs_smoke_conus13km_hrrr_warm_qr
 
 COMPILE | csawmg | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | | fv3 |
 RUN | control_csawmg                                    | - gaea.intel               | baseline |
@@ -206,9 +206,9 @@ RUN | hrrr_control_restart_qr_dyn32_phy32               |
 
 COMPILE | rrfs_dyn32_phy32_faster | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DFASTER=ON | | fv3 |
 RUN | rrfs_smoke_conus13km_fast_phy32                   |                            | baseline |
-RUN | rrfs_smoke_conus13km_fast_phy32_qr                |                            | baseline |
+RUN | rrfs_smoke_conus13km_fast_phy32_qr                | - cheyenne                            | baseline |
 RUN | rrfs_smoke_conus13km_fast_phy32_restart_mismatch  |                            | baseline | rrfs_smoke_conus13km_fast_phy32
-RUN | rrfs_smoke_conus13km_fast_phy32_restart_qr_mismatch |                          |          | rrfs_smoke_conus13km_fast_phy32_qr
+RUN | rrfs_smoke_conus13km_fast_phy32_restart_qr_mismatch | - cheyenne                          |          | rrfs_smoke_conus13km_fast_phy32_qr
 
 COMPILE | rrfs_dyn64_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON | | fv3 |
 RUN | rap_control_dyn64_phy32                           |                            | baseline |
@@ -334,7 +334,7 @@ RUN | hrrr_control_restart                              | + hera cheyenne
 RUN | hrrr_control_restart_qr                           | + hera cheyenne            |          | hrrr_control_qr
 RUN | rrfs_v1beta                                       | + hera cheyenne            | baseline |
 RUN | rrfs_smoke_conus13km_hrrr_warm                    | + hera cheyenne            | baseline |
-RUN | rrfs_smoke_conus13km_hrrr_warm_qr                 | + hera cheyenne            |          |
+RUN | rrfs_smoke_conus13km_hrrr_warm_qr                 | + hera                     |          |
 RUN | rrfs_smoke_conus13km_hrrr_warm_2threads           | + hera cheyenne            |          |
 RUN | rrfs_smoke_conus13km_radar_tten_warm              | + hera cheyenne            | baseline |
 RUN | rrfs_conus13km_hrrr_warm                          | + hera cheyenne            | baseline |
@@ -343,7 +343,7 @@ RUN | rrfs_conus13km_hrrr_warm                          | + hera cheyenne
 #RUN | rrfs_smoke_conus13km_hrrr_warm_restart           | + hera cheyenne            |          | rrfs_smoke_conus13km_hrrr_warm
 # Just to make sure restart doesn't crash again:
 RUN | rrfs_smoke_conus13km_hrrr_warm_restart_mismatch   | + hera cheyenne            | baseline | rrfs_smoke_conus13km_hrrr_warm
-RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | + hera cheyenne           |          | rrfs_smoke_conus13km_hrrr_warm_qr
+RUN | rrfs_smoke_conus13km_hrrr_warm_restart_qr_mismatch | + hera                    |          | rrfs_smoke_conus13km_hrrr_warm_qr
 
 ### CCPP DEBUG tests ###
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
@@ -383,9 +383,9 @@ RUN | rap_restart_dyn32_phy32                           | + hera cheyenne
 RUN | hrrr_control_restart_dyn32_phy32                  | + hera cheyenne            |          | hrrr_control_dyn32_phy32
 RUN | hrrr_control_restart_qr_dyn32_phy32               | + hera cheyenne            |          | hrrr_control_qr_dyn32_phy32
 RUN | rrfs_smoke_conus13km_phy32                        | + hera cheyenne            | baseline |
-RUN | rrfs_smoke_conus13km_phy32_qr                     | + hera cheyenne            | baseline |
+RUN | rrfs_smoke_conus13km_phy32_qr                     | + hera                     | baseline |
 RUN | rrfs_smoke_conus13km_phy32_restart_mismatch       | + hera cheyenne            | baseline | rrfs_smoke_conus13km_phy32
-RUN | rrfs_smoke_conus13km_phy32_restart_qr_mismatch    | + hera cheyenne            |          | rrfs_smoke_conus13km_phy32_qr
+RUN | rrfs_smoke_conus13km_phy32_restart_qr_mismatch    | + hera            |          | rrfs_smoke_conus13km_phy32_qr
 
 COMPILE | atm_dyn64_phy32 | gnu | -DAPP=ATM -DCCPP_32BIT=ON | + hera cheyenne | fv3 |
 RUN | rap_control_dyn64_phy32                           | + hera cheyenne            | baseline |

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -347,28 +347,19 @@ check_results() {
         fi
 
         if [[ $d -eq 1 && ${i##*.} == 'nc' ]] ; then
-          if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ wcoss2 || ${MACHINE_ID} =~ acorn || ${MACHINE_ID} =~ cheyenne || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ s4 || ${MACHINE_ID} =~ noaacloud ]] ; then
+          if [[ " orion hera wcoss2 acorn cheyenne gaea jet s4 noaacloud " =~ " ${MACHINE_ID} " ]]; then
             printf ".......ALT CHECK.." >> ${RT_LOG}
             printf ".......ALT CHECK.."
-            if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ cheyenne ]] ; then
               if [[ $CMP_DATAONLY == false ]]; then
                 nccmp -d -S -q -f -g -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
               else
                 nccmp -d -S -q -f -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
               fi
               if [[ $d -ne 0 && $d -ne 1 ]]; then
-		  echo "....ERROR" >> ${RT_LOG}
-		  echo "....ERROR"
-		  exit 1
+                echo "....ERROR" >> ${RT_LOG}
+                echo "....ERROR"
+                exit 1
               fi
-            else
-              ${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}_${RT_COMPILER}/$i ${RUNDIR}/$i > compare_ncfile.log 2>&1 && d=$? || d=$?
-	      if [[ $d -eq 1 ]]; then
-		  echo "....ERROR" >> ${RT_LOG}
-		  echo "....ERROR"
-		  exit 1
-              fi
-            fi
           fi
         fi
 
@@ -635,11 +626,11 @@ ecflow_run() {
     echo "ecflow_server is NOT running on ${ECF_HOST}:${ECF_PORT}"
     if [[ ${MACHINE_ID} == wcoss2 || ${MACHINE_ID} == acorn ]]; then
       if [[ "${HOST::1}" == "a" ]]; then
-	export ECF_HOST=aecflow01
+    export ECF_HOST=aecflow01
       elif [[ "${HOST::1}" == "c" ]]; then
-	export ECF_HOST=cdecflow01
+    export ECF_HOST=cdecflow01
       elif [[ "${HOST::1}" == "d" ]]; then
-	export ECF_HOST=ddecflow01
+    export ECF_HOST=ddecflow01
       fi
       MYCOMM="bash -l -c \"module load ecflow && ecflow_start.sh -p ${ECF_PORT} \""
       ssh $ECF_HOST "${MYCOMM}"

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -96,13 +96,11 @@ cp ${PATHTR}/modulefiles/ufs_common*               ./modulefiles/.
 # Get the shell file that loads the "module" command and purges modules:
 cp ${PATHRT}/module-setup.sh                       module-setup.sh
 
-if [[ $MACHINE_ID == wcoss2 ]] || [[ $MACHINE_ID == acorn ]] ; then
-  # for compare_ncfile.py
-  module load gcc/10.3.0 python/3.8.6
-fi
-
 # load nccmp module
-if [[ $MACHINE_ID == hera ]] || [[ $MACHINE_ID == orion ]] || [[ $MACHINE_ID == gaea ]] || [[ $MACHINE_ID == jet ]] || [[ $MACHINE_ID == cheyenne ]]; then
+if [[ " hera orion gaea jet cheyenne acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
+  if [[ " wcoss2 acorn " =~ " ${MACHINE_ID} " ]] ; then
+    module load intel/19.1.3.304 netcdf/4.7.4
+  fi
   module load nccmp
 fi
+11 −3		mediator/esmFldsExchange_nems_mod.F90
+3 −3		mediator/med.F90
+2 −3		mediator/med_phases_prep_atm_mod.F90
+2 −26		mediator/med_phases_prep_ocn_mod.F90
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		export BL_DATE=20230804
		export BL_DATE=20230809