Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cleanup tests dir
  • Loading branch information
FernandoAndrade-NOAA committed Jan 22, 2026
commit 2694996397299b0b8686ae3eb0d7588091d4e2eb
20 changes: 0 additions & 20 deletions tests/ci/Jenkinsfile.combined
Original file line number Diff line number Diff line change
Expand Up @@ -118,26 +118,6 @@ def generateStage(nodeLabel) {
cd .. && cd .. && cd ..
cp RegressionTests_gaea.log $WORKSPACE/tests/logs/
cd $WORKSPACE/tests/
elif [[ $machine =~ "Hera" ]]
then
echo "Creating baselines on $machine"
export ACCNR=epic
./rt.sh -a ${ACCNR} -c -r -l rt.conf
export DISKNM=/scratch2/NAGAPE/epic/UFS-WM_RT
cd ${DISKNM}/NEMSfv3gfs/
mkdir develop-${BL_DATE}
cd /scratch1/NCEPDEV/stmp4/role.epic/FV3_RT
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 Down
3 changes: 0 additions & 3 deletions tests/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ if [[ ${MAKE_OPT} == *-DDEBUG=ON* ]]; then
CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Debug"
else
CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Release"
if [[ ${MACHINE_ID} == jet ]] && [[ ${RT_COMPILER} == intel ]]; then
CMAKE_FLAGS+=" -DSIMDMULTIARCH=ON"
fi
fi

if [[ ${MACHINE_ID} == wcoss2 ]] || [[ ${MACHINE_ID} == acorn ]]; then
Expand Down
63 changes: 0 additions & 63 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -198,27 +198,6 @@ elif [[ ${MACHINE_ID} = hercules ]]; then
export WAV_tasks_atmw_gdas=248


elif [[ ${MACHINE_ID} = hera ]]; then

export TPN=40

export INPES_dflt=3
export JNPES_dflt=8
export INPES_thrd=3
export JNPES_thrd=4
export INPES_c384=6
export JNPES_c384=8
export THRD_c384=2
export INPES_c768=8
export JNPES_c768=16
export THRD_c768=4

export THRD_cpl_atmw_gdas=2
export INPES_cpl_atmw_gdas=6
export JNPES_cpl_atmw_gdas=8
export WPG_cpl_atmw_gdas=24
export WAV_tasks_atmw_gdas=248

elif [[ ${MACHINE_ID} = ursa ]]; then

export TPN=192
Expand Down Expand Up @@ -266,48 +245,6 @@ elif [[ ${MACHINE_ID} = linux ]]; then
export ICE_tasks_cpl_thrd=10
export WAV_tasks_cpl_thrd=12

elif [[ ${MACHINE_ID} = jet ]]; then

export TPN=24

export INPES_dflt=3
export JNPES_dflt=8
export INPES_thrd=3
export JNPES_thrd=4
export INPES_c384=6
export JNPES_c384=12
export THRD_c384=1
export INPES_c768=8
export JNPES_c768=16
export THRD_c768=2
export WRTTASK_PER_GROUP_c384=84
export WRTTASK_PER_GROUP_c384gdas=88

export THRD_cpl_atmw_gdas=2
export INPES_cpl_atmw_gdas=6
export JNPES_cpl_atmw_gdas=8
export WPG_cpl_atmw_gdas=24
export WAV_tasks_atmw_gdas=240

# run only in weekly test
export THRD_cpl_bmrk=2
export INPES_cpl_bmrk=16
export JNPES_cpl_bmrk=16
export WPG_cpl_bmrk=48
export OCN_tasks_cpl_bmrk=100
export ICE_tasks_cpl_bmrk=48
export WAV_tasks_cpl_bmrk=100
export WLCLK_cpl_bmrk=120

# run only in weekly test
export THRD_cpl_c192=2
export INPES_cpl_c192=12
export JNPES_cpl_c192=16
export WPG_cpl_c192=24
export OCN_tasks_cpl_c192=100
export ICE_tasks_cpl_c192=48
export WAV_tasks_cpl_c192=80
export WLCLK_cpl_c192=120

elif [[ ${MACHINE_ID} = s4 ]]; then

Expand Down
11 changes: 0 additions & 11 deletions tests/detect_machine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ case $(hostname -f) in
gaea6[1-8]) MACHINE_ID=gaeac6 ;; ### gaea61-68
gaea6[1-8].ncrc.gov) MACHINE_ID=gaeac6 ;; ### gaea61-68

hfe0[1-9]) MACHINE_ID=hera ;; ### hera01-09
hfe1[0-2]) MACHINE_ID=hera ;; ### hera10-12
hecflow01) MACHINE_ID=hera ;; ### heraecflow01

ufe01) MACHINE_ID=ursa ;; ### ursa
ufe02) MACHINE_ID=ursa ;; ### ursa
Expand All @@ -44,9 +41,6 @@ case $(hostname -f) in

s4-submit.ssec.wisc.edu) MACHINE_ID=s4 ;; ### s4

fe[1-8]) MACHINE_ID=jet ;; ### jet01-8
tfe[12]) MACHINE_ID=jet ;; ### tjet1-2

Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4

[Hh]ercules-login-[1-4].[Hh][Pp][Cc].[Mm]s[Ss]tate.[Ee]du) MACHINE_ID=hercules ;; ### hercules1-4
Expand Down Expand Up @@ -95,17 +89,12 @@ if [[ -d /lfs/h3 ]]; then
elif [[ -d /lfs/h1 && ! -d /lfs/h3 ]]; then
# We are on NOAA TDS Acorn
MACHINE_ID=acorn
elif [[ -d /mnt/lfs1 ]]; then
# We are on NOAA Jet
MACHINE_ID=jet
elif [[ -d /scratch3 ]]; then
# We are on NOAA Hera or Ursa
mount=$(findmnt -n -o SOURCE /home)
if [[ ${mount} =~ "ursa" ]]; then
# We are on ursa
MACHINE_ID=ursa
elif [[ ${mount} =~ "hera" ]]; then
MACHINE_ID=hera
fi
elif [[ -d /work ]]; then
# We are on MSU Orion or Hercules
Expand Down
54 changes: 0 additions & 54 deletions tests/fv3_conf/fv3_slurm.IN_hera

This file was deleted.

49 changes: 0 additions & 49 deletions tests/fv3_conf/fv3_slurm.IN_jet

This file was deleted.

16 changes: 1 addition & 15 deletions tests/module-setup.sh
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
#!/bin/bash
set -eu

if [[ ${MACHINE_ID} = jet ]] ; then
# We are on NOAA Jet
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/lmod/init/bash
fi
module purge

elif [[ ${MACHINE_ID} = hera ]] ; then
# We are on NOAA Hera
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/lmod/init/bash
fi
module purge

elif [[ ${MACHINE_ID} = ursa ]] ; then
if [[ ${MACHINE_ID} = ursa ]] ; then
# We are on NOAA Ursa
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/lmod/init/bash
Expand Down
Loading