Merge tag 'ctsm5.1.dev169' into hillslope_hydrology-169

Merge pull request ESCOMP#2382 from samsrabin/merge-b4bdev-20240222

Brings in 3 PRs from b4b-dev to master:
- Do not crash "make all" even if pylint isn't clean (ESCOMP#2353; Sam Rabin)
- Resolve pylint issues (ESCOMP#2354; Sam Rabin)
- Move FSURDATMODIFYCTSM test to Derecho (ESCOMP#2364; Sam Rabin)

cime_config/testdefs/testlist_clm.xml

@@ -3308,8 +3308,8 @@
 
   <test name="FSURDATMODIFYCTSM_D_Mmpi-serial_Ld1" grid="5x5_amazon" compset="I2000Clm50SpRs">
     <machines>
-      <machine name="cheyenne" compiler="intel" category="aux_clm"/>
-      <machine name="cheyenne" compiler="intel" category="clm_pymods"/>
+      <machine name="derecho" compiler="gnu" category="aux_clm"/>
+      <machine name="derecho" compiler="gnu" category="clm_pymods"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>

doc/ChangeLog

@@ -1,4 +1,156 @@
 ===============================================================
+Tag name: ctsm5.1.dev169
+Originator(s): samrabin (Sam Rabin, UCAR/TSS, [email protected])
+Date: Thu 22 Feb 2024 09:42:57 AM MST
+One-line Summary: Merge b4b-dev
+
+Purpose and description of changes
+----------------------------------
+
+Brings in 3 PRs from b4b-dev to master:
+- Do not crash "make all" even if pylint isn't clean (ESCOMP/CTSM#2353; Sam Rabin)
+- Resolve pylint issues (ESCOMP/CTSM#2354; Sam Rabin)
+- Move FSURDATMODIFYCTSM test to Derecho (ESCOMP/CTSM#2364; Sam Rabin)
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+
+CTSM issues fixed:
+- Fixes ESCOMP/CTSM#2255: make lint is not clean in ctsm5.1.dev152
+- Fixes ESCOMP/CTSM#2316: "make all" doesn't run black if lint fails
+- FIXES ESCOMP/CTSM#2362: FSURDATMODIFYCTSM test should be moved to Derecho or Izumi
+
+
+Notes of particular relevance for developers:
+---------------------------------------------
+
+Changes to tests or testing:
+- FSURDATMODIFYCTSM test changed from derecho_intel (didn't work in debug mode) to derecho_gnu. I.e., from
+    FSURDATMODIFYCTSM_D_Mmpi-serial_Ld1.5x5_amazon.I2000Clm50SpRs.derecho_intel
+  to
+    FSURDATMODIFYCTSM_D_Mmpi-serial_Ld1.5x5_amazon.I2000Clm50SpRs.derecho_gnu
+
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+  any other testing (give details below):
+  - "make all" in python/ is clean. 
+
+
+Other details
+-------------
+
+Pull Requests that document the changes (include PR ids):
+- ESCOMP/CTSM#2353: Do not crash "make all" even if pylint isn't clean (https://github.com/ESCOMP/CTSM/pull/2353)
+- ESCOMP/CTSM#2354: Resolve pylint issues (https://github.com/ESCOMP/CTSM/pull/2354)
+- ESCOMP/CTSM#2364: Move FSURDATMODIFYCTSM test to Derecho (https://github.com/ESCOMP/CTSM/pull/2364)
+
+===============================================================
+===============================================================
+Tag name: ctsm5.1.dev168
+Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
+Date: Fri 16 Feb 2024 01:27:41 PM MST
+One-line Summary: Remove a source of negative snocan in CanopyFluxesMod
+
+Purpose and description of changes
+----------------------------------
+
+In ctsm5.2 testing, this test
+LWISO_Ld10.f10_f10_mg37.I2000Clm50BgcCrop.derecho_gnu.clm-coldStart
+complained of a tiny negative ice1_grc tracer not matching the bulk
+value. My troubleshooting led me to more than tiny negative snocan
+originating in a line of code that this PR now changes to prevent
+negative values.
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+CTSM issues fixed (include CTSM Issue #):
+Fixes #2366
+
+Notes of particular relevance for developers:
+---------------------------------------------
+Caveats for developers (e.g., code that is duplicated that requires double maintenance):
+ It was suggested at the ctsm software meeting yesterday that, in addition to
+ including "max(0._r8," in this line of code, that I reorder the code
+ by bringing "liqcan(p) =" before "snocan(p) =". I have decided against this
+ because the existing order repeats in a following paragraph of code right
+ after this one. It's likely that the group's suggestion would have worked, but
+ I did not want to delay this PR for a longer evaluation because CTSM5.2 is
+ waiting for this merge, in order to proceed with next steps.
+
+
+Testing summary:
+----------------
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: YES
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: all
+    - what platforms/compilers: all
+    - nature of change: roundoff
+ A short test, e.g.
+ SMS_Ln9.ne30pg2_ne30pg2_mg17.I1850Clm50Sp.derecho_intel.clm-clm50cam6LndTuningMode
+ has these maximum differences:
+RMS H2OCAN 4.7359E-19            NORMALIZED  4.0163E-18
+RMS SNOCAN 4.4873E-19            NORMALIZED  9.1036E-18
+ while the differences grow in longer tests.
+
+Other details
+-------------
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/2371
+
+===============================================================
+===============================================================
 Tag name: ctsm5.1.dev167
 Originator(s): samrabin (Sam Rabin, UCAR/TSS, [email protected])
 Date: Thu 08 Feb 2024 01:56:05 PM MST

doc/ChangeSum

@@ -1,5 +1,7 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+    ctsm5.1.dev169 samrabin 02/22/2024 Merge b4b-dev
+    ctsm5.1.dev168   slevis 02/16/2024 Remove a source of negative snocan in CanopyFluxesMod
     ctsm5.1.dev167 samrabin 02/08/2024 Delete _FillValue and history from parameter files
     ctsm5.1.dev166 multiple 01/24/2024 BFB merge tag
     ctsm5.1.dev165   slevis 01/19/2024 Turn Meier2022, tillage, residue removal on for ctsm5.1, fix #2212

python/Makefile

@@ -19,15 +19,15 @@ ifneq ($(verbose), not-set)
 endif
 
 PYLINT=pylint
-PYLINT_ARGS=-j 4 --rcfile=ctsm/.pylintrc
+PYLINT_ARGS=-j 4 --rcfile=ctsm/.pylintrc --fail-under=0
 PYLINT_SRC = \
 	ctsm
 #  NOTE: These don't pass pylint checking and should be added when we put into effort to get them to pass
 #       ../cime_config/SystemTests \
 #       ../cime_config/buildlib \
 #       ../cime_config/buildnml
 
-all: test lint black
+all: test black lint
 	@echo
 	@echo
 	@echo "Successfully ran all standard tests"

python/ctsm/.pylintrc

@@ -436,7 +436,10 @@ good-names=i,
            _,
 # --- default list is above here, our own list is below here ---
 # Allow logger as a global name in each module, because this seems to follow general recommended convention:
-           logger
+           logger,
+# Allow these names, which are commonly used in matplotlib instructions
+           ax,
+           im
 
 # Include a hint for the correct naming format with invalid-name.
 include-naming-hint=no