Skip to content

Commit 69619cf

Browse files
SamuelTrahanNOAASamuelTrahanNOAA
committed
Merge remote-tracking branch 'upstream/develop' into error-checking
2 parents bacf7a9 + 0b59ad3 commit 69619cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+2488
-2078
lines changed

‎FV3

‎tests/bl_date.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20240614
1+
export BL_DATE=20240624

‎tests/ci/Jenkinsfile.combined

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def generateStage(nodeLabel) {
326326
GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
327327
GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
328328

329-
curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels -d '{"labels":["$machine-.*RT|$machine-.*BL"]}'
329+
curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}" https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
330330
'''
331331
s3Upload consoleLogLevel: 'INFO', dontSetBuildResultOnFailure: false, dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'noaa-epic-prod-jenkins-artifacts', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: true, noUploadOnFailure: false, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: "**/*tgz*", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: []
332332
currentBuild.result = 'FAILURE'

‎tests/ci/Jenkinsfile.ort

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
pipeline {
2+
agent none
3+
stages {
4+
stage('Run ORTs') {
5+
agent {
6+
label 'built-in'
7+
}
8+
steps {
9+
script {
10+
for (label in pullRequest.labels) {
11+
if ((label.matches("orion"))) {
12+
env.CHOICE_NODE='orion'
13+
}
14+
else if ((label.matches("hera"))) {
15+
env.CHOICE_NODE='hera'
16+
}
17+
else if ((label.matches("hercules"))) {
18+
env.CHOICE_NODE='hercules'
19+
}
20+
else if ((label.matches("jet"))) {
21+
env.CHOICE_NODE='jet'
22+
}
23+
else {
24+
env.CHOICE_NODE='none'
25+
}
26+
}
27+
// Why do I need another if..block, because it just works this way.
28+
29+
if (CHOICE_NODE == 'orion') {
30+
echo "Starting up orion ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
31+
32+
}
33+
else if (CHOICE_NODE == 'jet') {
34+
echo "Starting up jet ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
35+
}
36+
else if (CHOICE_NODE == 'hercules') {
37+
echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
38+
}
39+
else if (CHOICE_NODE == 'hera') {
40+
echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
41+
}
42+
else {
43+
echo "${CHOICE_NODE} is NOT a platform, moving on..."
44+
}
45+
}
46+
}
47+
}
48+
stage('Run ORT on Hera') {
49+
agent {
50+
label "hera"
51+
}
52+
environment {
53+
ACCNR = 'epic'
54+
NODE_PATH = '/scratch2/NAGAPE/epic/role.epic/'
55+
}
56+
steps {
57+
58+
cleanWs()
59+
checkout scm
60+
sh '''
61+
git submodule update --init --recursive
62+
cd tests/fv3_conf
63+
sed 's/#SBATCH --time=.*/#SBATCH --time=02:00:00/g' -i fv3_slurm.IN_hera
64+
cd ..
65+
export machine=${NODE_NAME}
66+
export PATH=$PATH:~/bin
67+
echo $CHANGE_ID
68+
export SSH_ORIGIN=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.repo.ssh_url')
69+
export FORK_BRANCH=$(curl --silent https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/$CHANGE_ID | jq -r '.head.ref')
70+
pwd
71+
sed "s|intel|gnu|g" -i opnReqTest
72+
export ACCNR=epic
73+
./opnReqTest -n regional_control -a ${ACCNR} -c bit,dcp,thr
74+
cd logs/
75+
cp OpnReqTests_regional_control_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
76+
cd ..
77+
./opnReqTest -n cpld_control_nowave_noaero_p8 -a ${ACCNR} -c dbg,rst
78+
cd logs/
79+
cp OpnReqTests_cpld_control_nowave_noaero_p8_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
80+
cd ..
81+
./opnReqTest -n control_p8 -a ${ACCNR} -c std,dbg,bit,mpi,rst,thr,dcp
82+
cd logs/
83+
cp OpnReqTests_control_p8_hera.log /scratch2/NAGAPE/epic/role.epic/jenkins/workspace
84+
git remote -v
85+
git fetch --no-recurse-submodules origin
86+
git reset FETCH_HEAD --hard
87+
cd .. && cd .. && cd ..
88+
cp OpnReqTests_control_p8_hera.log $WORKSPACE/tests/logs/
89+
cp OpnReqTests_regional_control_hera.log $WORKSPACE/tests/logs/
90+
cp OpnReqTests_cpld_control_nowave_noaero_p8_hera.log $WORKSPACE/tests/logs/
91+
cd $WORKSPACE/tests/
92+
git config user.email "ecc.platform@noaa.gov"
93+
git config user.name "epic-cicd-jenkins"
94+
echo "Testing concluded...removing labels for $machine from $GIT_URL"
95+
96+
export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }')
97+
git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
98+
git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
99+
git add logs/OpnReqTests_control_p8_hera.log logs/OpnReqTests_regional_control_hera.log logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
100+
git commit -m "ORT Jobs Completed.\n\n\n on-behalf-of @ufs-community <ecc.platform@noaa.gov>"
101+
git pull sshorigin $FORK_BRANCH
102+
git push sshorigin HEAD:$FORK_BRANCH
103+
'''
104+
}
105+
}
106+
}
107+
}

‎tests/default_vars.sh

+2
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,8 @@ export DO_UGWP_V1_W_GSLDRAG=.false.
624624
export DO_UGWP_V0_OROG_ONLY=.false.
625625
export DO_GSL_DRAG_LS_BL=.false.
626626
export DO_GSL_DRAG_SS=.true.
627+
export DO_GWD_OPT_PSL=.false.
628+
export PSL_GWD_DX_FACTOR=6.0
627629
export DO_GSL_DRAG_TOFD=.false.
628630
export DO_UGWP_V1=.false.
629631
export DO_UGWP_V1_OROG_ONLY=.false.

‎tests/fv3_conf/control_run.IN

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ $WARM_START = .false. ]; then
2323
elif [ "$V2_SFC_FILE" = "true" ]; then
2424
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
2525
else
26-
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127/* ./INPUT/.
26+
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/.
2727
fi
2828
else
2929
mkdir INPUT RESTART

‎tests/fv3_conf/cpld_control_run.IN

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ if [ $IAER = 1011 ]; then
183183
fi
184184

185185
cp @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
186-
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127/oro_data_ls* ./INPUT
187-
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127/oro_data_ss* ./INPUT
186+
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ls* ./INPUT
187+
cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_gfsv17/oro_data_ss* ./INPUT
188188

189189
if [ $IMP_PHYSICS = 8 ]; then
190190
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN CCN_ACTIVATE.BIN

‎tests/logs/OpnReqTests_control_p8_hera.log

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Fri Jun 28 12:40:12 UTC 2024
1+
Sun Jul 7 19:56:59 UTC 2024
22
Start Operation Requirement Test
33

44

5-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
6-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/bit_base_bit_base
5+
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
6+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/bit_base_bit_base
77
Checking test bit_base results ....
88
Moving baseline bit_base files ....
99
Moving sfcf000.nc .........OK
@@ -51,14 +51,14 @@ Moving baseline bit_base files ....
5151
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
5252
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
5353

54-
0: The total amount of wall time = 278.149410
55-
0: The maximum resident set size (KB) = 1448036
54+
0: The total amount of wall time = 280.646356
55+
0: The maximum resident set size (KB) = 1444896
5656

5757
Test bit_base PASS
5858

5959

60-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
61-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/dbg_base_dbg_base
60+
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
61+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/dbg_base_dbg_base
6262
Checking test dbg_base results ....
6363
Moving baseline dbg_base files ....
6464
Moving sfcf000.nc .........OK
@@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
106106
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
107107
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
108108

109-
0: The total amount of wall time = 978.713008
110-
0: The maximum resident set size (KB) = 1435680
109+
0: The total amount of wall time = 1003.437253
110+
0: The maximum resident set size (KB) = 1430112
111111

112112
Test dbg_base PASS
113113

114114

115-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
116-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/dcp_dcp
115+
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
116+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/dcp_dcp
117117
Checking test dcp results ....
118118
Comparing sfcf000.nc .....USING NCCMP......OK
119119
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -160,14 +160,14 @@ Checking test dcp results ....
160160
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
161161
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
162162

163-
0: The total amount of wall time = 249.442600
164-
0: The maximum resident set size (KB) = 1424744
163+
0: The total amount of wall time = 249.484393
164+
0: The maximum resident set size (KB) = 1425876
165165

166166
Test dcp PASS
167167

168168

169-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
170-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/mpi_mpi
169+
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
170+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/mpi_mpi
171171
Checking test mpi results ....
172172
Comparing sfcf000.nc .....USING NCCMP......OK
173173
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -214,14 +214,14 @@ Checking test mpi results ....
214214
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
215215
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
216216

217-
0: The total amount of wall time = 251.855654
218-
0: The maximum resident set size (KB) = 1430024
217+
0: The total amount of wall time = 250.029285
218+
0: The maximum resident set size (KB) = 1435352
219219

220220
Test mpi PASS
221221

222222

223-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
224-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/rst_rst
223+
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
224+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/rst_rst
225225
Checking test rst results ....
226226
Comparing sfcf000.nc .....USING NCCMP......OK
227227
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -268,14 +268,14 @@ Checking test rst results ....
268268
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
269269
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
270270

271-
0: The total amount of wall time = 251.841071
272-
0: The maximum resident set size (KB) = 1423276
271+
0: The total amount of wall time = 249.870001
272+
0: The maximum resident set size (KB) = 1424956
273273

274274
Test rst PASS
275275

276276

277-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
278-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/std_base_std_base
277+
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
278+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/std_base_std_base
279279
Checking test std_base results ....
280280
Moving baseline std_base files ....
281281
Moving sfcf000.nc .........OK
@@ -323,14 +323,14 @@ Moving baseline std_base files ....
323323
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
324324
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK
325325

326-
0: The total amount of wall time = 254.210275
327-
0: The maximum resident set size (KB) = 1432268
326+
0: The total amount of wall time = 247.121930
327+
0: The maximum resident set size (KB) = 1438272
328328

329329
Test std_base PASS
330330

331331

332-
baseline dir = /scratch1/NCEPDEV/stmp4/Zachary.Shrader/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
333-
working dir = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_OPNREQ_TEST/opnReqTest_960194/thr_thr
332+
baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
333+
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_2387923/thr_thr
334334
Checking test thr results ....
335335
Comparing sfcf000.nc .....USING NCCMP......OK
336336
Comparing sfcf021.nc .....USING NCCMP......OK
@@ -377,11 +377,11 @@ Checking test thr results ....
377377
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
378378
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK
379379

380-
0: The total amount of wall time = 248.567157
381-
0: The maximum resident set size (KB) = 1424576
380+
0: The total amount of wall time = 251.892903
381+
0: The maximum resident set size (KB) = 1423700
382382

383383
Test thr PASS
384384

385385
OPERATION REQUIREMENT TEST WAS SUCCESSFUL
386-
Fri Jun 28 13:51:40 UTC 2024
387-
Elapsed time: 01h:11m:29s. Have a nice day!
386+
Sun Jul 7 21:02:25 UTC 2024
387+
Elapsed time: 01h:05m:27s. Have a nice day!

0 commit comments

Comments
 (0)