fixes for nvhpc build

ESCOMP · Nov 21, 2024 · 91e1a27 · 91e1a27
1 parent 3f02530
commit 91e1a27
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
diff --git 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
+29 −1		.github/workflows/general-ci-tests.yml
+2 −2		.gitmodules
+1 −1		MOM6
+1 −3		param_templates/MOM_input.yaml
+35 −24		param_templates/input_data_list.yaml
+1 −4		param_templates/json/MOM_input.json
+36 −24		param_templates/json/input_data_list.json
+171 −0		tests/check_input_data_list.py
+48 −0		tests/check_input_data_repo.py