Merge pull request #1069 from fvitt/waccmx_nuopc

cam6_4_014: Remove WACCMX gridded component layer

bld/build-namelist

@@ -3120,6 +3120,7 @@ if ($waccmx) {
   add_default($nl,'ionos_xport_nsplit');
   add_default($nl,'steady_state_ion_elec_temp', 'val'=>'.false.');
   add_default($nl,'oplus_ring_polar_filter');
+  add_default($nl,'rxn_rate_sums');
 }
 
 # Chemistry options

bld/namelist_files/namelist_defaults_cam.xml

@@ -3347,6 +3347,14 @@
   'SolIonRate_Tot = jeuv_1 + jeuv_2 + jeuv_3 + jeuv_4 + jeuv_5 + jeuv_6 + jeuv_7 + jeuv_8 + jeuv_9 + jeuv_10 + jeuv_11 + ',
                    'jeuv_14 + jeuv_15 + jeuv_16 + jeuv_17 + jeuv_18 + jeuv_19 + jeuv_20 + jeuv_21 + jeuv_22 + jeuv_23',
 </rxn_rate_sums>
+<rxn_rate_sums chem="waccm_ma" waccmx="1">
+  'SolIonRate_Tot = jeuv_1 + jeuv_2 + jeuv_3 + jeuv_4 + jeuv_5 + jeuv_6 + jeuv_7 + jeuv_8 + jeuv_9 + jeuv_10 + jeuv_11 + ',
+                   'jeuv_14 + jeuv_15 + jeuv_16 + jeuv_17 + jeuv_18 + jeuv_19 + jeuv_20 + jeuv_21 + jeuv_22 + jeuv_23',
+</rxn_rate_sums>
+<rxn_rate_sums chem="waccm_mad_mam5" waccmx="1">
+  'SolIonRate_Tot = jeuv_1 + jeuv_2 + jeuv_3 + jeuv_4 + jeuv_5 + jeuv_6 + jeuv_7 + jeuv_8 + jeuv_9 + jeuv_10 + jeuv_11 + ',
+                   'jeuv_14 + jeuv_15 + jeuv_16 + jeuv_17 + jeuv_18 + jeuv_19 + jeuv_20 + jeuv_21 + jeuv_22 + jeuv_23',
+</rxn_rate_sums>
 <rxn_rate_sums chem="trop_strat_mam5_ts2">
     'O3_Prod = NO_HO2 + CH3O2_NO + HOCH2OO_NO + C2H5O2_NO + CH3CO3_NO + EO2_NO + C3H7O2_NO + PO2_NO + ',
                'RO2_NO + ENEO2_NO + MACRO2_NOa + jhonitr + ',

bld/namelist_files/use_cases/waccmx_ma_2000_cam4.xml

@@ -112,7 +112,6 @@
   'jo2_a', 'jo2_b', 'jo3_a',  'jo3_b', 'jhocl', 'jno3_b', 'jcl2o2',
   'SAD_SULFC', 'SAD_LNAT', 'SAD_ICE','AOA1','AOA2',
   'O2', 'CLDLIQ', 'CLDICE', 'ASDIR',
-  'VTHzm', 'WTHzm', 'UVzm', 'UWzm', 'TH', 'MSKtem',
   'O2_1S', 'O2_1D',
   'Op', 'O2p', 'Np', 'NOp', 'N2p', 'e',
   'UIONTEND', 'VIONTEND', 'UTGWSPEC', 'UTGWORO', 'VTGWSPEC', 'VTGWORO', 'TTGW',

bld/namelist_files/use_cases/waccmx_ma_hist_cam6.xml

@@ -93,7 +93,7 @@
 	 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'OMEGA_08_COS', 'OMEGA_08_SIN'
 </fincl5>
 <!-- Average every day -->
-<fincl7>
+<fincl7 dyn="fv">
          'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS'
 </fincl7>
 

cime_config/testdefs/testlist_cam.xml

@@ -2472,7 +2472,16 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test compset="QPX2000" grid="f19_f19_mg17" name="SMS_D_Ln9_P240x3" testmods="cam/outfrq9s_ltr">
+  <test compset="FXHIST" grid="ne16pg3_ne16pg3_mg17" name="SMS_C2_D_Ln9" testmods="cam/outfrq9s">
+    <machines>
+      <machine name="derecho" compiler="intel" category="waccmx"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">WACCM-X multi-instance test</option>
+    </options>
+  </test>
+  <test compset="QPX2000" grid="f19_f19_mg17" name="SMS_D_Ln9_P256x3" testmods="cam/outfrq9s_ltr">
     <machines>
       <machine name="derecho" compiler="intel" category="waccmx"/>
     </machines>
@@ -2489,6 +2498,7 @@
     </machines>
     <options>
       <option name="wallclock">00:30:00</option>
+      <option name="comment">WACCM-X multi-instance test</option>
     </options>
   </test>
   <test compset="FXHIST" grid="f19_f19_mg17" name="ERS_Ld3"   testmods="cam/outfrq1d_amie">

doc/ChangeLog

@@ -1,5 +1,82 @@
 ===============================================================
 
+Tag name: cam6_4_014
+Originator(s): fvitt
+Date: 22 Jul 2024
+One-line Summary: Clean up WACCMX use of ESMF gridded component
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1069
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+ Remove the ESMF gridded component layer in WACCMX #1055
+
+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: gold2718 cacraigucar
+
+List all files eliminated:
+D       src/ionosphere/waccmx/edyn_grid_comp.F90
+ - remove gridded component layer which was needed for MCT component coupling
+
+List all files added and what they do:
+A       src/ionosphere/waccmx/edyn_phys_grid.F90
+ - manaages the physics grid mesh for ESMF regridding
+
+List all existing files that have been modified, and describe the changes:
+M       bld/build-namelist
+M       bld/namelist_files/namelist_defaults_cam.xml
+ - default rxn_rate_sums for waccmx
+
+M       bld/namelist_files/use_cases/waccmx_ma_2000_cam4.xml
+M       bld/namelist_files/use_cases/waccmx_ma_hist_cam6.xml
+ - changes for zm history fields
+
+M       cime_config/testdefs/testlist_cam.xml
+ - multi-instance test
+
+M       src/ionosphere/waccmx/edyn_init.F90
+M       src/ionosphere/waccmx/ionosphere_interface.F90
+ - invoke dpie_coupling directly
+
+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:
+  NLFAIL ERC_D_Ln9.f19_f19_mg17.QPX2000.derecho_intel.cam-outfrq3s
+ - new namelist includes default rxn_rate_sums for waccmx
+
+  FAIL ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s
+ - pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856
+
+  PEND SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s
+  PEND SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s
+ - pre-existing failures -- need fix in CLM external
+
+  FAIL SMS_D_Ln9.T42_T42.FSCAM.derecho_intel.cam-outfrq9s
+ - pre-existing failure -- will go away when CICE external is updated post git-fleximod
+
+izumi/nag/aux_cam:
+  FAIL DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae
+ - pre-existing failure - issue #670
+
+  NLFAIL SMS_D_Ln3.ne5pg3_ne5pg3_mg37.QPX2000.izumi_nag.cam-outfrq3s
+ - new namelist includes default rxn_rate_sums for waccmx
+
+izumi/gnu/aux_cam: All PASS
+
+Summarize any changes to answers: bit-for-bit unchanged
+
+===============================================================
+===============================================================
+
 Tag name: cam6_4_013
 Originator(s): fvitt, tilmes
 Date: 21 Jul 2024