Merge branch 'history-bugfixes' of https://github.com/peverwhee/CAM i…

…nto history-bugfixes

doc/ChangeLog

@@ -1,5 +1,102 @@
 ===============================================================
 
+Tag name: cam6_4_047
+Originator(s): peverwhee
+Date: 12 November 2024
+One-line Summary: History bugfixes
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1163
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+- Issue #1149: cam history always chooses first averaging flag when using duplicate fields
+- Issue #1150: CAM history erroneously overrides averaging flags for nhtfrq=1
+- Issue #1166: time_bounds array should not be present in history files containing instantaneous output
+- Issue #1167: Time shown in history file names is incorrect for instantaneous data
+- Issue #1183: Suggested improvement for openfile
+- Updates git-fleximod to v0.9.2
+
+Describe any changes made to build system:
+M   bld/namelist_files/use_cases/sd_waccm_sulfur.xml
+ - Remove bad XML comment line
+
+Describe any changes made to the namelist: none
+
+List any changes to the defaults for the boundary datasets: none
+
+Describe any substantial timing or memory changes: none
+
+Code reviewed by: brian-eaton
+
+List all files eliminated: none
+
+List all files added and what they do: none
+
+List all existing files that have been modified, and describe the changes:
+
+M   .lib/git-fleximod/*
+ - updates to move git-fleximod to v0.9.2
+
+M   src/control/cam_history.F90
+ - remove nhtfrq=1 accumulation flag override if sampled_on_subcyle=.true.
+ - modify list_index routine to optionally check for duplicates/compatibility
+ - endrun with message including all duplicates found (if flags differ)
+ - remove time_bounds from instantaneous history files
+ - override instantaneous file name for monthly files to include full timestep
+   - also report correct timestamp on inst. files (don't use prev timestamp as
+   in accumulated files)
+
+M   src/control/cam_history_support.F90
+ - add sampled_on_subcycle to field_info object
+
+M   src/physics/cam/cam_diagnostics.F90
+M   src/physics/cam/clubb_intr.F90
+M   src/physics/cam/hetfrz_classnuc_cam.F90
+M   src/physics/cam/macrop_driver.F90
+M   src/physics/cam/micro_pumas_cam.F90
+M   src/physics/cam/microp_aero.F90
+M   src/physics/cam/ndrop.F90
+M   src/physics/cam/ndrop_bam.F90
+M   src/physics/cam/nucleate_ice_cam.F90
+M   src/physics/cam/subcol_SILHS.F90
+M   src/physics/cam7/micro_pumas_cam.F90
+M   src/physics/cam7/stochastic_emulated_cam.F90
+M   src/physics/cam7/stochastic_tau_cam.F90
+ - add sampled_on_subcycle=.true. argument to addflds calls for history fields
+   that are outfld-ed in the macmic loop
+
+M   src/utils/cam_pio_utils.F90
+ - move filename logging to before pio call
+
+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:
+
+SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL)
+SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
+ - pre-existing failures due to build-namelist error requiring CLM/CTSM external update.
+
+ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
+SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF)
+ - pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856
+
+derecho/nvhpc/aux_cam:
+
+izumi/nag/aux_cam:
+
+DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL)
+ - pre-existing failure -- issue #670
+
+izumi/gnu/aux_cam:
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers: none
+
+===============================================================
+
 Tag name: cam6_4_046
 Originator(s): sjsprecious
 Date: 06 November 2024