Merge branch 'ufs-community:develop' into dice_cplhist

NickSzapiro-NOAA · Apr 25, 2024 · 5551178 · 5551178
2 parents 92df055 + 04bbc15
commit 5551178
Show file tree

Hide file tree

Showing 17 changed files with 2,756 additions and 2,414 deletions.
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/build.sh b/build.sh
@@ -26,4 +26,4 @@ for i in ${CMAKE_FLAGS}; do ARR_CMAKE_FLAGS+=("${i}") ; done
 cmake "${UFS_MODEL_DIR}" "${ARR_CMAKE_FLAGS[@]}"
 # Turn off OpenMP threading for parallel builds
 # to avoid exhausting the number of user processes
-OMP_NUM_THREADS=1 make -j "${BUILD_JOBS:-4}" "VERBOSE=${BUILD_VERBOSE:-1}"
+OMP_NUM_THREADS=1 make -j "${BUILD_JOBS:-4}" "VERBOSE=${BUILD_VERBOSE:-}"
diff --git a/tests/ci/Jenkinsfile.combined b/tests/ci/Jenkinsfile.combined
@@ -11,7 +11,6 @@ for (label in pullRequest.labels) {
    if ((label.matches(node.getLabelString()+"(.*)-BL"))) {
      generateBaselineNode += node.getLabelString() 
    }
-
  }
 }
 
