From 610e8ae6c2fe158f9c9316a0e84cf47022116f27 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 20 Sep 2023 08:33:55 -0400
Subject: [PATCH 001/103] Update Jenkinsfile to add log automation

---
 tests/ci/Jenkinsfile | 60 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 8e89f1dc10..1906014570 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -1,3 +1,46 @@
+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 Build Result"],
+        errorHandlers: [[$class: "ChangingBuildStatusErrorHandler", result: "UNSTABLE"]],
+        statusResultSource: [ $class: "ConditionalStatusResultSource", results: [[$class: "AnyBuildResult", message: message, state: state]] ]
+    ]);
+}
+
+def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
+    script {
+        writeFile file: logFilePath, text: currentBuild.rawBuild.getLog(100000) 
+        
+        def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
+        def headers = [
+            "Authorization": "token GitHubJenkins",
+            "User-Agent": "Jenkins",
+            "Content-Type": "application/json"
+        ]
+
+        def payload = [
+            body: commentMessage,
+            file: readFile(logFilePath)
+        ]
+
+        def response = httpRequest(
+            acceptType: 'APPLICATION_JSON',
+            contentType: 'APPLICATION_JSON',
+            httpMode: 'POST',
+            requestBody: jsonToString(payload),
+            url: apiUrl,
+            customHeaders: headers
+        )
+
+        if (response.getResponseCode() == 201) {
+            echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
+        } else {
+            error "Failed to add comment with log file to PR #${env.CHANGE_ID}: ${response.getResponseCode()} - ${response.getResponseMessage()}"
+        }
+    }
+}
+
 pipeline {
     agent none
 
@@ -104,4 +147,21 @@ pipeline {
             }
         }
     }
+    post {
+        success {
+            setBuildStatus("Build succeeded", "SUCCESS");
+        }
+        failure {
+            setBuildStatus("Build failed", "FAILURE");
+        }
+        always {
+            script {
+                node('master') {
+                    def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
+                    def commentMessage = "Build log for this run: ${buildResult}"
+                    postGitHubCommentWithLogFile(commentMessage, "jenkins_console_log.txt")
+                }
+            }
+        }
+    }    
 }

From 12b6a43b63c5fb7314d0930c64f2ceb8a2017fc3 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 20 Sep 2023 13:53:30 -0400
Subject: [PATCH 002/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 1906014570..4800d60fe2 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -55,7 +55,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
                 }
             }

From 1d325b24dbc4e197c60ec33e7abac440ad49227f Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 20 Sep 2023 14:07:22 -0400
Subject: [PATCH 003/103] Update Jenkinsfile replace master node

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 4800d60fe2..b669ace74a 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -157,7 +157,7 @@ pipeline {
         }
         always {
             script {
-                node('master') {
+                node('Built-In Node')
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"
                     postGitHubCommentWithLogFile(commentMessage, "jenkins_console_log.txt")

From 6dd99937f89703731fd56c18da0ee50eaacace40 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 21 Sep 2023 10:48:07 -0400
Subject: [PATCH 004/103] Update Jenkinsfile remove extra bracket

---
 tests/ci/Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index b669ace74a..5a6d5683f7 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -164,5 +164,4 @@ pipeline {
                 }
             }
         }
-    }    
-}
+    }

From e07b494dd705172ea05d05b5ddeeca00a91d853b Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:26:41 -0400
Subject: [PATCH 005/103] Update Jenkinsfile swap script and node

