Update changelog post-merge

Signed-off-by: Lizzie Lundgren <[email protected]>

doc/ChangeLog

@@ -1,4 +1,116 @@
+Tag name:
+Originator(s): lizziel
+Date:
+One-line Summary: Update GEOS-Chem to 14.3.1, HEMCO to 3.8.1, and add Cloud-J 7.7.1 external
+Github PR URL: https://github.com/ESCOMP/CAM/pull/996
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+Describe any changes made to build system:
+
+Describe any changes made to the namelist:
+
+List any changes to the defaults for the boundary datasets:
+
+Describe any substantial timing or memory changes:
+
+Code reviewed by:
+
+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       .gitignore
+
+	- Add new external src/chemistry/cloud_j
+
+M       Externals_CAM.cfg
+	- Update GEOS-Chem from 14.1.2 to 14.3.1
+	- Update HEMCO_CESM from _ to _
+	- Add Cloud-J 7.7.1 external to compute photolysis rates for GEOS-Chem
+
+M       bld/build-namelist
+	- Add defaults for GEOS-Chem namelist input directories
+
+M       bld/configure
+	- Add MODEL_CESM and MODEL_GEOSCHEM to geoschem chem_cppdefs for use in Cloud-J
+	- Update hard-coded chem_nadv used for GEOS-Chem
+
+M       bld/namelist_files/geoschem_master_gas_drydep_list.xml
+M       bld/namelist_files/geoschem_master_gas_wetdep_list.xml
+	- Add new GEOS-Chem deposited species FURA
+	- Add SO4 which is a non-MAM aerosol species in GEOS-Chem
+
+M       bld/namelist_files/namelist_defaults_cam.xml
+	- Update default dep_data_file used for GEOS-Chem
+	- Add two input directories for GEOS-Chem
+
+M       bld/namelist_files/namelist_definition.xml
+	- Change GEOS-Chem chem inputs directory name
+	- Add new GEOS-Chem input directory used for Cloud-J
+
+M       bld/namelist_files/use_cases/2000_geoschem.xml
+M       bld/namelist_files/use_cases/2010_geoschem.xml
+M       bld/namelist_files/use_cases/hist_geoschem.xml
+M       bld/namelist_files/use_cases/hist_geoschem_nudged.xml
+	- Delete GEOS-Chem chem inputs directory since now in defaults
+
+M       cime_config/config_component.xml
+	- Remove GEOS-chem from CAM40 and CAM50 options
+
+M       src/chemistry/geoschem/chem_mods.F90
+	- Update hard-coded nTracersMax, gas_pcnst, and nslvd used for
+	  GEOS-Chem compsets
+
+M       src/chemistry/geoschem/chemistry.F90
+	- Updates for compatibility with GEOS-Chem 14.3.1
+	- Replace hard-coded photolysis inputs directory with namelist value
+	- Add aerosol distribution fix to deposit SO4 using Neu as gas instead of aerosol
+
+M       src/chemistry/geoschem/mo_sim_dat.F90
+	- Add new species to solsym: BUTDI (butendedial) and FURA (furan)
+
+M       src/chemistry/mozart/mo_neu_wetdep.F90
+	- Restrict henrys law coefficient assignment error print to masterproc
+	- Add GEOS-Chem bulk sulfates SO4 and SO4S
+
+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:
+
+izumi/nag/aux_cam:
 
+izumi/gnu/aux_cam:
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers, i.e.,
+- what code configurations:
+- what platforms/compilers:
+- nature of change (roundoff; larger than roundoff but same climate; new
+  climate):
+
+If bitwise differences were observed, how did you show they were no worse
+than roundoff?
+
+If this tag changes climate describe the run(s) done to evaluate the new
+climate in enough detail that it(they) could be reproduced, i.e.,
+- source tag (all code used must be in the repository):
+- platform/compilers:
+- configure commandline:
+- build-namelist command (or complete namelist):
+- MSS location of output:
+
+MSS location of control simulations used to validate new climate:
+
+URL for AMWG diagnostics output used to validate new climate:
+
+===============================================================
 ===============================================================
 
 Tag name: cam6_3_158
@@ -22,8 +134,7 @@ 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
->>>>>>> upstream/cam_development
+Code reviewed by:
 
 List all files eliminated: N/A