Merge pull request ESCOMP#1020 from cacraigucar/cam_sct_fix

Fix for SCT when using ccs_config_ces0.0.99 on derecho

cime_config/SystemTests/sct.py

@@ -79,3 +79,13 @@ def _component_compare_test(self, suffix1, suffix2,
                 self._test_status.set_status("{}_{}_{}".format(COMPARE_PHASE, self._run_one_suffix, self._run_two_suffix), TEST_FAIL_STATUS)
                 comments="QDIFF,TDIFF: Difference greater than round off."
             append_testlog(comments, self._orig_caseroot)
+
+    def _case_two_custom_prerun_action(self):
+        """ On NCAR derecho system the mpibind script causes ESMF in the second job to think it is using 128 tasks when it should only use 1
+        changing the env variable PBS_SELECT solves this issue
+        """
+        machine = self._case2.get_value("MACH")
+        if "derecho" in machine:
+            os.environ["PBS_SELECT"] = "1:ncpus=1:mpiprocs=1:ompthreads=1:mem=230gb:Qlist=cpu:ngpus=0"
+
+

doc/ChangeLog

@@ -1,3 +1,54 @@
+
+===============================================================
+
+Tag name: cam6_3_160
+Originator(s): cacraig, jedwards
+Date: April 29, 2024
+One-line Summary: workaround so that sct works on derecho
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1019
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+  - Newest ccs_config tag causes the derecho_intel SCT test to fail: https://github.com/ESCOMP/CAM/issues/1017
+
+  IMPORTANT NOTE:  This tag breaks the SCT test on derecho (see below) as it does not bring in the  update to ccs_config_cesm0.0.99
+                   The reason to do this is that this change will be available for the next CESM alpha tag starting today.
+		   In order to not hold up the CESM alpha tag sequence, we do not have time to run the full regression test suite
+
+Describe any changes made to build system: N/A
+
+Describe any changes made to the namelist: N/A
+
+List any changes to the defaults for the boundary datasets: N/A
+
+Describe any substantial timing or memory changes: N/A
+
+Code reviewed by: nusbaume, katec, cacraig
+
+List all files eliminated: N/A
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+  M       cime_config/SystemTests/sct.py
+
+TESTING NOTES:  Due to time constraints, only the SCT tests were run
+
+derecho/intel/aux_cam: Only SCT test was run:
+   SCT_D_Ln7.T42_T42_mg17.QPC5.derecho_intel.cam-scm_prep - Did not even start up with this change when using the
+     - current ccs_config tag.  Error reported in cime-test.o4308193 file:
+	      File "/glade/u/apps/derecho/23.09/opt/._view/dmewvyohndr7lajyom5grftguonqfbdr/lib/python3.10/xml/etree/ElementTree.py", line 580, in parse
+	          self._root = parser._parse_whole(source)
+	      xml.etree.ElementTree.ParseError: not well-formed (invalid token): line 1, column 0
+
+   SCT_D_Ln7.T42_T42_mg17.QPC5.derecho_intel.cam-scm_prep (Overall: PASS) details:
+     -  When ccs_config_cesm0.0.99 is used, this test PASSES and is BFB
+
+
+izumi/nag/aux_cam: None run
+
+izumi/gnu/aux_cam: Only two SCT tests were run and they were BFB and ran fine
+
+===============================================================
 ===============================================================
 
 Tag name: cam6_3_159