@@ -60,6 +59,14 @@ def generateStage(nodeLabel) {
                             chgrp noaa-hpc develop-${BL_DATE}
 		            cd $WORKSPACE/tests
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			    cd logs/
+                            cp RegressionTests_hercules.log /work/noaa/epic/role-epic/jenkins/workspace
+                            git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+			    cp RegressionTests_hercules.log $WORKSPACE/tests/logs/
+                            cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Orion" ]]
                           then
                             echo "Creating baselines on $machine"
@@ -77,24 +84,40 @@ def generateStage(nodeLabel) {
                             chgrp noaa-hpc develop-${BL_DATE}
 			    cd $WORKSPACE/tests
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+                             cd logs/
+                             cp RegressionTests_orion.log /work/noaa/epic/role-epic/jenkins/workspace
+                             git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+			     cp RegressionTests_orion.log $WORKSPACE/tests/logs/
+			     cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Gaea" ]]
                           then 
                             echo "Creating baselines on $machine"
                             ./rt.sh -a ${ACCNR} -c -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
                             unset LD_LIBRARY_PATH
-                            export DISKNM=/lustre/f2/pdata/ncep/role.epic/C5/RT
+                            export DISKNM=/gpfs/f5/epic/world-shared/UFS-WM_RT
                             cd ${DISKNM}/NEMSfv3gfs/
                             mkdir develop-${BL_DATE}
-                            cd  /lustre/f2/scratch/role.epic/FV3_RT
+                            cd /gpfs/f5/epic/scratch/role.epic/FV3_RT
                             rsync -a REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE}
                             cd ${DISKNM}/NEMSfv3gfs/
                             chgrp ncep develop-${BL_DATE}
 		            cd $WORKSPACE/tests
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			    cd logs/
+			    cp RegressionTests_gaea.log /gpfs/f5/epic/scratch/role.epic/jenkins/workspace
+			    git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+			    cp RegressionTests_gaea.log $WORKSPACE/tests/logs/
+			    cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Hera" ]]
                           then
                             echo "Creating baselines on $machine"
-                            export ACCNR=nems
+                            export ACCNR=epic
                             ./rt.sh -a ${ACCNR} -c -r -l rt.conf
                             export DISKNM=/scratch2/NAGAPE/epic/UFS-WM_RT
 			    cd ${DISKNM}/NEMSfv3gfs/
@@ -103,6 +126,14 @@ def generateStage(nodeLabel) {
 			    rsync -a REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE}
 			    cd $WORKSPACE/tests
                             ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			     cd logs/
+			     cp RegressionTests_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
+			     git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+			     cp RegressionTests_hera.log $WORKSPACE/tests/logs/
+			     cd $WORKSPACE/tests/
                            elif [[ $machine =~ "Derecho" ]]
                            then
                              echo "Creating baselines on $machine"
@@ -115,6 +146,14 @@ def generateStage(nodeLabel) {
 			     rsync -a REGRESSION_TEST/ ${DISKNM}/NEMSfv3gfs/develop-${BL_DATE}
 			     cd $WORKSPACE/tests
                              ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			     cd logs/
+			     cp RegressionTests_derecho.log /glade/derecho/scratch/epicufsrt/jenkins/workspace
+			     git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+                             cp RegressionTests_derecho.log $WORKSPACE/tests/logs/
+                             cd $WORKSPACE/tests/
                           else
                             echo "Creating baselines on $machine"
                             ./rt.sh -a ${ACCNR} -c -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
@@ -159,32 +198,72 @@ def generateStage(nodeLabel) {
                             ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
                           elif [[ $machine =~ "Hercules" ]]
                           then
-                           echo "Running regression tests on $machine"
+                          echo "Running regression tests on $machine"
                             export dprefix=/work2/noaa/$ACCNR/$USER
                             sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
                             export ACCNR=epic
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+                            cd logs/
+                            cp RegressionTests_hercules.log /work/noaa/epic/role-epic/jenkins/workspace
+                            git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+                            cp RegressionTests_hercules.log $WORKSPACE/tests/logs/
+                            cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Orion" ]]
                           then
                            echo "Running regression tests on $machine"
                             export dprefix=/work2/noaa/$ACCNR/$USER
                             sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+                             cd logs/
+                             cp RegressionTests_orion.log /work/noaa/epic/role-epic/jenkins/workspace
+                             git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+			     cp RegressionTests_orion.log $WORKSPACE/tests/logs/
+			     cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Gaea" ]]
                           then 
                            echo "Running regression tests on $machine"
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
                             unset LD_LIBRARY_PATH
+			    cd logs/
+			    cp RegressionTests_gaea.log /gpfs/f5/epic/scratch/role.epic/jenkins/workspace
+			    git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+			    cp RegressionTests_gaea.log $WORKSPACE/tests/logs/
+			    cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Hera" ]]
                           then
                            echo "Running regression tests on $machine"
-                           export ACCNR=nems
-                          ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+                             export ACCNR=epic
+                             ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			     cd logs/
+			     cp RegressionTests_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
+			     git remote -v
+                             git fetch --no-recurse-submodules origin
+                             git reset FETCH_HEAD --hard
+                             cd .. && cd .. && cd ..
+			     cp RegressionTests_hera.log $WORKSPACE/tests/logs/
+			     cd $WORKSPACE/tests/
 			  elif [[ $machine =~ "Derecho" ]]
                           then
                            echo "Running regression tests on $machine"
                            export ACCNR=nral0032
                            ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log
+			    cd logs/
+			    cp RegressionTests_derecho.log /glade/derecho/scratch/epicufsrt/jenkins/workspace
+			    git remote -v
+                            git fetch --no-recurse-submodules origin
+                            git reset FETCH_HEAD --hard
+                            cd .. && cd .. && cd ..
+                            cp RegressionTests_derecho.log $WORKSPACE/tests/logs/
+                            cd $WORKSPACE/tests/
                           else
                            echo "Running regression tests on $machine"
                            ./rt.sh -a ${ACCNR} -r -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log

diff --git a/tests/fv3_conf/fv3_slurm.IN_hera b/tests/fv3_conf/fv3_slurm.IN_hera
@@ -15,9 +15,9 @@ date_s_start=$(date +%s)
 echo -n "${date_s_start}," > job_timestamp.txt
 
 set +x
-#MACHINE_ID=hera
+export MACHINE_ID=hera
 source ./module-setup.sh
-module use "@[PWD]/modulefiles"
+module use "${PWD}/modulefiles"
 module load modules.fv3
 module list
 set -x
@@ -27,7 +27,8 @@ echo "Model started: ${date_start}"
 
 export MPI_TYPE_DEPTH=20
 export OMP_STACKSIZE=512M
-export OMP_NUM_THREADS="@[THRD]"
+# shellcheck disable=SC2125
+export OMP_NUM_THREADS=@[THRD]
 export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
 export ESMF_RUNTIME_PROFILE=ON
 export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
@@ -37,7 +38,8 @@ export PSM_SHAREDCONTEXTS=1
 # Avoid job errors because of filesystem synchronization delays
 sync && sleep 1
 
-srun --label -n "@[TASKS]" ./fv3.exe
+# shellcheck disable=SC2102
+srun --label -n @[TASKS] ./fv3.exe
 
 date_end=$(date)
 echo "Model ended: ${date_end}"

diff --git a/tests/logs/OpnReqTests_control_p8_hera.log b/tests/logs/OpnReqTests_control_p8_hera.log
@@ -1,9 +1,9 @@
-Fri Apr 19 19:57:57 UTC 2024
+Wed Apr 24 12:38:17 UTC 2024
 Start Operation Requirement Test
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_669166/bit_base_bit_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/bit_base_bit_base
 Checking test bit_base results ....
 Moving baseline bit_base files ....
  Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 272.557598
-  0: The maximum resident set size (KB)                   = 1254932
+  0: The total amount of wall time                        = 276.967845
+  0: The maximum resident set size (KB)                   = 1253216
 
 Test bit_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_669166/dbg_base_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/dbg_base_dbg_base
 Checking test dbg_base results ....
 Moving baseline dbg_base files ....
  Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 959.903328
-  0: The maximum resident set size (KB)                   = 1232448
+  0: The total amount of wall time                        = 960.176678
+  0: The maximum resident set size (KB)                   = 1233464
 
 Test dbg_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_669166/dcp_dcp
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/dcp_dcp
 Checking test dcp results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 241.225092
-  0: The maximum resident set size (KB)                   = 1230688
+  0: The total amount of wall time                        = 238.109868
+  0: The maximum resident set size (KB)                   = 1235600
 
 Test dcp PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_669166/mpi_mpi
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/mpi_mpi
 Checking test mpi results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 236.258585
-  0: The maximum resident set size (KB)                   = 1236816
+  0: The total amount of wall time                        = 239.999110
+  0: The maximum resident set size (KB)                   = 1231020
 
 Test mpi PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_669166/rst_rst
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/rst_rst
 Checking test rst results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 235.269569
-  0: The maximum resident set size (KB)                   = 1231588
+  0: The total amount of wall time                        = 241.494846
+  0: The maximum resident set size (KB)                   = 1230996
 
 Test rst PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_669166/std_base_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/std_base_std_base
 Checking test std_base results ....
 Moving baseline std_base files ....
  Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
  Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 240.429501
-  0: The maximum resident set size (KB)                   = 1232412
+  0: The total amount of wall time                        = 240.187367
+  0: The maximum resident set size (KB)                   = 1237016
 
 Test std_base PASS
 
 
 baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_669166/thr_thr
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_1818248/thr_thr
 Checking test thr results ....
  Comparing sfcf000.nc .....USING NCCMP......OK
  Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
 
-  0: The total amount of wall time                        = 237.774632
-  0: The maximum resident set size (KB)                   = 1232820
+  0: The total amount of wall time                        = 239.880609
+  0: The maximum resident set size (KB)                   = 1228084
 
 Test thr PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Apr 19 20:59:04 UTC 2024
-Elapsed time: 01h:01m:08s. Have a nice day!
+Wed Apr 24 13:54:57 UTC 2024
+Elapsed time: 01h:16m:40s. Have a nice day!
+119 −21		config_src/drivers/nuopc_cap/mom_cap.F90
+8 −1		config_src/drivers/nuopc_cap/mom_cap_methods.F90
+13 −2		config_src/infra/FMS1/MOM_domain_infra.F90
+10 −0		config_src/infra/FMS2/MOM_coms_infra.F90
+14 −3		config_src/infra/FMS2/MOM_domain_infra.F90
+4 −4		src/core/MOM.F90
+319 −18		src/framework/MOM_domains.F90
+5 −1		src/framework/MOM_netcdf.F90
+1 −1		src/ice_shelf/MOM_ice_shelf.F90
+1 −1		src/ocean_data_assim/MOM_oda_driver.F90
+314 −252		src/parameterizations/lateral/MOM_hor_visc.F90