fix issues 1326 and 1332; update ChangeLog

Author: brian-eaton

bld/config_files/definition.xml

@@ -127,10 +127,10 @@ Chemistry source directory generated by the chemistry preprocessor; contains F90
 <entry id="chem_src_dir" value="">
 Chemistry source directory; contains F90 files.
 </entry>
-<entry id="ocn" valid_values="docn,dom,som,socn,aquaplanet,pop,mom" value="docn">
+<entry id="ocn" valid_values="docn,dom,som,socn,aquaplanet,pop,mom,mpaso" value="docn">
 Use data ocean model (docn or dom), stub ocean (socn), or aqua planet ocean
 (aquaplanet) in cam build.  When built from the CESM scripts the value of
-ocn may be set to pop.  This doesn't impact how CAM is built, only how
+ocn may be set to pop, mom, or mpaso.  This doesn't impact how CAM is built, only how
 attributes are matched when searching for namelist defaults.  If ocn is set
 to som then the docn component is used.
 </entry>

cime_config/config_pes.xml

@@ -1429,14 +1429,14 @@
       <pes pesize="any" compset="any">
         <comment>none</comment>
 	      <ntasks>
-	        <ntasks_atm>-91</ntasks_atm>
-	        <ntasks_lnd>-91</ntasks_lnd>
-	        <ntasks_rof>-91</ntasks_rof>
-	        <ntasks_ice>-91</ntasks_ice>
-	        <ntasks_ocn>-91</ntasks_ocn>
-	        <ntasks_glc>-91</ntasks_glc>
-	        <ntasks_wav>-91</ntasks_wav>
-	        <ntasks_cpl>-91</ntasks_cpl>
+	        <ntasks_atm>1920</ntasks_atm>
+	        <ntasks_lnd>1920</ntasks_lnd>
+	        <ntasks_rof>1920</ntasks_rof>
+	        <ntasks_ice>1920</ntasks_ice>
+	        <ntasks_ocn>1920</ntasks_ocn>
+	        <ntasks_glc>1920</ntasks_glc>
+	        <ntasks_wav>1920</ntasks_wav>
+	        <ntasks_cpl>1920</ntasks_cpl>
 	      </ntasks>
 	      <nthrds>
 	        <nthrds_atm>1</nthrds_atm>

cime_config/testdefs/testlist_cam.xml

@@ -1535,7 +1535,7 @@
       <option name="wallclock">00:30:00</option>
     </options>
   </test>
-  <test compset="FHIST" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" name="SMS_D_Ln9_P1280x1" testmods="cam/outfrq9s" supported="false">
+  <test compset="FHIST" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" name="SMS_D_Ln9" testmods="cam/outfrq9s" supported="false">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cam"/>
       <machine name="derecho" compiler="intel" category="cam_refined"/>

doc/ChangeLog

@@ -2,7 +2,7 @@
 
 Tag name: cam6_4_099
 Originator(s): eaton
-Date:
+Date: 24 June 2025
 One-line Summary: New F compset for cam4; updates to CAM testing.
 Github PR URL: https://github.com/ESCOMP/CAM/pull/1331
 
@@ -15,6 +15,13 @@ Purpose of changes (include the issue number and title text for each relevant Gi
 
 . Replace cam6 version of a "nochem" test by a cam7-lt version.
 
+. Resolve #1332 - ne0ARCTICne30x4 test fails with 1280 tasks and fixed CTSM,
+                  because of too few processors
+  - increase pe count from 1280 to 1920.  Make this the default in the
+    config_pes.xml file. 
+
+. Resolve #1326 - Add MPAS-O and MPAS-SI from EarthWorksOrg/EarthWorks
+  - add "mpaso" as a valid value in the configure definition file
 
 Describe any changes made to build system: none
 
@@ -33,6 +40,9 @@ cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined
 
 List all files added and what they do:
 
+bld/config_files/definition.xml
+. add 'mpaso' as a valid value for the -ocn argument.
+
 bld/namelist_files/use_cases/1850-2005_cam4.xml
 . This file copied from cam5_4_01.  Then modify as follows:
   - remove setting start_ymd (done in config_component.xml)
@@ -55,6 +65,8 @@ cime_config/config_pes.xml
 . remove izumi setting that forces WACCM compsets on 1.9x2.5 grid to use
   192 tasks.  The only 2 deg WACCM test in aux_cam runs fine with the
   default 24 tasks.
+. set default pe count for ne0ARCTICne30x4 to 1920.  The ARCTIC test had
+  pes set in the test definition to 1280.
 
 cime_config/testdefs/testlist_cam.xml
 . remove P512 from test specifications for mpasa120 grid.  It's now the
@@ -82,24 +94,47 @@ cime_config/testdefs/testlist_cam.xml
   ERC_D_Ln9.mpasa480_mpasa480_mt232.FHISTC_LTso.izumi_gnu.cam-outfrq9s_mpasa480
 . remove - unicon is being removed.
   ERC_D_Ln9.f10_f10_mg37.QPC5.izumi_gnu.cam-outfrq3s_unicon
+. Increase PEs for ARCTIC test by modifying config_pes.xml and remove the
+  specification from the test definition.
+  Replace 
+  SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s
+  by
+  SMS_D_Ln9.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s
 
 If there were any failures reported from running test_driver.sh on any test
 platform, and checkin with these failures has been OK'd by the gatekeeper,
 then copy the lines from the td.*.status files for the failed tests to the
 appropriate machine below.  All failed tests must be justified.
 
 derecho/intel/aux_cam:
+ERC_D_Ln9.mpasa120_mpasa120.F2000climo.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF)
+ERC_D_Ln9.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF)
+ERC_D_Ln9.mpasa120_mpasa120.QPC7.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF)
+SMS_D_Ln9.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: DIFF)
+- new tests - no baselines
 
-derecho/nvhpc/aux_cam:
+SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
+- pre-existing failure due to build-namelist error requiring CLM/CTSM external update
+
+derecho/nvhpc/aux_cam: All PASS
 
 izumi/nag/aux_cam:
 
+ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-outfrq9s_nochem (Overall: DIFF)
+SMS_D_Ln9.f10_f10_mt232.F1850.izumi_nag.cam-outfrq9s (Overall: DIFF)
+- new tests, no baselines
+
 izumi/gnu/aux_cam:
 
+ERC_D_Ln9.mpasa480_mpasa480_mt232.FHISTC_LTso.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF) details:
+ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHIST_C4.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
+SMS_D_Ln9.f19_f19_mt232.FW4madSD.izumi_gnu.cam-outfrq9s (Overall: DIFF) details:
+- new tests, no baselines
+
 CAM tag used for the baseline comparison tests if different than previous
 tag:
 
-Summarize any changes to answers:
+Summarize any changes to answers: BFB
 
 ===============================================================
 ===============================================================