Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into fv3atm_output_dir
Browse files Browse the repository at this point in the history
  • Loading branch information
@DusanJovic-NOAA
DusanJovic-NOAA committed Apr 26, 2024
2 parents 28de119 + 04bbc15 commit e126474
Show file tree
Hide file tree
Showing 104 changed files with 4,377 additions and 4,763 deletions.
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Submodule MOM6 updated 11 files
+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
2 changes: 1 addition & 1 deletion build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:-}"
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240417
export BL_DATE=20240419
93 changes: 86 additions & 7 deletions tests/ci/Jenkinsfile.combined
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ for (label in pullRequest.labels) {
if ((label.matches(node.getLabelString()+"(.*)-BL"))) {
generateBaselineNode += node.getLabelString()
}

}
}

Expand Down Expand Up @@ -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"
Expand All @@ -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/
Expand All @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit e126474

Please sign in to comment.