Use SSP specific pattern match and fix use of eqv operator with or/and

E3SM-Project · Sep 28, 2023 · ce46a5f · ce46a5f
1 parent 1b746a2
commit ce46a5f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/components/eam/cime_config/config_component.xml b/components/eam/cime_config/config_component.xml
@@ -47,7 +47,7 @@
     <values modifier='additive'>
       <value compset=""                >-mach $MACH</value>
       <value compset="_EAM"            >-phys default</value>
-      <value compset="_EAM%CMIP6_"      >&eam_phys_defaults; &eam_chem_defaults;</value>
+      <value compset="^((?!SSP).)*_EAM%CMIP6_" >&eam_phys_defaults; &eam_chem_defaults;</value>
       <value compset="_EAM%CMIP6-1pctCO2" >&eam_phys_defaults; &eam_chem_defaults;</value>
       <value compset="_EAM%CMIP6-4xCO2"   >&eam_phys_defaults; &eam_chem_defaults;</value>
       <value compset="SSP.*_EAM%CMIP6_"   >&eam_phys_defaults; -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero</value>

diff --git a/components/eam/src/chemistry/mozart/lin_strat_chem.F90 b/components/eam/src/chemistry/mozart/lin_strat_chem.F90
@@ -186,10 +186,10 @@ subroutine lin_strat_chem_inti(phys_state)
     if (linoz_v3) file%linoz_v3=.true.
     if (linoz_v2) file%linoz_v2=.true.
     !!
-    if (linoz_v2.eqv..true. .and.linoz_v3.eqv..true. ) then
+    if (linoz_v2 .and. linoz_v3 ) then
             write(iulog,*) 'linoz_readnl, linoz: Both linoz_v2 and linoz_v3 are true. This is wrong! please check.'
             return
-    elseif (linoz_v2.eqv..false..and.linoz_v3.eqv..false.) then
+    elseif (.not. linoz_v2 .and. .not. linoz_v3) then
             write(iulog,*) 'linoz_readnl, linoz: Both linoz_v2 and linoz_v3 are false, which can be correct, but be sure that is intended!'
     endif
     !!

diff --git a/components/eam/src/chemistry/utils/tracer_data.F90 b/components/eam/src/chemistry/utils/tracer_data.F90
@@ -1285,7 +1285,7 @@ subroutine read_next_trcdata(state, flds, file )
              cnt3(flds(f)%coords(ZA_TIMDIM)) = 1
              strt3(flds(f)%coords(ZA_TIMDIM)) = recnos(i)
              !!
-             if (file%linoz_v3.eqv..true..or.file%linoz_v2.eqv..true.) then
+             if (file%linoz_v3 .or. file%linoz_v2) then
                      !!check if these are the surface variables
                      !!no need to do interpolate since only used
                      !!in preprocessing,