Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make exchanged field names consistent between CMEPS,MOM6,CICE6 #1906

Merged
merged 130 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
c5d202b
update CMEPS
DeniseWorthen Jan 18, 2023
67f6a9d
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Jan 23, 2023
7260ff9
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Jan 25, 2023
65ba673
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Jan 30, 2023
fdf2885
update CMEPS w/ fix for error condition
DeniseWorthen Jan 30, 2023
fc0385f
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Jan 30, 2023
73edc63
[AutoRT] cheyenne.gnu Job Completed.
jkbk2004 Jan 30, 2023
0d182dd
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Jan 30, 2023
e93d8c9
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Jan 30, 2023
64a9953
[AutoRT] gaea.intel Job Completed.
BrianCurtis-NOAA Jan 31, 2023
3ec4ec2
add orion.intel RT log: passed
jkbk2004 Jan 31, 2023
a2174bc
add hera.gnu RT log: passed
jkbk2004 Jan 31, 2023
87371b2
add cheyenne.intel RT log: passed
jkbk2004 Jan 31, 2023
33c02e6
turning off regional_atmaq_debug: time-out issue on cheyenne.intel
jkbk2004 Jan 31, 2023
a0f7518
WCOSS2 Intel RT Log
BrianCurtis-NOAA Feb 1, 2023
59ce60f
Acorn Intel RT Log
BrianCurtis-NOAA Feb 1, 2023
956d5be
update CMEPS and revert gitmodules
DeniseWorthen Feb 1, 2023
2aa5256
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Feb 7, 2023
262a820
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen May 11, 2023
ab45186
update CMEPS and cmakelists
DeniseWorthen May 12, 2023
a894584
update cmeps
DeniseWorthen May 12, 2023
efb01d6
update CMEPS
DeniseWorthen May 15, 2023
7691b4f
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen May 15, 2023
8afba4a
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen May 17, 2023
fc32337
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen May 23, 2023
0ea5a4e
initial sw fix branch
DeniseWorthen May 24, 2023
cd77399
update CMEPS
DeniseWorthen May 24, 2023
55b4ee1
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen May 25, 2023
9a84998
Merge branch 'ufs-community:develop' into feature/fixsw
DeniseWorthen May 25, 2023
42135d5
make pio rearranger=box the default for all tests
DeniseWorthen May 29, 2023
867b8b8
remove file
DeniseWorthen May 29, 2023
7c11791
update cmeps
DeniseWorthen May 31, 2023
d167485
update cmeps
DeniseWorthen May 31, 2023
e0b2aeb
Merge branch 'ufs-community:develop' into feature/fixsw
DeniseWorthen Jun 1, 2023
ca2e06b
Merge branch 'feature/updcmeps' into feature/fixsw
DeniseWorthen Jun 1, 2023
5a94fb1
update cmeps
DeniseWorthen Jun 1, 2023
ceb1a86
update configurations for ocnalb changes
DeniseWorthen Jun 1, 2023
6324fde
subset test results
DeniseWorthen Jun 2, 2023
6d62b41
re-work config options
DeniseWorthen Jun 12, 2023
b22c1b2
Merge branch 'develop' into feature/fixsw
DeniseWorthen Jun 12, 2023
b503412
retest with new config settings
DeniseWorthen Jun 13, 2023
84319f3
Merge branch 'develop' into feature/fixsw
DeniseWorthen Jun 14, 2023
b3e0616
clean up config variables
DeniseWorthen Jun 14, 2023
59670ce
point to feature branchs
DeniseWorthen Jun 21, 2023
ea2ccb4
add HYCOM feature branch
DeniseWorthen Jun 21, 2023
ec659ec
test for tauxy sign changes
DeniseWorthen Jun 21, 2023
c8dcf4d
update CMEPS
DeniseWorthen Jun 21, 2023
91d86eb
commit changes for sensible heat flux
DeniseWorthen Jun 22, 2023
ee65372
add sensible heat changes
DeniseWorthen Jun 22, 2023
4dafbaa
update submodules and fd for evap fields
DeniseWorthen Jun 22, 2023
979a9f2
Merge branch 'ufs-community:develop' into feature/fixsw
DeniseWorthen Jun 22, 2023
4dbfe67
update FV3
DeniseWorthen Jun 22, 2023
5760b5a
backup to pre-evap changes to test
DeniseWorthen Jun 22, 2023
54e3c42
update FV3
DeniseWorthen Jun 22, 2023
ceb6b90
Merge branch 'ufs-community:develop' into feature/signs_units
DeniseWorthen Jun 24, 2023
295cc9b
Merge branch 'ufs-community:develop' into feature/fixsw
DeniseWorthen Jun 24, 2023
18f6e78
update FV3
DeniseWorthen Jun 26, 2023
34ca4d7
swap signs for latent heat flux used by HYCOM
DeniseWorthen Jun 26, 2023
87c7257
test latent flux change for hycom
DeniseWorthen Jun 26, 2023
fc2ab4f
update FV3
DeniseWorthen Jun 27, 2023
3ec64f9
Merge branch 'develop' into feature/signs_units
DeniseWorthen Jun 27, 2023
5b256cc
update FV3
DeniseWorthen Jun 30, 2023
90f9af0
Merge branch 'develop' into feature/signs_units
DeniseWorthen Jun 30, 2023
8b11497
update FV3, CMEPS
DeniseWorthen Jul 7, 2023
6342808
Merge branch 'develop' into feature/signs_units
DeniseWorthen Jul 7, 2023
f767818
remove temporary file
DeniseWorthen Jul 7, 2023
49a1e9f
update FV3
DeniseWorthen Jul 24, 2023
2ff0ec7
Merge remote-tracking branch 'origin/develop' into feature/signs_units
DeniseWorthen Jul 24, 2023
094de8f
update FV3
DeniseWorthen Jul 25, 2023
4a33043
Merge remote-tracking branch 'origin/develop' into feature/signs_units
DeniseWorthen Jul 25, 2023
dd46acd
update CMEPS
DeniseWorthen Jul 25, 2023
0ae2605
Merge remote-tracking branch 'origin/develop' into feature/fixsw
DeniseWorthen Jul 25, 2023
81e7f6a
Merge branch 'ufs-community:develop' into feature/fixsw
DeniseWorthen Jul 26, 2023
f615782
Merge branch 'ufs-community:develop' into feature/fixsw
DeniseWorthen Jul 28, 2023
facfb15
Merge branch 'ufs-community:develop' into feature/fixsw
DeniseWorthen Jul 28, 2023
3ad8fae
update CMEPS
DeniseWorthen Jul 29, 2023
bb9cb92
update FV3
DeniseWorthen Jul 29, 2023
6e6d092
Merge remote-tracking branch 'origin/develop' into feature/signs_units
DeniseWorthen Jul 29, 2023
9b626d0
point to X-exchange branch
DeniseWorthen Jul 29, 2023
f419f7e
update CMEPS
DeniseWorthen Jul 31, 2023
a9832d8
update CMEPS
DeniseWorthen Jul 31, 2023
730846f
Merge branch 'feature/fixsw' into feature/refactor_nemsFldsX
DeniseWorthen Jul 31, 2023
026e7f1
update FV3
DeniseWorthen Jul 31, 2023
0668ac2
Merge remote-tracking branch 'origin/develop' into feature/refactor_n…
DeniseWorthen Aug 1, 2023
76dca11
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Aug 3, 2023
5f60b35
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Aug 7, 2023
26e8eb8
Merge branch 'develop' into feature/refactor_nemsFldsX
DeniseWorthen Sep 1, 2023
8152cdc
fix nems.configure for datm
DeniseWorthen Sep 1, 2023
1c0195e
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Sep 1, 2023
55e71e5
update MOM6
DeniseWorthen Sep 1, 2023
ae00e86
b4b tests w/ updated field names
DeniseWorthen Sep 4, 2023
21dcdbc
b4b test w/ mom emc/dev and new fd_nems.yaml, use_ufsX
DeniseWorthen Sep 6, 2023
a68622d
update CMEPS
DeniseWorthen Sep 9, 2023
38bd625
update CMEPS
DeniseWorthen Sep 9, 2023
7d3ea3a
revert back to MOM6 dev
DeniseWorthen Sep 9, 2023
40ea708
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Sep 9, 2023
d5ac9af
revert test harness
DeniseWorthen Sep 9, 2023
001c859
remove temporary file
DeniseWorthen Sep 9, 2023
63f9898
update CMEPS
DeniseWorthen Sep 9, 2023
3c31a7f
updat CMEPS
DeniseWorthen Sep 10, 2023
7576e5d
add field names to fd_nems.yaml
DeniseWorthen Sep 13, 2023
4f30bb1
set up fldnames branch
DeniseWorthen Sep 13, 2023
165c128
subset of baselines pass except for mediator restarts
DeniseWorthen Sep 14, 2023
1c1f08b
update CICE and MOM6
DeniseWorthen Sep 14, 2023
ad0fb33
all cmeps test pass against test baseline
DeniseWorthen Sep 14, 2023
a618156
baselines are b4b with bl.xfld.7576e5d8
DeniseWorthen Sep 14, 2023
a277853
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Sep 15, 2023
71a33a9
Merge branch 'ufs-community:develop' into feature/fldnames
DeniseWorthen Sep 15, 2023
4d01626
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Sep 19, 2023
d55179b
Merge branch 'ufs-community:develop' into feature/fldnames
DeniseWorthen Sep 19, 2023
d634feb
fix typo in fd_nems.yaml
DeniseWorthen Sep 20, 2023
9fa49bb
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Sep 21, 2023
8d89888
Merge branch 'ufs-community:develop' into feature/fldnames
DeniseWorthen Sep 21, 2023
f15b601
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Sep 21, 2023
610cc2b
Merge branch 'ufs-community:develop' into feature/refactor_nemsFldsX
DeniseWorthen Sep 26, 2023
13940fe
update CICE
DeniseWorthen Sep 26, 2023
c621051
Merge remote-tracking branch 'origin/feature/refactor_nemsFldsX' into…
DeniseWorthen Sep 26, 2023
ac79eae
update CMEPS and revert gitmodules
DeniseWorthen Oct 5, 2023
beac043
Merge branch 'ufs-community:develop' into feature/fldnames
DeniseWorthen Oct 5, 2023
9351096
Update Jenkinsfile-ci pass/fail notification
zach1221 Oct 5, 2023
2880cb8
add orion RT log: passed
jkbk2004 Oct 5, 2023
c7e9235
add hercules RT log: passed
jkbk2004 Oct 5, 2023
4dbae92
add hera RT logs: passed
zach1221 Oct 6, 2023
9a335df
add gaea RT logs: passed
zach1221 Oct 6, 2023
a0d45bf
add jet RT log passed
FernandoAndrade-NOAA Oct 6, 2023
5ea2985
WCOSS2 RT Log
BrianCurtis-NOAA Oct 6, 2023
ff9de0f
Acorn RT Log
BrianCurtis-NOAA Oct 6, 2023
5c55332
update CICE and revert gitmodules
DeniseWorthen Oct 6, 2023
1ee885b
update MOM6 and revert gitmodules
DeniseWorthen Oct 6, 2023
18a7b35
fix spacing in gitmodule
DeniseWorthen Oct 6, 2023
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
2 changes: 1 addition & 1 deletion CICE-interface/CICE
58 changes: 56 additions & 2 deletions tests/ci/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
def commentMessage

