Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move aerosol_mod.F90 arrays to State_Chm%AerMass object #2015

Merged
merged 7 commits into from
Dec 5, 2023
Merged

Move aerosol_mod.F90 arrays to State_Chm%AerMass object #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d55e42
Move all aerosol_mod gridded module arrays to new derived type in Sta…
lizziel Oct 26, 2023
c74a5c5
Remove unused oasave.F90 and associated code
lizziel Oct 27, 2023
3743ae8
Change AerMass arrays from allocatable to pointers
lizziel Nov 15, 2023
ffcfb72
Remove unused unit conversion use statement and local variable
lizziel Nov 15, 2023
e749e5e
Update changelog and use updated method for unit conversion string ch…
lizziel Nov 15, 2023
b9d2352
Use GC_CheckVar when allocating aerosol mass container arrays
lizziel Nov 15, 2023
e6d25fa
Merge branch 'dev/no-diff-to-benchmark' into feature/move_aerosol_mod…
lizziel Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Update error message for missing surface CH4 emissions with instructions on how to resolve the problem
- Change GCHP grid resolution threshold for lowering timesteps from C180 inclusive to C180 exclusive
- Read GEOS-Chem Classic restart file paths from the relevant `download_data.yml` file
- Moved aerosol_mod module variables to new State_Chm container called AerMass

### Fixed
- Prevent `POAEMISS` from being assigned a value if not allocated (in `carbon_mod.F90`)
Expand Down
31 changes: 8 additions & 23 deletions GeosCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
# GeosCore/CMakeLists.txt

#-----------------------------------------------------------------------------
# Define libTransport.a
#-----------------------------------------------------------------------------
add_library(Transport
STATIC EXCLUDE_FROM_ALL
diag_mod.F90
calc_met_mod.F90
diagnostics_mod.F90
pjc_pfix_mod.F90
tpcore_fvdas_mod.F90
tpcore_window_mod.F90
pjc_pfix_window_mod.F90
transport_mod.F90
)

# Dependencies
target_link_libraries(Transport
PUBLIC
GeosUtil
)

# Add a compilation flag to force REAL to REAL*8 if necessary
# only for file tpcore_window_mod.F90
if(${USE_REAL8})
Expand All @@ -41,6 +20,7 @@ add_library(GeosCore
aero_drydep.F90
aerosol_mod.F90
airs_ch4_mod.F90
calc_met_mod.F90
carbon_mod.F90
carbon_gases_mod.F90
chemistry_mod.F90
Expand All @@ -49,6 +29,8 @@ add_library(GeosCore
co2_mod.F90
convection_mod.F90
depo_mercury_mod.F90
diag_mod.F90
diagnostics_mod.F90
diag3.F90
drydep_mod.F90
dust_mod.F90
Expand Down Expand Up @@ -77,11 +59,12 @@ add_library(GeosCore
mixing_mod.F90
modis_lai_mod.F90
ndxx_setup.F90
oasave.F90
ocean_mercury_mod.F90
olson_landmap_mod.F90
pbl_mix_mod.F90
photolysis_mod.F90
pjc_pfix_mod.F90
pjc_pfix_window_mod.F90
planeflight_mod.F90
pops_mod.F90
RnPbBe_mod.F90
Expand All @@ -94,7 +77,10 @@ add_library(GeosCore
tagged_o3_mod.F90
tccon_ch4_mod.F90
toms_mod.F90
tpcore_fvdas_mod.F90
tpcore_window_mod.F90
tracer_mod.F90
transport_mod.F90
ucx_mod.F90
uvalbedo_mod.F90
vdiff_mod.F90
Expand All @@ -119,7 +105,6 @@ endif()

# Define dependencies for libGeosCore.a
target_link_libraries(GeosCore PUBLIC
Transport
ObsPack
History
Isorropia
Expand Down
Loading