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

* update CMEPS w/ fix for error condition * turning off regional_atmaq_debug: time-out issue on cheyenne.intel *update cmeps build to implement check4nans feature using module stored in cdeps repo * make pio rearranger=box the default for all tests * update configurations for ocnalb changes * set the ocean albedo limit in config and use it to set logical flag * albdir and albdif can be set as non-std values in nems.configure will default to 0.07 and 0.06 if not set * swap signs for latent heat flux used by HYCOM * test latent flux change for hycom
ufs-community · Oct 6, 2023 · b95e334 · b95e334
1 parent c2d7026
commit b95e334
Show file tree

Hide file tree

Showing 11 changed files with 4,231 additions and 4,194 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
@@ -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
 
@@ -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
                 }
             }
@@ -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}"'
                         }
                     }
                 }
@@ -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)
+                }
+            }
+        }
+    }
 }
diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/parm/fd_nems.yaml b/tests/parm/fd_nems.yaml
@@ -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