Move aerosol_mod.F90 arrays to State_Chm%AerMass object #2015
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lizziel
requested review from
msulprizio and
yantosca
and removed request for
msulprizio
|
Tagging Aerosol WG Co-Chairs: @beckyalexander, @theloniuspunk, @wporter. Let me know if you have any questions/concerns. |
…te_Chm Updates include: - New file aermass_container_mod.F90 to hold gridded arrays previously in aerosol_mod.F90, e.g. OCFPOA, BCPO, and other aerosol mass arrays computed in Aerosol_Conc - New derived type AerMassContainer defined in the new file - State_Chm%AerMass to point to the AerMassContainer object - Code updates to access the aerosol mass arrays via the State_Chm pointer, e.g. State_Chm%AerMass%OCFPOA - Removal of aerosol_mod.F90 subroutine Cleanup_Aerosol - Moved diagnostic submodule Set_AerMass_Diagnostic in aerosol_mod.F90 to be stored instead in diagnostics_mod.F90 - Remove the Transport library from GeosCore/CMakeLists.txt A note on the last update, to remove the Transport library from GeosCore: This code was put in years ago with the intention of making it easier to include GEOS-Chem in external models without GEOS-Chem Classic transport. However, the files in the library are built before GeosCore and include diagnostics_mod.F90. Excluding this built library in models would prevent using GEOS-Chem diagnostics. It also prevents using non-transport GeosCore modules within diagnostics_mod.F90, a problem that came up during this aerosols update. In practice we do not need this separately built library when porting GEOS-Chem to other models. There are simpler ways of not building the transport files for all cases thus far. Signed-off-by: Lizzie Lundgren <[email protected]>
In updating the aerosol mass arrays I changes code within oasave.F90. However, we actually do not need this anymore since it is for obsolute binary diagnostics. I am thus removing the file and the code that uses it. Signed-off-by: Lizzie Lundgren <[email protected]>
Signed-off-by: Lizzie Lundgren <[email protected]>
Signed-off-by: Lizzie Lundgren <[email protected]>
…ecks Signed-off-by: Lizzie Lundgren <[email protected]>
lizziel
force-pushed
the
feature/move_aerosol_mod_arrays_to_state_chm
branch
from
e74b04e to
e749e5e
Compare
Signed-off-by: Lizzie Lundgren <[email protected]>
|
Thanks for the feedback @yantosca! I made the updates and now have it on top of the no-diff branch. Please review again at your convenience. |
…_arrays_to_state_chm # Conflicts: # CHANGELOG.md Signed-off-by: Lizzie Lundgren <[email protected]>
msulprizio
approved these changes
Dec 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Name and Institution (Required)
Name: Lizzie Lundgren
Institution: Harvard University
Describe the update
This PR moves all gridded module arrays in
aerosol_mod.90to new derived type objectState_Chm%AerMass. Updates include:aermass_container_mod.F90to hold gridded arrays previously inaerosol_mod.F90, e.g. OCFPOA, BCPO, and other aerosol mass arrays computed inAerosol_ConcsubroutineAerMassContainerdefined in the new fileState_Chm%AerMassto point to theAerMassContainerobjectState_Chm%AerMass%OCFPOAaerosol_mod.F90subroutineCleanup_AerosolSet_AerMass_Diagnosticinaerosol_mod.F90to be stored instead indiagnostics_mod.F90oasave.F90and code that references itTransportlibrary fromGeosCore/CMakeLists.txtRegarding the last update, removal of the
Transportlibrary, this CMake code was put in years ago with the intention of making it easier to include GEOS-Chem in external models without GEOS-Chem Classic transport. However, the files in the library are built before otherGeosCorefiles and includediagnostics_mod.F90andcalc_met_mod.F90. Excluding this built library in models would therefore break GEOS-Chem. The presence of this library also prevents using non-transportGeosCoremodules withindiagnostics_mod.F90, a problem that came up during this aerosols update. In practice we do not need this separately built library when porting GEOS-Chem to other models. There are simpler ways of not building the transport files for all cases thus far.This is a zero diff update but I would like it to go into 14.3.0 so that it can be used in the interface to Cloud-J.
All integration tests passed for GC-Classic and GCHP except the TOMAS simulations which is a known issue unrelated to this update.
Expected changes
This is a no diff update for all simulations.
Reference(s)
None
Related Github Issue(s)
closes #1418