From 91e1a271643596930638b52016464fc56bde07bd Mon Sep 17 00:00:00 2001
From: Jim Edwards <jedwards@ucar.edu>
Date: Thu, 21 Nov 2024 10:59:07 -0700
Subject: [PATCH] fixes for nvhpc build

---
 .github/workflows/build.yaml                |  2 +-
 .gitmodules                                 |  6 +++---
 ccs_config                                  |  2 +-
 cime_config/testfiles/ExpectedTestFails.xml | 12 ++++++------
 components/mom                              |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index daede784a..88b11c25c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,7 +38,7 @@ jobs:
         run: |
           cd $SCRATCH
           # if no fails and no passes in expected fails then cleanup and exit 0 otherwise exit 1
-          ./cs.status.${GITHUB_RUN_ID}${{ inputs.compiler }} --expected-fails-file $GITHUB_WORKSPACE/cime_config/testfiles/ExpectedTestFails.xml | grep FAIL | grep -v FAILURE
+          ./cs.status.${GITHUB_RUN_ID}${{ inputs.compiler }} --fails-only --expected-fails-file $GITHUB_WORKSPACE/cime_config/testfiles/ExpectedTestFails.xml | grep FAIL | grep -v FAILURE
           retcode=$?
           if [ $retcode -eq 0 ]; then
             exit 1
diff --git a/.gitmodules b/.gitmodules
index 8aedfcbfc..fab2bd8c3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,7 +30,7 @@
         path = ccs_config
         url = https://github.com/jedwards4b/ccs_config_cesm.git
         fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
-        fxtag = ccs_config_cesm1.0.10_update_default_ww3grid03
+        fxtag = ccs_config_cesm1.0.10_update_default_ww3grid04
         fxrequired = ToplevelRequired
 
 [submodule "cime"]
@@ -77,10 +77,10 @@
 
 [submodule "mom"]
         path = components/mom
-        url = https://github.com/ESCOMP/MOM_interface
+        url = https://github.com/jedwards4b/MOM_interface
         fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface
         fxrequired = ToplevelRequired
-        fxtag = mi_241104
+        fxtag = mi_241104_ncar_241101_use_atan2_for_nvhpc01
 
 [submodule "cism"]
         path = components/cism
diff --git a/ccs_config b/ccs_config
index e874fd0d9..7bd0d1f05 160000
--- a/ccs_config
+++ b/ccs_config
@@ -1 +1 @@
-Subproject commit e874fd0d9cd1c3e23a64d60a34c814062b51e59a
+Subproject commit 7bd0d1f05e20e6e1d3f1fa260a788206294f5927
diff --git a/cime_config/testfiles/ExpectedTestFails.xml b/cime_config/testfiles/ExpectedTestFails.xml
index 5688a8ab6..b377854c9 100644
--- a/cime_config/testfiles/ExpectedTestFails.xml
+++ b/cime_config/testfiles/ExpectedTestFails.xml
@@ -39,28 +39,28 @@
   <test name="SMS_Ld2.ne30pg3_t232.BMT1850.derecho_nvhpc.allactive-defaultio">
     <phase name="MODEL_BUILD">
       <status>FAIL</status>
-      <issue></issue>
-      <comment></comment>
+      <issue>https://github.com/NCAR/MOM6/issues/324</issue>
+      <comment>atan function</comment>
     </phase>
   </test>
   <test name="SMS_Ld2.ne30pg3_t232.BLT1850.derecho_nvhpc.allactive-defaultio">
     <phase name="MODEL_BUILD">
       <status>FAIL</status>
-      <issue></issue>
+      <issue>https://github.com/NCAR/MOM6/issues/324</issue>
       <comment></comment>
     </phase>
   </test>
   <test name="SMS_Ld2.ne30pg3_t232.BHISTC_MTso.derecho_nvhpc.allactive-defaultio">
     <phase name="MODEL_BUILD">
       <status>FAIL</status>
-      <issue></issue>
+      <issue>https://github.com/NCAR/MOM6/issues/324</issue>
       <comment></comment>
     </phase>
   </test>
   <test name="SMS_Ld2.ne30pg3_t232.BHISTC_LTso.derecho_nvhpc.allactive-defaultio">
     <phase name="MODEL_BUILD">
       <status>FAIL</status>
-      <issue></issue>
+      <issue>https://github.com/NCAR/MOM6/issues/324</issue>
       <comment></comment>
     </phase>
   </test>
@@ -69,7 +69,7 @@
     <phase name="SHAREDLIB_BUILD">
       <status>FAIL</status>
       <issue></issue>
-      <comment></comment>
+      <comment>FMS file mpp.F90 fails to compile in debug mode</comment>
     </phase>
   </test>
 
diff --git a/components/mom b/components/mom
index 112f5caa9..9b84901bf 160000
--- a/components/mom
+++ b/components/mom
@@ -1 +1 @@
-Subproject commit 112f5caa98b22351753ad0ddeb513b2a76083f25
+Subproject commit 9b84901bf530b1f10e68ab9d124949472595e120