void setBuildStatus(String message, String state) {
step([
$class: "GitHubCommitStatusSetter",
reposSource: [$class: "ManuallyEnteredRepositorySource", url: "https://github.com/ufs-community/ufs-weather-model"],
contextSource: [$class: "ManuallyEnteredCommitContextSource", context: "Jenkins-ci ORTs"],
errorHandlers: [[$class: "ChangingBuildStatusErrorHandler", result: "UNSTABLE"]],
statusResultSource: [ $class: "ConditionalStatusResultSource", results: [[$class: "AnyBuildResult", message: message, state: state]] ]
]);
}

def postGitHubCommentWithLogFile(commentMessage) {
script {
withCredentials([string(credentialsId: 'GithubJenkinsNew', variable: 'ACCESS_TOKEN')]) {
def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"

def curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +
"-X POST -d '{\"body\": \"" + commentMessage + "\"}' \\\n" +
"\"" + apiUrl + "\""

def response = sh(script: curlCommand, returnStatus: true)

if (response == 0) {
echo "Comment added successfully to PR #${env.CHANGE_ID}"
} else {
error "Failed to add comment to PR #${env.CHANGE_ID}"
}
}
}
}

pipeline {
agent none

Expand All @@ -12,7 +44,8 @@ pipeline {
steps {
script {
build job: '/ufs-weather-model/ufs-wm-sonarqube', parameters: [
string(name: 'BRANCH_NAME', value: env.CHANGE_BRANCH ?: 'develop')
string(name: 'BRANCH_NAME', value: env.CHANGE_BRANCH ?: 'develop'),
string(name: 'FORK_NAME', value: env.CHANGE_FORK ?: '')
], wait: false
}
}
Expand Down Expand Up @@ -87,7 +120,7 @@ pipeline {

stage('Test') {
steps {
sh 'docker run --rm --env test_name="${TEST_NAME}" --env run_case="${TEST_CASE}" --workdir /home/builder/ufs-weather-model/tests --volume DataVolume:/home/builder/data/NEMSfv3gfs --interactive --shm-size=16gb "${IMG_NAME}"'
sh 'docker run --rm --env test_name="${TEST_NAME}" --env run_case="${TEST_CASE}" --workdir /home/builder/ufs-weather-model/tests --volume DataVolume:/home/builder/data/NEMSfv3gfs --interactive --shm-size=32gb "${IMG_NAME}"'
}
}
}
Expand All @@ -104,4 +137,25 @@ pipeline {
}
}
}
post {
success {
node('built-in') {
setBuildStatus("Build succeeded", "SUCCESS");
}
}
failure {
node('built-in') {
setBuildStatus("Build failed", "FAILURE");
}
}
always {
node('built-in') {
script {
def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "passed" : "failed"
commentMessage = "Jenkins-ci ORTs ${buildResult}"
postGitHubCommentWithLogFile(commentMessage)
}
}
}
}
}
1,086 changes: 543 additions & 543 deletions tests/logs/RegressionTests_acorn.log

Large diffs are not rendered by default.

1,088 changes: 544 additions & 544 deletions tests/logs/RegressionTests_gaea.log

Large diffs are not rendered by default.

1,550 changes: 775 additions & 775 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

1,525 changes: 754 additions & 771 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

980 changes: 490 additions & 490 deletions tests/logs/RegressionTests_jet.log

Large diffs are not rendered by default.

1,158 changes: 579 additions & 579 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

974 changes: 487 additions & 487 deletions tests/logs/RegressionTests_wcoss2.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/parm/fd_nems.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@
- standard_name: Si_vice
alias: mean_ice_volume
canonical_units: m
description: sea-ice export - volume of ice per unit are
description: sea-ice export - volume of ice per unit area
#
- standard_name: Si_snowh
canonical_units: m
Expand Down