---
 tests/ci/Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 5a6d5683f7..cfa927676f 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -156,8 +156,8 @@ pipeline {
             setBuildStatus("Build failed", "FAILURE");
         }
         always {
-            script {
-                node('Built-In Node')
+            node('Built-In Node')
+                script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"
                     postGitHubCommentWithLogFile(commentMessage, "jenkins_console_log.txt")

From 0a49df8f16fa949d4beadce3370af0744b7c8b6f Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 25 Sep 2023 06:57:16 -0500
Subject: [PATCH 006/103] Update Jenkinsfile-add parentheses

---
 tests/ci/Jenkinsfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index cfa927676f..b889ca0e32 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -150,13 +150,17 @@ pipeline {
     }
     post {
         success {
-            setBuildStatus("Build succeeded", "SUCCESS");
+            node('Built-In Node') {
+                setBuildStatus("Build succeeded", "SUCCESS");
+            }
         }
         failure {
-            setBuildStatus("Build failed", "FAILURE");
+            node('Built-In Node') {            
+                setBuildStatus("Build failed", "FAILURE");
+            }
         }
         always {
-            node('Built-In Node')
+            node('Built-In Node') {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"
@@ -165,3 +169,4 @@ pipeline {
             }
         }
     }
+}

From ca7c03240bfa2cd545e225f775899353de90a659 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 26 Sep 2023 10:27:58 -0400
Subject: [PATCH 007/103] Update Jenkinsfile change node name

---
 tests/ci/Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index b889ca0e32..b5f876586a 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -150,17 +150,17 @@ pipeline {
     }
     post {
         success {
-            node('Built-In Node') {
+            node('${JENKINS_URL}/computer/(built-in)/') {
                 setBuildStatus("Build succeeded", "SUCCESS");
             }
         }
         failure {
-            node('Built-In Node') {            
+            node('${JENKINS_URL}/computer/(built-in)/') {
                 setBuildStatus("Build failed", "FAILURE");
             }
         }
         always {
-            node('Built-In Node') {
+            node('${JENKINS_URL}/computer/(built-in)/') {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"

From fd845817d407d13ec433c33f2dd964160e9a7c05 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:10:18 -0400
Subject: [PATCH 008/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index b5f876586a..7e55468032 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -160,7 +160,7 @@ pipeline {
             }
         }
         always {
-            node('${JENKINS_URL}/computer/(built-in)/') {
+            node(null) {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"

From d74d8dd527f66d8d03fec9a70c3477c392376b6a Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:12:36 -0400
Subject: [PATCH 009/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 7e55468032..fc16ebf32e 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -150,17 +150,17 @@ pipeline {
     }
     post {
         success {
-            node('${JENKINS_URL}/computer/(built-in)/') {
+            node('Jenkins') {
                 setBuildStatus("Build succeeded", "SUCCESS");
             }
         }
         failure {
-            node('${JENKINS_URL}/computer/(built-in)/') {
+            node('Jenkins') {
                 setBuildStatus("Build failed", "FAILURE");
             }
         }
         always {
-            node(null) {
+            node('Jenkins') {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"

From c8354ea8442ada78ee828d5ad6e2f8d6c7873ba7 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:16:20 -0400
Subject: [PATCH 010/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index fc16ebf32e..3573211147 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -149,24 +149,21 @@ pipeline {
         }
     }
     post {
+        agent {
+                    label 'Jenkins'
+        }
         success {
-            node('Jenkins') {
                 setBuildStatus("Build succeeded", "SUCCESS");
-            }
         }
         failure {
-            node('Jenkins') {
                 setBuildStatus("Build failed", "FAILURE");
-            }
         }
         always {
-            node('Jenkins') {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"
                     postGitHubCommentWithLogFile(commentMessage, "jenkins_console_log.txt")
                 }
-            }
         }
     }
 }

From c213a99f1aa9ed51d7e7c3d2fcbe6ecbeaba7dcb Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:17:56 -0400
Subject: [PATCH 011/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 3573211147..b14cd4f319 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -149,17 +149,23 @@ pipeline {
         }
     }
     post {
-        agent {
-                    label 'Jenkins'
-        }
         success {
-                setBuildStatus("Build succeeded", "SUCCESS");
+            agent {
+                    label 'Jenkins'
+            }    
+            setBuildStatus("Build succeeded", "SUCCESS");
         }
         failure {
-                setBuildStatus("Build failed", "FAILURE");
+            agent {
+                    label 'Jenkins'
+            }
+            setBuildStatus("Build failed", "FAILURE");
         }
         always {
-                script {
+            agent {
+                    label 'Jenkins'
+            }    
+            script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"
                     postGitHubCommentWithLogFile(commentMessage, "jenkins_console_log.txt")

From fae11b6231c4eae6c714d3b2bd71f60adc160d11 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:24:08 -0400
Subject: [PATCH 012/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index b14cd4f319..781996f8e1 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -150,26 +150,23 @@ pipeline {
     }
     post {
         success {
-            agent {
-                    label 'Jenkins'
-            }    
-            setBuildStatus("Build succeeded", "SUCCESS");
+            node('built-in') { 
+                setBuildStatus("Build succeeded", "SUCCESS");
+            }
         }
         failure {
-            agent {
-                    label 'Jenkins'
+            node('built-in') {
+                setBuildStatus("Build failed", "FAILURE");
             }
-            setBuildStatus("Build failed", "FAILURE");
         }
         always {
-            agent {
-                    label 'Jenkins'
-            }    
-            script {
+            node('built-in') {
+                script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"
                     postGitHubCommentWithLogFile(commentMessage, "jenkins_console_log.txt")
                 }
+            }
         }
     }
 }

From 17194b3fa83f0955e8df0c5431f493ab61fa788b Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:28:32 -0400
Subject: [PATCH 013/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 781996f8e1..a76129aa10 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -10,7 +10,7 @@ void setBuildStatus(String message, String state) {
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
-        writeFile file: logFilePath, text: currentBuild.rawBuild.getLog(100000) 
+        writeFile file: logFilePath, text: currentBuild.rawBuild.getLog(100000).toString() 
         
         def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
         def headers = [

From e637097575d1ce00586b42bc24a39b687948c1fb Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:37:31 -0400
Subject: [PATCH 014/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index a76129aa10..d8ff6baf43 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -10,7 +10,7 @@ void setBuildStatus(String message, String state) {
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
-        writeFile file: logFilePath, text: currentBuild.rawBuild.getLog(100000).toString() 
+        writeFile file: logFilePath, text: currentBuild.rawBuild.logFile.text
         
         def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
         def headers = [

From 9bfe3924ef44c2016e9e5816b21962e2c84c9d1b Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:49:25 -0400
Subject: [PATCH 015/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index d8ff6baf43..6afdaad9de 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -12,6 +12,8 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
         writeFile file: logFilePath, text: currentBuild.rawBuild.logFile.text
         
+        pullRequest.comment(commentMessage)
+        
         def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
         def headers = [
             "Authorization": "token GitHubJenkins",
@@ -28,7 +30,7 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
             acceptType: 'APPLICATION_JSON',
             contentType: 'APPLICATION_JSON',
             httpMode: 'POST',
-            requestBody: jsonToString(payload),
+            requestBody: payload,
             url: apiUrl,
             customHeaders: headers
         )

From 78701db17bee2f7cd87ca794740d5b2fdcedbdaf Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:54:39 -0400
Subject: [PATCH 016/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 6afdaad9de..98d6cfe7aa 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -10,9 +10,15 @@ void setBuildStatus(String message, String state) {
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
+          def repository_url = scm.userRemoteConfigs[0].url
+          def repository_name = repository_url.replace("git@github.com:","").replace(".git","")
+
+          withCredentials([string(credentialsId: 'GitHubJenkins', variable: 'GITHUB_TOKEN')]) {
+            sh "curl -s -H \"Authorization: token ${GITHUB_TOKEN}\" -X POST -d '{\"body\": \"${commentMessage}\"}' \"https://api.github.com/repos/${repository_name}/issues/${ghprbPullId}/comments\""
+          }
+        
         writeFile file: logFilePath, text: currentBuild.rawBuild.logFile.text
         
-        pullRequest.comment(commentMessage)
         
         def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
         def headers = [

From 40930bf8f45d25d564887ec98c083c2365b04c5a Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Thu, 28 Sep 2023 09:57:44 -0400
Subject: [PATCH 017/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 98d6cfe7aa..a8fde53b59 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -10,13 +10,7 @@ void setBuildStatus(String message, String state) {
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
-          def repository_url = scm.userRemoteConfigs[0].url
-          def repository_name = repository_url.replace("git@github.com:","").replace(".git","")
 
-          withCredentials([string(credentialsId: 'GitHubJenkins', variable: 'GITHUB_TOKEN')]) {
-            sh "curl -s -H \"Authorization: token ${GITHUB_TOKEN}\" -X POST -d '{\"body\": \"${commentMessage}\"}' \"https://api.github.com/repos/${repository_name}/issues/${ghprbPullId}/comments\""
-          }
-        
         writeFile file: logFilePath, text: currentBuild.rawBuild.logFile.text
         
         
@@ -36,7 +30,7 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
             acceptType: 'APPLICATION_JSON',
             contentType: 'APPLICATION_JSON',
             httpMode: 'POST',
-            requestBody: payload,
+            requestBody: commentMessage,
             url: apiUrl,
             customHeaders: headers
         )

From 27f428e950da467724b130a022c0880f1ffa59e4 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 07:17:13 -0500
Subject: [PATCH 018/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index a8fde53b59..28ddac4c54 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -30,11 +30,12 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
             acceptType: 'APPLICATION_JSON',
             contentType: 'APPLICATION_JSON',
             httpMode: 'POST',
-            requestBody: commentMessage,
+            requestBody: jsonSerialize(payload), 
             url: apiUrl,
             customHeaders: headers
         )
 
+
         if (response.getResponseCode() == 201) {
             echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
         } else {

From 9c1217dd394e444ea31c7e4a62e09fe498b1599d Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 07:19:38 -0500
Subject: [PATCH 019/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 28ddac4c54..f842ebaf63 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -25,17 +25,18 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
             body: commentMessage,
             file: readFile(logFilePath)
         ]
-
+        
         def response = httpRequest(
             acceptType: 'APPLICATION_JSON',
             contentType: 'APPLICATION_JSON',
             httpMode: 'POST',
-            requestBody: jsonSerialize(payload), 
+            requestBody: JsonOutput.toJson(payload), 
             url: apiUrl,
             customHeaders: headers
         )
 
 
+
         if (response.getResponseCode() == 201) {
             echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
         } else {

From 6f2aa44a79ca68a1acc050212cf1f1d2f1132f19 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 07:28:32 -0500
Subject: [PATCH 020/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index f842ebaf63..85b19e935f 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -7,40 +7,37 @@ void setBuildStatus(String message, String state) {
         statusResultSource: [ $class: "ConditionalStatusResultSource", results: [[$class: "AnyBuildResult", message: message, state: state]] ]
     ]);
 }
+import groovy.json.JsonBuilder
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
-
-        writeFile file: logFilePath, text: currentBuild.rawBuild.logFile.text
-        
-        
         def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
         def headers = [
             "Authorization": "token GitHubJenkins",
             "User-Agent": "Jenkins",
             "Content-Type": "application/json"
-        ]
 
-        def payload = [
-            body: commentMessage,
-            file: readFile(logFilePath)
         ]
-        
+
+        def payload = new JsonBuilder()
+        payload {
+            body(commentMessage)
+            file(readFile(logFilePath))
+        }
+
         def response = httpRequest(
             acceptType: 'APPLICATION_JSON',
             contentType: 'APPLICATION_JSON',
             httpMode: 'POST',
-            requestBody: JsonOutput.toJson(payload), 
+            requestBody: payload.toString(),
             url: apiUrl,
             customHeaders: headers
         )
 
-
-
-        if (response.getResponseCode() == 201) {
+        if (response.status == 201) {
             echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
         } else {
-            error "Failed to add comment with log file to PR #${env.CHANGE_ID}: ${response.getResponseCode()} - ${response.getResponseMessage()}"
+            error "Failed to add comment with log file to PR #${env.CHANGE_ID}: ${response.status} - ${response.response}"
         }
     }
 }

From b77709cf52d16b633103664425ab64ced2c8be52 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 07:33:07 -0500
Subject: [PATCH 021/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 85b19e935f..cd2064a810 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -19,21 +19,22 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
 
         ]
 
-        def payload = new JsonBuilder()
-        payload {
-            body(commentMessage)
-            file(readFile(logFilePath))
-        }
+        def payloadMap = [
+            body: commentMessage,
+            file: readFile(logFilePath)
+        ]
+
+        def payloadJson = new JsonBuilder(payloadMap).toPrettyString()
 
         def response = httpRequest(
             acceptType: 'APPLICATION_JSON',
             contentType: 'APPLICATION_JSON',
             httpMode: 'POST',
-            requestBody: payload.toString(),
+            requestBody: payloadJson, 
             url: apiUrl,
             customHeaders: headers
         )
-
+        
         if (response.status == 201) {
             echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
         } else {

From ffd588f4d3128a5b6772d9225b51b202f0c5adc3 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 08:49:14 -0500
Subject: [PATCH 022/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 66 +++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 25 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index cd2064a810..bf928c11a0 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -12,34 +12,50 @@ import groovy.json.JsonBuilder
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
         def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
-        def headers = [
-            "Authorization": "token GitHubJenkins",
-            "User-Agent": "Jenkins",
-            "Content-Type": "application/json"
-
-        ]
-
-        def payloadMap = [
-            body: commentMessage,
-            file: readFile(logFilePath)
-        ]
-
-        def payloadJson = new JsonBuilder(payloadMap).toPrettyString()
-
-        def response = httpRequest(
-            acceptType: 'APPLICATION_JSON',
-            contentType: 'APPLICATION_JSON',
-            httpMode: 'POST',
-            requestBody: payloadJson, 
-            url: apiUrl,
-            customHeaders: headers
-        )
         
-        if (response.status == 201) {
-            echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
+        def curlCommand = """
+            curl -s -H "Authorization: token ${GitHubJenkins}" \\
+            -X POST -d '{"body": "${commentMessage}"}' \\
+            "${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 with log file to PR #${env.CHANGE_ID}: ${response.status} - ${response.response}"
+            error "Failed to add comment to PR #${env.CHANGE_ID}"
         }
+        
+    //     def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
+    //     def headers = [
+    //         "Authorization": "token GitHubJenkins",
+    //         "User-Agent": "Jenkins",
+    //         "Content-Type": "application/json"
+
+    //     ]
+
+    //     def payloadMap = [
+    //         body: commentMessage,
+    //         file: readFile(logFilePath)
+    //     ]
+
+    //     def payloadJson = new JsonBuilder(payloadMap).toPrettyString()
+
+    //     def response = httpRequest(
+    //         acceptType: 'APPLICATION_JSON',
+    //         contentType: 'APPLICATION_JSON',
+    //         httpMode: 'POST',
+    //         requestBody: payloadJson, 
+    //         url: apiUrl,
+    //         customHeaders: headers
+    //     )
+        
+    //     if (response.status == 201) {
+    //         echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
+    //     } else {
+    //         error "Failed to add comment with log file to PR #${env.CHANGE_ID}: ${response.status} - ${response.response}"
+    //     }
     }
 }
 

From c9b9b8f0f368409059a631c1ee4f8c383203c7a8 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:11:44 -0500
Subject: [PATCH 023/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index bf928c11a0..f3535cc601 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -11,20 +11,22 @@ import groovy.json.JsonBuilder
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
-        def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
-        
-        def curlCommand = """
-            curl -s -H "Authorization: token ${GitHubJenkins}" \\
-            -X POST -d '{"body": "${commentMessage}"}' \\
-            "${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}"
+        withCredentials([string(credentialsId: 'GithubJenkins', 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}" \\
+                -X POST -d '{"body": "${commentMessage}"}' \\
+                "${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}"
+            }
         }
         
     //     def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"

From ccc0bfed9a02582bf7248ec67eba098d3c5b010c Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:13:40 -0500
Subject: [PATCH 024/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index f3535cc601..72255d2677 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -11,7 +11,7 @@ import groovy.json.JsonBuilder
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
-        withCredentials([string(credentialsId: 'GithubJenkins', variable: 'ACCESS_TOKEN')]) {
+        withCredentials([string(credentialsId: 'GitHubJenkins', variable: 'ACCESS_TOKEN')]) {
             def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
             
             def curlCommand = """

From 395f42eda2f73d4a4a206c91b6efd594186c06ed Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:28:35 -0500
Subject: [PATCH 025/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 72255d2677..6c7d3b03a7 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -11,11 +11,11 @@ import groovy.json.JsonBuilder
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
-        withCredentials([string(credentialsId: 'GitHubJenkins', variable: 'ACCESS_TOKEN')]) {
+        withCredentials([usernamePassword(credentialsId: 'GitHubJenkins', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
             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}" \\
+                curl -s -u ${USERNAME}:${PASSWORD} \\
                 -X POST -d '{"body": "${commentMessage}"}' \\
                 "${apiUrl}"
             """
@@ -28,6 +28,7 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
                 error "Failed to add comment to PR #${env.CHANGE_ID}"
             }
         }
+
         
     //     def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
     //     def headers = [

From 1182652d38d7f80077a5a14b9b8d801f1504a7b2 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:34:01 -0500
Subject: [PATCH 026/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 6c7d3b03a7..1dd729dfcb 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -20,13 +20,23 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
                 "${apiUrl}"
             """
             
-            def response = sh(script: curlCommand, returnStatus: true)
+            def response = sh(script: curlCommand, returnStatus: true, returnStdout: true)
             
             if (response == 0) {
                 echo "Comment added successfully to PR #${env.CHANGE_ID}"
             } else {
                 error "Failed to add comment to PR #${env.CHANGE_ID}"
             }
+
+            // Check for a response from GitHub and extract the comment ID
+            def jsonResponse = readJSON(text: response)
+            def commentId = jsonResponse.id
+
+            if (commentId) {
+                echo "Comment ID: ${commentId}"
+            } else {
+                error "Failed to retrieve comment ID"
+            }
         }
 
         

From 00deb2f968489687406540458418812d5ced35f9 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:56:32 -0500
Subject: [PATCH 027/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 1dd729dfcb..cd40876a2f 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -11,34 +11,25 @@ import groovy.json.JsonBuilder
 
 def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     script {
-        withCredentials([usernamePassword(credentialsId: 'GitHubJenkins', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+        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 -u ${USERNAME}:${PASSWORD} \\
-                -X POST -d '{"body": "${commentMessage}"}' \\
-                "${apiUrl}"
-            """
+                    curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
+                    -X POST -d '{"body": "${commentMessage}"}' \\
+                    "${apiUrl}"
+                """
             
-            def response = sh(script: curlCommand, returnStatus: true, returnStdout: true)
+            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}"
             }
-
-            // Check for a response from GitHub and extract the comment ID
-            def jsonResponse = readJSON(text: response)
-            def commentId = jsonResponse.id
-
-            if (commentId) {
-                echo "Comment ID: ${commentId}"
-            } else {
-                error "Failed to retrieve comment ID"
-            }
         }
-
+    }
+}
         
     //     def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
     //     def headers = [
@@ -68,9 +59,9 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
     //         echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
     //     } else {
     //         error "Failed to add comment with log file to PR #${env.CHANGE_ID}: ${response.status} - ${response.response}"
-    //     }
-    }
-}
+//     //     }
+//     }
+// }
 
 pipeline {
     agent none

From 718f44ed03114f84f8680eda631dfb41309faeb0 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 10:16:21 -0500
Subject: [PATCH 028/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 40 ++++------------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index cd40876a2f..e8c1a4c115 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -7,16 +7,16 @@ void setBuildStatus(String message, String state) {
         statusResultSource: [ $class: "ConditionalStatusResultSource", results: [[$class: "AnyBuildResult", message: message, state: state]] ]
     ]);
 }
-import groovy.json.JsonBuilder
 
-def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
+def postGitHubCommentWithLogFile(commentMessage, jobName) {
     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 consoleLogLink = "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
             
             def curlCommand = """
                     curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
-                    -X POST -d '{"body": "${commentMessage}"}' \\
+                    -X POST -d '{"body": "${commentMessage}\n\n[Console Log](${consoleLogLink})"}' \\
                     "${apiUrl}"
                 """
             
@@ -30,38 +30,6 @@ def postGitHubCommentWithLogFile(commentMessage, logFilePath) {
         }
     }
 }
-        
-    //     def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
-    //     def headers = [
-    //         "Authorization": "token GitHubJenkins",
-    //         "User-Agent": "Jenkins",
-    //         "Content-Type": "application/json"
-
-    //     ]
-
-    //     def payloadMap = [
-    //         body: commentMessage,
-    //         file: readFile(logFilePath)
-    //     ]
-
-    //     def payloadJson = new JsonBuilder(payloadMap).toPrettyString()
-
-    //     def response = httpRequest(
-    //         acceptType: 'APPLICATION_JSON',
-    //         contentType: 'APPLICATION_JSON',
-    //         httpMode: 'POST',
-    //         requestBody: payloadJson, 
-    //         url: apiUrl,
-    //         customHeaders: headers
-    //     )
-        
-    //     if (response.status == 201) {
-    //         echo "Comment with log file added successfully to PR #${env.CHANGE_ID}"
-    //     } else {
-    //         error "Failed to add comment with log file to PR #${env.CHANGE_ID}: ${response.status} - ${response.response}"
-//     //     }
-//     }
-// }
 
 pipeline {
     agent none
@@ -186,7 +154,7 @@ pipeline {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build log for this run: ${buildResult}"
-                    postGitHubCommentWithLogFile(commentMessage, "jenkins_console_log.txt")
+                    postGitHubCommentWithLogFile(commentMessage, env.JOB_NAME)
                 }
             }
         }

From 7f6fb32224ab417b773737d2bf2913ec112f2111 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 10:18:47 -0500
Subject: [PATCH 029/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index e8c1a4c115..266dc933dd 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -12,6 +12,8 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
     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 buildNumber = currentBuild.number
             def consoleLogLink = "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
             
             def curlCommand = """

From 0d71e1a8354d3e6517d4817b15cfaf494ef10da9 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 10:24:12 -0500
Subject: [PATCH 030/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 266dc933dd..891888fb38 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -18,7 +18,7 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
             
             def curlCommand = """
                     curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
-                    -X POST -d '{"body": "${commentMessage}\n\n[Console Log](${consoleLogLink})"}' \\
+                    -X POST -d "{\"body\": \"${commentMessage}\\n\\n[Console Log](${consoleLogLink})\"}" \\
                     "${apiUrl}"
                 """
             

From 2b311c069e37bdbef874ae6e787c136c7ac7e310 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:08:10 -0500
Subject: [PATCH 031/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 891888fb38..1bf7efec30 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -15,10 +15,11 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
             
             def buildNumber = currentBuild.number
             def consoleLogLink = "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
+            echo "Console Log Link:  ${consoleLogLink}"
             
             def curlCommand = """
                     curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
-                    -X POST -d "{\"body\": \"${commentMessage}\\n\\n[Console Log](${consoleLogLink})\"}" \\
+                    -X POST -d "{\"body\": \"${consoleLogLink}\\n"}" \\
                     "${apiUrl}"
                 """
             

From 7770be8a425297ad159ed4c190310f9aefa1f54b Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:12:48 -0500
Subject: [PATCH 032/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 1bf7efec30..247d081b1f 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -14,12 +14,15 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
             def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
             
             def buildNumber = currentBuild.number
-            def consoleLogLink = "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
+            def consoleLogLink = "${JENKINS_URL}job/${jobName}/${buildNumber}/consoleText"
             echo "Console Log Link:  ${consoleLogLink}"
+
+            def commentBody = "${commentMessage}\\n\\n${consoleLogLink}"
+            echo "Comment Body: ${commentBody}"
             
             def curlCommand = """
                     curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
-                    -X POST -d "{\"body\": \"${consoleLogLink}\\n"}" \\
+                    -X POST -d "{\"body\": \"${commentBody}\"}" \\
                     "${apiUrl}"
                 """
             

From 93be126edc5b33514753bc132eabe19e068d3384 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:25:28 -0500
Subject: [PATCH 033/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 247d081b1f..b4cce1366e 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -12,12 +12,22 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
     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 buildNumber = currentBuild.number
-            def consoleLogLink = "${JENKINS_URL}job/${jobName}/${buildNumber}/consoleText"
-            echo "Console Log Link:  ${consoleLogLink}"
+            def logFilePath = "${JENKINS_HOME}/workspace/${jobName}/build-${buildNumber}-console.log"
+
+
+            writeFile file: logFilePath, text: currentBuild.rawBuild.getLog(100000)
+            archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
+            
+            
+            // def consoleLogLink = "${JENKINS_URL}job/${jobName}/${buildNumber}/consoleText"
+            
+            echo "Console Log Link:  ${logFilePath}"
 
-            def commentBody = "${commentMessage}\\n\\n${consoleLogLink}"
+            def commentBody = ${commentMessage} + '\\n\\n' + ${logFilePath}
             echo "Comment Body: ${commentBody}"
             
             def curlCommand = """

From 7e589ec89c9a502252085628156d97e1a906ee28 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:30:30 -0500
Subject: [PATCH 034/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index b4cce1366e..e922bfe590 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -13,28 +13,24 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
         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 buildNumber = currentBuild.number
             def logFilePath = "${JENKINS_HOME}/workspace/${jobName}/build-${buildNumber}-console.log"
 
+            def logContent = currentBuild.rawBuild.getLog(100000).join('\n') 
 
-            writeFile file: logFilePath, text: currentBuild.rawBuild.getLog(100000)
+            writeFile file: logFilePath, text: logContent 
             archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
             
-            
-            // def consoleLogLink = "${JENKINS_URL}job/${jobName}/${buildNumber}/consoleText"
-            
-            echo "Console Log Link:  ${logFilePath}"
+            echo "Console Log Link: ${logFilePath}"
 
-            def commentBody = ${commentMessage} + '\\n\\n' + ${logFilePath}
+            def commentBody = "${commentMessage}\n\n${logFilePath}" 
             echo "Comment Body: ${commentBody}"
             
             def curlCommand = """
-                    curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
-                    -X POST -d "{\"body\": \"${commentBody}\"}" \\
-                    "${apiUrl}"
-                """
+                curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
+                -X POST -d "{\"body\": \"${commentBody}\"}" \\
+                "${apiUrl}"
+            """
             
             def response = sh(script: curlCommand, returnStatus: true)
             
@@ -46,7 +42,6 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
         }
     }
 }
-
 pipeline {
     agent none
 

From d90fe6b749fea58021026003d6f929262c7c43a3 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:36:13 -0500
Subject: [PATCH 035/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index e922bfe590..5931111260 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -14,7 +14,7 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
             def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
 
             def buildNumber = currentBuild.number
-            def logFilePath = "${JENKINS_HOME}/workspace/${jobName}/build-${buildNumber}-console.log"
+            def logFilePath = "${WORKSPACE}/build-${buildNumber}-console.log"
 
             def logContent = currentBuild.rawBuild.getLog(100000).join('\n') 
 

From b9f4e2a9e802fb2941eed803fdb6e46ea90d90e0 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:40:08 -0500
Subject: [PATCH 036/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 5931111260..ce83b8515b 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -14,16 +14,16 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
             def apiUrl = "https://api.github.com/repos/ufs-community/ufs-weather-model/issues/${env.CHANGE_ID}/comments"
 
             def buildNumber = currentBuild.number
-            def logFilePath = "${WORKSPACE}/build-${buildNumber}-console.log"
-
+            // def logFilePath = "${WORKSPACE}/build-${buildNumber}-console.log"
+            // "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
             def logContent = currentBuild.rawBuild.getLog(100000).join('\n') 
 
-            writeFile file: logFilePath, text: logContent 
-            archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
+            // writeFile file: logFilePath, text: logContent 
+            // archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
             
             echo "Console Log Link: ${logFilePath}"
 
-            def commentBody = "${commentMessage}\n\n${logFilePath}" 
+            def commentBody = "${commentMessage}\n\n${logContent}" 
             echo "Comment Body: ${commentBody}"
             
             def curlCommand = """

From 209ffb337f9b173983bf9698af610e1915cee7b9 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 11:41:14 -0500
Subject: [PATCH 037/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index ce83b8515b..6087fc2b87 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -21,7 +21,7 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
             // writeFile file: logFilePath, text: logContent 
             // archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
             
-            echo "Console Log Link: ${logFilePath}"
+            // echo "Console Log Link: ${logFilePath}"
 
             def commentBody = "${commentMessage}\n\n${logContent}" 
             echo "Comment Body: ${commentBody}"

From e0efcf41d28f03ba4d24fcb8b41dff00a53ed251 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 13:39:50 -0500
Subject: [PATCH 038/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 6087fc2b87..ecab5a9d82 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -12,18 +12,21 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
     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 buildNumber = currentBuild.number
             // def logFilePath = "${WORKSPACE}/build-${buildNumber}-console.log"
             // "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
-            def logContent = currentBuild.rawBuild.getLog(100000).join('\n') 
+            // def logContent = currentBuild.rawBuild.getLog(100000).join('\n') 
 
-            // writeFile file: logFilePath, text: logContent 
-            // archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
+            def logFilePath = "https://jenkins.epic.oarcloud.noaa.gov/view/all/job/ufs-weather-model/job/ort-docker-pipeline/view/change-requests/job/PR-${env.CHANGE_ID}/${buildNumber}/artifact/build-${buildNumber}-console.log
+            echo "Console Log Link: ${logFilePath}"
             
-            // echo "Console Log Link: ${logFilePath}"
+            
+            // writeFile file: logFilePath, text: logContent 
+            archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
+
 
-            def commentBody = "${commentMessage}\n\n${logContent}" 
+            def commentBody = "${logFilePath}" 
             echo "Comment Body: ${commentBody}"
             
             def curlCommand = """

From 5c88f1533f16d616710a03b8455e675eeb7aa5f2 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 13:40:44 -0500
Subject: [PATCH 039/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index ecab5a9d82..51ed0f74d8 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -18,7 +18,7 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
             // "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
             // def logContent = currentBuild.rawBuild.getLog(100000).join('\n') 
 
-            def logFilePath = "https://jenkins.epic.oarcloud.noaa.gov/view/all/job/ufs-weather-model/job/ort-docker-pipeline/view/change-requests/job/PR-${env.CHANGE_ID}/${buildNumber}/artifact/build-${buildNumber}-console.log
+            def logFilePath = "https://jenkins.epic.oarcloud.noaa.gov/view/all/job/ufs-weather-model/job/ort-docker-pipeline/view/change-requests/job/PR-${env.CHANGE_ID}/${buildNumber}/artifact/build-${buildNumber}-console.log"
             echo "Console Log Link: ${logFilePath}"
             
             

From df08ebcc70bd218915b0ccb28c8ce5c9e614e48f Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Mon, 2 Oct 2023 13:44:33 -0500
Subject: [PATCH 040/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 51ed0f74d8..bee66af64c 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -18,20 +18,20 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
             // "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
             // def logContent = currentBuild.rawBuild.getLog(100000).join('\n') 
 
-            def logFilePath = "https://jenkins.epic.oarcloud.noaa.gov/view/all/job/ufs-weather-model/job/ort-docker-pipeline/view/change-requests/job/PR-${env.CHANGE_ID}/${buildNumber}/artifact/build-${buildNumber}-console.log"
-            echo "Console Log Link: ${logFilePath}"
+            // def logFilePath = "https://jenkins.epic.oarcloud.noaa.gov/view/all/job/ufs-weather-model/job/ort-docker-pipeline/view/change-requests/job/PR-${env.CHANGE_ID}/${buildNumber}/artifact/build-${buildNumber}-console.log"
+            // echo "Console Log Link: ${logFilePath}"
             
             
             // writeFile file: logFilePath, text: logContent 
             archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
 
 
-            def commentBody = "${logFilePath}" 
-            echo "Comment Body: ${commentBody}"
+            // def commentBody = "${logFilePath}" 
+            // echo "Comment Body: ${commentBody}"
             
             def curlCommand = """
                 curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
-                -X POST -d "{\"body\": \"${commentBody}\"}" \\
+                -X POST -d "{\"body\": \"${commentMessage}\"}" \\
                 "${apiUrl}"
             """
             
@@ -167,7 +167,7 @@ pipeline {
             node('built-in') {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
-                    def commentMessage = "Build log for this run: ${buildResult}"
+                    def commentMessage = "Build result for this run: ${buildResult}"
                     postGitHubCommentWithLogFile(commentMessage, env.JOB_NAME)
                 }
             }

From 266066dc0a52ea947db051ac69da1f86066cedf0 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:36:15 -0400
Subject: [PATCH 041/103] Create Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 54 ++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 tests/ci/Jenkinsfile.spack_stack

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
new file mode 100644
index 0000000000..c43dc9f6b0
--- /dev/null
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -0,0 +1,54 @@
+pipeline {
+  agent none
+  stages {
+    stage('Start Hercules Cluster') {
+       agent {
+        label 'built-in'   
+       }
+      steps {
+        script {
+          for (label in pullRequest.labels) {
+            if ((label.matches("Stack_Build"))) {
+                 env.CHOICE_NODE='Hercules'
+            } 
+            else { 
+                env.CHOICE_NODE='none'
+            }
+         }
+// Why do I need another if..block, because it just works this way.
+
+            if (CHOICE_NODE == 'Hercules') {
+                echo "Starting up Hercules cluster ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+            }
+             else {
+                echo "${CHOICE_NODE} is NOT a Parallelworks cluster, moving on..."
+            }
+       }    
+    }
+  } 
+  stage('Run Regression Tests script') {
+        agent {
+          label "${CHOICE_NODE}"
+        }
+        environment {
+        ACCNR = 'nems'
+        NODE_PATH = '/work/'
+      }
+      steps {
+          }
+        }
+        cleanWs()
+        checkout scm
+        sh '''
+        pwd
+        git submodule update --init --recursive
+        cd tests/
+        if [[ "${CREATE_BASELINES}" = true ]] 
+        then
+        echo "Creating baselines for regressions tests"
+        ./rt.sh -c -l rt.conf
+        echo "Sending regression test logs to $GIT_URL"
+        fi
+        '''
+            }
+        }

From 2230ea688f84b6d269e35a664a15ca339e5041c4 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:38:15 -0500
Subject: [PATCH 042/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index bee66af64c..99d6e9359b 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -8,32 +8,16 @@ void setBuildStatus(String message, String state) {
     ]);
 }
 
-def postGitHubCommentWithLogFile(commentMessage, jobName) {
+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 buildNumber = currentBuild.number
-            // def logFilePath = "${WORKSPACE}/build-${buildNumber}-console.log"
-            // "${JENKINS_URL}/job/${jobName}/${buildNumber}/consoleText"
-            // def logContent = currentBuild.rawBuild.getLog(100000).join('\n') 
-
-            // def logFilePath = "https://jenkins.epic.oarcloud.noaa.gov/view/all/job/ufs-weather-model/job/ort-docker-pipeline/view/change-requests/job/PR-${env.CHANGE_ID}/${buildNumber}/artifact/build-${buildNumber}-console.log"
-            // echo "Console Log Link: ${logFilePath}"
-            
-            
-            // writeFile file: logFilePath, text: logContent 
-            archiveArtifacts artifacts: "build-${buildNumber}-console.log", allowEmptyArchive: true
 
-
-            // def commentBody = "${logFilePath}" 
-            // echo "Comment Body: ${commentBody}"
-            
             def curlCommand = """
-                curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
-                -X POST -d "{\"body\": \"${commentMessage}\"}" \\
-                "${apiUrl}"
-            """
+                    curl -s -H "Authorization: token ${ACCESS_TOKEN}" \\
+                    -X POST -d '{"body": "${commentMessage}"}' \\
+                    "${apiUrl}"
+                """
             
             def response = sh(script: curlCommand, returnStatus: true)
             
@@ -45,6 +29,8 @@ def postGitHubCommentWithLogFile(commentMessage, jobName) {
         }
     }
 }
+
+
 pipeline {
     agent none
 
@@ -168,7 +154,7 @@ pipeline {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
                     def commentMessage = "Build result for this run: ${buildResult}"
-                    postGitHubCommentWithLogFile(commentMessage, env.JOB_NAME)
+                    postGitHubCommentWithLogFile(commentMessage)
                 }
             }
         }

From c500547a155f22cff71d7e1bf32babb81fc18a0b Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:43:48 -0500
Subject: [PATCH 043/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 99d6e9359b..07d3c29eef 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -12,9 +12,9 @@ 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}" \\
+                    curl -s -H 'Authorization: token \${ACCESS_TOKEN}' \\
                     -X POST -d '{"body": "${commentMessage}"}' \\
                     "${apiUrl}"
                 """
@@ -30,7 +30,6 @@ def postGitHubCommentWithLogFile(commentMessage) {
     }
 }
 
-
 pipeline {
     agent none
 

From e882a9364606dde9e2a42362a62630c7f34069bb Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:46:55 -0500
Subject: [PATCH 044/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 07d3c29eef..4de4000e7f 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -12,15 +12,15 @@ 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}' \\
                     -X POST -d '{"body": "${commentMessage}"}' \\
                     "${apiUrl}"
                 """
-            
-            def response = sh(script: curlCommand, returnStatus: true)
-            
+
+            sh(script: "export ACCESS_TOKEN=\$ACCESS_TOKEN && $curlCommand", returnStatus: true)
+
             if (response == 0) {
                 echo "Comment added successfully to PR #${env.CHANGE_ID}"
             } else {

From 649c9cc75e22f01e0f0cf95c2d47ede9ec4a4c3d Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:51:03 -0500
Subject: [PATCH 045/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 4de4000e7f..6b09643ab2 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -8,19 +8,19 @@ void setBuildStatus(String message, String state) {
     ]);
 }
 
-def postGitHubCommentWithLogFile(commentMessage) {
+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}' \\
+                    curl -s -H 'Authorization: token ${ACCESS_TOKEN}' \\
                     -X POST -d '{"body": "${commentMessage}"}' \\
                     "${apiUrl}"
                 """
-
-            sh(script: "export ACCESS_TOKEN=\$ACCESS_TOKEN && $curlCommand", returnStatus: true)
-
+            
+            def response = sh(script: curlCommand, returnStatus: true)
+            
             if (response == 0) {
                 echo "Comment added successfully to PR #${env.CHANGE_ID}"
             } else {

From 9e91ce0ed972ef23011705153e2dfe6d76fdce3f Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:53:31 -0500
Subject: [PATCH 046/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 6b09643ab2..a967264a54 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -13,11 +13,10 @@ postGitHubCommentWithLogFile(commentMessage) {
         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}' \\
-                    -X POST -d '{"body": "${commentMessage}"}' \\
-                    "${apiUrl}"
-                """
+            def curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +
+                 "-X POST -d '{\"body\": \"" + commentMessage + "\"}' \\\n" +
+                 "\"" + apiUrl + "\""
+
             
             def response = sh(script: curlCommand, returnStatus: true)
             

From 4a50bbb623b257643a36b88d9b82a56e64ffdb97 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:58:18 -0500
Subject: [PATCH 047/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index a967264a54..1c9e7ebb55 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -1,3 +1,5 @@
+def commentMessage
+
 void setBuildStatus(String message, String state) {
     step([
         $class: "GitHubCommitStatusSetter",
@@ -151,7 +153,7 @@ pipeline {
             node('built-in') {
                 script {
                     def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
-                    def commentMessage = "Build result for this run: ${buildResult}"
+                    commentMessage = "Build result for this run: ${buildResult}"
                     postGitHubCommentWithLogFile(commentMessage)
                 }
             }

From 21c7f13d804c8fc5f0be025b05d3aa9b16a0c2fc Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 3 Oct 2023 06:59:00 -0500
Subject: [PATCH 048/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 1c9e7ebb55..b51352e98b 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -10,7 +10,7 @@ void setBuildStatus(String message, String state) {
     ]);
 }
 
-postGitHubCommentWithLogFile(commentMessage) {
+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"

From b8de60fc1455ac0cd8f63770f7813e587756faaa Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Tue, 3 Oct 2023 14:27:45 -0500
Subject: [PATCH 049/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index b51352e98b..f1b761c329 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -121,7 +121,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}"'
                         }
                     }
                 }

From 51a53e5218c3d0d40918b2a90404b972c4351a93 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Wed, 4 Oct 2023 10:11:19 -0500
Subject: [PATCH 050/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index f1b761c329..5717dc22af 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -15,11 +15,18 @@ def postGitHubCommentWithLogFile(commentMessage) {
         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 curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +
+            //      "-X POST -d '{\"body\": \"" + commentMessage + "\"}' \\\n" +
+            //      "\"" + apiUrl + "\""
+            def logFile = "${WORKSPACE}/console.log"
+            writeFile file: logFile, text: currentBuild.rawBuild.getLog(100000)
             
+            def curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +
+                              "-X POST \\\n" +
+                              "-H \"Content-Type: application/octet-stream\" \\\n" +
+                              "--data-binary @\"" + logFile + "\" \\\n" +
+                              "\"" + apiUrl + "\""
+                    
             def response = sh(script: curlCommand, returnStatus: true)
             
             if (response == 0) {

From 98e244258ae3305ac4d8d2dd153e33af30679ad4 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Wed, 4 Oct 2023 10:15:31 -0500
Subject: [PATCH 051/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 5717dc22af..1859f1216d 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -18,7 +18,10 @@ def postGitHubCommentWithLogFile(commentMessage) {
             // def curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +
             //      "-X POST -d '{\"body\": \"" + commentMessage + "\"}' \\\n" +
             //      "\"" + apiUrl + "\""
+            
             def logFile = "${WORKSPACE}/console.log"
+            echo "${logFile}
+            
             writeFile file: logFile, text: currentBuild.rawBuild.getLog(100000)
             
             def curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +

From 46d9daecb1137844e8f469bef5dcc3a6e8d43cb1 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Wed, 4 Oct 2023 10:23:20 -0500
Subject: [PATCH 052/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 1859f1216d..53ce2be963 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -19,10 +19,14 @@ def postGitHubCommentWithLogFile(commentMessage) {
             //      "-X POST -d '{\"body\": \"" + commentMessage + "\"}' \\\n" +
             //      "\"" + apiUrl + "\""
             
-            def logFile = "${WORKSPACE}/console.log"
-            echo "${logFile}
+            def logFile = "build-${currentBuild.number}-console.log"
+            echo "Log File Name: ${logFile}"
+
+            def logContent = currentBuild.rawBuild.getLog(100000).join('\n')
+            echo "Log Content added" 
             
-            writeFile file: logFile, text: currentBuild.rawBuild.getLog(100000)
+            writeFile file: logFile, text: logContent
+            // archiveArtifacts artifacts: "build-${currentBuild.number}-console.log", allowEmptyArchive: true
             
             def curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +
                               "-X POST \\\n" +

From 9727d1cd1c34357fdf669e5ced90e7ab61f5e859 Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:38:34 -0500
Subject: [PATCH 053/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index 53ce2be963..a00ff13a45 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -26,13 +26,25 @@ def postGitHubCommentWithLogFile(commentMessage) {
             echo "Log Content added" 
             
             writeFile file: logFile, text: logContent
+            def encodedLogFile = new String(logFile.bytes).bytes.encodeBase64().toString()
             // archiveArtifacts artifacts: "build-${currentBuild.number}-console.log", allowEmptyArchive: true
             
-            def curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +
-                              "-X POST \\\n" +
-                              "-H \"Content-Type: application/octet-stream\" \\\n" +
-                              "--data-binary @\"" + logFile + "\" \\\n" +
-                              "\"" + apiUrl + "\""
+             def curlCommand = '''
+                curl -s -H "Authorization: token ''' + ACCESS_TOKEN + '''" \\
+                -X POST \\
+                -H "Content-Type: application/json" \\
+                --data '{
+                    "body": "''' + commentMessage + '''",
+                    "created_from": "Jenkins",
+                    "attachments": [
+                        {
+                            "name": "console.log",
+                            "data": "''' + encodedLogFile + '''"
+                        }
+                    ]
+                }' \\
+                "''' + apiUrl + '''"
+            '''
                     
             def response = sh(script: curlCommand, returnStatus: true)
             

From ef30617d10ae7ae44ef99fd50f82c5a6bb8aebcc Mon Sep 17 00:00:00 2001
From: ankimball <131040494+ankimball@users.noreply.github.com>
Date: Wed, 4 Oct 2023 13:33:23 -0500
Subject: [PATCH 054/103] Update Jenkinsfile

---
 tests/ci/Jenkinsfile | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/tests/ci/Jenkinsfile b/tests/ci/Jenkinsfile
index a00ff13a45..fa3dad496b 100644
--- a/tests/ci/Jenkinsfile
+++ b/tests/ci/Jenkinsfile
@@ -4,7 +4,7 @@ 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 Build Result"],
+        contextSource: [$class: "ManuallyEnteredCommitContextSource", context: "Jenkins-ci ORTs"],
         errorHandlers: [[$class: "ChangingBuildStatusErrorHandler", result: "UNSTABLE"]],
         statusResultSource: [ $class: "ConditionalStatusResultSource", results: [[$class: "AnyBuildResult", message: message, state: state]] ]
     ]);
@@ -15,36 +15,9 @@ def postGitHubCommentWithLogFile(commentMessage) {
         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 logFile = "build-${currentBuild.number}-console.log"
-            echo "Log File Name: ${logFile}"
-
-            def logContent = currentBuild.rawBuild.getLog(100000).join('\n')
-            echo "Log Content added" 
-            
-            writeFile file: logFile, text: logContent
-            def encodedLogFile = new String(logFile.bytes).bytes.encodeBase64().toString()
-            // archiveArtifacts artifacts: "build-${currentBuild.number}-console.log", allowEmptyArchive: true
-            
-             def curlCommand = '''
-                curl -s -H "Authorization: token ''' + ACCESS_TOKEN + '''" \\
-                -X POST \\
-                -H "Content-Type: application/json" \\
-                --data '{
-                    "body": "''' + commentMessage + '''",
-                    "created_from": "Jenkins",
-                    "attachments": [
-                        {
-                            "name": "console.log",
-                            "data": "''' + encodedLogFile + '''"
-                        }
-                    ]
-                }' \\
-                "''' + apiUrl + '''"
-            '''
+            def curlCommand = "curl -s -H \"Authorization: token " + ACCESS_TOKEN + "\" \\\n" +
+                 "-X POST -d '{\"body\": \"" + commentMessage + "\"}' \\\n" +
+                 "\"" + apiUrl + "\""
                     
             def response = sh(script: curlCommand, returnStatus: true)
             
@@ -178,8 +151,8 @@ pipeline {
         always {
             node('built-in') {
                 script {
-                    def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "Success" : "Failure"
-                    commentMessage = "Build result for this run: ${buildResult}"
+                    def buildResult = currentBuild.resultIsBetterOrEqualTo("SUCCESS") ? "passed" : "failed"
+                    commentMessage = "Jenkins-ci ORTs ${buildResult}"
                     postGitHubCommentWithLogFile(commentMessage)
                 }
             }

From e4f692573bee9d85b32d4be125b1155bd1670c28 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 4 Oct 2023 15:02:22 -0400
Subject: [PATCH 055/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index c43dc9f6b0..25f994759a 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -41,12 +41,21 @@ pipeline {
         checkout scm
         sh '''
         pwd
-        git submodule update --init --recursive
+        git clone --recurse-submodules https://github.com/ufs-community/ufs-weather-model
+        cd ufs-weather-model/modulefiles/
+        sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-dev-20230825/envs/ufs-pio-2.5.10/install/modulefiles/Core|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core|g' ufs_hercules.gnu.lua 
+        sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|g' ufs_hercules.gnu.lua
+        sed -i 's|stack_python_ver=os.getenv("stack_python_ver") or "3.9.14"|stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"|g' ufs_hercules.gnu.lua 
+        sed -i 's|3.3.3|4.3.0|g' ufs_hercules.gnu.lua 
+        sed -i 's|2.9.2|2.10.0|g' ufs_hercules.gnu.lua
+        sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-dev-20230825/envs/ufs-pio-2.5.10/install/modulefiles/Core|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core|g' ufs_hercules.intel.lua
+        sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|g' ufs_hercules.intel.lua  
+        sed -i 's|stack_python_ver=os.getenv("stack_python_ver") or "3.9.14"|stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"|g' ufs_hercules.intel.lua 
+        sed -i 's|3.3.3|4.3.0|g' ufs_hercules.intel.lua 
+        sed -i 's|2.9.2|2.10.0|g' ufs_hercules.intel.lua
+        cd ..
         cd tests/
-        if [[ "${CREATE_BASELINES}" = true ]] 
-        then
-        echo "Creating baselines for regressions tests"
-        ./rt.sh -c -l rt.conf
+        ./rt.sh -a nems -c -l rt.conf
         echo "Sending regression test logs to $GIT_URL"
         fi
         '''

From 6958c06307e9158c0aa85a332fbf0e47d448419a Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 4 Oct 2023 16:26:20 -0400
Subject: [PATCH 056/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 103 +++++++++++++++++++++++++------
 1 file changed, 84 insertions(+), 19 deletions(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 25f994759a..7b61021aef 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -1,15 +1,24 @@
 pipeline {
   agent none
   stages {
-    stage('Start Hercules Cluster') {
+    stage('Spack-stack-test') {
        agent {
         label 'built-in'   
        }
       steps {
         script {
           for (label in pullRequest.labels) {
-            if ((label.matches("Stack_Build"))) {
-                 env.CHOICE_NODE='Hercules'
+            if ((label.matches("orion"))) {
+                 env.CHOICE_NODE='orion'
+            }  
+            else if ((label.matches("hera"))) { 
+                env.CHOICE_NODE='hera'
+            }  
+            else if ((label.matches("hercules"))) { 
+                env.CHOICE_NODE='hercules'
+            }  
+            else if ((label.matches("jet"))) {
+                env.CHOICE_NODE='jet'
             } 
             else { 
                 env.CHOICE_NODE='none'
@@ -17,30 +26,38 @@ pipeline {
          }
 // Why do I need another if..block, because it just works this way.
 
-            if (CHOICE_NODE == 'Hercules') {
-                echo "Starting up Hercules cluster ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+            if (CHOICE_NODE == 'orion') {
+                echo "Starting up orion ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+               
+            } 
+             else if (CHOICE_NODE == 'jet') {
+                echo "Starting up jet ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+            }
+             else if (CHOICE_NODE == 'hercules') {
+                 echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+            }
+             else if (CHOICE_NODE == 'hera') {
+                 echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
             }
              else {
-                echo "${CHOICE_NODE} is NOT a Parallelworks cluster, moving on..."
+                echo "${CHOICE_NODE} is NOT a platform, moving on..."
             }
        }    
     }
   } 
-  stage('Run Regression Tests script') {
+  stage('Run Land DA Workflow on Hera') {
         agent {
-          label "${CHOICE_NODE}"
+          label "hercules"
         }
         environment {
-        ACCNR = 'nems'
-        NODE_PATH = '/work/'
+        ACCNR = 'epic'
+        NODE_PATH = '/scratch1/NCEPDEV/stmp2/role.epic/'
       }
       steps {
-          }
-        }
+          
         cleanWs()
         checkout scm
         sh '''
-        pwd
         git clone --recurse-submodules https://github.com/ufs-community/ufs-weather-model
         cd ufs-weather-model/modulefiles/
         sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-dev-20230825/envs/ufs-pio-2.5.10/install/modulefiles/Core|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core|g' ufs_hercules.gnu.lua 
@@ -53,11 +70,59 @@ pipeline {
         sed -i 's|stack_python_ver=os.getenv("stack_python_ver") or "3.9.14"|stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"|g' ufs_hercules.intel.lua 
         sed -i 's|3.3.3|4.3.0|g' ufs_hercules.intel.lua 
         sed -i 's|2.9.2|2.10.0|g' ufs_hercules.intel.lua
-        cd ..
-        cd tests/
-        ./rt.sh -a nems -c -l rt.conf
-        echo "Sending regression test logs to $GIT_URL"
-        fi
         '''
-            }
+      }
+    }        
+    stage('Run Land DA Workflow on Orion') {
+        agent {
+          label "orion"
+        }
+        environment {
+        ACCNR = 'nems'
+        NODE_PATH = '/work/noaa/epic/role-epic/'
+      }
+      steps {
+          
+        cleanWs()
+        checkout scm
+        sh '''
+        
+        '''
+      }
+    }    
+    stage('Run Land DA Workflow on Hercules') {
+        agent {
+          label "hera"
         }
+        environment {
+        ACCNR = 'nems'
+        NODE_PATH = '/work/noaa/epic/role-epic/'
+      }
+      steps {
+          
+        cleanWs()
+        checkout scm
+        sh '''
+      
+        ''' 
+        }
+    } 
+        stage('Run Land DA Workflow on Jet') {
+        agent {
+          label "jet"
+        }
+        environment {
+        ACCNR = 'hfv3gfs'
+        NODE_PATH = '/mnt/lfs4/HFIP/hfv3gfs/role.epic/'
+      }
+      steps {
+          
+        cleanWs()
+        checkout scm
+        sh '''
+        
+        '''
+      }
+    }
+  }  
+}

From 910706b34016318a3ad9e0cd6f6276c54c822d89 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 4 Oct 2023 16:29:10 -0400
Subject: [PATCH 057/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 7b61021aef..11959e49d3 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -45,7 +45,7 @@ pipeline {
        }    
     }
   } 
-  stage('Run Land DA Workflow on Hera') {
+  stage('Test spack-stack on Hercules') {
         agent {
           label "hercules"
         }
@@ -73,7 +73,7 @@ pipeline {
         '''
       }
     }        
-    stage('Run Land DA Workflow on Orion') {
+    stage('Test spack-stack on Orion') {
         agent {
           label "orion"
         }
@@ -90,7 +90,7 @@ pipeline {
         '''
       }
     }    
-    stage('Run Land DA Workflow on Hercules') {
+    stage('Test spack-stack on Hera') {
         agent {
           label "hera"
         }
@@ -107,7 +107,7 @@ pipeline {
         ''' 
         }
     } 
-        stage('Run Land DA Workflow on Jet') {
+        stage('Test spack-stack on Jet') {
         agent {
           label "jet"
         }

From 3d5e4dd0baaaf40c19a5d5d245efcb5d3d8b83ac Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 5 Oct 2023 14:27:36 -0400
Subject: [PATCH 058/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 11959e49d3..6b2ec0f5b0 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -51,7 +51,7 @@ pipeline {
         }
         environment {
         ACCNR = 'epic'
-        NODE_PATH = '/scratch1/NCEPDEV/stmp2/role.epic/'
+        NODE_PATH = '/work/noaa/epic/role-epic/'
       }
       steps {
           
@@ -96,7 +96,7 @@ pipeline {
         }
         environment {
         ACCNR = 'nems'
-        NODE_PATH = '/work/noaa/epic/role-epic/'
+        NODE_PATH = '/scratch1/NCEPDEV/stmp2/role.epic/'
       }
       steps {
           

From f92885b46781b225514ad20e7595854545e60909 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 6 Oct 2023 11:52:47 -0400
Subject: [PATCH 059/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 6b2ec0f5b0..6601352cc3 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -70,6 +70,10 @@ pipeline {
         sed -i 's|stack_python_ver=os.getenv("stack_python_ver") or "3.9.14"|stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"|g' ufs_hercules.intel.lua 
         sed -i 's|3.3.3|4.3.0|g' ufs_hercules.intel.lua 
         sed -i 's|2.9.2|2.10.0|g' ufs_hercules.intel.lua
+        cd ..
+        cd tests
+        module list
+        ./rt.sh -a epic -c -e -l rt.conf
         '''
       }
     }        

From cfd19a7754a40e5d9762e0148a76b9d9f10cc341 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 6 Oct 2023 13:30:23 -0400
Subject: [PATCH 060/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 80 ++------------------------------
 1 file changed, 5 insertions(+), 75 deletions(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 6601352cc3..fd10942dfb 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -8,17 +8,8 @@ pipeline {
       steps {
         script {
           for (label in pullRequest.labels) {
-            if ((label.matches("orion"))) {
-                 env.CHOICE_NODE='orion'
-            }  
-            else if ((label.matches("hera"))) { 
-                env.CHOICE_NODE='hera'
-            }  
-            else if ((label.matches("hercules"))) { 
-                env.CHOICE_NODE='hercules'
-            }  
-            else if ((label.matches("jet"))) {
-                env.CHOICE_NODE='jet'
+            if ((label.matches("hercules"))) {
+                 env.CHOICE_NODE='hercules'
             } 
             else { 
                 env.CHOICE_NODE='none'
@@ -26,18 +17,8 @@ pipeline {
          }
 // Why do I need another if..block, because it just works this way.
 
-            if (CHOICE_NODE == 'orion') {
-                echo "Starting up orion ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
-               
-            } 
-             else if (CHOICE_NODE == 'jet') {
-                echo "Starting up jet ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
-            }
-             else if (CHOICE_NODE == 'hercules') {
-                 echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
-            }
-             else if (CHOICE_NODE == 'hera') {
-                 echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+            if (CHOICE_NODE == 'hercules') {
+                echo "Starting up hercules ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
             }
              else {
                 echo "${CHOICE_NODE} is NOT a platform, moving on..."
@@ -76,57 +57,6 @@ pipeline {
         ./rt.sh -a epic -c -e -l rt.conf
         '''
       }
-    }        
-    stage('Test spack-stack on Orion') {
-        agent {
-          label "orion"
-        }
-        environment {
-        ACCNR = 'nems'
-        NODE_PATH = '/work/noaa/epic/role-epic/'
-      }
-      steps {
-          
-        cleanWs()
-        checkout scm
-        sh '''
-        
-        '''
-      }
-    }    
-    stage('Test spack-stack on Hera') {
-        agent {
-          label "hera"
-        }
-        environment {
-        ACCNR = 'nems'
-        NODE_PATH = '/scratch1/NCEPDEV/stmp2/role.epic/'
-      }
-      steps {
-          
-        cleanWs()
-        checkout scm
-        sh '''
-      
-        ''' 
-        }
-    } 
-        stage('Test spack-stack on Jet') {
-        agent {
-          label "jet"
-        }
-        environment {
-        ACCNR = 'hfv3gfs'
-        NODE_PATH = '/mnt/lfs4/HFIP/hfv3gfs/role.epic/'
-      }
-      steps {
-          
-        cleanWs()
-        checkout scm
-        sh '''
-        
-        '''
       }
     }
-  }  
-}
+  }

From fb26e25d1b389b537f18007baa7c441cb008ecf5 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 6 Oct 2023 13:40:15 -0400
Subject: [PATCH 061/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index fd10942dfb..762eb64cdb 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -31,7 +31,7 @@ pipeline {
           label "hercules"
         }
         environment {
-        ACCNR = 'epic'
+        ACCNR = 'nems'
         NODE_PATH = '/work/noaa/epic/role-epic/'
       }
       steps {
@@ -54,7 +54,7 @@ pipeline {
         cd ..
         cd tests
         module list
-        ./rt.sh -a epic -c -e -l rt.conf
+        ./rt.sh -a nems -c -e -l rt.conf
         '''
       }
       }

From 74fa9384f513cebd1e4dab596491cef4a62d2462 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 6 Oct 2023 14:16:32 -0400
Subject: [PATCH 062/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 762eb64cdb..868b847053 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -39,6 +39,7 @@ pipeline {
         cleanWs()
         checkout scm
         sh '''
+        groups
         git clone --recurse-submodules https://github.com/ufs-community/ufs-weather-model
         cd ufs-weather-model/modulefiles/
         sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-dev-20230825/envs/ufs-pio-2.5.10/install/modulefiles/Core|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core|g' ufs_hercules.gnu.lua 

From 6ee532a61451011dc1f72f0342dd216d425780ff Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 6 Oct 2023 17:18:24 -0400
Subject: [PATCH 063/103] Update rt.sh

---
 tests/rt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index 137a637b03..573a365ffe 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -401,7 +401,7 @@ elif [[ $MACHINE_ID = hercules ]]; then
   QUEUE=windfall
   COMPILE_QUEUE=windfall
   PARTITION=hercules
-  dprefix=/work2/noaa/stmp/${USER}
+  dprefix=/work/noaa/stmp/${USER}
   DISKNM=/work/noaa/epic/hercules/UFS-WM_RT
   STMP=$dprefix/stmp
   PTMP=$dprefix/stmp

From 21616b1f6966afc6ea089fc5835c907c17c4aa3e Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 6 Oct 2023 17:31:19 -0400
Subject: [PATCH 064/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 868b847053..97e04b71c5 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -40,7 +40,7 @@ pipeline {
         checkout scm
         sh '''
         groups
-        git clone --recurse-submodules https://github.com/ufs-community/ufs-weather-model
+        git clone -b Feature/ci_log_automation https://github.com/zach1221/ufs-weather-model
         cd ufs-weather-model/modulefiles/
         sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-dev-20230825/envs/ufs-pio-2.5.10/install/modulefiles/Core|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core|g' ufs_hercules.gnu.lua 
         sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|g' ufs_hercules.gnu.lua

From dbaf2cbd9d64584719a4624b0dc7b8b35a2f1163 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 10:52:32 -0400
Subject: [PATCH 065/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 97e04b71c5..1e2cfd2b62 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -40,22 +40,17 @@ pipeline {
         checkout scm
         sh '''
         groups
-        git clone -b Feature/ci_log_automation https://github.com/zach1221/ufs-weather-model
-        cd ufs-weather-model/modulefiles/
-        sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-dev-20230825/envs/ufs-pio-2.5.10/install/modulefiles/Core|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core|g' ufs_hercules.gnu.lua 
-        sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|g' ufs_hercules.gnu.lua
-        sed -i 's|stack_python_ver=os.getenv("stack_python_ver") or "3.9.14"|stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"|g' ufs_hercules.gnu.lua 
-        sed -i 's|3.3.3|4.3.0|g' ufs_hercules.gnu.lua 
-        sed -i 's|2.9.2|2.10.0|g' ufs_hercules.gnu.lua
-        sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-dev-20230825/envs/ufs-pio-2.5.10/install/modulefiles/Core|/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core|g' ufs_hercules.intel.lua
-        sed -i 's|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles|g' ufs_hercules.intel.lua  
-        sed -i 's|stack_python_ver=os.getenv("stack_python_ver") or "3.9.14"|stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"|g' ufs_hercules.intel.lua 
-        sed -i 's|3.3.3|4.3.0|g' ufs_hercules.intel.lua 
-        sed -i 's|2.9.2|2.10.0|g' ufs_hercules.intel.lua
-        cd ..
-        cd tests
-        module list
-        ./rt.sh -a nems -c -e -l rt.conf
+        cd /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0
+        module purge
+        module use /work/noaa/epic/role-epic/spack-stack/hercules/modulefiles
+        module load ecflow/5.8.4
+        module load mysql/8.0.31
+        source ./setup.sh
+        spack env activate -p envs/unified-env
+        spack concretize 2>&1 | tee log.concretize.unified-env.001
+        spack install --verbose 2>&1 | tee log.install.unified-env.001
+        spack module lmod refresh
+        spack stack setup-meta-modules
         '''
       }
       }

From 138f36c53d72f6e02e4e20c447b3aad60a2f251f Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 10:58:45 -0400
Subject: [PATCH 066/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 1e2cfd2b62..63bf3ae389 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -39,7 +39,6 @@ pipeline {
         cleanWs()
         checkout scm
         sh '''
-        groups
         cd /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0
         module purge
         module use /work/noaa/epic/role-epic/spack-stack/hercules/modulefiles

From d4ad85723405dc3f5a0fec91b942579b31c0efb4 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:07:22 -0400
Subject: [PATCH 067/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 63bf3ae389..7e063dd407 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -40,6 +40,8 @@ pipeline {
         checkout scm
         sh '''
         cd /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0
+        rm -rf log.concretize.unified-env.001
+        rm -rf log.install.unified-env.001
         module purge
         module use /work/noaa/epic/role-epic/spack-stack/hercules/modulefiles
         module load ecflow/5.8.4

From b76567d6bf80bf138757ebe7b911a033eb9201e9 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:10:47 -0400
Subject: [PATCH 068/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 7e063dd407..1a4e59e089 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -52,6 +52,7 @@ pipeline {
         spack install --verbose 2>&1 | tee log.install.unified-env.001
         spack module lmod refresh
         spack stack setup-meta-modules
+        y
         '''
       }
       }

From a1829b6b451c566bfff853c61ce4264e37ce3573 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:21:31 -0400
Subject: [PATCH 069/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 1a4e59e089..0877ba2e79 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -52,7 +52,7 @@ pipeline {
         spack install --verbose 2>&1 | tee log.install.unified-env.001
         spack module lmod refresh
         spack stack setup-meta-modules
-        y
+        module list
         '''
       }
       }

From 193afd4605b90fbb416d427562e96dec6935a399 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 14:36:52 -0400
Subject: [PATCH 070/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 0877ba2e79..92d3ba68a7 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -51,6 +51,7 @@ pipeline {
         spack concretize 2>&1 | tee log.concretize.unified-env.001
         spack install --verbose 2>&1 | tee log.install.unified-env.001
         spack module lmod refresh
+        y
         spack stack setup-meta-modules
         module list
         '''

From e93926f7836b78eebf4d64043f0708fbb4d4e1a0 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 14:44:22 -0400
Subject: [PATCH 071/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 92d3ba68a7..c404074b98 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -51,7 +51,7 @@ pipeline {
         spack concretize 2>&1 | tee log.concretize.unified-env.001
         spack install --verbose 2>&1 | tee log.install.unified-env.001
         spack module lmod refresh
-        y
+        echo y | command
         spack stack setup-meta-modules
         module list
         '''

From 4ca1040e73ac219ca894f33f15714925cb8e839d Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 15:02:23 -0400
Subject: [PATCH 072/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index c404074b98..551c80c7ee 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -50,8 +50,7 @@ pipeline {
         spack env activate -p envs/unified-env
         spack concretize 2>&1 | tee log.concretize.unified-env.001
         spack install --verbose 2>&1 | tee log.install.unified-env.001
-        spack module lmod refresh
-        echo y | command
+        spack module lmod refresh -y
         spack stack setup-meta-modules
         module list
         '''

From 2643396b5b1fc6509ed93935317860ce6e5d990e Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 9 Oct 2023 15:28:18 -0400
Subject: [PATCH 073/103] Update Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
index 551c80c7ee..9203db7d0f 100644
--- a/tests/ci/Jenkinsfile.spack_stack
+++ b/tests/ci/Jenkinsfile.spack_stack
@@ -52,6 +52,10 @@ pipeline {
         spack install --verbose 2>&1 | tee log.install.unified-env.001
         spack module lmod refresh -y
         spack stack setup-meta-modules
+        module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core
+        module load stack-gcc/11.3.1 openmpi/4.1.5 stack-openmpi/4.1.5 jasper/2.0.32 zlib/1.2.13 libpng/1.6.37 hdf5/1.14.0
+        module load netcdf-c/4.9.2 netcdf-fortran/4.6.0 parallelio/2.5.10 esmf/8.4.2 fms/2023.02 bacio/2.4.1 crtm/2.4.0 g2/3.4.5
+        module load g2tmpl/1.10.2 ip/4.3.0 sp/2.3.3 w3emc/2.10.0 gftl-shared/1.5.0 mapl/2.35.2-esmf-8.4.2 scotch/7.0.4
         module list
         '''
       }

From d36df0367b8f01fe82616a34bfa9c4e5adb6d43e Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 12 Oct 2023 14:06:15 -0400
Subject: [PATCH 074/103] Update cpld_control_p8 remove gnu wallclock

---
 tests/tests/cpld_control_p8 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
index 470aa18109..cf6d4a1cb3 100644
--- a/tests/tests/cpld_control_p8
+++ b/tests/tests/cpld_control_p8
@@ -85,7 +85,3 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = cheyenne ]]; then
   TPN=18
 fi
-
-if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
-  WLCLK=40
-fi

From 92273513f990bab5621ef44b6551f5f81a7d002f Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 12 Oct 2023 14:07:04 -0400
Subject: [PATCH 075/103] Update cpld_debug_p8 remove gnu wall clock

---
 tests/tests/cpld_debug_p8 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
index 2f32de047b..d8ce3c3a60 100644
--- a/tests/tests/cpld_debug_p8
+++ b/tests/tests/cpld_debug_p8
@@ -76,7 +76,3 @@ export FV3_RUN=cpld_control_run.IN
 if [[ $MACHINE_ID = cheyenne ]]; then
   TPN=18
 fi
-
-if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
-  WLCLK=40
-fi

From 3d028f089972502e249f97921c57f3ae23772bc0 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 12 Oct 2023 14:35:39 -0400
Subject: [PATCH 076/103] Update rt.conf re-add two cpld cases to gaea

---
 tests/rt.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/rt.conf b/tests/rt.conf
index 5345b5485c..71474d4146 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -35,8 +35,8 @@ RUN | cpld_2threads_p8                                  |   - noaacloud
 RUN | cpld_decomp_p8                                    |   - noaacloud                       |          |
 RUN | cpld_mpi_p8                                       |   - noaacloud                       |          |
 #RUN | cpld_multigrid_p8                                |   - noaacloud                       |          |
-RUN | cpld_control_ciceC_p8                             | - gaea  noaacloud                   | baseline |
-RUN | cpld_control_c192_p8                              | - wcoss2 jet acorn gaea s4 noaacloud | baseline |
+RUN | cpld_control_ciceC_p8                             |   - noaacloud                       | baseline |
+RUN | cpld_control_c192_p8                              | - wcoss2 jet acorn s4 noaacloud     | baseline |
 RUN | cpld_restart_c192_p8                              | - wcoss2 jet acorn gaea s4 noaacloud  |          | cpld_control_c192_p8
 RUN | cpld_bmark_p8                                     | - s4 jet cheyenne acorn   noaacloud   | baseline |
 RUN | cpld_restart_bmark_p8                             | - s4 jet cheyenne acorn   noaacloud   |          | cpld_bmark_p8

From 294f2d7a33dcd13626178a5850e5cf569e8fc527 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Tue, 17 Oct 2023 17:28:21 -0400
Subject: [PATCH 077/103] Update rt.conf replace cheyenne with derecho

---
 tests/rt.conf | 194 +++++++++++++++++++++++++-------------------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/tests/rt.conf b/tests/rt.conf
index 71474d4146..abb87ac760 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -38,8 +38,8 @@ RUN | cpld_mpi_p8                                       |   - noaacloud
 RUN | cpld_control_ciceC_p8                             |   - noaacloud                       | baseline |
 RUN | cpld_control_c192_p8                              | - wcoss2 jet acorn s4 noaacloud     | baseline |
 RUN | cpld_restart_c192_p8                              | - wcoss2 jet acorn gaea s4 noaacloud  |          | cpld_control_c192_p8
-RUN | cpld_bmark_p8                                     | - s4 jet cheyenne acorn   noaacloud   | baseline |
-RUN | cpld_restart_bmark_p8                             | - s4 jet cheyenne acorn   noaacloud   |          | cpld_bmark_p8
+RUN | cpld_bmark_p8                                     | - s4 jet derecho acorn noaacloud      | baseline |
+RUN | cpld_restart_bmark_p8                             | - s4 jet derecho acorn noaacloud      |          | cpld_bmark_p8
 
 COMPILE | s2sw | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 |                                 | fv3 |
 RUN | cpld_control_noaero_p8                            |                                       | baseline |
@@ -60,17 +60,17 @@ RUN | cpld_control_c48                                   |
 #RUN | cpld_warmstart_c48                                |    - noaacloud                       | baseline |
 #RUN | cpld_restart_c48                                  |    - noaacloud                       |          | cpld_warmstart_c48
 
-COMPILE | s2swa_faster | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DFASTER=ON | - cheyenne  noaacloud  | fv3 |
-RUN | cpld_control_p8_faster                            | - cheyenne  noaacloud                 | baseline |
+COMPILE | s2swa_faster | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DFASTER=ON | - derecho noaacloud  | fv3 |
+RUN | cpld_control_p8_faster                            | - derecho  noaacloud                  | baseline |
 
 # Unstructured WW3 mesh
-COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | + hera orion cheyenne wcoss2 | fv3 |
-RUN | cpld_control_pdlib_p8                             | + hera orion cheyenne wcoss2    | baseline |
-RUN | cpld_restart_pdlib_p8                             | + hera orion cheyenne wcoss2    |          | cpld_control_pdlib_p8
-RUN | cpld_mpi_pdlib_p8                                 | + hera orion cheyenne wcoss2    |          | cpld_control_pdlib_p8
+COMPILE | s2sw_pdlib | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | + hera orion derecho wcoss2 | fv3 |
+RUN | cpld_control_pdlib_p8                             | + hera orion derecho wcoss2           | baseline |
+RUN | cpld_restart_pdlib_p8                             | + hera orion derecho wcoss2           |          | cpld_control_pdlib_p8
+RUN | cpld_mpi_pdlib_p8                                 | + hera orion derecho wcoss2           |          | cpld_control_pdlib_p8
 
-COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | + hera orion cheyenne wcoss2 | fv3 |
-RUN | cpld_debug_pdlib_p8                               | + hera orion cheyenne wcoss2    | baseline |
+COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | + hera orion derecho wcoss2 | fv3 |
+RUN | cpld_debug_pdlib_p8                               | + hera orion derecho wcoss2           | baseline |
 
 ### ATM tests ###
 COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn -D32BIT=ON | | fv3 |
@@ -207,7 +207,7 @@ COMPILE | rrfs_dyn32_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_H
 RUN | rap_control_debug_dyn32_phy32                     |  - noaacloud                 | baseline |
 RUN | hrrr_control_debug_dyn32_phy32                    |  - noaacloud                 | baseline |
 RUN | conus13km_debug                                   |  - noaacloud                 | baseline |
-RUN | conus13km_debug_qr                                |  - noaacloud cheyenne        |          |
+RUN | conus13km_debug_qr                                |  - noaacloud derecho         |          |
 RUN | conus13km_debug_2threads                          |  - noaacloud                 |          |
 RUN | conus13km_radar_tten_debug                        |  - noaacloud                 | baseline |
 
@@ -225,15 +225,15 @@ RUN | hafs_regional_atm_ocn                             |
 RUN | hafs_regional_atm_wav                             |                               | baseline |
 RUN | hafs_regional_atm_ocn_wav                         | - noaacloud                   | baseline |
 RUN | hafs_regional_1nest_atm                           | - jet s4  noaacloud           | baseline |
-RUN | hafs_regional_1nest_atm_qr                        | - jet s4 cheyenne noaacloud   |          |
+RUN | hafs_regional_1nest_atm_qr                        | - jet s4 derecho noaacloud    |          |
 RUN | hafs_regional_telescopic_2nests_atm               | - jet s4  noaacloud           | baseline |
 RUN | hafs_global_1nest_atm                             | - jet s4  noaacloud           | baseline |
-RUN | hafs_global_1nest_atm_qr                          | - jet s4 cheyenne noaacloud   |          |
+RUN | hafs_global_1nest_atm_qr                          | - jet s4 derecho noaacloud    |          |
 RUN | hafs_global_multiple_4nests_atm                   | - jet s4  noaacloud           | baseline |
-RUN | hafs_global_multiple_4nests_atm_qr                | - jet s4 cheyenne noaacloud   |          |
+RUN | hafs_global_multiple_4nests_atm_qr                | - jet s4 derecho noaacloud    |          |
 RUN | hafs_regional_specified_moving_1nest_atm          | - jet s4  noaacloud           | baseline |
 RUN | hafs_regional_storm_following_1nest_atm           | - jet s4  noaacloud           | baseline |
-RUN | hafs_regional_storm_following_1nest_atm_qr        | - jet s4 cheyenne noaacloud   |          |
+RUN | hafs_regional_storm_following_1nest_atm_qr        | - jet s4 derecho noaacloud    |          |
 RUN | hafs_regional_storm_following_1nest_atm_ocn       | - jet s4  noaacloud           | baseline |
 RUN | hafs_global_storm_following_1nest_atm             | - jet s4  noaacloud           | baseline |
 
@@ -287,7 +287,7 @@ RUN | atmwav_control_noaero_p8                          | - wcoss2
 #connectors (wmesmf)
 COMPILE | atmwm | intel | -DAPP=ATMWM -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON | - wcoss2     | fv3 |
 RUN | control_atmwav                                    | - wcoss2                             | baseline |
-#RUN | control_c384gdas_wav                             | - jet cheyenne wcoss2   noaacloud    | baseline |
+#RUN | control_c384gdas_wav                             | - jet derecho wcoss2   noaacloud     | baseline |
 
 ### ATM-GOCART tests ###
 COMPILE | atmaero | intel | -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON | - noaacloud    | fv3 |
@@ -300,7 +300,7 @@ COMPILE | atmaq | intel | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -D32BIT=ON | -
 RUN | regional_atmaq                                    | - jet s4                             | baseline |
 
 COMPILE | atmaq_debug | intel | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON | - jet noaacloud    gaea cheyenne s4 | fv3 |
-RUN | regional_atmaq_debug                              | - jet gaea cheyenne s4  noaacloud    | baseline |
+RUN | regional_atmaq_debug                              | - jet gaea derecho s4  noaacloud    | baseline |
 
 COMPILE | atmaq_faster | intel | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON -D32BIT=ON | - jet    wcoss2 acorn s4 | fv3 |
 RUN | regional_atmaq_faster                             | - jet wcoss2 acorn s4                | baseline |
@@ -308,106 +308,106 @@ RUN | regional_atmaq_faster                             | - jet wcoss2 acorn s4
 
 ### GNU TESTS ###
 ### CCPP PROD tests ###
-COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8 | + hera cheyenne hercules | fv3 |
-RUN | control_c48                                       | + hera cheyenne hercules            | baseline |
-RUN | control_stochy                                    | + hera cheyenne hercules            | baseline |
-RUN | control_ras                                       | + hera cheyenne hercules            | baseline |
-RUN | control_p8                                        | + hera cheyenne hercules            | baseline |
-RUN | control_flake                                     | + hera cheyenne hercules            | baseline |
-
-COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera cheyenne hercules | fv3 |
-RUN | rap_control                                       | + hera cheyenne hercules            | baseline |
-RUN | rap_decomp                                        | + hera cheyenne hercules            |          |
-RUN | rap_2threads                                      | + hera cheyenne hercules            |          |
-RUN | rap_restart                                       | + hera cheyenne hercules            |          | rap_control
-RUN | rap_sfcdiff                                       | + hera cheyenne hercules            | baseline |
-RUN | rap_sfcdiff_decomp                                | + hera cheyenne hercules            |          |
-RUN | rap_sfcdiff_restart                               | + hera cheyenne hercules            |          | rap_sfcdiff
-RUN | hrrr_control                                      | + hera cheyenne hercules            | baseline |
-RUN | hrrr_control_qr                                   | + hera cheyenne hercules            |          |
-RUN | hrrr_control_2threads                             | + hera cheyenne hercules            |          |
-RUN | hrrr_control_decomp                               | + hera cheyenne hercules            |          |
-RUN | hrrr_control_restart                              | + hera cheyenne hercules            |          | hrrr_control
-RUN | hrrr_control_restart_qr                           | + hera cheyenne hercules            |          | hrrr_control_qr
-RUN | rrfs_v1beta                                       | + hera cheyenne hercules            | baseline |
+COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8 | + hera hercules | fv3 |
+RUN | control_c48                                       | + hera hercules            | baseline |
+RUN | control_stochy                                    | + hera hercules            | baseline |
+RUN | control_ras                                       | + hera hercules            | baseline |
+RUN | control_p8                                        | + hera hercules            | baseline |
+RUN | control_flake                                     | + hera hercules            | baseline |
+
+COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera hercules | fv3 |
+RUN | rap_control                                       | + hera hercules            | baseline |
+RUN | rap_decomp                                        | + hera hercules            |          |
+RUN | rap_2threads                                      | + hera hercules            |          |
+RUN | rap_restart                                       | + hera hercules            |          | rap_control
+RUN | rap_sfcdiff                                       | + hera hercules            | baseline |
+RUN | rap_sfcdiff_decomp                                | + hera hercules            |          |
+RUN | rap_sfcdiff_restart                               | + hera hercules            |          | rap_sfcdiff
+RUN | hrrr_control                                      | + hera hercules            | baseline |
+RUN | hrrr_control_qr                                   | + hera hercules            |          |
+RUN | hrrr_control_2threads                             | + hera hercules            |          |
+RUN | hrrr_control_decomp                               | + hera hercules            |          |
+RUN | hrrr_control_restart                              | + hera hercules            |          | hrrr_control
+RUN | hrrr_control_restart_qr                           | + hera hercules            |          | hrrr_control_qr
+RUN | rrfs_v1beta                                       | + hera hercules            | baseline |
 
 ### CCPP DEBUG tests ###
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)
-COMPILE | atm_dyn32_debug | gnu | -DAPP=ATM -D32BIT=ON -DDEBUG=ON | + hera cheyenne hercules | fv3 |
-RUN | control_diag_debug                                | + hera cheyenne hercules            | baseline |
-RUN | regional_debug                                    | + hera cheyenne hercules            | baseline |
-RUN | rap_control_debug                                 | + hera cheyenne hercules            | baseline |
-RUN | hrrr_control_debug                                | + hera cheyenne hercules            | baseline |
-RUN | hrrr_gf_debug                                     | + hera cheyenne hercules            | baseline |
-RUN | hrrr_c3_debug                                     | + hera cheyenne hercules            | baseline |
-RUN | rap_diag_debug                                    | + hera cheyenne hercules            | baseline |
-RUN | rap_noah_sfcdiff_cires_ugwp_debug                 | + hera cheyenne hercules            | baseline |
-RUN | rap_progcld_thompson_debug                        | + hera cheyenne hercules            | baseline |
-RUN | rrfs_v1beta_debug                                 | + hera cheyenne hercules            | baseline |
-RUN | control_ras_debug                                 | + hera cheyenne hercules            | baseline |
-RUN | control_stochy_debug                              | + hera cheyenne hercules            | baseline |
-RUN | control_debug_p8                                  | + hera cheyenne hercules            | baseline |
-RUN | rap_flake_debug                                   | + hera cheyenne hercules            | baseline |
-RUN | rap_clm_lake_debug                                | + hera cheyenne hercules            | baseline |
-
-
-COMPILE | wam_debug | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | + hera cheyenne hercules | fv3 |
-RUN | control_wam_debug                                 | + hera cheyenne                     | baseline |
+COMPILE | atm_dyn32_debug | gnu | -DAPP=ATM -D32BIT=ON -DDEBUG=ON | + hera hercules | fv3 |
+RUN | control_diag_debug                                | + hera hercules            | baseline |
+RUN | regional_debug                                    | + hera hercules            | baseline |
+RUN | rap_control_debug                                 | + hera hercules            | baseline |
+RUN | hrrr_control_debug                                | + hera hercules            | baseline |
+RUN | hrrr_gf_debug                                     | + hera hercules            | baseline |
+RUN | hrrr_c3_debug                                     | + hera hercules            | baseline |
+RUN | rap_diag_debug                                    | + hera hercules            | baseline |
+RUN | rap_noah_sfcdiff_cires_ugwp_debug                 | + hera hercules            | baseline |
+RUN | rap_progcld_thompson_debug                        | + hera hercules            | baseline |
+RUN | rrfs_v1beta_debug                                 | + hera hercules            | baseline |
+RUN | control_ras_debug                                 | + hera hercules            | baseline |
+RUN | control_stochy_debug                              | + hera hercules            | baseline |
+RUN | control_debug_p8                                  | + hera hercules            | baseline |
+RUN | rap_flake_debug                                   | + hera hercules            | baseline |
+RUN | rap_clm_lake_debug                                | + hera hercules            | baseline |
+
+
+COMPILE | wam_debug | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | + hera hercules | fv3 |
+RUN | control_wam_debug                                 | + hera                     | baseline |
 
 
 ### 32-bit physics tests ###
-COMPILE | rrfs_dyn32_phy32 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | + hera cheyenne hercules | fv3 |
-RUN | rap_control_dyn32_phy32                           | + hera cheyenne hercules            | baseline |
-RUN | hrrr_control_dyn32_phy32                          | + hera cheyenne hercules            | baseline |
-RUN | hrrr_control_qr_dyn32_phy32                       | + hera cheyenne hercules            |          |
-RUN | rap_2threads_dyn32_phy32                          | + hera cheyenne hercules            |          |
-RUN | hrrr_control_2threads_dyn32_phy32                 | + hera cheyenne hercules            |          |
-RUN | hrrr_control_decomp_dyn32_phy32                   | + hera cheyenne hercules            |          |
-RUN | rap_restart_dyn32_phy32                           | + hera cheyenne hercules            |          | rap_control_dyn32_phy32
-RUN | hrrr_control_restart_dyn32_phy32                  | + hera cheyenne hercules            |          | hrrr_control_dyn32_phy32
-RUN | hrrr_control_restart_qr_dyn32_phy32               | + hera cheyenne hercules            |          | hrrr_control_qr_dyn32_phy32
-RUN | conus13km_control                                 | + hera cheyenne hercules            | baseline |
-RUN | conus13km_2threads                                | + hera cheyenne hercules            |          | conus13km_control
-RUN | conus13km_restart_mismatch                        | + hera cheyenne hercules            | baseline | conus13km_control
+COMPILE | rrfs_dyn32_phy32 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | + hera hercules | fv3 |
+RUN | rap_control_dyn32_phy32                           | + hera hercules            | baseline |
+RUN | hrrr_control_dyn32_phy32                          | + hera hercules            | baseline |
+RUN | hrrr_control_qr_dyn32_phy32                       | + hera hercules            |          |
+RUN | rap_2threads_dyn32_phy32                          | + hera hercules            |          |
+RUN | hrrr_control_2threads_dyn32_phy32                 | + hera hercules            |          |
+RUN | hrrr_control_decomp_dyn32_phy32                   | + hera hercules            |          |
+RUN | rap_restart_dyn32_phy32                           | + hera hercules            |          | rap_control_dyn32_phy32
+RUN | hrrr_control_restart_dyn32_phy32                  | + hera hercules            |          | hrrr_control_dyn32_phy32
+RUN | hrrr_control_restart_qr_dyn32_phy32               | + hera hercules            |          | hrrr_control_qr_dyn32_phy32
+RUN | conus13km_control                                 | + hera hercules            | baseline |
+RUN | conus13km_2threads                                | + hera hercules            |          | conus13km_control
+RUN | conus13km_restart_mismatch                        | + hera hercules            | baseline | conus13km_control
 
 # Expected to fail:
-# RUN | conus13km_restart                               | + hera cheyenne hercules            |          | conus13km_control
-# RUN | conus13km_decomp                                | + hera cheyenne hercules            |          | conus13km_control
+# RUN | conus13km_restart                               | + hera hercules            |          | conus13km_control
+# RUN | conus13km_decomp                                | + hera hercules            |          | conus13km_control
 
-COMPILE | atm_dyn64_phy32 | gnu | -DAPP=ATM -DCCPP_32BIT=ON | + hera cheyenne hercules | fv3 |
-RUN | rap_control_dyn64_phy32                           | + hera cheyenne hercules            | baseline |
+COMPILE | atm_dyn64_phy32 | gnu | -DAPP=ATM -DCCPP_32BIT=ON | + hera hercules | fv3 |
+RUN | rap_control_dyn64_phy32                           | + hera hercules            | baseline |
 
-COMPILE | atm_dyn32_phy32_debug | gnu | -DAPP=ATM -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | + hera cheyenne hercules | fv3 |
-RUN | rap_control_debug_dyn32_phy32                     | + hera cheyenne hercules            | baseline |
-RUN | hrrr_control_debug_dyn32_phy32                    | + hera cheyenne hercules            | baseline |
-RUN | conus13km_debug                                   | + hera cheyenne hercules            | baseline |
+COMPILE | atm_dyn32_phy32_debug | gnu | -DAPP=ATM -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | + hera hercules | fv3 |
+RUN | rap_control_debug_dyn32_phy32                     | + hera hercules            | baseline |
+RUN | hrrr_control_debug_dyn32_phy32                    | + hera hercules            | baseline |
+RUN | conus13km_debug                                   | + hera hercules            | baseline |
 RUN | conus13km_debug_qr                                | + hera          hercules            |          |
-RUN | conus13km_debug_2threads                          | + hera cheyenne hercules            |          |
-RUN | conus13km_radar_tten_debug                        | + hera cheyenne hercules            | baseline |
+RUN | conus13km_debug_2threads                          | + hera hercules            |          |
+RUN | conus13km_radar_tten_debug                        | + hera hercules            | baseline |
 
 # Expected to fail:
-# RUN | conus13km_debug_decomp       | + hera cheyenne hercules            |          |
+# RUN | conus13km_debug_decomp       | + hera hercules            |          |
 
-COMPILE | atm_dyn64_phy32_debug | gnu | -DAPP=ATM -DCCPP_32BIT=ON -DDEBUG=ON | + hera cheyenne hercules | fv3 |
-RUN | rap_control_dyn64_phy32_debug                     | + hera cheyenne hercules            | baseline |
+COMPILE | atm_dyn64_phy32_debug | gnu | -DAPP=ATM -DCCPP_32BIT=ON -DDEBUG=ON | + hera hercules | fv3 |
+RUN | rap_control_dyn64_phy32_debug                     | + hera hercules            | baseline |
 
 ### S2S tests ###
-COMPILE | s2swa | gnu | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera cheyenne hercules | fv3 |
-RUN | cpld_control_p8                                   | + hera cheyenne hercules            | baseline |
+COMPILE | s2swa | gnu | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera hercules | fv3 |
+RUN | cpld_control_p8                                   | + hera hercules            | baseline |
 
-COMPILE | s2s | gnu | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera cheyenne hercules | fv3 |
-RUN | cpld_control_nowave_noaero_p8                     | + hera cheyenne hercules            | baseline |
+COMPILE | s2s | gnu | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera hercules | fv3 |
+RUN | cpld_control_nowave_noaero_p8                     | + hera hercules            | baseline |
 
-COMPILE | s2swa_debug | gnu | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera cheyenne hercules | fv3 |
-RUN | cpld_debug_p8                                     | + hera cheyenne hercules            | baseline |
+COMPILE | s2swa_debug | gnu | -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | + hera hercules | fv3 |
+RUN | cpld_debug_p8                                     | + hera hercules            | baseline |
 
 # Unstructured WW3
-COMPILE | s2sw_pdlib | gnu | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | + hera cheyenne hercules | fv3 |
-RUN | cpld_control_pdlib_p8                             | + hera cheyenne hercules            | baseline |
+COMPILE | s2sw_pdlib | gnu | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON | + hera hercules | fv3 |
+RUN | cpld_control_pdlib_p8                             | + hera hercules            | baseline |
 
-COMPILE | s2sw_pdlib_debug | gnu | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | + hera cheyenne hercules | fv3 |
-RUN | cpld_debug_pdlib_p8                               | + hera cheyenne hercules            | baseline |
+COMPILE | s2sw_pdlib_debug | gnu | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON | + hera hercules | fv3 |
+RUN | cpld_debug_pdlib_p8                               | + hera hercules            | baseline |
 
 ### CDEPS Data Atmosphere test ###
-COMPILE | datm_cdeps | gnu | -DAPP=NG-GODAS | + hera cheyenne hercules | fv3 |
-RUN | datm_cdeps_control_cfsr                           | + hera cheyenne hercules            | baseline |
+COMPILE | datm_cdeps | gnu | -DAPP=NG-GODAS | + hera hercules | fv3 |
+RUN | datm_cdeps_control_cfsr                           | + hera hercules            | baseline |

From 50aaa6f1a48972dd6bfe6c6c3946e03961b2e117 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Tue, 17 Oct 2023 17:30:30 -0400
Subject: [PATCH 078/103] Update rt.sh removing cheyenne

---
 tests/rt.sh | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index 573a365ffe..c3d10ec520 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -459,33 +459,6 @@ elif [[ $MACHINE_ID = s4 ]]; then
 
   SCHEDULER=slurm
 
-elif [[ $MACHINE_ID = cheyenne ]]; then
-
-  export PATH=/glade/work/jedipara/cheyenne/spack-stack/miniconda-3.9.12/bin:$PATH
-  export PYTHONPATH=/glade/work/jedipara/cheyenne/spack-stack/miniconda-3.9.12/lib/python3.9/site-packages
-
-  module use /gpfs/fs1/work/strahan/rocoto/modulefiles
-  module load rocoto/1.3.3
-  ROCOTORUN=$(which rocotorun)
-  ROCOTOSTAT=$(which rocotostat)
-  ROCOTOCOMPLETE=$(which rocotocomplete)
-  ROCOTO_SCHEDULER=pbspro
-  ROCOTO_NODESIZE=36
-
-  module use /glade/work/jedipara/cheyenne/spack-stack/modulefiles/misc
-  module load ecflow/5.8.4
-  ECFLOW_START=/glade/work/jedipara/cheyenne/spack-stack/ecflow-5.8.4/bin/ecflow_start.sh
-  ECF_PORT=$(( $(id -u) + 1500 ))
-
-  QUEUE=regular
-  COMPILE_QUEUE=regular
-  PARTITION=
-  dprefix=/glade/scratch
-  DISKNM=/glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT
-  STMP=$dprefix
-  PTMP=$dprefix
-  SCHEDULER=pbs
-
 elif [[ $MACHINE_ID = stampede ]]; then
 
   export PYTHONPATH=
@@ -665,10 +638,6 @@ if [[ $ROCOTO == true ]]; then
     QUEUE=batch
     COMPILE_QUEUE=batch
     ROCOTO_SCHEDULER=slurm
-  elif [[ $MACHINE_ID = cheyenne ]]; then
-    QUEUE=regular
-    COMPILE_QUEUE=regular
-    ROCOTO_SCHEDULER=pbspro
   elif [[ $MACHINE_ID = gaea ]]; then
     QUEUE=normal
     COMPILE_QUEUE=normal
@@ -745,8 +714,6 @@ EOF
     QUEUE=s4
   elif [[ $MACHINE_ID = gaea ]]; then
     QUEUE=normal
-  elif [[ $MACHINE_ID = cheyenne ]]; then
-    QUEUE=regular
   else
     die "ecFlow is not supported on this machine $MACHINE_ID"
   fi

From 514bce7f39d4ea641e641a92d1987cc252c56244 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Tue, 17 Oct 2023 17:31:15 -0400
Subject: [PATCH 079/103] Update module-setup.sh removing cheyenne

---
 tests/module-setup.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/module-setup.sh b/tests/module-setup.sh
index c58f881a88..9b96000535 100755
--- a/tests/module-setup.sh
+++ b/tests/module-setup.sh
@@ -43,13 +43,6 @@ elif [[ $MACHINE_ID = wcoss2 || $MACHINE_ID = acorn ]] ; then
     fi
     module purge
     module reset
-
-elif [[ $MACHINE_ID = cheyenne ]] ; then
-    # We are on NCAR Cheyenne
-    if ( ! eval module help > /dev/null 2>&1 ) ; then
-        source /glade/u/apps/ch/modulefiles/default/localinit/localinit.sh
-    fi
-    module purge
     
 elif [[ $MACHINE_ID = noaacloud ]] ; then
     # We are on NOAA Cloud

From 383a5c8d3088846bd3ba0d1f4706d008b2ee2e1b Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 09:38:20 -0400
Subject: [PATCH 080/103] Update detect_machine.sh remove cheyenne

---
 tests/detect_machine.sh | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
index 249ac536a8..5bbe29511b 100755
--- a/tests/detect_machine.sh
+++ b/tests/detect_machine.sh
@@ -80,25 +80,6 @@ case $(hostname -f) in
   Hercules-login-3.HPC.MsState.Edu) MACHINE_ID=hercules;; ### hercules3
   Hercules-login-4.HPC.MsState.Edu) MACHINE_ID=hercules;; ### hercules4
 
-  cheyenne1.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
-  cheyenne2.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne2
-  cheyenne3.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne3
-  cheyenne4.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne4
-  cheyenne5.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne5
-  cheyenne6.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne6
-  cheyenne1.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
-  cheyenne2.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne2
-  cheyenne3.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne3
-  cheyenne4.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne4
-  cheyenne5.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne5
-  cheyenne6.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne6
-  chadmin1.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
-  chadmin2.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
-  chadmin3.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
-  chadmin4.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
-  chadmin5.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
-  chadmin6.ib0.cheyenne.ucar.edu) MACHINE_ID=cheyenne ;; ### cheyenne1
-
   login1.stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1
   login2.stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede2
   login3.stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede3

From 0e87b80709fbd33fee89c06b23432ad6e86cef79 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 09:39:26 -0400
Subject: [PATCH 081/103] Update default_vars.sh remove cheyenne

---
 tests/default_vars.sh | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 0bdf7e8821..923f0ea510 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -227,49 +227,6 @@ elif [[ $MACHINE_ID = gaea ]]; then
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
   WAV_tasks_atmw_gdas=264
 
-elif [[ $MACHINE_ID = cheyenne ]]; then
-
-  TPN=36
-
-  INPES_dflt=3 ; JNPES_dflt=8
-  INPES_thrd=3 ; JNPES_thrd=4
-  INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
-  INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
-
-  THRD_cpl_atmw_gdas=3
-  INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
-  WAV_tasks_atmw_gdas=264
-
-  THRD_cpl_dflt=1
-  INPES_cpl_dflt=6; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
-  OCN_tasks_cpl_dflt=20
-  ICE_tasks_cpl_dflt=10
-  WAV_tasks_cpl_dflt=20
-
-  THRD_cpl_thrd=2
-  INPES_cpl_thrd=6; JNPES_cpl_thrd=4; WPG_cpl_thrd=6
-  OCN_tasks_cpl_thrd=20
-  ICE_tasks_cpl_thrd=10
-  WAV_tasks_cpl_thrd=20
-
-  THRD_cpl_dcmp=1
-  INPES_cpl_dcmp=4; JNPES_cpl_dcmp=12; WPG_cpl_dcmp=6
-  OCN_tasks_cpl_dcmp=20
-  ICE_tasks_cpl_dcmp=10
-  WAV_tasks_cpl_dcmp=20
-
-  THRD_cpl_mpi=1
-  INPES_cpl_mpi=6; JNPES_cpl_mpi=12; WPG_cpl_mpi=6
-  OCN_tasks_cpl_mpi=24
-  ICE_tasks_cpl_mpi=12
-  WAV_tasks_cpl_mpi=24
-
-  THRD_cpl_bmrk=2
-  INPES_cpl_bmrk=12; JNPES_cpl_bmrk=8; WPG_cpl_bmrk=48
-  OCN_tasks_cpl_bmrk=120
-  ICE_tasks_cpl_bmrk=48
-  WAV_tasks_cpl_bmrk=100
-
 elif [[ $MACHINE_ID = stampede ]]; then
 
   echo "Unknown MACHINE_ID ${MACHINE_ID}. Please update tasks configurations in default_vars.sh"

From b3201274ff54ce307640aca7eb01b729c6c49c5d Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 09:40:28 -0400
Subject: [PATCH 082/103] Update compile.sh add derecho

---
 tests/compile.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/compile.sh b/tests/compile.sh
index 34d9b79d9b..e2ae1fa723 100755
--- a/tests/compile.sh
+++ b/tests/compile.sh
@@ -45,7 +45,7 @@ BUILD_DIR=${BUILD_DIR:-$(pwd)/build_${BUILD_NAME}}
 # ----------------------------------------------------------------------
 # Make sure we have reasonable number of threads.
 
-if [[ $MACHINE_ID == cheyenne ]]; then
+if [[ $MACHINE_ID == derecho ]]; then
     BUILD_JOBS=${BUILD_JOBS:-3}
 fi
 

From e345fe8f3eedd44faf6a434b24d7560fa76ca3e5 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 09:41:57 -0400
Subject: [PATCH 083/103] Update rt_utils.sh add derecho

---
 tests/rt_utils.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
index 0bdba5ab60..64e526fd47 100755
--- a/tests/rt_utils.sh
+++ b/tests/rt_utils.sh
@@ -347,7 +347,7 @@ check_results() {
         fi
 
         if [[ $d -eq 1 && ${i##*.} == 'nc' ]] ; then
-          if [[ " orion hercules hera wcoss2 acorn cheyenne gaea jet s4 noaacloud " =~ " ${MACHINE_ID} " ]]; then
+          if [[ " orion hercules hera wcoss2 acorn derecho gaea jet s4 noaacloud " =~ " ${MACHINE_ID} " ]]; then
             printf ".......ALT CHECK.." >> ${RT_LOG}
             printf ".......ALT CHECK.."
               if [[ $CMP_DATAONLY == false ]]; then

From a5a3483fc80c6cbf17dec7b0f9cf1d53cf13e174 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 09:44:06 -0400
Subject: [PATCH 084/103] Update run_test.sh add derecho

---
 tests/run_test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run_test.sh b/tests/run_test.sh
index 61c59c6b51..e9bb964a00 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -97,7 +97,7 @@ cp ${PATHTR}/modulefiles/ufs_common*               ./modulefiles/.
 cp ${PATHRT}/module-setup.sh                       module-setup.sh
 
 # load nccmp module
-if [[ " s4 hera orion hercules gaea jet cheyenne acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
+if [[ " s4 hera orion hercules gaea jet derecho acorn wcoss2 " =~ " $MACHINE_ID " ]]; then
   if [[ " wcoss2 acorn " =~ " ${MACHINE_ID} " ]] ; then
     module load intel/19.1.3.304 netcdf/4.7.4
     module load nccmp

From ea6a976ef6e8cac2e11f09d665af3fb7fca50ed6 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:04:19 -0400
Subject: [PATCH 085/103] Update and rename ufs_cheyenne.intel.lua to
 ufs_derecho.intel.lua

---
 modulefiles/ufs_cheyenne.intel.lua | 61 ------------------------------
 modulefiles/ufs_derecho.intel.lua  | 43 +++++++++++++++++++++
 2 files changed, 43 insertions(+), 61 deletions(-)
 delete mode 100644 modulefiles/ufs_cheyenne.intel.lua
 create mode 100644 modulefiles/ufs_derecho.intel.lua

diff --git a/modulefiles/ufs_cheyenne.intel.lua b/modulefiles/ufs_cheyenne.intel.lua
deleted file mode 100644
index 3401e5f0c2..0000000000
--- a/modulefiles/ufs_cheyenne.intel.lua
+++ /dev/null
@@ -1,61 +0,0 @@
-help([[
-loads UFS Model prerequisites for Cheyenne/Intel
-]])
-
-cmake_ver=os.getenv("cmake_ver") or "3.22.0"
-load(pathJoin("cmake", cmake_ver))
-
-python_ver=os.getenv("python_ver") or "3.7.9"
-load(pathJoin("python", python))
-
---load programming environment
-ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
-load(pathJoin("ncarenv", ncarenv_ver))
-
-intel_ver=os.getenv("intel_ver") or "2022.1"
-load(pathJoin("intel", intel_ver))
-
-mpt_ver=os.getenv("mpt_ver") or "2.25"
-load(pathJoin("mpt", mpt_ver))
-
-ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
-load(pathJoin("ncarcompilers", ncarcompilers_ver))
-
-unload("netcdf")
-
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1_ncdf492/modulefiles/stack")
-
-hpc_ver=os.getenv("hpc_ver") or "1.2.0"
-load(pathJoin("hpc", hpc_ver))
-
-hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1"
-load(pathJoin("hpc-intel", hpc_intel_ver))
-
-hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25"
-load(pathJoin("hpc-mpt", hpc_mpt_ver))
-
-load("jasper/2.0.25")
-load("zlib/1.2.11")
-load("hdf5/1.14.0")
-load("netcdf/4.9.2")
-load("pio/2.5.10")
-load("esmf/8.4.2")
-load("fms/2023.01")
-load("bacio/2.4.1")
-load("crtm/2.4.0")
-load("g2/3.4.5")
-load("g2tmpl/1.10.2")
-load("ip/3.3.3")
-load("sp/2.3.3")
-load("w3emc/2.9.2")
-load("gftl-shared/v1.5.0")
-load("mapl/2.35.2-esmf-8.4.2")
-load("scotch/7.0.3")
-
-
-setenv("CC", "mpicc")
-setenv("CXX", "mpicxx")
-setenv("FC", "mpif90")
-setenv("CMAKE_Platform", "cheyenne.intel")
-
-whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_derecho.intel.lua b/modulefiles/ufs_derecho.intel.lua
new file mode 100644
index 0000000000..fe785058f8
--- /dev/null
+++ b/modulefiles/ufs_derecho.intel.lua
@@ -0,0 +1,43 @@
+help([[
+loads UFS Model prerequisites for NOAA Parallelworks/Intel
+]])
+
+
+setenv("LMOD_TMOD_FIND_FIRST","yes")
+prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles")
+load("ecflow/5.8.4")
+load("mysql/8.0.33")
+
+setenv("LMOD_TMOD_FIND_FIRST","yes")
+prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
+prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/spack-stack/spack-stack-dev-20230825/envs/unified-env/install/modulefiles/Core")
+--prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/spack-stack/spack-stack-dev-20230814/envs/unified-en2/install/modulefiles/Core")
+--prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/spack-stack/spack-stack-dev-20230814/envs/unified-env/install/modulefiles/Core")
+--prepend_path("MODULEPATH", "/lustre/desc1/scratch/mpotts/spack-stack/spack-stack-dev-20230814/envs/ufs-pio-2.5.10/install/modulefiles/Core")
+--prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/spack-stack/spack-stack-1.4.1/envs/unified-dev/install/modulefiles/Core")
+
+--stack_intel_ver=os.getenv("stack_intel_ver") or "2021.8.0"
+stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
+load(pathJoin("stack-intel", stack_intel_ver))
+
+--stack_impi_ver=os.getenv("stack_impi_ver") or "2021.8.0"
+--load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "8.1.25"
+load(pathJoin("stack-cray-mpich", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.26.3"
+load(pathJoin("cmake", cmake_ver))
+
+stack_python_ver=os.getenv("stack_python_ver") or "3.10.10"
+load(pathJoin("stack-python", stack_python_ver))
+
+
+setenv("CMAKE_Platform", "derecho.intel")
+load("ufs-weather-model-env")
+--prepend_path("PATH","/opt/cray/pe/pals/1.2.11/bin")
+--setenv("CC", "cc")
+--setenv("CXX", "CC")
+--setenv("FC", "ftn")
+
+whatis("Description: UFS build environment")

From c8a81eb65fc061a3c0137af50d898b5bcccb7a6c Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:11:46 -0400
Subject: [PATCH 086/103] Delete modulefiles/ufs_cheyenne.gnu.lua

---
 modulefiles/ufs_cheyenne.gnu.lua | 60 --------------------------------
 1 file changed, 60 deletions(-)
 delete mode 100644 modulefiles/ufs_cheyenne.gnu.lua

diff --git a/modulefiles/ufs_cheyenne.gnu.lua b/modulefiles/ufs_cheyenne.gnu.lua
deleted file mode 100644
index 74f3ada97b..0000000000
--- a/modulefiles/ufs_cheyenne.gnu.lua
+++ /dev/null
@@ -1,60 +0,0 @@
-help([[
-loads UFS Model prerequisites for Cheyenne/GNU
-]])
-
-cmake_ver=os.getenv("cmake_ver") or "3.22.0"
-load(pathJoin("cmake", cmake_ver))
-
-python_ver=os.getenv("python_ver") or "3.7.9"
-load(pathJoin("python", python_ver))
-
-ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
-load(pathJoin("ncarenv", ncarenv_ver))
-
-gnu_ver=os.getenv("gnu_ver") or "10.1.0"
-load(pathJoin("gnu", gnu_ver))
-
-mpt_ver=os.getenv("mpt_ver") or "2.25"
-load(pathJoin("mpt", mpt_ver))
-
-ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
-load(pathJoin("ncarcompilers", ncarcompilers_ver))
-
-unload("netcdf")
-
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/gnu10.1.0_ncdf492/modulefiles/stack")
-
-hpc_ver=os.getenv("hpc_ver") or "1.2.0"
-load(pathJoin("hpc", hpc_ver))
-
-hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "10.1.0"
-load(pathJoin("hpc-gnu", hpc_gnu_ver))
-
-hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25"
-load(pathJoin("hpc-mpt", hpc_mpt_ver))
-
-load("jasper/2.0.25")
-load("zlib/1.2.11")
-load("hdf5/1.14.0")
-load("netcdf/4.9.2")
-load("pio/2.5.10")
-load("esmf/8.4.2")
-load("fms/2023.01")
-load("bacio/2.4.1")
-load("crtm/2.4.0")
-load("g2/3.4.5")
-load("g2tmpl/1.10.2")
-load("ip/3.3.3")
-load("sp/2.3.3")
-load("w3emc/2.9.2")
-load("gftl-shared/v1.5.0")
-load("mapl/2.35.2-esmf-8.4.2")
-load("scotch/7.0.3")
-
-
-setenv("CC", "mpicc")
-setenv("CXX", "mpicxx")
-setenv("FC", "mpif90")
-setenv("CMAKE_Platform", "cheyenne.gnu")
-
-whatis("Description: UFS build environment")

From ae3b6df1b9b77f5c18e4a1a1a783a449e60ab832 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:13:06 -0400
Subject: [PATCH 087/103] Update default_vars.sh add Derecho

---
 tests/default_vars.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 923f0ea510..d5ca88ea9f 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -214,6 +214,18 @@ elif [[ $MACHINE_ID = s4 ]]; then
   ICE_tasks_cpl_bmrk=48
   WAV_tasks_cpl_bmrk=80
 
+elif [[ $MACHINE_ID = derecho ]]; then
+
+  TPN=128
+  INPES_dflt=3 ; JNPES_dflt=8
+  INPES_thrd=3 ; JNPES_thrd=4
+  INPES_c384=8 ; JNPES_c384=6  ; THRD_c384=2
+  INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
+
+  THRD_cpl_atmw_gdas=2
+  INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
+  WAV_tasks_atmw_gdas=248
+
 elif [[ $MACHINE_ID = gaea ]]; then
 
   TPN=24

From b0941c6fcb75b5e04a47f7ea5f0f5e393b5ee402 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:17:56 -0400
Subject: [PATCH 088/103] Update detect_machine.sh add derecho

---
 tests/detect_machine.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
index 5bbe29511b..2bd105b071 100755
--- a/tests/detect_machine.sh
+++ b/tests/detect_machine.sh
@@ -75,6 +75,15 @@ case $(hostname -f) in
   Orion-login-3.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion3
   Orion-login-4.HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion4
 
+  derecho1.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho1
+  derecho2.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho2
+  derecho3.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho3
+  derecho4.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho4
+  derecho5.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho5
+  derecho6.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho6
+  derecho7.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho7
+  derecho8.hsn.de.hpc.ucar.edu) MACHINE_ID=derecho ;; ### derecho8
+
   Hercules-login-1.HPC.MsState.Edu) MACHINE_ID=hercules;; ### hercules1 
   Hercules-login-2.HPC.MsState.Edu) MACHINE_ID=hercules;; ### hercules2 
   Hercules-login-3.HPC.MsState.Edu) MACHINE_ID=hercules;; ### hercules3

From 5c4764ff28e57c7166d24662f6452193aa42f5f3 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:22:18 -0400
Subject: [PATCH 089/103] Create compile_qsub.IN_derecho

---
 .../tests/fv3_conf/compile_qsub.IN_derecho    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/fv3_conf/tests/fv3_conf/compile_qsub.IN_derecho

diff --git a/tests/fv3_conf/tests/fv3_conf/compile_qsub.IN_derecho b/tests/fv3_conf/tests/fv3_conf/compile_qsub.IN_derecho
new file mode 100644
index 0000000000..6744d25935
--- /dev/null
+++ b/tests/fv3_conf/tests/fv3_conf/compile_qsub.IN_derecho
@@ -0,0 +1,19 @@
+#!/bin/bash -l
+#PBS -o out
+#PBS -e err
+#PBS -N @[JBNME]
+#PBS -A @[ACCNR]
+#PBS -q @[QUEUE]
+#PBS -l select=1:ncpus=8:mpiprocs=1
+#PBS -l walltime=00:30:00
+
+set -eux
+
+echo -n " $( date +%s )," >  job_timestamp.txt
+echo "Compile started:  " `date`
+module purge
+
+@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
+
+echo "Compile ended:    " `date`
+echo -n " $( date +%s )," >> job_timestamp.txt

From 52a08405cb376fb9219f294a7006801ca5868764 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:22:56 -0400
Subject: [PATCH 090/103] Delete tests/fv3_conf/tests/fv3_conf directory

---
 .../tests/fv3_conf/compile_qsub.IN_derecho    | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 tests/fv3_conf/tests/fv3_conf/compile_qsub.IN_derecho

diff --git a/tests/fv3_conf/tests/fv3_conf/compile_qsub.IN_derecho b/tests/fv3_conf/tests/fv3_conf/compile_qsub.IN_derecho
deleted file mode 100644
index 6744d25935..0000000000
--- a/tests/fv3_conf/tests/fv3_conf/compile_qsub.IN_derecho
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -l
-#PBS -o out
-#PBS -e err
-#PBS -N @[JBNME]
-#PBS -A @[ACCNR]
-#PBS -q @[QUEUE]
-#PBS -l select=1:ncpus=8:mpiprocs=1
-#PBS -l walltime=00:30:00
-
-set -eux
-
-echo -n " $( date +%s )," >  job_timestamp.txt
-echo "Compile started:  " `date`
-module purge
-
-@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]
-
-echo "Compile ended:    " `date`
-echo -n " $( date +%s )," >> job_timestamp.txt

From f3e487a40f1e1cd857d22713f5555027279fd8ba Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:24:14 -0400
Subject: [PATCH 091/103] Create compile_qsub.IN_derecho

---
 tests/fv3_conf/compile_qsub.IN_derecho | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/fv3_conf/compile_qsub.IN_derecho

diff --git a/tests/fv3_conf/compile_qsub.IN_derecho b/tests/fv3_conf/compile_qsub.IN_derecho
new file mode 100644
index 0000000000..dd3145e8ee
--- /dev/null
+++ b/tests/fv3_conf/compile_qsub.IN_derecho
@@ -0,0 +1,16 @@
+#!/bin/bash -l
+#PBS -o out
+#PBS -e err
+#PBS -N @[JBNME]
+#PBS -A @[ACCNR]
+#PBS -q @[QUEUE]
+#PBS -l select=1:ncpus=8:mpiprocs=1
+#PBS -l walltime=00:30:00
+
+set -eux
+
+echo -n " $( date +%s )," >  job_timestamp.txt
+echo "Compile started:  " `date`
+module purge
+
+@[PATHRT]/compile.sh @[MACHINE_ID] "@[MAKE_OPT]" @[COMPILE_NR] @[RT_COMPILER]

From 052f5ee44c16e577cee2661095b5f49118851058 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:26:21 -0400
Subject: [PATCH 092/103] Update and rename fv3_qsub.IN_cheyenne to
 fv3_qsub.IN_derecho

---
 tests/fv3_conf/{fv3_qsub.IN_cheyenne => fv3_qsub.IN_derecho} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename tests/fv3_conf/{fv3_qsub.IN_cheyenne => fv3_qsub.IN_derecho} (87%)

diff --git a/tests/fv3_conf/fv3_qsub.IN_cheyenne b/tests/fv3_conf/fv3_qsub.IN_derecho
similarity index 87%
rename from tests/fv3_conf/fv3_qsub.IN_cheyenne
rename to tests/fv3_conf/fv3_qsub.IN_derecho
index 38b0d6a8ff..64a854aaed 100644
--- a/tests/fv3_conf/fv3_qsub.IN_cheyenne
+++ b/tests/fv3_conf/fv3_qsub.IN_derecho
@@ -11,7 +11,7 @@ set -eux
 echo -n " $( date +%s )," >  job_timestamp.txt
 
 set +x
-MACHINE_ID=cheyenne
+MACHINE_ID=derecho
 source ./module-setup.sh
 if [[ ! -d modulefiles ]]; then
   mkdir modulefiles
@@ -30,11 +30,12 @@ export OMP_NUM_THREADS=@[THRD]
 export ESMF_RUNTIME_COMPLIANCECHECK=OFF:depth=4
 export ESMF_RUNTIME_PROFILE=ON
 export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
+export MPICH_COLL_OPT_OFF=1
 
 # Avoid job errors because of filesystem synchronization delays
 sync && sleep 1
 
-mpiexec_mpt -p %g: -np @[TASKS] omplace ./fv3.exe
+mpiexec -n @[TASKS] -ppn @[PPN] --hostfile $PBS_NODEFILE ./fv3.exe
 
 echo "Model ended:    " `date`
 echo -n " $( date +%s )," >> job_timestamp.txt

From e85c191b9d53d39293dbef6883c44d476163a5a4 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:33:54 -0400
Subject: [PATCH 093/103] Update rt.sh add derecho

---
 tests/rt.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/rt.sh b/tests/rt.sh
index c3d10ec520..6a242f2ad8 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -459,6 +459,29 @@ elif [[ $MACHINE_ID = s4 ]]; then
 
   SCHEDULER=slurm
 
+elif [[ $MACHINE_ID = derecho ]]; then
+
+  export PATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/bin:/glade/p/ral/jntp/tools/miniconda3/4.8.3/bin:$PATH
+  export PYTHONPATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/glade/p/ral/jntp/tools/miniconda3/4.8.3/lib/python3.8/site-packages
+  ECFLOW_START=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/bin/ecflow_start.sh
+  ECF_PORT=$(( $(id -u) + 1500 ))
+
+  QUEUE=main
+  COMPILE_QUEUE=main
+  PARTITION=
+  dprefix=/glade/derecho/scratch
+  DISKNM=/glade/cheyenne/scratch/epicufsrt/GMTB/ufs-weather-model/RT
+  STMP=$dprefix
+  PTMP=$dprefix
+  SCHEDULER=pbs
+  cp fv3_conf/fv3_qsub.IN_derecho fv3_conf/fv3_qsub.IN
+  cp fv3_conf/compile_qsub.IN_derecho fv3_conf/compile_qsub.IN
+
+  ROCOTORUN=$(which rocotorun)
+  ROCOTOSTAT=$(which rocotostat)
+  ROCOTOCOMPLETE=$(which rocotocomplete)
+  ROCOTO_SCHEDULER=pbspro
+
 elif [[ $MACHINE_ID = stampede ]]; then
 
   export PYTHONPATH=
@@ -630,6 +653,10 @@ if [[ $ROCOTO == true ]]; then
     QUEUE=s4
     COMPILE_QUEUE=s4
     ROCOTO_SCHEDULER=slurm
+  elif [[ $MACHINE_ID = derecho ]]; then
+    QUEUE=main
+    COMPILE_QUEUE=main
+    ROCOTO_SCHEDULER=pbspro
   elif [[ $MACHINE_ID = noaacloud ]]; then
     QUEUE=batch
     COMPILE_QUEUE=batch
@@ -714,6 +741,8 @@ EOF
     QUEUE=s4
   elif [[ $MACHINE_ID = gaea ]]; then
     QUEUE=normal
+  elif [[ $MACHINE_ID = derecho ]]; then
+    QUEUE=main
   else
     die "ecFlow is not supported on this machine $MACHINE_ID"
   fi

From 7ea1476a11ff411c15c3afa464e14d7c1613dc9a Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:34:58 -0400
Subject: [PATCH 094/103] Update run_test.sh

---
 tests/run_test.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/run_test.sh b/tests/run_test.sh
index e9bb964a00..8b89d244c2 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -287,8 +287,16 @@ if (( NODES * TPN < TASKS )); then
 fi
 export NODES
 
-TASKS=$(( NODES * TPN ))
-export TASKS
+PPN=$(( (TASKS - 1)/NODES + 1 ))
+
+if (( $(( PPN % 2 )) > 0 )); then
+  PPN=$(( PPN + 1 ))
+fi
+
+if (( PPN > TPN )); then
+  PPN=${TPN}
+fi
+export PPN
 
 if [[ $SCHEDULER = 'pbs' ]]; then
   if [[ -e $PATHRT/fv3_conf/fv3_qsub.IN_${MACHINE_ID} ]]; then 

From 291af94ddf183780f9c0a6cfad9b24a4ce8ed3c9 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Wed, 18 Oct 2023 16:18:10 -0400
Subject: [PATCH 095/103] Update rt.sh hash out rocoto

---
 tests/rt.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index 6a242f2ad8..501da48632 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -477,10 +477,10 @@ elif [[ $MACHINE_ID = derecho ]]; then
   cp fv3_conf/fv3_qsub.IN_derecho fv3_conf/fv3_qsub.IN
   cp fv3_conf/compile_qsub.IN_derecho fv3_conf/compile_qsub.IN
 
-  ROCOTORUN=$(which rocotorun)
-  ROCOTOSTAT=$(which rocotostat)
-  ROCOTOCOMPLETE=$(which rocotocomplete)
-  ROCOTO_SCHEDULER=pbspro
+  #ROCOTORUN=$(which rocotorun)
+  #ROCOTOSTAT=$(which rocotostat)
+  #ROCOTOCOMPLETE=$(which rocotocomplete)
+  #ROCOTO_SCHEDULER=pbspro
 
 elif [[ $MACHINE_ID = stampede ]]; then
 

From 68aef03b078c7faea5094d975d1af46e0d57b1b2 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Thu, 19 Oct 2023 14:15:07 -0400
Subject: [PATCH 096/103] Update rt.sh new derecho disknm

---
 tests/rt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rt.sh b/tests/rt.sh
index 501da48632..ac79e567f9 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -470,7 +470,7 @@ elif [[ $MACHINE_ID = derecho ]]; then
   COMPILE_QUEUE=main
   PARTITION=
   dprefix=/glade/derecho/scratch
-  DISKNM=/glade/cheyenne/scratch/epicufsrt/GMTB/ufs-weather-model/RT
+  DISKNM=/glade/derecho/scratch/epicufsrt/ufs-weather-model/RT
   STMP=$dprefix
   PTMP=$dprefix
   SCHEDULER=pbs

From 2923616c70ea54ed4821a9e4ecd9dfef0fda5464 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:05:40 -0400
Subject: [PATCH 097/103] Update rt.conf

---
 tests/rt.conf | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/rt.conf b/tests/rt.conf
index abb87ac760..8a3fdca6b6 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -309,27 +309,27 @@ RUN | regional_atmaq_faster                             | - jet wcoss2 acorn s4
 ### GNU TESTS ###
 ### CCPP PROD tests ###
 COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8 | + hera hercules | fv3 |
-RUN | control_c48                                       | + hera hercules            | baseline |
-RUN | control_stochy                                    | + hera hercules            | baseline |
-RUN | control_ras                                       | + hera hercules            | baseline |
-RUN | control_p8                                        | + hera hercules            | baseline |
-RUN | control_flake                                     | + hera hercules            | baseline |
+RUN | control_c48                                       | + hera cheyenne hercules            | baseline |
+RUN | control_stochy                                    | + hera cheyenne hercules            | baseline |
+RUN | control_ras                                       | + hera cheyenne hercules            | baseline |
+RUN | control_p8                                        | + hera cheyenne hercules            | baseline |
+RUN | control_flake                                     | + hera cheyenne hercules            | baseline |
 
 COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera hercules | fv3 |
-RUN | rap_control                                       | + hera hercules            | baseline |
-RUN | rap_decomp                                        | + hera hercules            |          |
-RUN | rap_2threads                                      | + hera hercules            |          |
-RUN | rap_restart                                       | + hera hercules            |          | rap_control
-RUN | rap_sfcdiff                                       | + hera hercules            | baseline |
-RUN | rap_sfcdiff_decomp                                | + hera hercules            |          |
-RUN | rap_sfcdiff_restart                               | + hera hercules            |          | rap_sfcdiff
-RUN | hrrr_control                                      | + hera hercules            | baseline |
-RUN | hrrr_control_qr                                   | + hera hercules            |          |
-RUN | hrrr_control_2threads                             | + hera hercules            |          |
-RUN | hrrr_control_decomp                               | + hera hercules            |          |
-RUN | hrrr_control_restart                              | + hera hercules            |          | hrrr_control
-RUN | hrrr_control_restart_qr                           | + hera hercules            |          | hrrr_control_qr
-RUN | rrfs_v1beta                                       | + hera hercules            | baseline |
+RUN | rap_control                                       | + hera cheyenne hercules            | baseline |
+RUN | rap_decomp                                        | + hera cheyenne hercules            |          |
+RUN | rap_2threads                                      | + hera cheyenne hercules            |          |
+RUN | rap_restart                                       | + hera cheyenne hercules            |          | rap_control
+RUN | rap_sfcdiff                                       | + hera cheyenne hercules            | baseline |
+RUN | rap_sfcdiff_decomp                                | + hera cheyenne hercules            |          |
+RUN | rap_sfcdiff_restart                               | + hera cheyenne hercules            |          | rap_sfcdiff
+RUN | hrrr_control                                      | + hera cheyenne hercules            | baseline |
+RUN | hrrr_control_qr                                   | + hera cheyenne hercules            |          |
+RUN | hrrr_control_2threads                             | + hera cheyenne hercules            |          |
+RUN | hrrr_control_decomp                               | + hera cheyenne hercules            |          |
+RUN | hrrr_control_restart                              | + hera cheyenne hercules            |          | hrrr_control
+RUN | hrrr_control_restart_qr                           | + hera cheyenne hercules            |          | hrrr_control_qr
+RUN | rrfs_v1beta                                       | + hera cheyenne hercules            | baseline |
 
 ### CCPP DEBUG tests ###
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)

From 44c21254ff0bd8adee1472634aee60c26c2de278 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:07:09 -0400
Subject: [PATCH 098/103] Update rt.conf

---
 tests/rt.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rt.conf b/tests/rt.conf
index 8a3fdca6b6..16a7f2e430 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -308,7 +308,7 @@ RUN | regional_atmaq_faster                             | - jet wcoss2 acorn s4
 
 ### GNU TESTS ###
 ### CCPP PROD tests ###
-COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8 | + hera hercules | fv3 |
+COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8 | + hera cheyenne hercules | fv3 |
 RUN | control_c48                                       | + hera cheyenne hercules            | baseline |
 RUN | control_stochy                                    | + hera cheyenne hercules            | baseline |
 RUN | control_ras                                       | + hera cheyenne hercules            | baseline |

From 99ffe4dbe421f451b89d6a3d0bcff555ae37979e Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:10:00 -0400
Subject: [PATCH 099/103] Update rt.conf

---
 tests/rt.conf | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/rt.conf b/tests/rt.conf
index a47e9cfbc6..0433e04501 100644
--- a/tests/rt.conf
+++ b/tests/rt.conf
@@ -317,29 +317,29 @@ RUN | regional_atmaq_faster                             | - jet wcoss2 acorn s4
 
 ### GNU TESTS ###
 ### CCPP PROD tests ###
-COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v17_p8_ugwpv1 | + hera cheyenne hercules | fv3 |
-RUN | control_c48                                       | + hera cheyenne hercules            | baseline |
-RUN | control_stochy                                    | + hera cheyenne hercules            | baseline |
-RUN | control_ras                                       | + hera cheyenne hercules            | baseline |
-RUN | control_p8                                        | + hera cheyenne hercules            | baseline |
-RUN | control_p8_ugwpv1                                 | + hera cheyenne hercules            | baseline |
-RUN | control_flake                                     | + hera cheyenne hercules            | baseline |
+COMPILE | atm | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v17_p8_ugwpv1 | + hera hercules | fv3 |
+RUN | control_c48                                       | + hera hercules            | baseline |
+RUN | control_stochy                                    | + hera hercules            | baseline |
+RUN | control_ras                                       | + hera hercules            | baseline |
+RUN | control_p8                                        | + hera hercules            | baseline |
+RUN | control_p8_ugwpv1                                 | + hera hercules            | baseline |
+RUN | control_flake                                     | + hera hercules            | baseline |
 
 COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera hercules | fv3 |
-RUN | rap_control                                       | + hera cheyenne hercules            | baseline |
-RUN | rap_decomp                                        | + hera cheyenne hercules            |          |
-RUN | rap_2threads                                      | + hera cheyenne hercules            |          |
-RUN | rap_restart                                       | + hera cheyenne hercules            |          | rap_control
-RUN | rap_sfcdiff                                       | + hera cheyenne hercules            | baseline |
-RUN | rap_sfcdiff_decomp                                | + hera cheyenne hercules            |          |
-RUN | rap_sfcdiff_restart                               | + hera cheyenne hercules            |          | rap_sfcdiff
-RUN | hrrr_control                                      | + hera cheyenne hercules            | baseline |
-RUN | hrrr_control_qr                                   | + hera cheyenne hercules            |          |
-RUN | hrrr_control_2threads                             | + hera cheyenne hercules            |          |
-RUN | hrrr_control_decomp                               | + hera cheyenne hercules            |          |
-RUN | hrrr_control_restart                              | + hera cheyenne hercules            |          | hrrr_control
-RUN | hrrr_control_restart_qr                           | + hera cheyenne hercules            |          | hrrr_control_qr
-RUN | rrfs_v1beta                                       | + hera cheyenne hercules            | baseline |
+RUN | rap_control                                       | + hera hercules            | baseline |
+RUN | rap_decomp                                        | + hera hercules            |          |
+RUN | rap_2threads                                      | + hera hercules            |          |
+RUN | rap_restart                                       | + hera hercules            |          | rap_control
+RUN | rap_sfcdiff                                       | + hera hercules            | baseline |
+RUN | rap_sfcdiff_decomp                                | + hera hercules            |          |
+RUN | rap_sfcdiff_restart                               | + hera hercules            |          | rap_sfcdiff
+RUN | hrrr_control                                      | + hera hercules            | baseline |
+RUN | hrrr_control_qr                                   | + hera hercules            |          |
+RUN | hrrr_control_2threads                             | + hera hercules            |          |
+RUN | hrrr_control_decomp                               | + hera hercules            |          |
+RUN | hrrr_control_restart                              | + hera hercules            |          | hrrr_control
+RUN | hrrr_control_restart_qr                           | + hera hercules            |          | hrrr_control_qr
+RUN | rrfs_v1beta                                       | + hera hercules            | baseline |
 
 ### CCPP DEBUG tests ###
 # Exercise compilation without specifying suites (i.e. compile all suites) in DEBUG mode (faster than in PROD mode)

From b6a526c5e16514ef8c2a6a454dd026fb679e8a98 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:11:41 -0400
Subject: [PATCH 100/103] Update cpld_control_p8 remove cheyenne, add hercules
 TPN stipulation

---
 tests/tests/cpld_control_p8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/tests/cpld_control_p8 b/tests/tests/cpld_control_p8
index cf6d4a1cb3..abf59d773c 100644
--- a/tests/tests/cpld_control_p8
+++ b/tests/tests/cpld_control_p8
@@ -82,6 +82,6 @@ export eps_imesh=2.5e-1
 
 export FV3_RUN=cpld_control_run.IN
 
-if [[ $MACHINE_ID = cheyenne ]]; then
-  TPN=18
+if [[ $MACHINE_ID = hercules ]]; then
+TPN=18
 fi

From fefb95c67225e5fc2dedac838f8c551f8d7608f0 Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Fri, 27 Oct 2023 13:12:05 -0400
Subject: [PATCH 101/103] Update cpld_debug_p8

---
 tests/tests/cpld_debug_p8 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/tests/cpld_debug_p8 b/tests/tests/cpld_debug_p8
index d8ce3c3a60..691899577f 100644
--- a/tests/tests/cpld_debug_p8
+++ b/tests/tests/cpld_debug_p8
@@ -73,6 +73,6 @@ export DIAG_FREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE`
 
 export FV3_RUN=cpld_control_run.IN
 
-if [[ $MACHINE_ID = cheyenne ]]; then
-  TPN=18
+if [[ $MACHINE_ID = hercules ]]; then
+TPN=18
 fi

From 80961860a7a6e50ebf080f8853edbba0f1f1174d Mon Sep 17 00:00:00 2001
From: zach1221 <Zachary.Shrader@noaa.gov>
Date: Mon, 6 Nov 2023 17:09:47 +0000
Subject: [PATCH 102/103] add hera RT logs

---
 tests/logs/RegressionTests_hera.log | 1590 +++++++++++++--------------
 1 file changed, 795 insertions(+), 795 deletions(-)

diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
index 01fbeecabe..1c12f6b668 100644
--- a/tests/logs/RegressionTests_hera.log
+++ b/tests/logs/RegressionTests_hera.log
@@ -1,76 +1,76 @@
-Wed Nov  1 17:27:43 UTC 2023
+Fri Nov  3 20:12:56 UTC 2023
 Start Regression test
 
-Testing UFSWM Hash: c4de662dd55fb0249ed955a4f59f6821477d7b4e
+Testing UFSWM Hash: de1d9e40c53c30e45642f55c63833bb5cc8c774f
 Testing With Submodule Hashes:
  37cbb7d6840ae7515a9a8f0dfd4d89461b3396d1 AQM (v0.2.0-37-g37cbb7d)
  2aa6bfbb62ebeecd7da964b8074f6c3c41c7d1eb CDEPS-interface/CDEPS (cdeps0.4.17-38-g2aa6bfb)
  50aa2c97882fbc9d4918813a22169fe97b424564 CICE-interface/CICE (CICE6.0.0-444-g50aa2c9)
  e5d08d4233b0c783a4840dcbc3252a170e3c3bb1 CMEPS-interface/CMEPS (cmeps_v0.4.1-1406-ge5d08d4)
  cabd7753ae17f7bfcc6dad56daf10868aa51c3f4 CMakeModules (v1.0.0-28-gcabd775)
- 1f2eafd8eb5c1eaf51f98e4f978461e9a6abcc4e FV3 (remotes/origin/feature_reorg_ozphys)
+ 29a9e833b9ee3ebb02523edc002aed47afe8e876 FV3 (heads/develop)
  041422934cae1570f2f0e67239d5d89f11c6e1b7 GOCART (sdr_v2.1.2.6-119-g0414229)
  35789c757766e07f688b4c0c7c5229816f224b09 HYCOM-interface/HYCOM (2.3.00-121-g35789c7)
  02d4dc455bb517b4c641c919dc6b9dc829e1e0d4 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-9803-g02d4dc455)
  569e354ababbde7a7cd68647533769a5c966468d NOAHMP-interface/noahmp (v3.7.1-303-g569e354)
  02693d837f2cd99d20ed08515878c2b5e9525e64 WW3 (6.07.1-343-g02693d83)
  62b89146be1250f354cd50a14096c0c25f2f3952 stochastic_physics (ufs-v2.0.0-191-g62b8914)
-Compile atm_debug_dyn32_intel elapsed time 280 seconds. -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile atm_dyn32_debug_gnu elapsed time 183 seconds. -DAPP=ATM -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile atm_dyn32_intel elapsed time 610 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atm_dyn32_phy32_debug_gnu elapsed time 181 seconds. -DAPP=ATM -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile atm_dyn64_phy32_debug_gnu elapsed time 185 seconds. -DAPP=ATM -DCCPP_32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile atm_dyn64_phy32_gnu elapsed time 281 seconds. -DAPP=ATM -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atm_faster_dyn32_intel elapsed time 571 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DFASTER=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atm_gnu elapsed time 207 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v17_p8_ugwpv1 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atmaero_intel elapsed time 557 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atmaq_debug_intel elapsed time 201 seconds. -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile atmaq_faster_intel elapsed time 559 seconds. -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atmaq_intel elapsed time 533 seconds. -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atml_intel elapsed time 567 seconds. -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atmw_intel elapsed time 569 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile atmwm_intel elapsed time 581 seconds. -DAPP=ATMWM -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile csawmg_intel elapsed time 559 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile datm_cdeps_debug_intel elapsed time 127 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile datm_cdeps_faster_intel elapsed time 207 seconds. -DAPP=NG-GODAS -DFASTER=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile atmaero_intel elapsed time 572 seconds. -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atmaq_debug_intel elapsed time 213 seconds. -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile atmaq_faster_intel elapsed time 562 seconds. -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atmaq_intel elapsed time 561 seconds. -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atm_debug_dyn32_intel elapsed time 293 seconds. -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile atm_dyn32_debug_gnu elapsed time 172 seconds. -DAPP=ATM -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile atm_dyn32_intel elapsed time 629 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atm_dyn32_phy32_debug_gnu elapsed time 197 seconds. -DAPP=ATM -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile atm_dyn64_phy32_debug_gnu elapsed time 189 seconds. -DAPP=ATM -DCCPP_32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile atm_dyn64_phy32_gnu elapsed time 296 seconds. -DAPP=ATM -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atm_faster_dyn32_intel elapsed time 552 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DFASTER=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atm_gnu elapsed time 209 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v17_p8_ugwpv1 -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atml_intel elapsed time 560 seconds. -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atmw_intel elapsed time 578 seconds. -DAPP=ATMW -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile atmwm_intel elapsed time 580 seconds. -DAPP=ATMWM -DCCPP_SUITES=FV3_GFS_v16 -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile csawmg_intel elapsed time 545 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile datm_cdeps_debug_intel elapsed time 143 seconds. -DAPP=NG-GODAS -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile datm_cdeps_faster_intel elapsed time 201 seconds. -DAPP=NG-GODAS -DFASTER=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
 Compile datm_cdeps_gnu elapsed time 114 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile datm_cdeps_intel elapsed time 196 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile datm_cdeps_land_intel elapsed time 70 seconds. -DAPP=LND -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile hafs_all_intel elapsed time 583 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile hafsw_debug_intel elapsed time 206 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile hafsw_faster_intel elapsed time 605 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON -DFASTER=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile hafsw_intel elapsed time 590 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst,FV3_HAFS_v1_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile rrfs_dyn32_phy32_debug_intel elapsed time 188 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR,FV3_HRRR_gf -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile rrfs_dyn32_phy32_faster_intel elapsed time 653 seconds. -DAPP=ATM -DFASTER=ON -DCCPP_SUITES=FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile rrfs_dyn32_phy32_gnu elapsed time 209 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile rrfs_dyn32_phy32_intel elapsed time 531 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile rrfs_dyn64_phy32_debug_intel elapsed time 187 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile rrfs_dyn64_phy32_intel elapsed time 533 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile rrfs_gnu elapsed time 206 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile rrfs_intel elapsed time 583 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
-Compile s2s_aoflux_intel elapsed time 610 seconds. -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_sfcocn -DCMEPS_AOFLUX=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2s_gnu elapsed time 234 seconds. -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2s_intel elapsed time 613 seconds. -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2sw_debug_intel elapsed time 241 seconds. -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile s2sw_intel elapsed time 664 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2sw_pdlib_debug_gnu elapsed time 128 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile s2sw_pdlib_debug_intel elapsed time 248 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile s2sw_pdlib_gnu elapsed time 253 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2sw_pdlib_intel elapsed time 915 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2swa_32bit_intel elapsed time 694 seconds. -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_v17_coupled_p8_ugwpv1 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2swa_32bit_pdlib_debug_intel elapsed time 266 seconds. -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile s2swa_32bit_pdlib_intel elapsed time 943 seconds. -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2swa_debug_gnu elapsed time 145 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile s2swa_debug_intel elapsed time 267 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile s2swa_faster_intel elapsed time 993 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DFASTER=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2swa_gnu elapsed time 267 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile s2swa_intel elapsed time 690 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
-Compile wam_debug_gnu elapsed time 105 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile wam_debug_intel elapsed time 196 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
-Compile wam_intel elapsed time 539 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile datm_cdeps_intel elapsed time 222 seconds. -DAPP=NG-GODAS -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile datm_cdeps_land_intel elapsed time 62 seconds. -DAPP=LND -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile hafs_all_intel elapsed time 709 seconds. -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile hafsw_debug_intel elapsed time 233 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile hafsw_faster_intel elapsed time 707 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON -DFASTER=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile hafsw_intel elapsed time 704 seconds. -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst,FV3_HAFS_v1_thompson_tedmf_gfdlsf -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile rrfs_dyn32_phy32_debug_intel elapsed time 196 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR,FV3_HRRR_gf -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile rrfs_dyn32_phy32_faster_intel elapsed time 767 seconds. -DAPP=ATM -DFASTER=ON -DCCPP_SUITES=FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile rrfs_dyn32_phy32_gnu elapsed time 221 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile rrfs_dyn32_phy32_intel elapsed time 532 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile rrfs_dyn64_phy32_debug_intel elapsed time 186 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile rrfs_dyn64_phy32_intel elapsed time 552 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile rrfs_gnu elapsed time 208 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile rrfs_intel elapsed time 555 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
+Compile s2s_aoflux_intel elapsed time 612 seconds. -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_sfcocn -DCMEPS_AOFLUX=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2s_gnu elapsed time 233 seconds. -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2s_intel elapsed time 609 seconds. -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2swa_32bit_intel elapsed time 682 seconds. -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_v17_coupled_p8_ugwpv1 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2swa_32bit_pdlib_debug_intel elapsed time 273 seconds. -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile s2swa_32bit_pdlib_intel elapsed time 981 seconds. -DAPP=S2SWA -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2swa_debug_gnu elapsed time 141 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile s2swa_debug_intel elapsed time 297 seconds. -DAPP=S2SWA -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile s2swa_faster_intel elapsed time 963 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DFASTER=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2swa_gnu elapsed time 266 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2swa_intel elapsed time 681 seconds. -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2sw_debug_intel elapsed time 272 seconds. -DAPP=S2SW -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile s2sw_intel elapsed time 665 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2sw_pdlib_debug_gnu elapsed time 133 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile s2sw_pdlib_debug_intel elapsed time 265 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile s2sw_pdlib_gnu elapsed time 269 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile s2sw_pdlib_intel elapsed time 956 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 -DPDLIB=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile wam_debug_gnu elapsed time 98 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile wam_debug_intel elapsed time 186 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug
+Compile wam_intel elapsed time 524 seconds. -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Release
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_mixedmode_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_p8_mixedmode_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_p8_mixedmode_intel
 Checking test 001 cpld_control_p8_mixedmode_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -135,14 +135,14 @@ Checking test 001 cpld_control_p8_mixedmode_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 314.334877
-  0: The maximum resident set size (KB)                   = 3165864
+  0: The total amount of wall time                        = 327.859900
+  0: The maximum resident set size (KB)                   = 3147964
 
 Test 001 cpld_control_p8_mixedmode_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_gfsv17_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_gfsv17_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_gfsv17_intel
 Checking test 002 cpld_control_gfsv17_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -206,14 +206,14 @@ Checking test 002 cpld_control_gfsv17_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 951.164144
-  0: The maximum resident set size (KB)                   = 1731840
+  0: The total amount of wall time                        = 955.097035
+  0: The maximum resident set size (KB)                   = 1692756
 
 Test 002 cpld_control_gfsv17_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_gfsv17_iau_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_gfsv17_iau_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_gfsv17_iau_intel
 Checking test 003 cpld_control_gfsv17_iau_intel results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
@@ -222,14 +222,14 @@ Checking test 003 cpld_control_gfsv17_iau_intel results ....
  Comparing 20210323.000000.out_pnt.ww3 .........OK
  Comparing 20210323.000000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 630.750471
-  0: The maximum resident set size (KB)                   = 1110460
+  0: The total amount of wall time                        = 755.890181
+  0: The maximum resident set size (KB)                   = 1086036
 
 Test 003 cpld_control_gfsv17_iau_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_gfsv17_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_restart_gfsv17_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_restart_gfsv17_intel
 Checking test 004 cpld_restart_gfsv17_intel results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile1.nc .........OK
@@ -282,14 +282,14 @@ Checking test 004 cpld_restart_gfsv17_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 440.698776
-  0: The maximum resident set size (KB)                   = 1063916
+  0: The total amount of wall time                        = 588.340241
+  0: The maximum resident set size (KB)                   = 1096252
 
 Test 004 cpld_restart_gfsv17_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_gfsv17_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_mpi_gfsv17_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_mpi_gfsv17_intel
 Checking test 005 cpld_mpi_gfsv17_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -353,14 +353,14 @@ Checking test 005 cpld_mpi_gfsv17_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1077.402974
-  0: The maximum resident set size (KB)                   = 1605424
+  0: The total amount of wall time                        = 1074.118328
+  0: The maximum resident set size (KB)                   = 1638544
 
 Test 005 cpld_mpi_gfsv17_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_debug_gfsv17_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_debug_gfsv17_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_debug_gfsv17_intel
 Checking test 006 cpld_debug_gfsv17_intel results ....
  Comparing sfcf003.tile1.nc .........OK
  Comparing sfcf003.tile2.nc .........OK
@@ -412,14 +412,14 @@ Checking test 006 cpld_debug_gfsv17_intel results ....
  Comparing 20210322.090000.out_pnt.ww3 .........OK
  Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1166.270817
-  0: The maximum resident set size (KB)                   = 1668024
+  0: The total amount of wall time                        = 1158.906650
+  0: The maximum resident set size (KB)                   = 1660388
 
 Test 006 cpld_debug_gfsv17_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_p8_intel
 Checking test 007 cpld_control_p8_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -484,14 +484,14 @@ Checking test 007 cpld_control_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 339.386703
-  0: The maximum resident set size (KB)                   = 3150280
+  0: The total amount of wall time                        = 343.324723
+  0: The maximum resident set size (KB)                   = 3139388
 
 Test 007 cpld_control_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_restart_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_restart_p8_intel
 Checking test 008 cpld_restart_p8_intel results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
@@ -544,14 +544,14 @@ Checking test 008 cpld_restart_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 194.194418
-  0: The maximum resident set size (KB)                   = 3242152
+  0: The total amount of wall time                        = 203.592602
+  0: The maximum resident set size (KB)                   = 3192512
 
 Test 008 cpld_restart_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_qr_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_qr_p8_intel
 Checking test 009 cpld_control_qr_p8_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -616,14 +616,14 @@ Checking test 009 cpld_control_qr_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 340.706384
-  0: The maximum resident set size (KB)                   = 3205840
+  0: The total amount of wall time                        = 344.174122
+  0: The maximum resident set size (KB)                   = 3199800
 
 Test 009 cpld_control_qr_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_restart_qr_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_restart_qr_p8_intel
 Checking test 010 cpld_restart_qr_p8_intel results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
@@ -676,14 +676,14 @@ Checking test 010 cpld_restart_qr_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 196.927246
-  0: The maximum resident set size (KB)                   = 3083224
+  0: The total amount of wall time                        = 207.428169
+  0: The maximum resident set size (KB)                   = 3091180
 
 Test 010 cpld_restart_qr_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_2threads_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_2threads_p8_intel
 Checking test 011 cpld_2threads_p8_intel results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
@@ -736,14 +736,14 @@ Checking test 011 cpld_2threads_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 333.869425
-  0: The maximum resident set size (KB)                   = 3531020
+  0: The total amount of wall time                        = 331.939276
+  0: The maximum resident set size (KB)                   = 3477860
 
 Test 011 cpld_2threads_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_decomp_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_decomp_p8_intel
 Checking test 012 cpld_decomp_p8_intel results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
@@ -796,14 +796,14 @@ Checking test 012 cpld_decomp_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 344.135792
-  0: The maximum resident set size (KB)                   = 3162500
+  0: The total amount of wall time                        = 347.092487
+  0: The maximum resident set size (KB)                   = 3116252
 
 Test 012 cpld_decomp_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_mpi_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_mpi_p8_intel
 Checking test 013 cpld_mpi_p8_intel results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
@@ -856,14 +856,14 @@ Checking test 013 cpld_mpi_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 295.478741
-  0: The maximum resident set size (KB)                   = 3043640
+  0: The total amount of wall time                        = 294.232472
+  0: The maximum resident set size (KB)                   = 3014072
 
 Test 013 cpld_mpi_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_ciceC_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_ciceC_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_ciceC_p8_intel
 Checking test 014 cpld_control_ciceC_p8_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -928,14 +928,14 @@ Checking test 014 cpld_control_ciceC_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 338.123629
-  0: The maximum resident set size (KB)                   = 3160460
+  0: The total amount of wall time                        = 346.290286
+  0: The maximum resident set size (KB)                   = 3184344
 
 Test 014 cpld_control_ciceC_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_c192_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_c192_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_c192_p8_intel
 Checking test 015 cpld_control_c192_p8_intel results ....
  Comparing sfcf030.tile1.nc .........OK
  Comparing sfcf030.tile2.nc .........OK
@@ -988,14 +988,14 @@ Checking test 015 cpld_control_c192_p8_intel results ....
  Comparing 20210323.120000.out_grd.ww3 .........OK
  Comparing 20210323.120000.out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 593.515914
-  0: The maximum resident set size (KB)                   = 3310496
+  0: The total amount of wall time                        = 606.787137
+  0: The maximum resident set size (KB)                   = 3305436
 
 Test 015 cpld_control_c192_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_c192_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_restart_c192_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_restart_c192_p8_intel
 Checking test 016 cpld_restart_c192_p8_intel results ....
  Comparing sfcf030.tile1.nc .........OK
  Comparing sfcf030.tile2.nc .........OK
@@ -1048,14 +1048,14 @@ Checking test 016 cpld_restart_c192_p8_intel results ....
  Comparing 20210323.120000.out_grd.ww3 .........OK
  Comparing 20210323.120000.out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 367.355635
-  0: The maximum resident set size (KB)                   = 3614048
+  0: The total amount of wall time                        = 372.136845
+  0: The maximum resident set size (KB)                   = 3557836
 
 Test 016 cpld_restart_c192_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_bmark_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_bmark_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_bmark_p8_intel
 Checking test 017 cpld_bmark_p8_intel results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
@@ -1103,14 +1103,14 @@ Checking test 017 cpld_bmark_p8_intel results ....
  Comparing 20130401.060000.out_pnt.ww3 .........OK
  Comparing 20130401.060000.out_grd.ww3 .........OK
 
-   0: The total amount of wall time                        = 614.296803
-   0: The maximum resident set size (KB)                   = 4129192
+   0: The total amount of wall time                        = 657.154822
+   0: The maximum resident set size (KB)                   = 4099048
 
 Test 017 cpld_bmark_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_bmark_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_restart_bmark_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_restart_bmark_p8_intel
 Checking test 018 cpld_restart_bmark_p8_intel results ....
  Comparing sfcf006.nc .........OK
  Comparing atmf006.nc .........OK
@@ -1158,14 +1158,14 @@ Checking test 018 cpld_restart_bmark_p8_intel results ....
  Comparing 20130401.060000.out_pnt.ww3 .........OK
  Comparing 20130401.060000.out_grd.ww3 .........OK
 
-   0: The total amount of wall time                        = 449.275985
-   0: The maximum resident set size (KB)                   = 4349156
+   0: The total amount of wall time                        = 751.919536
+   0: The maximum resident set size (KB)                   = 4342688
 
 Test 018 cpld_restart_bmark_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_noaero_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_noaero_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_noaero_p8_intel
 Checking test 019 cpld_control_noaero_p8_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -1229,14 +1229,14 @@ Checking test 019 cpld_control_noaero_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 269.449813
-  0: The maximum resident set size (KB)                   = 1727072
+  0: The total amount of wall time                        = 270.204554
+  0: The maximum resident set size (KB)                   = 1724624
 
 Test 019 cpld_control_noaero_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_c96_noaero_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_nowave_noaero_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_nowave_noaero_p8_intel
 Checking test 020 cpld_control_nowave_noaero_p8_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -1298,14 +1298,14 @@ Checking test 020 cpld_control_nowave_noaero_p8_intel results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 251.122309
-  0: The maximum resident set size (KB)                   = 1770284
+  0: The total amount of wall time                        = 254.007343
+  0: The maximum resident set size (KB)                   = 1769916
 
 Test 020 cpld_control_nowave_noaero_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_debug_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_debug_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_debug_p8_intel
 Checking test 021 cpld_debug_p8_intel results ....
  Comparing sfcf003.tile1.nc .........OK
  Comparing sfcf003.tile2.nc .........OK
@@ -1358,14 +1358,14 @@ Checking test 021 cpld_debug_p8_intel results ....
  Comparing 20210322.090000.out_pnt.ww3 .........OK
  Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 477.904382
-  0: The maximum resident set size (KB)                   = 3226576
+  0: The total amount of wall time                        = 478.026590
+  0: The maximum resident set size (KB)                   = 3178508
 
 Test 021 cpld_debug_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_debug_noaero_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_debug_noaero_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_debug_noaero_p8_intel
 Checking test 022 cpld_debug_noaero_p8_intel results ....
  Comparing sfcf003.tile1.nc .........OK
  Comparing sfcf003.tile2.nc .........OK
@@ -1417,14 +1417,14 @@ Checking test 022 cpld_debug_noaero_p8_intel results ....
  Comparing 20210322.090000.out_pnt.ww3 .........OK
  Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 320.604382
-  0: The maximum resident set size (KB)                   = 1741240
+  0: The total amount of wall time                        = 325.205251
+  0: The maximum resident set size (KB)                   = 1740784
 
 Test 022 cpld_debug_noaero_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_noaero_p8_agrid_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_noaero_p8_agrid_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_noaero_p8_agrid_intel
 Checking test 023 cpld_control_noaero_p8_agrid_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -1486,14 +1486,14 @@ Checking test 023 cpld_control_noaero_p8_agrid_intel results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 252.821495
-  0: The maximum resident set size (KB)                   = 1764556
+  0: The total amount of wall time                        = 261.941131
+  0: The maximum resident set size (KB)                   = 1715692
 
 Test 023 cpld_control_noaero_p8_agrid_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_c48_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_c48_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_c48_intel
 Checking test 024 cpld_control_c48_intel results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
@@ -1543,14 +1543,14 @@ Checking test 024 cpld_control_c48_intel results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
- 0: The total amount of wall time                        = 557.605508
- 0: The maximum resident set size (KB)                   = 2805948
+ 0: The total amount of wall time                        = 556.599891
+ 0: The maximum resident set size (KB)                   = 2810760
 
 Test 024 cpld_control_c48_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_faster_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_p8_faster_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_p8_faster_intel
 Checking test 025 cpld_control_p8_faster_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -1615,14 +1615,14 @@ Checking test 025 cpld_control_p8_faster_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 312.107313
-  0: The maximum resident set size (KB)                   = 3192548
+  0: The total amount of wall time                        = 322.151999
+  0: The maximum resident set size (KB)                   = 3181992
 
 Test 025 cpld_control_p8_faster_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_pdlib_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_pdlib_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_pdlib_p8_intel
 Checking test 026 cpld_control_pdlib_p8_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -1686,14 +1686,14 @@ Checking test 026 cpld_control_pdlib_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 966.266344
-  0: The maximum resident set size (KB)                   = 1749028
+  0: The total amount of wall time                        = 973.191017
+  0: The maximum resident set size (KB)                   = 1750044
 
 Test 026 cpld_control_pdlib_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_pdlib_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_restart_pdlib_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_restart_pdlib_p8_intel
 Checking test 027 cpld_restart_pdlib_p8_intel results ....
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
@@ -1745,14 +1745,14 @@ Checking test 027 cpld_restart_pdlib_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 451.478649
-  0: The maximum resident set size (KB)                   = 1111636
+  0: The total amount of wall time                        = 727.164907
+  0: The maximum resident set size (KB)                   = 1112208
 
 Test 027 cpld_restart_pdlib_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_pdlib_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_mpi_pdlib_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_mpi_pdlib_p8_intel
 Checking test 028 cpld_mpi_pdlib_p8_intel results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -1816,14 +1816,14 @@ Checking test 028 cpld_mpi_pdlib_p8_intel results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1118.642389
-  0: The maximum resident set size (KB)                   = 1654380
+  0: The total amount of wall time                        = 1366.995722
+  0: The maximum resident set size (KB)                   = 1659064
 
 Test 028 cpld_mpi_pdlib_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_debug_pdlib_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_debug_pdlib_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_debug_pdlib_p8_intel
 Checking test 029 cpld_debug_pdlib_p8_intel results ....
  Comparing sfcf003.tile1.nc .........OK
  Comparing sfcf003.tile2.nc .........OK
@@ -1875,14 +1875,14 @@ Checking test 029 cpld_debug_pdlib_p8_intel results ....
  Comparing 20210322.090000.out_pnt.ww3 .........OK
  Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1464.364659
-  0: The maximum resident set size (KB)                   = 1672116
+  0: The total amount of wall time                        = 1473.373764
+  0: The maximum resident set size (KB)                   = 1662544
 
 Test 029 cpld_debug_pdlib_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_flake_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_flake_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_flake_intel
 Checking test 030 control_flake_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1893,14 +1893,14 @@ Checking test 030 control_flake_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 190.177631
-  0: The maximum resident set size (KB)                   = 700704
+  0: The total amount of wall time                        = 199.783062
+  0: The maximum resident set size (KB)                   = 678076
 
 Test 030 control_flake_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_CubedSphereGrid_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_CubedSphereGrid_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_CubedSphereGrid_intel
 Checking test 031 control_CubedSphereGrid_intel results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
@@ -1927,36 +1927,36 @@ Checking test 031 control_CubedSphereGrid_intel results ....
  Comparing atmf024.tile5.nc .........OK
  Comparing atmf024.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 132.325843
-  0: The maximum resident set size (KB)                   = 637780
+  0: The total amount of wall time                        = 134.943045
+  0: The maximum resident set size (KB)                   = 634176
 
 Test 031 control_CubedSphereGrid_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_CubedSphereGrid_parallel_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_CubedSphereGrid_parallel_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_CubedSphereGrid_parallel_intel
 Checking test 032 control_CubedSphereGrid_parallel_intel results ....
- Comparing sfcf000.nc .........OK
+ Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
  Comparing cubed_sphere_grid_sfcf000.nc ............ALT CHECK......OK
  Comparing cubed_sphere_grid_sfcf024.nc ............ALT CHECK......OK
  Comparing cubed_sphere_grid_atmf000.nc .........OK
- Comparing cubed_sphere_grid_atmf024.nc .........OK
+ Comparing cubed_sphere_grid_atmf024.nc ............ALT CHECK......OK
  Comparing GFSFLX.GrbF00 .........OK
  Comparing GFSFLX.GrbF24 .........OK
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 139.028852
-  0: The maximum resident set size (KB)                   = 639944
+  0: The total amount of wall time                        = 143.853802
+  0: The maximum resident set size (KB)                   = 628952
 
 Test 032 control_CubedSphereGrid_parallel_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_latlon_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_latlon_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_latlon_intel
 Checking test 033 control_latlon_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -1967,16 +1967,16 @@ Checking test 033 control_latlon_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 134.223770
-  0: The maximum resident set size (KB)                   = 623216
+  0: The total amount of wall time                        = 136.667210
+  0: The maximum resident set size (KB)                   = 604240
 
 Test 033 control_latlon_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_wrtGauss_netcdf_parallel_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_wrtGauss_netcdf_parallel_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_wrtGauss_netcdf_parallel_intel
 Checking test 034 control_wrtGauss_netcdf_parallel_intel results ....
- Comparing sfcf000.nc .........OK
+ Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf024.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf024.nc .........OK
@@ -1985,14 +1985,14 @@ Checking test 034 control_wrtGauss_netcdf_parallel_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 137.796877
-  0: The maximum resident set size (KB)                   = 632760
+  0: The total amount of wall time                        = 141.132770
+  0: The maximum resident set size (KB)                   = 624768
 
 Test 034 control_wrtGauss_netcdf_parallel_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_c48_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_c48_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_c48_intel
 Checking test 035 control_c48_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2031,14 +2031,14 @@ Checking test 035 control_c48_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-0: The total amount of wall time                        = 372.707970
-0: The maximum resident set size (KB)                   = 830844
+0: The total amount of wall time                        = 367.409171
+0: The maximum resident set size (KB)                   = 831456
 
 Test 035 control_c48_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_c192_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_c192_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_c192_intel
 Checking test 036 control_c192_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2049,14 +2049,14 @@ Checking test 036 control_c192_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 526.493269
-  0: The maximum resident set size (KB)                   = 784380
+  0: The total amount of wall time                        = 533.288169
+  0: The maximum resident set size (KB)                   = 773876
 
 Test 036 control_c192_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_c384_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_c384_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_c384_intel
 Checking test 037 control_c384_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -2067,14 +2067,14 @@ Checking test 037 control_c384_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 535.375446
-  0: The maximum resident set size (KB)                   = 1371612
+  0: The total amount of wall time                        = 534.663543
+  0: The maximum resident set size (KB)                   = 1363120
 
 Test 037 control_c384_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_c384gdas_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_c384gdas_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_c384gdas_intel
 Checking test 038 control_c384gdas_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -2117,14 +2117,14 @@ Checking test 038 control_c384gdas_intel results ....
  Comparing RESTART/20210322.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 465.052372
-  0: The maximum resident set size (KB)                   = 1485184
+  0: The total amount of wall time                        = 467.612995
+  0: The maximum resident set size (KB)                   = 1493188
 
 Test 038 control_c384gdas_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_stochy_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_stochy_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_stochy_intel
 Checking test 039 control_stochy_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -2135,28 +2135,28 @@ Checking test 039 control_stochy_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 90.034630
-  0: The maximum resident set size (KB)                   = 642148
+  0: The total amount of wall time                        = 89.719891
+  0: The maximum resident set size (KB)                   = 609548
 
 Test 039 control_stochy_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_stochy_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_stochy_restart_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_stochy_restart_intel
 Checking test 040 control_stochy_restart_intel results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 48.609113
-  0: The maximum resident set size (KB)                   = 549660
+  0: The total amount of wall time                        = 55.237628
+  0: The maximum resident set size (KB)                   = 531004
 
 Test 040 control_stochy_restart_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_lndp_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_lndp_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_lndp_intel
 Checking test 041 control_lndp_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -2167,14 +2167,14 @@ Checking test 041 control_lndp_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 82.613114
-  0: The maximum resident set size (KB)                   = 637408
+  0: The total amount of wall time                        = 83.138372
+  0: The maximum resident set size (KB)                   = 609288
 
 Test 041 control_lndp_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_iovr4_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_iovr4_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_iovr4_intel
 Checking test 042 control_iovr4_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2189,14 +2189,14 @@ Checking test 042 control_iovr4_intel results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 135.854832
-  0: The maximum resident set size (KB)                   = 634684
+  0: The total amount of wall time                        = 139.210926
+  0: The maximum resident set size (KB)                   = 628508
 
 Test 042 control_iovr4_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_iovr5_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_iovr5_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_iovr5_intel
 Checking test 043 control_iovr5_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2211,14 +2211,14 @@ Checking test 043 control_iovr5_intel results ....
  Comparing GFSPRS.GrbF21 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 137.009276
-  0: The maximum resident set size (KB)                   = 645796
+  0: The total amount of wall time                        = 137.920758
+  0: The maximum resident set size (KB)                   = 618960
 
 Test 043 control_iovr5_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_intel
 Checking test 044 control_p8_intel results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
@@ -2265,14 +2265,14 @@ Checking test 044 control_p8_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 164.289142
-  0: The maximum resident set size (KB)                   = 1607664
+  0: The total amount of wall time                        = 176.262053
+  0: The maximum resident set size (KB)                   = 1562116
 
 Test 044 control_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_ugwpv1_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_ugwpv1_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_ugwpv1_intel
 Checking test 045 control_p8_ugwpv1_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2319,14 +2319,14 @@ Checking test 045 control_p8_ugwpv1_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 157.906200
-  0: The maximum resident set size (KB)                   = 1605080
+  0: The total amount of wall time                        = 163.497521
+  0: The maximum resident set size (KB)                   = 1594416
 
 Test 045 control_p8_ugwpv1_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_restart_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_restart_p8_intel
 Checking test 046 control_restart_p8_intel results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -2365,14 +2365,14 @@ Checking test 046 control_restart_p8_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 85.601010
-  0: The maximum resident set size (KB)                   = 926380
+  0: The total amount of wall time                        = 87.692294
+  0: The maximum resident set size (KB)                   = 903640
 
 Test 046 control_restart_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_qr_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_qr_p8_intel
 Checking test 047 control_qr_p8_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2419,14 +2419,14 @@ Checking test 047 control_qr_p8_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc ............ALT CHECK......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 165.764345
-  0: The maximum resident set size (KB)                   = 1571388
+  0: The total amount of wall time                        = 166.251369
+  0: The maximum resident set size (KB)                   = 1602940
 
 Test 047 control_qr_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_restart_qr_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_restart_qr_p8_intel
 Checking test 048 control_restart_qr_p8_intel results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -2465,14 +2465,14 @@ Checking test 048 control_restart_qr_p8_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc ............ALT CHECK......OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 88.101842
-  0: The maximum resident set size (KB)                   = 863428
+  0: The total amount of wall time                        = 91.179845
+  0: The maximum resident set size (KB)                   = 870344
 
 Test 048 control_restart_qr_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_decomp_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_decomp_p8_intel
 Checking test 049 control_decomp_p8_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2515,14 +2515,14 @@ Checking test 049 control_decomp_p8_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 168.030107
-  0: The maximum resident set size (KB)                   = 1583656
+  0: The total amount of wall time                        = 172.250030
+  0: The maximum resident set size (KB)                   = 1551328
 
 Test 049 control_decomp_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_2threads_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_2threads_p8_intel
 Checking test 050 control_2threads_p8_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -2565,14 +2565,14 @@ Checking test 050 control_2threads_p8_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 161.405990
-  0: The maximum resident set size (KB)                   = 1687408
+  0: The total amount of wall time                        = 158.319938
+  0: The maximum resident set size (KB)                   = 1690664
 
 Test 050 control_2threads_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_lndp_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_lndp_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_lndp_intel
 Checking test 051 control_p8_lndp_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2591,14 +2591,14 @@ Checking test 051 control_p8_lndp_intel results ....
  Comparing GFSPRS.GrbF24 .........OK
  Comparing GFSPRS.GrbF48 .........OK
 
-  0: The total amount of wall time                        = 305.170146
-  0: The maximum resident set size (KB)                   = 1605984
+  0: The total amount of wall time                        = 301.008184
+  0: The maximum resident set size (KB)                   = 1598536
 
 Test 051 control_p8_lndp_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_rrtmgp_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_rrtmgp_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_rrtmgp_intel
 Checking test 052 control_p8_rrtmgp_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2645,14 +2645,14 @@ Checking test 052 control_p8_rrtmgp_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 217.870662
-  0: The maximum resident set size (KB)                   = 1665896
+  0: The total amount of wall time                        = 223.795943
+  0: The maximum resident set size (KB)                   = 1655460
 
 Test 052 control_p8_rrtmgp_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_mynn_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_mynn_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_mynn_intel
 Checking test 053 control_p8_mynn_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2699,14 +2699,14 @@ Checking test 053 control_p8_mynn_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 165.292313
-  0: The maximum resident set size (KB)                   = 1604740
+  0: The total amount of wall time                        = 169.572544
+  0: The maximum resident set size (KB)                   = 1596444
 
 Test 053 control_p8_mynn_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/merra2_thompson_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/merra2_thompson_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/merra2_thompson_intel
 Checking test 054 merra2_thompson_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2753,14 +2753,14 @@ Checking test 054 merra2_thompson_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 199.318832
-  0: The maximum resident set size (KB)                   = 1612892
+  0: The total amount of wall time                        = 198.637687
+  0: The maximum resident set size (KB)                   = 1625968
 
 Test 054 merra2_thompson_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_control_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_control_intel
 Checking test 055 regional_control_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -2771,28 +2771,28 @@ Checking test 055 regional_control_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 293.127768
-  0: The maximum resident set size (KB)                   = 1091272
+  0: The total amount of wall time                        = 297.049735
+  0: The maximum resident set size (KB)                   = 1090880
 
 Test 055 regional_control_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_restart_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_restart_intel
 Checking test 056 regional_restart_intel results ....
  Comparing dynf006.nc .........OK
  Comparing phyf006.nc .........OK
  Comparing PRSLEV.GrbF06 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 149.182544
-  0: The maximum resident set size (KB)                   = 1055384
+  0: The total amount of wall time                        = 149.333651
+  0: The maximum resident set size (KB)                   = 1077280
 
 Test 056 regional_restart_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_control_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_control_qr_intel
 Checking test 057 regional_control_qr_intel results ....
  Comparing dynf000.nc ............ALT CHECK......OK
  Comparing dynf006.nc ............ALT CHECK......OK
@@ -2803,28 +2803,28 @@ Checking test 057 regional_control_qr_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 293.851403
-  0: The maximum resident set size (KB)                   = 1087996
+  0: The total amount of wall time                        = 302.397923
+  0: The maximum resident set size (KB)                   = 1057992
 
 Test 057 regional_control_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_restart_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_restart_qr_intel
 Checking test 058 regional_restart_qr_intel results ....
  Comparing dynf006.nc .........OK
  Comparing phyf006.nc .........OK
  Comparing PRSLEV.GrbF06 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 147.999419
-  0: The maximum resident set size (KB)                   = 1088028
+  0: The total amount of wall time                        = 154.630181
+  0: The maximum resident set size (KB)                   = 1055232
 
 Test 058 regional_restart_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_decomp_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_decomp_intel
 Checking test 059 regional_decomp_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -2835,14 +2835,14 @@ Checking test 059 regional_decomp_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 311.265384
-  0: The maximum resident set size (KB)                   = 1048392
+  0: The total amount of wall time                        = 310.265484
+  0: The maximum resident set size (KB)                   = 1055508
 
 Test 059 regional_decomp_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_2threads_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_2threads_intel
 Checking test 060 regional_2threads_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -2853,14 +2853,14 @@ Checking test 060 regional_2threads_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 179.196705
-  0: The maximum resident set size (KB)                   = 1060716
+  0: The total amount of wall time                        = 180.398003
+  0: The maximum resident set size (KB)                   = 1073304
 
 Test 060 regional_2threads_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_noquilt_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_noquilt_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_noquilt_intel
 Checking test 061 regional_noquilt_intel results ....
  Comparing atmos_4xdaily.nc .........OK
  Comparing fv3_history2d.nc .........OK
@@ -2868,28 +2868,28 @@ Checking test 061 regional_noquilt_intel results ....
  Comparing RESTART/fv_core.res.tile1_new.nc .........OK
  Comparing RESTART/fv_tracer.res.tile1_new.nc .........OK
 
-  0: The total amount of wall time                        = 290.029398
-  0: The maximum resident set size (KB)                   = 1358896
+  0: The total amount of wall time                        = 296.335659
+  0: The maximum resident set size (KB)                   = 1356804
 
 Test 061 regional_noquilt_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_netcdf_parallel_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_netcdf_parallel_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_netcdf_parallel_intel
 Checking test 062 regional_netcdf_parallel_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
  Comparing phyf000.nc .........OK
  Comparing phyf006.nc .........OK
 
-  0: The total amount of wall time                        = 293.327705
-  0: The maximum resident set size (KB)                   = 1072912
+  0: The total amount of wall time                        = 290.657342
+  0: The maximum resident set size (KB)                   = 1091540
 
 Test 062 regional_netcdf_parallel_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_2dwrtdecomp_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_2dwrtdecomp_intel
 Checking test 063 regional_2dwrtdecomp_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -2900,14 +2900,14 @@ Checking test 063 regional_2dwrtdecomp_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 294.996519
-  0: The maximum resident set size (KB)                   = 1094080
+  0: The total amount of wall time                        = 297.690544
+  0: The maximum resident set size (KB)                   = 1070028
 
 Test 063 regional_2dwrtdecomp_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/fv3_regional_wofs_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_wofs_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_wofs_intel
 Checking test 064 regional_wofs_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -2918,14 +2918,14 @@ Checking test 064 regional_wofs_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 371.306132
-  0: The maximum resident set size (KB)                   = 914036
+  0: The total amount of wall time                        = 375.191277
+  0: The maximum resident set size (KB)                   = 878956
 
 Test 064 regional_wofs_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_intel
 Checking test 065 rap_control_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -2972,14 +2972,14 @@ Checking test 065 rap_control_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 448.235159
-  0: The maximum resident set size (KB)                   = 1223144
+  0: The total amount of wall time                        = 465.662239
+  0: The maximum resident set size (KB)                   = 1235380
 
 Test 065 rap_control_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_spp_sppt_shum_skeb_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_spp_sppt_shum_skeb_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_spp_sppt_shum_skeb_intel
 Checking test 066 regional_spp_sppt_shum_skeb_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
@@ -2990,14 +2990,14 @@ Checking test 066 regional_spp_sppt_shum_skeb_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-  0: The total amount of wall time                        = 233.513401
-  0: The maximum resident set size (KB)                   = 1197692
+  0: The total amount of wall time                        = 246.681042
+  0: The maximum resident set size (KB)                   = 1164432
 
 Test 066 regional_spp_sppt_shum_skeb_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_decomp_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_decomp_intel
 Checking test 067 rap_decomp_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -3044,14 +3044,14 @@ Checking test 067 rap_decomp_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 465.761001
-  0: The maximum resident set size (KB)                   = 1162280
+  0: The total amount of wall time                        = 474.759120
+  0: The maximum resident set size (KB)                   = 1162088
 
 Test 067 rap_decomp_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_2threads_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_2threads_intel
 Checking test 068 rap_2threads_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -3098,14 +3098,14 @@ Checking test 068 rap_2threads_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 416.165762
-  0: The maximum resident set size (KB)                   = 1318772
+  0: The total amount of wall time                        = 450.679667
+  0: The maximum resident set size (KB)                   = 1320800
 
 Test 068 rap_2threads_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_restart_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_restart_intel
 Checking test 069 rap_restart_intel results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -3144,14 +3144,14 @@ Checking test 069 rap_restart_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 227.292900
-  0: The maximum resident set size (KB)                   = 1102672
+  0: The total amount of wall time                        = 231.325881
+  0: The maximum resident set size (KB)                   = 1133440
 
 Test 069 rap_restart_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_sfcdiff_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_sfcdiff_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_sfcdiff_intel
 Checking test 070 rap_sfcdiff_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -3198,14 +3198,14 @@ Checking test 070 rap_sfcdiff_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 448.204978
-  0: The maximum resident set size (KB)                   = 1196876
+  0: The total amount of wall time                        = 463.989768
+  0: The maximum resident set size (KB)                   = 1240884
 
 Test 070 rap_sfcdiff_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_sfcdiff_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_sfcdiff_decomp_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_sfcdiff_decomp_intel
 Checking test 071 rap_sfcdiff_decomp_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -3252,14 +3252,14 @@ Checking test 071 rap_sfcdiff_decomp_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 471.802348
-  0: The maximum resident set size (KB)                   = 1157480
+  0: The total amount of wall time                        = 686.577923
+  0: The maximum resident set size (KB)                   = 1166348
 
 Test 071 rap_sfcdiff_decomp_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_sfcdiff_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_sfcdiff_restart_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_sfcdiff_restart_intel
 Checking test 072 rap_sfcdiff_restart_intel results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
@@ -3298,14 +3298,14 @@ Checking test 072 rap_sfcdiff_restart_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 330.786543
-  0: The maximum resident set size (KB)                   = 1160648
+  0: The total amount of wall time                        = 335.553593
+  0: The maximum resident set size (KB)                   = 1165116
 
 Test 072 rap_sfcdiff_restart_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_intel
 Checking test 073 hrrr_control_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -3352,14 +3352,14 @@ Checking test 073 hrrr_control_intel results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 225.588509
-  0: The maximum resident set size (KB)                   = 1140404
+  0: The total amount of wall time                        = 229.085692
+  0: The maximum resident set size (KB)                   = 1145508
 
 Test 073 hrrr_control_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_qr_intel
 Checking test 074 hrrr_control_qr_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -3406,14 +3406,14 @@ Checking test 074 hrrr_control_qr_intel results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc ............ALT CHECK......OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 225.675150
-  0: The maximum resident set size (KB)                   = 1033216
+  0: The total amount of wall time                        = 229.575903
+  0: The maximum resident set size (KB)                   = 1036140
 
 Test 074 hrrr_control_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_decomp_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_decomp_intel
 Checking test 075 hrrr_control_decomp_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -3460,14 +3460,14 @@ Checking test 075 hrrr_control_decomp_intel results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 232.529137
-  0: The maximum resident set size (KB)                   = 1088712
+  0: The total amount of wall time                        = 234.976200
+  0: The maximum resident set size (KB)                   = 1091364
 
 Test 075 hrrr_control_decomp_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_2threads_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_2threads_intel
 Checking test 076 hrrr_control_2threads_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -3514,42 +3514,42 @@ Checking test 076 hrrr_control_2threads_intel results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 207.627880
-  0: The maximum resident set size (KB)                   = 1100688
+  0: The total amount of wall time                        = 211.753751
+  0: The maximum resident set size (KB)                   = 1113240
 
 Test 076 hrrr_control_2threads_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_restart_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_restart_intel
 Checking test 077 hrrr_control_restart_intel results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 116.998309
-  0: The maximum resident set size (KB)                   = 1024864
+  0: The total amount of wall time                        = 320.798094
+  0: The maximum resident set size (KB)                   = 1047996
 
 Test 077 hrrr_control_restart_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_restart_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_restart_qr_intel
 Checking test 078 hrrr_control_restart_qr_intel results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 120.536642
-  0: The maximum resident set size (KB)                   = 904964
+  0: The total amount of wall time                        = 141.293220
+  0: The maximum resident set size (KB)                   = 916536
 
 Test 078 hrrr_control_restart_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rrfs_v1beta_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rrfs_v1beta_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rrfs_v1beta_intel
 Checking test 079 rrfs_v1beta_intel results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf009.nc ............ALT CHECK......OK
@@ -3596,14 +3596,14 @@ Checking test 079 rrfs_v1beta_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 441.016981
-  0: The maximum resident set size (KB)                   = 1169172
+  0: The total amount of wall time                        = 676.273002
+  0: The maximum resident set size (KB)                   = 1196720
 
 Test 079 rrfs_v1beta_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rrfs_v1nssl_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rrfs_v1nssl_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rrfs_v1nssl_intel
 Checking test 080 rrfs_v1nssl_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -3618,14 +3618,14 @@ Checking test 080 rrfs_v1nssl_intel results ....
  Comparing GFSPRS.GrbF09 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 520.793185
-  0: The maximum resident set size (KB)                   = 797156
+  0: The total amount of wall time                        = 734.433501
+  0: The maximum resident set size (KB)                   = 764476
 
 Test 080 rrfs_v1nssl_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rrfs_v1nssl_nohailnoccn_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rrfs_v1nssl_nohailnoccn_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rrfs_v1nssl_nohailnoccn_intel
 Checking test 081 rrfs_v1nssl_nohailnoccn_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -3640,14 +3640,14 @@ Checking test 081 rrfs_v1nssl_nohailnoccn_intel results ....
  Comparing GFSPRS.GrbF09 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 506.764935
-  0: The maximum resident set size (KB)                   = 878992
+  0: The total amount of wall time                        = 713.176157
+  0: The maximum resident set size (KB)                   = 892788
 
 Test 081 rrfs_v1nssl_nohailnoccn_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_csawmg_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_csawmg_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_csawmg_intel
 Checking test 082 control_csawmg_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -3658,14 +3658,14 @@ Checking test 082 control_csawmg_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 337.626347
-  0: The maximum resident set size (KB)                   = 811348
+  0: The total amount of wall time                        = 555.072665
+  0: The maximum resident set size (KB)                   = 811272
 
 Test 082 control_csawmg_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_csawmgt_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_csawmgt_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_csawmgt_intel
 Checking test 083 control_csawmgt_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -3676,14 +3676,14 @@ Checking test 083 control_csawmgt_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 336.247804
-  0: The maximum resident set size (KB)                   = 806944
+  0: The total amount of wall time                        = 530.227380
+  0: The maximum resident set size (KB)                   = 809860
 
 Test 083 control_csawmgt_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_ras_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_ras_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_ras_intel
 Checking test 084 control_ras_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -3694,26 +3694,26 @@ Checking test 084 control_ras_intel results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 185.311169
-  0: The maximum resident set size (KB)                   = 809664
+  0: The total amount of wall time                        = 395.101496
+  0: The maximum resident set size (KB)                   = 787564
 
 Test 084 control_ras_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_wam_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_wam_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_wam_intel
 Checking test 085 control_wam_intel results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
 
-  0: The total amount of wall time                        = 111.679896
-  0: The maximum resident set size (KB)                   = 698512
+  0: The total amount of wall time                        = 112.236036
+  0: The maximum resident set size (KB)                   = 668668
 
 Test 085 control_wam_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_faster_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_faster_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_faster_intel
 Checking test 086 control_p8_faster_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -3760,14 +3760,14 @@ Checking test 086 control_p8_faster_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 148.064785
-  0: The maximum resident set size (KB)                   = 1576680
+  0: The total amount of wall time                        = 360.156713
+  0: The maximum resident set size (KB)                   = 1599160
 
 Test 086 control_p8_faster_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_control_faster_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_control_faster_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_control_faster_intel
 Checking test 087 regional_control_faster_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf006.nc .........OK
@@ -3778,14 +3778,14 @@ Checking test 087 regional_control_faster_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 268.439831
-  0: The maximum resident set size (KB)                   = 1078440
+  0: The total amount of wall time                        = 283.851247
+  0: The maximum resident set size (KB)                   = 1099588
 
 Test 087 regional_control_faster_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_CubedSphereGrid_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_CubedSphereGrid_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_CubedSphereGrid_debug_intel
 Checking test 088 control_CubedSphereGrid_debug_intel results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
@@ -3812,376 +3812,376 @@ Checking test 088 control_CubedSphereGrid_debug_intel results ....
  Comparing atmf001.tile5.nc .........OK
  Comparing atmf001.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 147.146668
-  0: The maximum resident set size (KB)                   = 796204
+  0: The total amount of wall time                        = 147.710428
+  0: The maximum resident set size (KB)                   = 800884
 
 Test 088 control_CubedSphereGrid_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_wrtGauss_netcdf_parallel_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_wrtGauss_netcdf_parallel_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_wrtGauss_netcdf_parallel_debug_intel
 Checking test 089 control_wrtGauss_netcdf_parallel_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 149.305136
-  0: The maximum resident set size (KB)                   = 785884
+  0: The total amount of wall time                        = 147.959269
+  0: The maximum resident set size (KB)                   = 776008
 
 Test 089 control_wrtGauss_netcdf_parallel_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_stochy_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_stochy_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_stochy_debug_intel
 Checking test 090 control_stochy_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 168.986597
-  0: The maximum resident set size (KB)                   = 778524
+  0: The total amount of wall time                        = 386.087011
+  0: The maximum resident set size (KB)                   = 796928
 
 Test 090 control_stochy_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_lndp_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_lndp_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_lndp_debug_intel
 Checking test 091 control_lndp_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 149.058114
-  0: The maximum resident set size (KB)                   = 798792
+  0: The total amount of wall time                        = 373.009169
+  0: The maximum resident set size (KB)                   = 802720
 
 Test 091 control_lndp_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_csawmg_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_csawmg_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_csawmg_debug_intel
 Checking test 092 control_csawmg_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 228.952643
-  0: The maximum resident set size (KB)                   = 849692
+  0: The total amount of wall time                        = 251.890947
+  0: The maximum resident set size (KB)                   = 818740
 
 Test 092 control_csawmg_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_csawmgt_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_csawmgt_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_csawmgt_debug_intel
 Checking test 093 control_csawmgt_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 224.446005
-  0: The maximum resident set size (KB)                   = 842364
+  0: The total amount of wall time                        = 235.180228
+  0: The maximum resident set size (KB)                   = 843432
 
 Test 093 control_csawmgt_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_ras_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_ras_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_ras_debug_intel
 Checking test 094 control_ras_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 151.279421
-  0: The maximum resident set size (KB)                   = 799996
+  0: The total amount of wall time                        = 164.042939
+  0: The maximum resident set size (KB)                   = 780728
 
 Test 094 control_ras_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_diag_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_diag_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_diag_debug_intel
 Checking test 095 control_diag_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 154.557833
-  0: The maximum resident set size (KB)                   = 860876
+  0: The total amount of wall time                        = 159.936668
+  0: The maximum resident set size (KB)                   = 857852
 
 Test 095 control_diag_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_debug_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_debug_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_debug_p8_intel
 Checking test 096 control_debug_p8_intel results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf001.nc ............ALT CHECK......OK
  Comparing atmf000.nc ............ALT CHECK......OK
  Comparing atmf001.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 155.667248
-  0: The maximum resident set size (KB)                   = 1597196
+  0: The total amount of wall time                        = 181.737228
+  0: The maximum resident set size (KB)                   = 1591624
 
 Test 096 control_debug_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_debug_intel
 Checking test 097 regional_debug_intel results ....
  Comparing dynf000.nc ............ALT CHECK......OK
  Comparing dynf001.nc ............ALT CHECK......OK
  Comparing phyf000.nc ............ALT CHECK......OK
  Comparing phyf001.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 967.872847
-  0: The maximum resident set size (KB)                   = 1099444
+  0: The total amount of wall time                        = 1008.510564
+  0: The maximum resident set size (KB)                   = 1100244
 
 Test 097 regional_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_debug_intel
 Checking test 098 rap_control_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 272.287820
-  0: The maximum resident set size (KB)                   = 1172016
+  0: The total amount of wall time                        = 278.378117
+  0: The maximum resident set size (KB)                   = 1180100
 
 Test 098 rap_control_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_debug_intel
 Checking test 099 hrrr_control_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 270.138745
-  0: The maximum resident set size (KB)                   = 1177564
+  0: The total amount of wall time                        = 275.128424
+  0: The maximum resident set size (KB)                   = 1170052
 
 Test 099 hrrr_control_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_gf_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_gf_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_gf_debug_intel
 Checking test 100 hrrr_gf_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 270.893072
-  0: The maximum resident set size (KB)                   = 1173316
+  0: The total amount of wall time                        = 273.510531
+  0: The maximum resident set size (KB)                   = 1165164
 
 Test 100 hrrr_gf_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_c3_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_c3_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_c3_debug_intel
 Checking test 101 hrrr_c3_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 272.562548
-  0: The maximum resident set size (KB)                   = 1180640
+  0: The total amount of wall time                        = 273.838762
+  0: The maximum resident set size (KB)                   = 1149288
 
 Test 101 hrrr_c3_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_unified_drag_suite_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_unified_drag_suite_debug_intel
 Checking test 102 rap_unified_drag_suite_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 272.434741
-  0: The maximum resident set size (KB)                   = 1179632
+  0: The total amount of wall time                        = 270.501504
+  0: The maximum resident set size (KB)                   = 1190540
 
 Test 102 rap_unified_drag_suite_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_diag_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_diag_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_diag_debug_intel
 Checking test 103 rap_diag_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 289.372222
-  0: The maximum resident set size (KB)                   = 1264328
+  0: The total amount of wall time                        = 290.985738
+  0: The maximum resident set size (KB)                   = 1265276
 
 Test 103 rap_diag_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_cires_ugwp_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_cires_ugwp_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_cires_ugwp_debug_intel
 Checking test 104 rap_cires_ugwp_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 275.022452
-  0: The maximum resident set size (KB)                   = 1182732
+  0: The total amount of wall time                        = 273.922274
+  0: The maximum resident set size (KB)                   = 1150604
 
 Test 104 rap_cires_ugwp_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_cires_ugwp_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_unified_ugwp_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_unified_ugwp_debug_intel
 Checking test 105 rap_unified_ugwp_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 273.295561
-  0: The maximum resident set size (KB)                   = 1178872
+  0: The total amount of wall time                        = 275.880055
+  0: The maximum resident set size (KB)                   = 1173116
 
 Test 105 rap_unified_ugwp_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_lndp_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_lndp_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_lndp_debug_intel
 Checking test 106 rap_lndp_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 274.940241
-  0: The maximum resident set size (KB)                   = 1163000
+  0: The total amount of wall time                        = 277.375112
+  0: The maximum resident set size (KB)                   = 1185156
 
 Test 106 rap_lndp_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_progcld_thompson_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_progcld_thompson_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_progcld_thompson_debug_intel
 Checking test 107 rap_progcld_thompson_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 271.878187
-  0: The maximum resident set size (KB)                   = 1180168
+  0: The total amount of wall time                        = 272.840781
+  0: The maximum resident set size (KB)                   = 1153452
 
 Test 107 rap_progcld_thompson_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_noah_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_noah_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_noah_debug_intel
 Checking test 108 rap_noah_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 263.154324
-  0: The maximum resident set size (KB)                   = 1172664
+  0: The total amount of wall time                        = 263.869651
+  0: The maximum resident set size (KB)                   = 1169388
 
 Test 108 rap_noah_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_sfcdiff_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_sfcdiff_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_sfcdiff_debug_intel
 Checking test 109 rap_sfcdiff_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 271.405333
-  0: The maximum resident set size (KB)                   = 1182752
+  0: The total amount of wall time                        = 270.471192
+  0: The maximum resident set size (KB)                   = 1171900
 
 Test 109 rap_sfcdiff_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_noah_sfcdiff_cires_ugwp_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_noah_sfcdiff_cires_ugwp_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_noah_sfcdiff_cires_ugwp_debug_intel
 Checking test 110 rap_noah_sfcdiff_cires_ugwp_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 446.365804
-  0: The maximum resident set size (KB)                   = 1178232
+  0: The total amount of wall time                        = 446.743130
+  0: The maximum resident set size (KB)                   = 1152584
 
 Test 110 rap_noah_sfcdiff_cires_ugwp_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rrfs_v1beta_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rrfs_v1beta_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rrfs_v1beta_debug_intel
 Checking test 111 rrfs_v1beta_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 264.230573
-  0: The maximum resident set size (KB)                   = 1177600
+  0: The total amount of wall time                        = 266.344802
+  0: The maximum resident set size (KB)                   = 1179208
 
 Test 111 rrfs_v1beta_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_clm_lake_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_clm_lake_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_clm_lake_debug_intel
 Checking test 112 rap_clm_lake_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 330.882555
-  0: The maximum resident set size (KB)                   = 1151172
+  0: The total amount of wall time                        = 327.253650
+  0: The maximum resident set size (KB)                   = 1152764
 
 Test 112 rap_clm_lake_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_flake_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_flake_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_flake_debug_intel
 Checking test 113 rap_flake_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 269.327851
-  0: The maximum resident set size (KB)                   = 1185592
+  0: The total amount of wall time                        = 271.227733
+  0: The maximum resident set size (KB)                   = 1173328
 
 Test 113 rap_flake_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_wam_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_wam_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_wam_debug_intel
 Checking test 114 control_wam_debug_intel results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-  0: The total amount of wall time                        = 275.179577
-  0: The maximum resident set size (KB)                   = 583472
+  0: The total amount of wall time                        = 279.217022
+  0: The maximum resident set size (KB)                   = 557724
 
 Test 114 control_wam_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_spp_sppt_shum_skeb_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_spp_sppt_shum_skeb_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_spp_sppt_shum_skeb_dyn32_phy32_intel
 Checking test 115 regional_spp_sppt_shum_skeb_dyn32_phy32_intel results ....
  Comparing dynf000.nc .........OK
  Comparing dynf001.nc .........OK
@@ -4192,14 +4192,14 @@ Checking test 115 regional_spp_sppt_shum_skeb_dyn32_phy32_intel results ....
  Comparing NATLEV.GrbF00 .........OK
  Comparing NATLEV.GrbF01 .........OK
 
-  0: The total amount of wall time                        = 220.949125
-  0: The maximum resident set size (KB)                   = 1078200
+  0: The total amount of wall time                        = 226.646934
+  0: The maximum resident set size (KB)                   = 1095164
 
 Test 115 regional_spp_sppt_shum_skeb_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_dyn32_phy32_intel
 Checking test 116 rap_control_dyn32_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -4246,14 +4246,14 @@ Checking test 116 rap_control_dyn32_phy32_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 369.387402
-  0: The maximum resident set size (KB)                   = 1094752
+  0: The total amount of wall time                        = 384.561956
+  0: The maximum resident set size (KB)                   = 1101308
 
 Test 116 rap_control_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_dyn32_phy32_intel
 Checking test 117 hrrr_control_dyn32_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -4300,14 +4300,14 @@ Checking test 117 hrrr_control_dyn32_phy32_intel results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 189.602372
-  0: The maximum resident set size (KB)                   = 1004172
+  0: The total amount of wall time                        = 195.650444
+  0: The maximum resident set size (KB)                   = 1022208
 
 Test 117 hrrr_control_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_qr_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_qr_dyn32_phy32_intel
 Checking test 118 hrrr_control_qr_dyn32_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -4354,14 +4354,14 @@ Checking test 118 hrrr_control_qr_dyn32_phy32_intel results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc ............ALT CHECK......OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 191.128031
-  0: The maximum resident set size (KB)                   = 954572
+  0: The total amount of wall time                        = 192.308158
+  0: The maximum resident set size (KB)                   = 968028
 
 Test 118 hrrr_control_qr_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_2threads_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_2threads_dyn32_phy32_intel
 Checking test 119 rap_2threads_dyn32_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -4408,14 +4408,14 @@ Checking test 119 rap_2threads_dyn32_phy32_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 349.941900
-  0: The maximum resident set size (KB)                   = 1116804
+  0: The total amount of wall time                        = 369.993629
+  0: The maximum resident set size (KB)                   = 1092116
 
 Test 119 rap_2threads_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_2threads_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_2threads_dyn32_phy32_intel
 Checking test 120 hrrr_control_2threads_dyn32_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -4462,14 +4462,14 @@ Checking test 120 hrrr_control_2threads_dyn32_phy32_intel results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 177.345254
-  0: The maximum resident set size (KB)                   = 957980
+  0: The total amount of wall time                        = 178.549901
+  0: The maximum resident set size (KB)                   = 969688
 
 Test 120 hrrr_control_2threads_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_decomp_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_decomp_dyn32_phy32_intel
 Checking test 121 hrrr_control_decomp_dyn32_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -4516,14 +4516,14 @@ Checking test 121 hrrr_control_decomp_dyn32_phy32_intel results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 200.700259
-  0: The maximum resident set size (KB)                   = 965412
+  0: The total amount of wall time                        = 204.340836
+  0: The maximum resident set size (KB)                   = 944484
 
 Test 121 hrrr_control_decomp_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_restart_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_restart_dyn32_phy32_intel
 Checking test 122 rap_restart_dyn32_phy32_intel results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
@@ -4562,42 +4562,42 @@ Checking test 122 rap_restart_dyn32_phy32_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 278.900971
-  0: The maximum resident set size (KB)                   = 1034280
+  0: The total amount of wall time                        = 313.193821
+  0: The maximum resident set size (KB)                   = 1049348
 
 Test 122 rap_restart_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_restart_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_restart_dyn32_phy32_intel
 Checking test 123 hrrr_control_restart_dyn32_phy32_intel results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 99.950059
-  0: The maximum resident set size (KB)                   = 921696
+  0: The total amount of wall time                        = 102.201842
+  0: The maximum resident set size (KB)                   = 928632
 
 Test 123 hrrr_control_restart_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_restart_qr_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_restart_qr_dyn32_phy32_intel
 Checking test 124 hrrr_control_restart_qr_dyn32_phy32_intel results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 100.752766
-  0: The maximum resident set size (KB)                   = 856868
+  0: The total amount of wall time                        = 102.374376
+  0: The maximum resident set size (KB)                   = 860704
 
 Test 124 hrrr_control_restart_qr_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_control_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_control_intel
 Checking test 125 conus13km_control_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -4613,40 +4613,40 @@ Checking test 125 conus13km_control_intel results ....
  Comparing RESTART/20210512.170000.phy_data.nc .........OK
  Comparing RESTART/20210512.170000.sfc_data.nc .........OK
 
-  0: The total amount of wall time                        = 112.270782
-  0: The maximum resident set size (KB)                   = 1248220
+  0: The total amount of wall time                        = 243.160050
+  0: The maximum resident set size (KB)                   = 1238712
 
 Test 125 conus13km_control_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_control_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_2threads_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_2threads_intel
 Checking test 126 conus13km_2threads_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 44.548514
-  0: The maximum resident set size (KB)                   = 1159492
+  0: The total amount of wall time                        = 56.014804
+  0: The maximum resident set size (KB)                   = 1133288
 
 Test 126 conus13km_2threads_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_restart_mismatch_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_restart_mismatch_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_restart_mismatch_intel
 Checking test 127 conus13km_restart_mismatch_intel results ....
  Comparing sfcf002.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 62.780261
-  0: The maximum resident set size (KB)                   = 1162908
+  0: The total amount of wall time                        = 141.675698
+  0: The maximum resident set size (KB)                   = 1152120
 
 Test 127 conus13km_restart_mismatch_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_dyn64_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_dyn64_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_dyn64_phy32_intel
 Checking test 128 rap_control_dyn64_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -4693,42 +4693,42 @@ Checking test 128 rap_control_dyn64_phy32_intel results ....
  Comparing RESTART/20210322.180000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.180000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 244.145163
-  0: The maximum resident set size (KB)                   = 1072860
+  0: The total amount of wall time                        = 395.294468
+  0: The maximum resident set size (KB)                   = 1067856
 
 Test 128 rap_control_dyn64_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_debug_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_debug_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_debug_dyn32_phy32_intel
 Checking test 129 rap_control_debug_dyn32_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 271.861900
-  0: The maximum resident set size (KB)                   = 1063820
+  0: The total amount of wall time                        = 280.573437
+  0: The maximum resident set size (KB)                   = 1064416
 
 Test 129 rap_control_debug_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_debug_dyn32_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_debug_dyn32_phy32_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_debug_dyn32_phy32_intel
 Checking test 130 hrrr_control_debug_dyn32_phy32_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 261.617057
-  0: The maximum resident set size (KB)                   = 1062940
+  0: The total amount of wall time                        = 274.973750
+  0: The maximum resident set size (KB)                   = 1035352
 
 Test 130 hrrr_control_debug_dyn32_phy32_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_debug_intel
 Checking test 131 conus13km_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -4742,14 +4742,14 @@ Checking test 131 conus13km_debug_intel results ....
  Comparing RESTART/20210512.170000.phy_data.nc .........OK
  Comparing RESTART/20210512.170000.sfc_data.nc .........OK
 
-  0: The total amount of wall time                        = 836.297221
-  0: The maximum resident set size (KB)                   = 1253392
+  0: The total amount of wall time                        = 937.583587
+  0: The maximum resident set size (KB)                   = 1243340
 
 Test 131 conus13km_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_debug_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_debug_qr_intel
 Checking test 132 conus13km_debug_qr_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -4763,81 +4763,81 @@ Checking test 132 conus13km_debug_qr_intel results ....
  Comparing RESTART/20210512.170000.phy_data.nc ............ALT CHECK......OK
  Comparing RESTART/20210512.170000.sfc_data.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 831.508071
-  0: The maximum resident set size (KB)                   = 926056
+  0: The total amount of wall time                        = 939.322391
+  0: The maximum resident set size (KB)                   = 915660
 
 Test 132 conus13km_debug_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_debug_2threads_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_debug_2threads_intel
 Checking test 133 conus13km_debug_2threads_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 464.493404
-  0: The maximum resident set size (KB)                   = 1200596
+  0: The total amount of wall time                        = 491.640887
+  0: The maximum resident set size (KB)                   = 1188512
 
 Test 133 conus13km_debug_2threads_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_radar_tten_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_radar_tten_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_radar_tten_debug_intel
 Checking test 134 conus13km_radar_tten_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 840.613545
-  0: The maximum resident set size (KB)                   = 1313596
+  0: The total amount of wall time                        = 874.565475
+  0: The maximum resident set size (KB)                   = 1309712
 
 Test 134 conus13km_radar_tten_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_debug_dyn64_phy32_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_dyn64_phy32_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_dyn64_phy32_debug_intel
 Checking test 135 rap_control_dyn64_phy32_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 274.697353
-  0: The maximum resident set size (KB)                   = 1106988
+  0: The total amount of wall time                        = 292.319440
+  0: The maximum resident set size (KB)                   = 1105096
 
 Test 135 rap_control_dyn64_phy32_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_atm_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_atm_intel
 Checking test 136 hafs_regional_atm_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing HURPRS.GrbF06 .........OK
 
-  0: The total amount of wall time                        = 217.985758
-  0: The maximum resident set size (KB)                   = 1233740
+  0: The total amount of wall time                        = 473.204542
+  0: The maximum resident set size (KB)                   = 1221556
 
 Test 136 hafs_regional_atm_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_atm_thompson_gfdlsf_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_atm_thompson_gfdlsf_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_atm_thompson_gfdlsf_intel
 Checking test 137 hafs_regional_atm_thompson_gfdlsf_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
 
-  0: The total amount of wall time                        = 344.081961
-  0: The maximum resident set size (KB)                   = 1567752
+  0: The total amount of wall time                        = 653.615659
+  0: The maximum resident set size (KB)                   = 1565888
 
 Test 137 hafs_regional_atm_thompson_gfdlsf_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_atm_ocn_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_atm_ocn_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_atm_ocn_intel
 Checking test 138 hafs_regional_atm_ocn_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -4846,14 +4846,14 @@ Checking test 138 hafs_regional_atm_ocn_intel results ....
  Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 379.954107
-  0: The maximum resident set size (KB)                   = 1399420
+  0: The total amount of wall time                        = 618.855817
+  0: The maximum resident set size (KB)                   = 1377756
 
 Test 138 hafs_regional_atm_ocn_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_atm_wav_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_atm_wav_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_atm_wav_intel
 Checking test 139 hafs_regional_atm_wav_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -4862,14 +4862,14 @@ Checking test 139 hafs_regional_atm_wav_intel results ....
  Comparing ufs.hafs.ww3.r.2019-08-29-21600 .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 738.286004
-  0: The maximum resident set size (KB)                   = 1436088
+  0: The total amount of wall time                        = 936.583513
+  0: The maximum resident set size (KB)                   = 1430212
 
 Test 139 hafs_regional_atm_wav_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_atm_ocn_wav_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_atm_ocn_wav_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_atm_ocn_wav_intel
 Checking test 140 hafs_regional_atm_ocn_wav_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -4880,14 +4880,14 @@ Checking test 140 hafs_regional_atm_ocn_wav_intel results ....
  Comparing ufs.hafs.ww3.r.2019-08-29-21600 .........OK
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 837.326783
-  0: The maximum resident set size (KB)                   = 1436648
+  0: The total amount of wall time                        = 903.760951
+  0: The maximum resident set size (KB)                   = 1456660
 
 Test 140 hafs_regional_atm_ocn_wav_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_1nest_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_1nest_atm_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_1nest_atm_intel
 Checking test 141 hafs_regional_1nest_atm_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -4909,14 +4909,14 @@ Checking test 141 hafs_regional_1nest_atm_intel results ....
  Comparing RESTART/fv_BC_ne.res.nest02.nc .........OK
  Comparing RESTART/fv_BC_sw.res.nest02.nc .........OK
 
-  0: The total amount of wall time                        = 295.908446
-  0: The maximum resident set size (KB)                   = 649984
+  0: The total amount of wall time                        = 490.979502
+  0: The maximum resident set size (KB)                   = 651192
 
 Test 141 hafs_regional_1nest_atm_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_1nest_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_1nest_atm_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_1nest_atm_qr_intel
 Checking test 142 hafs_regional_1nest_atm_qr_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -4938,14 +4938,14 @@ Checking test 142 hafs_regional_1nest_atm_qr_intel results ....
  Comparing RESTART/fv_BC_ne.res.nest02.nc .........OK
  Comparing RESTART/fv_BC_sw.res.nest02.nc .........OK
 
-  0: The total amount of wall time                        = 319.105103
-  0: The maximum resident set size (KB)                   = 492756
+  0: The total amount of wall time                        = 516.994547
+  0: The maximum resident set size (KB)                   = 498420
 
 Test 142 hafs_regional_1nest_atm_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_telescopic_2nests_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_telescopic_2nests_atm_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_telescopic_2nests_atm_intel
 Checking test 143 hafs_regional_telescopic_2nests_atm_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -4954,14 +4954,14 @@ Checking test 143 hafs_regional_telescopic_2nests_atm_intel results ....
  Comparing atm.nest03.f006.nc .........OK
  Comparing sfc.nest03.f006.nc .........OK
 
-  0: The total amount of wall time                        = 350.393095
-  0: The maximum resident set size (KB)                   = 658440
+  0: The total amount of wall time                        = 537.106906
+  0: The maximum resident set size (KB)                   = 664240
 
 Test 143 hafs_regional_telescopic_2nests_atm_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_global_1nest_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_global_1nest_atm_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_global_1nest_atm_intel
 Checking test 144 hafs_global_1nest_atm_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5008,14 +5008,14 @@ Checking test 144 hafs_global_1nest_atm_intel results ....
  Comparing RESTART/fv_BC_ne.res.nest02.nc .........OK
  Comparing RESTART/fv_BC_sw.res.nest02.nc .........OK
 
-  0: The total amount of wall time                        = 136.405697
-  0: The maximum resident set size (KB)                   = 397296
+  0: The total amount of wall time                        = 268.522921
+  0: The maximum resident set size (KB)                   = 398864
 
 Test 144 hafs_global_1nest_atm_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_global_1nest_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_global_1nest_atm_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_global_1nest_atm_qr_intel
 Checking test 145 hafs_global_1nest_atm_qr_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5062,14 +5062,14 @@ Checking test 145 hafs_global_1nest_atm_qr_intel results ....
  Comparing RESTART/fv_BC_ne.res.nest02.nc .........OK
  Comparing RESTART/fv_BC_sw.res.nest02.nc .........OK
 
-  0: The total amount of wall time                        = 144.296280
-  0: The maximum resident set size (KB)                   = 373576
+  0: The total amount of wall time                        = 278.032644
+  0: The maximum resident set size (KB)                   = 354564
 
 Test 145 hafs_global_1nest_atm_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_global_multiple_4nests_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_global_multiple_4nests_atm_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_global_multiple_4nests_atm_intel
 Checking test 146 hafs_global_multiple_4nests_atm_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5151,14 +5151,14 @@ Checking test 146 hafs_global_multiple_4nests_atm_intel results ....
  Comparing RESTART/fv_BC_sw.res.nest04.nc .........OK
  Comparing RESTART/fv_BC_sw.res.nest05.nc .........OK
 
-  0: The total amount of wall time                        = 404.984735
-  0: The maximum resident set size (KB)                   = 471200
+  0: The total amount of wall time                        = 494.067313
+  0: The maximum resident set size (KB)                   = 477196
 
 Test 146 hafs_global_multiple_4nests_atm_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_global_multiple_4nests_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_global_multiple_4nests_atm_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_global_multiple_4nests_atm_qr_intel
 Checking test 147 hafs_global_multiple_4nests_atm_qr_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5240,14 +5240,14 @@ Checking test 147 hafs_global_multiple_4nests_atm_qr_intel results ....
  Comparing RESTART/fv_BC_sw.res.nest04.nc .........OK
  Comparing RESTART/fv_BC_sw.res.nest05.nc .........OK
 
-  0: The total amount of wall time                        = 481.484831
-  0: The maximum resident set size (KB)                   = 470232
+  0: The total amount of wall time                        = 532.786971
+  0: The maximum resident set size (KB)                   = 476684
 
 Test 147 hafs_global_multiple_4nests_atm_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_specified_moving_1nest_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_specified_moving_1nest_atm_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_specified_moving_1nest_atm_intel
 Checking test 148 hafs_regional_specified_moving_1nest_atm_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5256,14 +5256,14 @@ Checking test 148 hafs_regional_specified_moving_1nest_atm_intel results ....
  Comparing HURPRS.GrbF06 .........OK
  Comparing HURPRS.GrbF06.nest02 .........OK
 
-  0: The total amount of wall time                        = 196.711727
-  0: The maximum resident set size (KB)                   = 660428
+  0: The total amount of wall time                        = 276.593391
+  0: The maximum resident set size (KB)                   = 667672
 
 Test 148 hafs_regional_specified_moving_1nest_atm_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_storm_following_1nest_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_storm_following_1nest_atm_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_storm_following_1nest_atm_intel
 Checking test 149 hafs_regional_storm_following_1nest_atm_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5285,14 +5285,14 @@ Checking test 149 hafs_regional_storm_following_1nest_atm_intel results ....
  Comparing RESTART/fv_BC_ne.res.nest02.nc .........OK
  Comparing RESTART/fv_BC_sw.res.nest02.nc .........OK
 
-  0: The total amount of wall time                        = 187.120744
-  0: The maximum resident set size (KB)                   = 636280
+  0: The total amount of wall time                        = 259.681046
+  0: The maximum resident set size (KB)                   = 664756
 
 Test 149 hafs_regional_storm_following_1nest_atm_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_storm_following_1nest_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_storm_following_1nest_atm_qr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_storm_following_1nest_atm_qr_intel
 Checking test 150 hafs_regional_storm_following_1nest_atm_qr_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5314,14 +5314,14 @@ Checking test 150 hafs_regional_storm_following_1nest_atm_qr_intel results ....
  Comparing RESTART/fv_BC_ne.res.nest02.nc .........OK
  Comparing RESTART/fv_BC_sw.res.nest02.nc .........OK
 
-  0: The total amount of wall time                        = 211.827021
-  0: The maximum resident set size (KB)                   = 525040
+  0: The total amount of wall time                        = 289.235844
+  0: The maximum resident set size (KB)                   = 531608
 
 Test 150 hafs_regional_storm_following_1nest_atm_qr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_storm_following_1nest_atm_ocn_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_storm_following_1nest_atm_ocn_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_storm_following_1nest_atm_ocn_intel
 Checking test 151 hafs_regional_storm_following_1nest_atm_ocn_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5330,42 +5330,42 @@ Checking test 151 hafs_regional_storm_following_1nest_atm_ocn_intel results ....
  Comparing archv.2020_238_18.a .........OK
  Comparing archs.2020_238_18.a .........OK
 
-  0: The total amount of wall time                        = 224.012731
-  0: The maximum resident set size (KB)                   = 710216
+  0: The total amount of wall time                        = 310.967625
+  0: The maximum resident set size (KB)                   = 710388
 
 Test 151 hafs_regional_storm_following_1nest_atm_ocn_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_global_storm_following_1nest_atm_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_global_storm_following_1nest_atm_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_global_storm_following_1nest_atm_intel
 Checking test 152 hafs_global_storm_following_1nest_atm_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
  Comparing atm.nest02.f006.nc .........OK
  Comparing sfc.nest02.f006.nc .........OK
 
-  0: The total amount of wall time                        = 55.094306
-  0: The maximum resident set size (KB)                   = 412136
+  0: The total amount of wall time                        = 161.588417
+  0: The maximum resident set size (KB)                   = 416072
 
 Test 152 hafs_global_storm_following_1nest_atm_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_storm_following_1nest_atm_ocn_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_storm_following_1nest_atm_ocn_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_storm_following_1nest_atm_ocn_debug_intel
 Checking test 153 hafs_regional_storm_following_1nest_atm_ocn_debug_intel results ....
  Comparing atmf001.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atm.nest02.f001.nc .........OK
  Comparing sfc.nest02.f001.nc .........OK
 
-  0: The total amount of wall time                        = 709.461734
-  0: The maximum resident set size (KB)                   = 728708
+  0: The total amount of wall time                        = 885.540833
+  0: The maximum resident set size (KB)                   = 705296
 
 Test 153 hafs_regional_storm_following_1nest_atm_ocn_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_storm_following_1nest_atm_ocn_wav_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_storm_following_1nest_atm_ocn_wav_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_storm_following_1nest_atm_ocn_wav_intel
 Checking test 154 hafs_regional_storm_following_1nest_atm_ocn_wav_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5376,14 +5376,14 @@ Checking test 154 hafs_regional_storm_following_1nest_atm_ocn_wav_intel results
  Comparing 20200825.180000.out_grd.ww3 .........OK
  Comparing 20200825.180000.out_pnt.ww3 .........OK
 
-  0: The total amount of wall time                        = 483.197436
-  0: The maximum resident set size (KB)                   = 803480
+  0: The total amount of wall time                        = 566.801448
+  0: The maximum resident set size (KB)                   = 807664
 
 Test 154 hafs_regional_storm_following_1nest_atm_ocn_wav_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_docn_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_docn_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_docn_intel
 Checking test 155 hafs_regional_docn_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5391,14 +5391,14 @@ Checking test 155 hafs_regional_docn_intel results ....
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 333.552897
-  0: The maximum resident set size (KB)                   = 1383304
+  0: The total amount of wall time                        = 343.289083
+  0: The maximum resident set size (KB)                   = 1400448
 
 Test 155 hafs_regional_docn_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_docn_oisst_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_docn_oisst_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_docn_oisst_intel
 Checking test 156 hafs_regional_docn_oisst_intel results ....
  Comparing atmf006.nc .........OK
  Comparing sfcf006.nc .........OK
@@ -5406,131 +5406,131 @@ Checking test 156 hafs_regional_docn_oisst_intel results ....
  Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .........OK
  Comparing ufs.hafs.docn.r.2019-08-29-21600.nc .........OK
 
-  0: The total amount of wall time                        = 351.284347
-  0: The maximum resident set size (KB)                   = 1384480
+  0: The total amount of wall time                        = 350.711401
+  0: The maximum resident set size (KB)                   = 1382112
 
 Test 156 hafs_regional_docn_oisst_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hafs_regional_datm_cdeps_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hafs_regional_datm_cdeps_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hafs_regional_datm_cdeps_intel
 Checking test 157 hafs_regional_datm_cdeps_intel results ....
  Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .........OK
  Comparing ufs.hafs.datm.r.2019-08-30-00000.nc .........OK
 
-  0: The total amount of wall time                        = 980.341543
-  0: The maximum resident set size (KB)                   = 1155264
+  0: The total amount of wall time                        = 953.581309
+  0: The maximum resident set size (KB)                   = 1157632
 
 Test 157 hafs_regional_datm_cdeps_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_control_cfsr_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_control_cfsr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_control_cfsr_intel
 Checking test 158 datm_cdeps_control_cfsr_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 162.490218
- 0: The maximum resident set size (KB)                   = 1118136
+ 0: The total amount of wall time                        = 169.668112
+ 0: The maximum resident set size (KB)                   = 1109284
 
 Test 158 datm_cdeps_control_cfsr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_control_cfsr_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_restart_cfsr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_restart_cfsr_intel
 Checking test 159 datm_cdeps_restart_cfsr_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 93.570056
- 0: The maximum resident set size (KB)                   = 1067876
+ 0: The total amount of wall time                        = 91.611879
+ 0: The maximum resident set size (KB)                   = 1070008
 
 Test 159 datm_cdeps_restart_cfsr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_control_gefs_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_control_gefs_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_control_gefs_intel
 Checking test 160 datm_cdeps_control_gefs_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 148.442029
- 0: The maximum resident set size (KB)                   = 1008744
+ 0: The total amount of wall time                        = 167.384956
+ 0: The maximum resident set size (KB)                   = 1000756
 
 Test 160 datm_cdeps_control_gefs_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_iau_gefs_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_iau_gefs_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_iau_gefs_intel
 Checking test 161 datm_cdeps_iau_gefs_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 151.826485
- 0: The maximum resident set size (KB)                   = 987728
+ 0: The total amount of wall time                        = 164.659180
+ 0: The maximum resident set size (KB)                   = 982636
 
 Test 161 datm_cdeps_iau_gefs_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_stochy_gefs_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_stochy_gefs_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_stochy_gefs_intel
 Checking test 162 datm_cdeps_stochy_gefs_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 148.469350
- 0: The maximum resident set size (KB)                   = 1003844
+ 0: The total amount of wall time                        = 178.670532
+ 0: The maximum resident set size (KB)                   = 993904
 
 Test 162 datm_cdeps_stochy_gefs_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_ciceC_cfsr_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_ciceC_cfsr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_ciceC_cfsr_intel
 Checking test 163 datm_cdeps_ciceC_cfsr_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 159.600060
- 0: The maximum resident set size (KB)                   = 1111432
+ 0: The total amount of wall time                        = 172.161776
+ 0: The maximum resident set size (KB)                   = 1111060
 
 Test 163 datm_cdeps_ciceC_cfsr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_bulk_cfsr_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_bulk_cfsr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_bulk_cfsr_intel
 Checking test 164 datm_cdeps_bulk_cfsr_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 157.900611
- 0: The maximum resident set size (KB)                   = 1109916
+ 0: The total amount of wall time                        = 195.603284
+ 0: The maximum resident set size (KB)                   = 1118856
 
 Test 164 datm_cdeps_bulk_cfsr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_bulk_gefs_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_bulk_gefs_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_bulk_gefs_intel
 Checking test 165 datm_cdeps_bulk_gefs_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 147.688800
- 0: The maximum resident set size (KB)                   = 1003108
+ 0: The total amount of wall time                        = 177.432837
+ 0: The maximum resident set size (KB)                   = 1003896
 
 Test 165 datm_cdeps_bulk_gefs_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_mx025_cfsr_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_mx025_cfsr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_mx025_cfsr_intel
 Checking test 166 datm_cdeps_mx025_cfsr_intel results ....
  Comparing RESTART/20111001.120000.MOM.res.nc .........OK
  Comparing RESTART/20111001.120000.MOM.res_1.nc .........OK
@@ -5539,14 +5539,14 @@ Checking test 166 datm_cdeps_mx025_cfsr_intel results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 402.610237
-  0: The maximum resident set size (KB)                   = 1029520
+  0: The total amount of wall time                        = 570.100258
+  0: The maximum resident set size (KB)                   = 1035360
 
 Test 166 datm_cdeps_mx025_cfsr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_mx025_gefs_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_mx025_gefs_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_mx025_gefs_intel
 Checking test 167 datm_cdeps_mx025_gefs_intel results ....
  Comparing RESTART/20111001.120000.MOM.res.nc .........OK
  Comparing RESTART/20111001.120000.MOM.res_1.nc .........OK
@@ -5555,77 +5555,77 @@ Checking test 167 datm_cdeps_mx025_gefs_intel results ....
  Comparing RESTART/iced.2011-10-01-43200.nc .........OK
  Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-01-43200.nc .........OK
 
-  0: The total amount of wall time                        = 409.739113
-  0: The maximum resident set size (KB)                   = 1018244
+  0: The total amount of wall time                        = 541.588192
+  0: The maximum resident set size (KB)                   = 1019172
 
 Test 167 datm_cdeps_mx025_gefs_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_control_cfsr_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_multiple_files_cfsr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_multiple_files_cfsr_intel
 Checking test 168 datm_cdeps_multiple_files_cfsr_intel results ....
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 158.179757
- 0: The maximum resident set size (KB)                   = 1117912
+ 0: The total amount of wall time                        = 174.249744
+ 0: The maximum resident set size (KB)                   = 1108624
 
 Test 168 datm_cdeps_multiple_files_cfsr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_3072x1536_cfsr_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_3072x1536_cfsr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_3072x1536_cfsr_intel
 Checking test 169 datm_cdeps_3072x1536_cfsr_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 231.124211
- 0: The maximum resident set size (KB)                   = 2393852
+ 0: The total amount of wall time                        = 321.494160
+ 0: The maximum resident set size (KB)                   = 2466516
 
 Test 169 datm_cdeps_3072x1536_cfsr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_gfs_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_gfs_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_gfs_intel
 Checking test 170 datm_cdeps_gfs_intel results ....
  Comparing RESTART/20210323.060000.MOM.res.nc .........OK
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/DATM_GFS.cpl.r.2021-03-23-21600.nc .........OK
 
- 0: The total amount of wall time                        = 239.987029
- 0: The maximum resident set size (KB)                   = 2449404
+ 0: The total amount of wall time                        = 293.865875
+ 0: The maximum resident set size (KB)                   = 2445368
 
 Test 170 datm_cdeps_gfs_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_debug_cfsr_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_debug_cfsr_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_debug_cfsr_intel
 Checking test 171 datm_cdeps_debug_cfsr_intel results ....
  Comparing RESTART/20111001.060000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-01-21600.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .........OK
 
- 0: The total amount of wall time                        = 338.919843
- 0: The maximum resident set size (KB)                   = 1050524
+ 0: The total amount of wall time                        = 361.612643
+ 0: The maximum resident set size (KB)                   = 1049576
 
 Test 171 datm_cdeps_debug_cfsr_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_control_cfsr_faster_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_control_cfsr_faster_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_control_cfsr_faster_intel
 Checking test 172 datm_cdeps_control_cfsr_faster_intel results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 157.270034
- 0: The maximum resident set size (KB)                   = 1107008
+ 0: The total amount of wall time                        = 150.717754
+ 0: The maximum resident set size (KB)                   = 1115136
 
 Test 172 datm_cdeps_control_cfsr_faster_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_lnd_gswp3_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_lnd_gswp3_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_lnd_gswp3_intel
 Checking test 173 datm_cdeps_lnd_gswp3_intel results ....
  Comparing ufs.cpld.lnd.out.2000-01-02-00000.tile1.nc .........OK
  Comparing ufs.cpld.lnd.out.2000-01-02-00000.tile2.nc .........OK
@@ -5634,14 +5634,14 @@ Checking test 173 datm_cdeps_lnd_gswp3_intel results ....
  Comparing ufs.cpld.lnd.out.2000-01-02-00000.tile5.nc .........OK
  Comparing ufs.cpld.lnd.out.2000-01-02-00000.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 7.502734
-  0: The maximum resident set size (KB)                   = 249884
+  0: The total amount of wall time                        = 21.733598
+  0: The maximum resident set size (KB)                   = 251116
 
 Test 173 datm_cdeps_lnd_gswp3_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_lnd_gswp3_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_lnd_gswp3_rst_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_lnd_gswp3_rst_intel
 Checking test 174 datm_cdeps_lnd_gswp3_rst_intel results ....
  Comparing ufs.cpld.lnd.out.2000-01-02-00000.tile1.nc .........OK
  Comparing ufs.cpld.lnd.out.2000-01-02-00000.tile2.nc .........OK
@@ -5650,14 +5650,14 @@ Checking test 174 datm_cdeps_lnd_gswp3_rst_intel results ....
  Comparing ufs.cpld.lnd.out.2000-01-02-00000.tile5.nc .........OK
  Comparing ufs.cpld.lnd.out.2000-01-02-00000.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 12.728520
-  0: The maximum resident set size (KB)                   = 251052
+  0: The total amount of wall time                        = 13.916774
+  0: The maximum resident set size (KB)                   = 251696
 
 Test 174 datm_cdeps_lnd_gswp3_rst_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_atmlnd_sbs_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_atmlnd_sbs_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_atmlnd_sbs_intel
 Checking test 175 control_p8_atmlnd_sbs_intel results ....
  Comparing sfcf000.tile1.nc .........OK
  Comparing sfcf000.tile2.nc .........OK
@@ -5742,14 +5742,14 @@ Checking test 175 control_p8_atmlnd_sbs_intel results ....
  Comparing ufs.cpld.lnd.out.2021-03-23-21600.tile5.nc .........OK
  Comparing ufs.cpld.lnd.out.2021-03-23-21600.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 215.946248
-  0: The maximum resident set size (KB)                   = 1605784
+  0: The total amount of wall time                        = 206.696392
+  0: The maximum resident set size (KB)                   = 1607000
 
 Test 175 control_p8_atmlnd_sbs_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/atmwav_control_noaero_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/atmwav_control_noaero_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/atmwav_control_noaero_p8_intel
 Checking test 176 atmwav_control_noaero_p8_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -5792,14 +5792,14 @@ Checking test 176 atmwav_control_noaero_p8_intel results ....
  Comparing 20210322.180000.out_grd.ww3 .........OK
  Comparing ufs.atmw.ww3.r.2021-03-22-64800 .........OK
 
-  0: The total amount of wall time                        = 106.795309
-  0: The maximum resident set size (KB)                   = 1612676
+  0: The total amount of wall time                        = 98.494273
+  0: The maximum resident set size (KB)                   = 1607216
 
 Test 176 atmwav_control_noaero_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_atmwav_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_atmwav_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_atmwav_intel
 Checking test 177 control_atmwav_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -5843,14 +5843,14 @@ Checking test 177 control_atmwav_intel results ....
  Comparing RESTART/20210322.180000.sfc_data.tile6.nc .........OK
  Comparing 20210322.180000.restart.glo_1deg .........OK
 
-  0: The total amount of wall time                        = 104.388346
-  0: The maximum resident set size (KB)                   = 635804
+  0: The total amount of wall time                        = 88.946577
+  0: The maximum resident set size (KB)                   = 662448
 
 Test 177 control_atmwav_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/atmaero_control_p8_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/atmaero_control_p8_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/atmaero_control_p8_intel
 Checking test 178 atmaero_control_p8_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -5894,14 +5894,14 @@ Checking test 178 atmaero_control_p8_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 234.326376
-  0: The maximum resident set size (KB)                   = 2980120
+  0: The total amount of wall time                        = 238.368640
+  0: The maximum resident set size (KB)                   = 2931660
 
 Test 178 atmaero_control_p8_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/atmaero_control_p8_rad_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/atmaero_control_p8_rad_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/atmaero_control_p8_rad_intel
 Checking test 179 atmaero_control_p8_rad_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -5945,14 +5945,14 @@ Checking test 179 atmaero_control_p8_rad_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 284.786872
-  0: The maximum resident set size (KB)                   = 3068592
+  0: The total amount of wall time                        = 278.892007
+  0: The maximum resident set size (KB)                   = 3060408
 
 Test 179 atmaero_control_p8_rad_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/atmaero_control_p8_rad_micro_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/atmaero_control_p8_rad_micro_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/atmaero_control_p8_rad_micro_intel
 Checking test 180 atmaero_control_p8_rad_micro_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -5996,14 +5996,14 @@ Checking test 180 atmaero_control_p8_rad_micro_intel results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 301.373026
-  0: The maximum resident set size (KB)                   = 3023736
+  0: The total amount of wall time                        = 296.427030
+  0: The maximum resident set size (KB)                   = 3070656
 
 Test 180 atmaero_control_p8_rad_micro_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_atmaq_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_atmaq_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_atmaq_intel
 Checking test 181 regional_atmaq_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf003.nc .........OK
@@ -6019,14 +6019,14 @@ Checking test 181 regional_atmaq_intel results ....
  Comparing RESTART/20190801.180000.phy_data.nc .........OK
  Comparing RESTART/20190801.180000.sfc_data.nc .........OK
 
-  0: The total amount of wall time                        = 657.533537
-  0: The maximum resident set size (KB)                   = 5345832
+  0: The total amount of wall time                        = 653.332128
+  0: The maximum resident set size (KB)                   = 5349684
 
 Test 181 regional_atmaq_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_atmaq_debug_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_atmaq_debug_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_atmaq_debug_intel
 Checking test 182 regional_atmaq_debug_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -6040,14 +6040,14 @@ Checking test 182 regional_atmaq_debug_intel results ....
  Comparing RESTART/20190801.130000.phy_data.nc .........OK
  Comparing RESTART/20190801.130000.sfc_data.nc .........OK
 
-  0: The total amount of wall time                        = 1180.645818
-  0: The maximum resident set size (KB)                   = 4791040
+  0: The total amount of wall time                        = 1217.197340
+  0: The maximum resident set size (KB)                   = 4800280
 
 Test 182 regional_atmaq_debug_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_atmaq_faster_intel
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_atmaq_faster_intel
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_atmaq_faster_intel
 Checking test 183 regional_atmaq_faster_intel results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf003.nc .........OK
@@ -6063,14 +6063,14 @@ Checking test 183 regional_atmaq_faster_intel results ....
  Comparing RESTART/20190801.180000.phy_data.nc .........OK
  Comparing RESTART/20190801.180000.sfc_data.nc .........OK
 
-  0: The total amount of wall time                        = 815.455574
-  0: The maximum resident set size (KB)                   = 5345120
+  0: The total amount of wall time                        = 803.915386
+  0: The maximum resident set size (KB)                   = 5342540
 
 Test 183 regional_atmaq_faster_intel PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_c48_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_c48_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_c48_gnu
 Checking test 184 control_c48_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -6109,14 +6109,14 @@ Checking test 184 control_c48_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-0: The total amount of wall time                        = 690.807259
-0: The maximum resident set size (KB)                   = 724952
+0: The total amount of wall time                        = 683.935578
+0: The maximum resident set size (KB)                   = 724728
 
 Test 184 control_c48_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_stochy_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_stochy_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_stochy_gnu
 Checking test 185 control_stochy_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf012.nc .........OK
@@ -6127,14 +6127,14 @@ Checking test 185 control_stochy_gnu results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 238.225383
-  0: The maximum resident set size (KB)                   = 504936
+  0: The total amount of wall time                        = 262.644517
+  0: The maximum resident set size (KB)                   = 526256
 
 Test 185 control_stochy_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_ras_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_ras_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_ras_gnu
 Checking test 186 control_ras_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -6145,14 +6145,14 @@ Checking test 186 control_ras_gnu results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 292.863115
-  0: The maximum resident set size (KB)                   = 509588
+  0: The total amount of wall time                        = 299.061417
+  0: The maximum resident set size (KB)                   = 510676
 
 Test 186 control_ras_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_gnu
 Checking test 187 control_p8_gnu results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf021.nc ............ALT CHECK......OK
@@ -6199,14 +6199,14 @@ Checking test 187 control_p8_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 284.475013
-  0: The maximum resident set size (KB)                   = 1289280
+  0: The total amount of wall time                        = 293.317822
+  0: The maximum resident set size (KB)                   = 1292500
 
 Test 187 control_p8_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_p8_ugwpv1_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_p8_ugwpv1_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_p8_ugwpv1_gnu
 Checking test 188 control_p8_ugwpv1_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -6253,14 +6253,14 @@ Checking test 188 control_p8_ugwpv1_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 274.733692
-  0: The maximum resident set size (KB)                   = 1294000
+  0: The total amount of wall time                        = 280.305831
+  0: The maximum resident set size (KB)                   = 1293928
 
 Test 188 control_p8_ugwpv1_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_flake_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_flake_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_flake_gnu
 Checking test 189 control_flake_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf024.nc .........OK
@@ -6271,14 +6271,14 @@ Checking test 189 control_flake_gnu results ....
  Comparing GFSPRS.GrbF00 .........OK
  Comparing GFSPRS.GrbF24 .........OK
 
-  0: The total amount of wall time                        = 349.572785
-  0: The maximum resident set size (KB)                   = 553196
+  0: The total amount of wall time                        = 356.072324
+  0: The maximum resident set size (KB)                   = 553056
 
 Test 189 control_flake_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_gnu
 Checking test 190 rap_control_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -6325,14 +6325,14 @@ Checking test 190 rap_control_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 703.931828
-  0: The maximum resident set size (KB)                   = 844340
+  0: The total amount of wall time                        = 691.160013
+  0: The maximum resident set size (KB)                   = 845592
 
 Test 190 rap_control_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_decomp_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_decomp_gnu
 Checking test 191 rap_decomp_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -6379,14 +6379,14 @@ Checking test 191 rap_decomp_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 731.599926
-  0: The maximum resident set size (KB)                   = 839920
+  0: The total amount of wall time                        = 699.384537
+  0: The maximum resident set size (KB)                   = 842080
 
 Test 191 rap_decomp_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_2threads_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_2threads_gnu
 Checking test 192 rap_2threads_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf021.nc .........OK
@@ -6433,14 +6433,14 @@ Checking test 192 rap_2threads_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 642.830926
-  0: The maximum resident set size (KB)                   = 946684
+  0: The total amount of wall time                        = 634.416331
+  0: The maximum resident set size (KB)                   = 942868
 
 Test 192 rap_2threads_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_restart_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_restart_gnu
 Checking test 193 rap_restart_gnu results ....
  Comparing sfcf024.nc .........OK
  Comparing atmf024.nc .........OK
@@ -6479,14 +6479,14 @@ Checking test 193 rap_restart_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 347.807255
-  0: The maximum resident set size (KB)                   = 748516
+  0: The total amount of wall time                        = 349.997244
+  0: The maximum resident set size (KB)                   = 749088
 
 Test 193 rap_restart_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_sfcdiff_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_sfcdiff_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_sfcdiff_gnu
 Checking test 194 rap_sfcdiff_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -6533,14 +6533,14 @@ Checking test 194 rap_sfcdiff_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 703.683739
-  0: The maximum resident set size (KB)                   = 844060
+  0: The total amount of wall time                        = 690.597822
+  0: The maximum resident set size (KB)                   = 845980
 
 Test 194 rap_sfcdiff_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_sfcdiff_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_sfcdiff_decomp_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_sfcdiff_decomp_gnu
 Checking test 195 rap_sfcdiff_decomp_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -6587,14 +6587,14 @@ Checking test 195 rap_sfcdiff_decomp_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 709.661424
-  0: The maximum resident set size (KB)                   = 845548
+  0: The total amount of wall time                        = 699.659174
+  0: The maximum resident set size (KB)                   = 840788
 
 Test 195 rap_sfcdiff_decomp_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_sfcdiff_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_sfcdiff_restart_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_sfcdiff_restart_gnu
 Checking test 196 rap_sfcdiff_restart_gnu results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
@@ -6633,14 +6633,14 @@ Checking test 196 rap_sfcdiff_restart_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 514.200987
-  0: The maximum resident set size (KB)                   = 755132
+  0: The total amount of wall time                        = 517.873221
+  0: The maximum resident set size (KB)                   = 755388
 
 Test 196 rap_sfcdiff_restart_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_gnu
 Checking test 197 hrrr_control_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -6687,14 +6687,14 @@ Checking test 197 hrrr_control_gnu results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 363.491940
-  0: The maximum resident set size (KB)                   = 841548
+  0: The total amount of wall time                        = 345.568958
+  0: The maximum resident set size (KB)                   = 836948
 
 Test 197 hrrr_control_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_qr_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_qr_gnu
 Checking test 198 hrrr_control_qr_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -6741,14 +6741,14 @@ Checking test 198 hrrr_control_qr_gnu results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc ............ALT CHECK......OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 365.854324
-  0: The maximum resident set size (KB)                   = 853340
+  0: The total amount of wall time                        = 349.365559
+  0: The maximum resident set size (KB)                   = 853120
 
 Test 198 hrrr_control_qr_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_2threads_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_2threads_gnu
 Checking test 199 hrrr_control_2threads_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -6795,14 +6795,14 @@ Checking test 199 hrrr_control_2threads_gnu results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 323.588134
-  0: The maximum resident set size (KB)                   = 948884
+  0: The total amount of wall time                        = 319.345314
+  0: The maximum resident set size (KB)                   = 944064
 
 Test 199 hrrr_control_2threads_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_decomp_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_decomp_gnu
 Checking test 200 hrrr_control_decomp_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -6849,42 +6849,42 @@ Checking test 200 hrrr_control_decomp_gnu results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 355.256776
-  0: The maximum resident set size (KB)                   = 840624
+  0: The total amount of wall time                        = 351.679078
+  0: The maximum resident set size (KB)                   = 840932
 
 Test 200 hrrr_control_decomp_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_restart_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_restart_gnu
 Checking test 201 hrrr_control_restart_gnu results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 182.596241
-  0: The maximum resident set size (KB)                   = 699436
+  0: The total amount of wall time                        = 184.634648
+  0: The maximum resident set size (KB)                   = 692236
 
 Test 201 hrrr_control_restart_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_restart_qr_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_restart_qr_gnu
 Checking test 202 hrrr_control_restart_qr_gnu results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 183.910224
-  0: The maximum resident set size (KB)                   = 603884
+  0: The total amount of wall time                        = 185.319027
+  0: The maximum resident set size (KB)                   = 601460
 
 Test 202 hrrr_control_restart_qr_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rrfs_v1beta_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rrfs_v1beta_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rrfs_v1beta_gnu
 Checking test 203 rrfs_v1beta_gnu results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf009.nc ............ALT CHECK......OK
@@ -6931,236 +6931,236 @@ Checking test 203 rrfs_v1beta_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 695.873767
-  0: The maximum resident set size (KB)                   = 840264
+  0: The total amount of wall time                        = 677.913235
+  0: The maximum resident set size (KB)                   = 839688
 
 Test 203 rrfs_v1beta_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_diag_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_diag_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_diag_debug_gnu
 Checking test 204 control_diag_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 88.871644
-  0: The maximum resident set size (KB)                   = 544184
+  0: The total amount of wall time                        = 92.319877
+  0: The maximum resident set size (KB)                   = 546984
 
 Test 204 control_diag_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/regional_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/regional_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/regional_debug_gnu
 Checking test 205 regional_debug_gnu results ....
  Comparing dynf000.nc ............ALT CHECK......OK
  Comparing dynf001.nc ............ALT CHECK......OK
  Comparing phyf000.nc ............ALT CHECK......OK
  Comparing phyf001.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 438.667706
-  0: The maximum resident set size (KB)                   = 816444
+  0: The total amount of wall time                        = 436.416616
+  0: The maximum resident set size (KB)                   = 818276
 
 Test 205 regional_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_debug_gnu
 Checking test 206 rap_control_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 146.018311
-  0: The maximum resident set size (KB)                   = 851388
+  0: The total amount of wall time                        = 146.144313
+  0: The maximum resident set size (KB)                   = 885864
 
 Test 206 rap_control_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_debug_gnu
 Checking test 207 hrrr_control_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 141.288950
-  0: The maximum resident set size (KB)                   = 851428
+  0: The total amount of wall time                        = 144.745332
+  0: The maximum resident set size (KB)                   = 853608
 
 Test 207 hrrr_control_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_gf_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_gf_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_gf_debug_gnu
 Checking test 208 hrrr_gf_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 144.005488
-  0: The maximum resident set size (KB)                   = 853256
+  0: The total amount of wall time                        = 145.979789
+  0: The maximum resident set size (KB)                   = 862928
 
 Test 208 hrrr_gf_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_c3_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_c3_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_c3_debug_gnu
 Checking test 209 hrrr_c3_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 162.223474
-  0: The maximum resident set size (KB)                   = 850224
+  0: The total amount of wall time                        = 144.975090
+  0: The maximum resident set size (KB)                   = 855200
 
 Test 209 hrrr_c3_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_diag_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_diag_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_diag_debug_gnu
 Checking test 210 rap_diag_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 155.922657
-  0: The maximum resident set size (KB)                   = 936320
+  0: The total amount of wall time                        = 157.692529
+  0: The maximum resident set size (KB)                   = 944816
 
 Test 210 rap_diag_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_noah_sfcdiff_cires_ugwp_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_noah_sfcdiff_cires_ugwp_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_noah_sfcdiff_cires_ugwp_debug_gnu
 Checking test 211 rap_noah_sfcdiff_cires_ugwp_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 235.810162
-  0: The maximum resident set size (KB)                   = 892472
+  0: The total amount of wall time                        = 222.928314
+  0: The maximum resident set size (KB)                   = 862776
 
 Test 211 rap_noah_sfcdiff_cires_ugwp_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_progcld_thompson_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_progcld_thompson_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_progcld_thompson_debug_gnu
 Checking test 212 rap_progcld_thompson_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 150.141402
-  0: The maximum resident set size (KB)                   = 857828
+  0: The total amount of wall time                        = 140.194083
+  0: The maximum resident set size (KB)                   = 858172
 
 Test 212 rap_progcld_thompson_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rrfs_v1beta_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rrfs_v1beta_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rrfs_v1beta_debug_gnu
 Checking test 213 rrfs_v1beta_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 148.499363
-  0: The maximum resident set size (KB)                   = 851264
+  0: The total amount of wall time                        = 139.022064
+  0: The maximum resident set size (KB)                   = 850928
 
 Test 213 rrfs_v1beta_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_ras_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_ras_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_ras_debug_gnu
 Checking test 214 control_ras_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 91.058781
-  0: The maximum resident set size (KB)                   = 497288
+  0: The total amount of wall time                        = 81.877585
+  0: The maximum resident set size (KB)                   = 500588
 
 Test 214 control_ras_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_stochy_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_stochy_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_stochy_debug_gnu
 Checking test 215 control_stochy_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 133.889524
-  0: The maximum resident set size (KB)                   = 492052
+  0: The total amount of wall time                        = 100.965357
+  0: The maximum resident set size (KB)                   = 495196
 
 Test 215 control_stochy_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_debug_p8_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_debug_p8_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_debug_p8_gnu
 Checking test 216 control_debug_p8_gnu results ....
  Comparing sfcf000.nc ............ALT CHECK......OK
  Comparing sfcf001.nc ............ALT CHECK......OK
  Comparing atmf000.nc ............ALT CHECK......OK
  Comparing atmf001.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 94.546798
-  0: The maximum resident set size (KB)                   = 1275188
+  0: The total amount of wall time                        = 87.732535
+  0: The maximum resident set size (KB)                   = 1279744
 
 Test 216 control_debug_p8_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_flake_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_flake_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_flake_debug_gnu
 Checking test 217 rap_flake_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 155.285330
-  0: The maximum resident set size (KB)                   = 860504
+  0: The total amount of wall time                        = 142.423392
+  0: The maximum resident set size (KB)                   = 864416
 
 Test 217 rap_flake_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_clm_lake_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_clm_lake_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_clm_lake_debug_gnu
 Checking test 218 rap_clm_lake_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 164.091394
-  0: The maximum resident set size (KB)                   = 860724
+  0: The total amount of wall time                        = 161.252644
+  0: The maximum resident set size (KB)                   = 860296
 
 Test 218 rap_clm_lake_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/control_wam_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/control_wam_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/control_wam_debug_gnu
 Checking test 219 control_wam_debug_gnu results ....
  Comparing sfcf019.nc .........OK
  Comparing atmf019.nc .........OK
 
-  0: The total amount of wall time                        = 140.358222
-  0: The maximum resident set size (KB)                   = 285012
+  0: The total amount of wall time                        = 138.205963
+  0: The maximum resident set size (KB)                   = 283540
 
 Test 219 control_wam_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_dyn32_phy32_gnu
 Checking test 220 rap_control_dyn32_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -7207,14 +7207,14 @@ Checking test 220 rap_control_dyn32_phy32_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 705.967549
-  0: The maximum resident set size (KB)                   = 739176
+  0: The total amount of wall time                        = 705.435488
+  0: The maximum resident set size (KB)                   = 746776
 
 Test 220 rap_control_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_dyn32_phy32_gnu
 Checking test 221 hrrr_control_dyn32_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -7261,14 +7261,14 @@ Checking test 221 hrrr_control_dyn32_phy32_gnu results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 355.550261
-  0: The maximum resident set size (KB)                   = 739300
+  0: The total amount of wall time                        = 360.622520
+  0: The maximum resident set size (KB)                   = 737024
 
 Test 221 hrrr_control_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_qr_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_qr_dyn32_phy32_gnu
 Checking test 222 hrrr_control_qr_dyn32_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -7315,14 +7315,14 @@ Checking test 222 hrrr_control_qr_dyn32_phy32_gnu results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc ............ALT CHECK......OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 358.006537
-  0: The maximum resident set size (KB)                   = 747380
+  0: The total amount of wall time                        = 357.277497
+  0: The maximum resident set size (KB)                   = 747856
 
 Test 222 hrrr_control_qr_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_2threads_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_2threads_dyn32_phy32_gnu
 Checking test 223 rap_2threads_dyn32_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -7369,14 +7369,14 @@ Checking test 223 rap_2threads_dyn32_phy32_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 633.039743
-  0: The maximum resident set size (KB)                   = 790316
+  0: The total amount of wall time                        = 635.616172
+  0: The maximum resident set size (KB)                   = 785344
 
 Test 223 rap_2threads_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_2threads_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_2threads_dyn32_phy32_gnu
 Checking test 224 hrrr_control_2threads_dyn32_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -7423,14 +7423,14 @@ Checking test 224 hrrr_control_2threads_dyn32_phy32_gnu results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 310.891398
-  0: The maximum resident set size (KB)                   = 780428
+  0: The total amount of wall time                        = 313.672990
+  0: The maximum resident set size (KB)                   = 778524
 
 Test 224 hrrr_control_2threads_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_decomp_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_decomp_dyn32_phy32_gnu
 Checking test 225 hrrr_control_decomp_dyn32_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -7477,14 +7477,14 @@ Checking test 225 hrrr_control_decomp_dyn32_phy32_gnu results ....
  Comparing RESTART/20210322.120000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.120000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 358.388537
-  0: The maximum resident set size (KB)                   = 737384
+  0: The total amount of wall time                        = 352.267073
+  0: The maximum resident set size (KB)                   = 738412
 
 Test 225 hrrr_control_decomp_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_restart_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_restart_dyn32_phy32_gnu
 Checking test 226 rap_restart_dyn32_phy32_gnu results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
@@ -7523,42 +7523,42 @@ Checking test 226 rap_restart_dyn32_phy32_gnu results ....
  Comparing RESTART/20210323.060000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210323.060000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 538.555880
-  0: The maximum resident set size (KB)                   = 649980
+  0: The total amount of wall time                        = 525.296000
+  0: The maximum resident set size (KB)                   = 649688
 
 Test 226 rap_restart_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_restart_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_restart_dyn32_phy32_gnu
 Checking test 227 hrrr_control_restart_dyn32_phy32_gnu results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 183.448489
-  0: The maximum resident set size (KB)                   = 613832
+  0: The total amount of wall time                        = 184.260644
+  0: The maximum resident set size (KB)                   = 614436
 
 Test 227 hrrr_control_restart_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_restart_qr_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_restart_qr_dyn32_phy32_gnu
 Checking test 228 hrrr_control_restart_qr_dyn32_phy32_gnu results ....
  Comparing sfcf012.nc .........OK
  Comparing atmf012.nc .........OK
  Comparing GFSFLX.GrbF12 .........OK
  Comparing GFSPRS.GrbF12 .........OK
 
-  0: The total amount of wall time                        = 184.381815
-  0: The maximum resident set size (KB)                   = 576692
+  0: The total amount of wall time                        = 187.826032
+  0: The maximum resident set size (KB)                   = 575864
 
 Test 228 hrrr_control_restart_qr_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_control_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_control_gnu
 Checking test 229 conus13km_control_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -7574,40 +7574,40 @@ Checking test 229 conus13km_control_gnu results ....
  Comparing RESTART/20210512.170000.phy_data.nc .........OK
  Comparing RESTART/20210512.170000.sfc_data.nc .........OK
 
-  0: The total amount of wall time                        = 244.233494
-  0: The maximum resident set size (KB)                   = 946616
+  0: The total amount of wall time                        = 244.263103
+  0: The maximum resident set size (KB)                   = 948872
 
 Test 229 conus13km_control_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_control_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_2threads_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_2threads_gnu
 Checking test 230 conus13km_2threads_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 115.153333
-  0: The maximum resident set size (KB)                   = 992376
+  0: The total amount of wall time                        = 106.501758
+  0: The maximum resident set size (KB)                   = 994816
 
 Test 230 conus13km_2threads_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_restart_mismatch_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_restart_mismatch_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_restart_mismatch_gnu
 Checking test 231 conus13km_restart_mismatch_gnu results ....
  Comparing sfcf002.nc .........OK
  Comparing atmf002.nc .........OK
 
-  0: The total amount of wall time                        = 129.827727
-  0: The maximum resident set size (KB)                   = 607904
+  0: The total amount of wall time                        = 127.942727
+  0: The maximum resident set size (KB)                   = 604480
 
 Test 231 conus13km_restart_mismatch_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_dyn64_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_dyn64_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_dyn64_phy32_gnu
 Checking test 232 rap_control_dyn64_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf009.nc .........OK
@@ -7654,42 +7654,42 @@ Checking test 232 rap_control_dyn64_phy32_gnu results ....
  Comparing RESTART/20210322.180000.sfc_data.tile5.nc .........OK
  Comparing RESTART/20210322.180000.sfc_data.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 406.917444
-  0: The maximum resident set size (KB)                   = 768516
+  0: The total amount of wall time                        = 405.754801
+  0: The maximum resident set size (KB)                   = 769324
 
 Test 232 rap_control_dyn64_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_debug_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_debug_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_debug_dyn32_phy32_gnu
 Checking test 233 rap_control_debug_dyn32_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 138.125017
-  0: The maximum resident set size (KB)                   = 748760
+  0: The total amount of wall time                        = 139.630432
+  0: The maximum resident set size (KB)                   = 748536
 
 Test 233 rap_control_debug_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/hrrr_control_debug_dyn32_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/hrrr_control_debug_dyn32_phy32_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/hrrr_control_debug_dyn32_phy32_gnu
 Checking test 234 hrrr_control_debug_dyn32_phy32_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 139.288511
-  0: The maximum resident set size (KB)                   = 752500
+  0: The total amount of wall time                        = 141.731877
+  0: The maximum resident set size (KB)                   = 747832
 
 Test 234 hrrr_control_debug_dyn32_phy32_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_debug_gnu
 Checking test 235 conus13km_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -7703,14 +7703,14 @@ Checking test 235 conus13km_debug_gnu results ....
  Comparing RESTART/20210512.170000.phy_data.nc .........OK
  Comparing RESTART/20210512.170000.sfc_data.nc .........OK
 
-  0: The total amount of wall time                        = 421.496155
-  0: The maximum resident set size (KB)                   = 962412
+  0: The total amount of wall time                        = 417.534764
+  0: The maximum resident set size (KB)                   = 965224
 
 Test 235 conus13km_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_debug_qr_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_debug_qr_gnu
 Checking test 236 conus13km_debug_qr_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
@@ -7724,56 +7724,56 @@ Checking test 236 conus13km_debug_qr_gnu results ....
  Comparing RESTART/20210512.170000.phy_data.nc ............ALT CHECK......OK
  Comparing RESTART/20210512.170000.sfc_data.nc ............ALT CHECK......OK
 
-  0: The total amount of wall time                        = 439.193708
-  0: The maximum resident set size (KB)                   = 622392
+  0: The total amount of wall time                        = 430.529848
+  0: The maximum resident set size (KB)                   = 632736
 
 Test 236 conus13km_debug_qr_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_debug_2threads_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_debug_2threads_gnu
 Checking test 237 conus13km_debug_2threads_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 254.169173
-  0: The maximum resident set size (KB)                   = 999476
+  0: The total amount of wall time                        = 261.496225
+  0: The maximum resident set size (KB)                   = 1001800
 
 Test 237 conus13km_debug_2threads_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/conus13km_radar_tten_debug_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/conus13km_radar_tten_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/conus13km_radar_tten_debug_gnu
 Checking test 238 conus13km_radar_tten_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 421.583336
-  0: The maximum resident set size (KB)                   = 1030496
+  0: The total amount of wall time                        = 426.517325
+  0: The maximum resident set size (KB)                   = 1030284
 
 Test 238 conus13km_radar_tten_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/rap_control_debug_dyn64_phy32_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/rap_control_dyn64_phy32_debug_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/rap_control_dyn64_phy32_debug_gnu
 Checking test 239 rap_control_dyn64_phy32_debug_gnu results ....
  Comparing sfcf000.nc .........OK
  Comparing sfcf001.nc .........OK
  Comparing atmf000.nc .........OK
  Comparing atmf001.nc .........OK
 
-  0: The total amount of wall time                        = 143.428981
-  0: The maximum resident set size (KB)                   = 776724
+  0: The total amount of wall time                        = 145.893362
+  0: The maximum resident set size (KB)                   = 770392
 
 Test 239 rap_control_dyn64_phy32_debug_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_p8_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_p8_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_p8_gnu
 Checking test 240 cpld_control_p8_gnu results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -7838,14 +7838,14 @@ Checking test 240 cpld_control_p8_gnu results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 631.817715
-  0: The maximum resident set size (KB)                   = 1506724
+  0: The total amount of wall time                        = 652.187402
+  0: The maximum resident set size (KB)                   = 1494592
 
 Test 240 cpld_control_p8_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_c96_noaero_p8_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_nowave_noaero_p8_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_nowave_noaero_p8_gnu
 Checking test 241 cpld_control_nowave_noaero_p8_gnu results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -7907,14 +7907,14 @@ Checking test 241 cpld_control_nowave_noaero_p8_gnu results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 384.929961
-  0: The maximum resident set size (KB)                   = 1403368
+  0: The total amount of wall time                        = 380.771972
+  0: The maximum resident set size (KB)                   = 1401272
 
 Test 241 cpld_control_nowave_noaero_p8_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_debug_p8_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_debug_p8_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_debug_p8_gnu
 Checking test 242 cpld_debug_p8_gnu results ....
  Comparing sfcf003.tile1.nc .........OK
  Comparing sfcf003.tile2.nc .........OK
@@ -7967,14 +7967,14 @@ Checking test 242 cpld_debug_p8_gnu results ....
  Comparing 20210322.090000.out_pnt.ww3 .........OK
  Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 351.460596
-  0: The maximum resident set size (KB)                   = 1503584
+  0: The total amount of wall time                        = 359.068431
+  0: The maximum resident set size (KB)                   = 1503536
 
 Test 242 cpld_debug_p8_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_control_pdlib_p8_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_control_pdlib_p8_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_control_pdlib_p8_gnu
 Checking test 243 cpld_control_pdlib_p8_gnu results ....
  Comparing sfcf021.tile1.nc .........OK
  Comparing sfcf021.tile2.nc .........OK
@@ -8038,14 +8038,14 @@ Checking test 243 cpld_control_pdlib_p8_gnu results ....
  Comparing 20210323.060000.out_pnt.ww3 .........OK
  Comparing 20210323.060000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 1323.163915
-  0: The maximum resident set size (KB)                   = 1370396
+  0: The total amount of wall time                        = 1327.511843
+  0: The maximum resident set size (KB)                   = 1367148
 
 Test 243 cpld_control_pdlib_p8_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/cpld_debug_pdlib_p8_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/cpld_debug_pdlib_p8_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/cpld_debug_pdlib_p8_gnu
 Checking test 244 cpld_debug_pdlib_p8_gnu results ....
  Comparing sfcf003.tile1.nc .........OK
  Comparing sfcf003.tile2.nc .........OK
@@ -8097,25 +8097,25 @@ Checking test 244 cpld_debug_pdlib_p8_gnu results ....
  Comparing 20210322.090000.out_pnt.ww3 .........OK
  Comparing 20210322.090000.out_grd.ww3 .........OK
 
-  0: The total amount of wall time                        = 756.235891
-  0: The maximum resident set size (KB)                   = 1383820
+  0: The total amount of wall time                        = 755.471520
+  0: The maximum resident set size (KB)                   = 1383648
 
 Test 244 cpld_debug_pdlib_p8_gnu PASS
 
 
 baseline dir = /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/develop-20231024/datm_cdeps_control_cfsr_gnu
-working dir  = /scratch1/NCEPDEV/stmp2/Jong.Kim/FV3_RT/rt_113030/datm_cdeps_control_cfsr_gnu
+working dir  = /scratch1/NCEPDEV/stmp2/Zachary.Shrader/FV3_RT/rt_28351/datm_cdeps_control_cfsr_gnu
 Checking test 245 datm_cdeps_control_cfsr_gnu results ....
  Comparing RESTART/20111002.000000.MOM.res.nc .........OK
  Comparing RESTART/iced.2011-10-02-00000.nc .........OK
  Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .........OK
 
- 0: The total amount of wall time                        = 175.310986
- 0: The maximum resident set size (KB)                   = 690396
+ 0: The total amount of wall time                        = 177.756143
+ 0: The maximum resident set size (KB)                   = 689488
 
 Test 245 datm_cdeps_control_cfsr_gnu PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Wed Nov  1 19:23:22 UTC 2023
-Elapsed time: 01h:55m:39s. Have a nice day!
+Fri Nov  3 22:32:50 UTC 2023
+Elapsed time: 02h:19m:55s. Have a nice day!

From fa8f2ccdeea7af6c56af11878716b0334f6d573a Mon Sep 17 00:00:00 2001
From: zach1221 <99902696+zach1221@users.noreply.github.com>
Date: Mon, 13 Nov 2023 12:46:09 -0500
Subject: [PATCH 103/103] Delete tests/ci/Jenkinsfile.spack_stack

---
 tests/ci/Jenkinsfile.spack_stack | 64 --------------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 tests/ci/Jenkinsfile.spack_stack

diff --git a/tests/ci/Jenkinsfile.spack_stack b/tests/ci/Jenkinsfile.spack_stack
deleted file mode 100644
index 9203db7d0f..0000000000
--- a/tests/ci/Jenkinsfile.spack_stack
+++ /dev/null
@@ -1,64 +0,0 @@
-pipeline {
-  agent none
-  stages {
-    stage('Spack-stack-test') {
-       agent {
-        label 'built-in'   
-       }
-      steps {
-        script {
-          for (label in pullRequest.labels) {
-            if ((label.matches("hercules"))) {
-                 env.CHOICE_NODE='hercules'
-            } 
-            else { 
-                env.CHOICE_NODE='none'
-            }
-         }
-// Why do I need another if..block, because it just works this way.
-
-            if (CHOICE_NODE == 'hercules') {
-                echo "Starting up hercules ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
-            }
-             else {
-                echo "${CHOICE_NODE} is NOT a platform, moving on..."
-            }
-       }    
-    }
-  } 
-  stage('Test spack-stack on Hercules') {
-        agent {
-          label "hercules"
-        }
-        environment {
-        ACCNR = 'nems'
-        NODE_PATH = '/work/noaa/epic/role-epic/'
-      }
-      steps {
-          
-        cleanWs()
-        checkout scm
-        sh '''
-        cd /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0
-        rm -rf log.concretize.unified-env.001
-        rm -rf log.install.unified-env.001
-        module purge
-        module use /work/noaa/epic/role-epic/spack-stack/hercules/modulefiles
-        module load ecflow/5.8.4
-        module load mysql/8.0.31
-        source ./setup.sh
-        spack env activate -p envs/unified-env
-        spack concretize 2>&1 | tee log.concretize.unified-env.001
-        spack install --verbose 2>&1 | tee log.install.unified-env.001
-        spack module lmod refresh -y
-        spack stack setup-meta-modules
-        module use /work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core
-        module load stack-gcc/11.3.1 openmpi/4.1.5 stack-openmpi/4.1.5 jasper/2.0.32 zlib/1.2.13 libpng/1.6.37 hdf5/1.14.0
-        module load netcdf-c/4.9.2 netcdf-fortran/4.6.0 parallelio/2.5.10 esmf/8.4.2 fms/2023.02 bacio/2.4.1 crtm/2.4.0 g2/3.4.5
-        module load g2tmpl/1.10.2 ip/4.3.0 sp/2.3.3 w3emc/2.10.0 gftl-shared/1.5.0 mapl/2.35.2-esmf-8.4.2 scotch/7.0.4
-        module list
-        '''
-      }
-      }
-    }
-  }