Skip to content

Commit

Permalink
Merge PR #2426 (Store aerosol-specific optics files in new directory)
Browse files Browse the repository at this point in the history
This merge brings PR #2426 (Store aerosol-specific optics files in new
Aerosol_Optics data directory, by @lizziel) into the GEOS-Chem 14.5.0\
development stream.

This PR moves the aerosol-specific optics data files (so4.dat, dust.dat, etc)
into a new data directory with path specified in the Aerosols menu in
geoschem_config.yml. Previously these files were stored in the same data
directory as photolysis input files. However, since we now have both
FAST-JX (for Hg simulation) and Cloud-J (for fullchem and aerosol sims)
we would need to store identical files in two different places.
This is not ideal. In addition it may cause confusion since these files
are no longer used for photolysis in Cloud-J. Aerosol optical properties
used in Cloud-J come from input file FJX_scat-aer.dat.

There are a few additional changes in this PR related to this data:

1. Move the calls to RD_AOD and CALC_AOD from Init_Photolysis to both
   Init_Aerosol and Init_FastJX. The former is for use in full
   chemistry and aerosol-only simulations. The latter is for use in the
   Hg simulation since it still uses Fast-JX and Fast-JX uses arrays
   computed by CALC_AOD.

2. Change the criteria to call Init_Aerosol to be based on simulation
   type rather than Input_Opt logicals for different aerosols.
   Init_Aerosol is now always called if using the full chemistry or
   aerosol-only simulation.

Signed-off-by: Bob Yantosca <[email protected]>
  • Loading branch information
yantosca committed Aug 29, 2024
2 parents 602b660 + 75d885d commit 647c9f5
Show file tree
Hide file tree
Showing 14 changed files with 662 additions and 593 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Do not convert from kg/kg to mol/mol before passing State_Chm to PBL mixing in `vdiff_mod.F90`.
- Updated GC-Classic and GCHP run scripts and environment files for NASA discover cluster
- Updated `GFED4_Climatology` entries to point to the climatology file for 2010-2023
- Read aerosol optical properties files from new data directory specified in geoschem_config.yml rather than directory containing photolysis input files
- Call `RD_AOD` and `CALC_AOD` from `Init_Aerosol` rather than `Init_Photolysis`

### Fixed
- Simplified SOA representations and fixed related AOD and TotalOA/OC calculations in benchmark.
Expand Down
Loading

0 comments on commit 647c9f5

Please sign in to comment.