Merge pull request #878 from cacraigucar/cam_derecho_fixes

cam6_3_123: CAM derecho fixes

Externals_CAM.cfg

@@ -51,7 +51,7 @@ required = True
 local_path = src/physics/ali_arms
 protocol = git
 repo_url = https://github.com/ESCOMP/ALI-ARMS
-tag = ALI_ARMS_v1.0.0
+tag = ALI_ARMS_v1.0.1
 required = True
 
 [atmos_phys]

doc/ChangeLog

@@ -1,5 +1,59 @@
 ===============================================================
 
+Tag name: cam6_3_123
+Originator(s): cacraig, jedwards, fvitt
+Date: August 16, 2023
+One-line Summary: Fix Derecho bugs
+Github PR URL: https://github.com/ESCOMP/CAM/pull/878
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+ - cam_history field order: https://github.com/ESCOMP/CAM/issues/876
+ - build failure on derecho: https://github.com/ESCOMP/ALI-ARMS/issues/2
+
+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
+
+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       Externals_CAM.cfg
+          - Update ALI-ARMS external
+
+M       src/control/cam_history.F90
+          - Improve history writing for derecho
+
+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.
+
+cheyenne/intel/aux_cam: all BFB except:
+  ERP_Ln9_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq9s (Overall: FAIL) details:
+    FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq9s COMPARE_base_rest
+    FAIL ERP_Ln9_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq9s BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_122: DIFF
+  ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FW2000climo.cheyenne_intel.cam-outfrq9s_wcm_ne30 (Overall: FAIL) details:
+    FAIL ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FW2000climo.cheyenne_intel.cam-outfrq9s_wcm_ne30 RUN time=272
+    PEND ERP_Ln9_Vnuopc.ne30pg3_ne30pg3_mg17.FW2000climo.cheyenne_intel.cam-outfrq9s_wcm_ne30 COMPARE_base_rest
+  SMS_Lh12_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq3h (Overall: DIFF) details:
+    FAIL SMS_Lh12_Vnuopc.f09_f09_mg17.FCSD_HCO.cheyenne_intel.cam-outfrq3h BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_3_122: DIFF
+     - pre-existing failures
+
+izumi/nag/aux_cam: all BFB
+
+izumi/gnu/aux_cam: all BFB
+
+===============================================================
+===============================================================
+
 Tag name: cam6_3_122
 Originator(s): fvitt
 Date: 11 Aug 2023

src/control/cam_history.F90

@@ -2818,7 +2818,18 @@ subroutine fldlst ()
       do f=nflds(t)-1,1,-1
         do ff=1,f
 
-          if (tape(t)%hlist(ff)%field%name > tape(t)%hlist(ff+1)%field%name) then
+          if (tape(t)%hlist(ff)%field%numlev > tape(t)%hlist(ff+1)%field%numlev) then
+            tmp = tape(t)%hlist(ff)
+            tape(t)%hlist(ff  ) = tape(t)%hlist(ff+1)
+            tape(t)%hlist(ff+1) = tmp
+          end if
+
+        end do
+
+        do ff=1,f
+
+           if ((tape(t)%hlist(ff)%field%numlev == tape(t)%hlist(ff+1)%field%numlev) .and. &
+                (tape(t)%hlist(ff)%field%name > tape(t)%hlist(ff+1)%field%name)) then
 
             tmp = tape(t)%hlist(ff)
             tape(t)%hlist(ff  ) = tape(t)%hlist(ff+1)