Merge PR #55 (HETP aerosol thermodynamics)

This merge brings PR #55 (HETP aerosol thermodynamics, by @lizziel) into the GEOS-Chem 14.4.0 development stream. This PR replaces ISORROPIA with HETP, which is an implementation of ISORROPIA for modern Fortran. Signed-off-by: Bob Yantosca <[email protected]
geoschem · Apr 26, 2024 · 1bb3cba · 1bb3cba
2 parents 923df7f + 5b0c47d
commit 1bb3cba
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 1 deletion.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "Cloud-J"]
 	path = src/Cloud-J
 	url = https://github.com/geoschem/Cloud-J.git
+[submodule "src/HETerogeneous-vectorized-or-Parallel"]
+	path = src/HETP
+	url = https://github.com/geoschem/HETerogeneous-vectorized-or-Parallel
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased] -- TBD
 ### Added
 - GitHub Action config file `.github/workflows/stale.yml`, which replaces StaleBot
+- Added git submodule HETP for aerosol thermodynamics in GEOS-Chem
+
 ### Changed
 - Updated GEOS-Chem submodule to 14.4.0
 - Updated HEMCO submodule to 3.9.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -234,6 +234,7 @@ set(GCCLASSIC_WRAPPER TRUE)
 set(GC_EXTERNAL_CONFIG FALSE)
 set(HEMCO_EXTERNAL_CONFIG TRUE)
 set(CLOUDJ_EXTERNAL_CONFIG TRUE)
+set(HETP_EXTERNAL_CONFIG TRUE)
 
 #-----------------------------------------------------------------------------
 # Add the directory with source code

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,6 +11,7 @@ target_compile_definitions(HEMCOBuildProperties
         $<$<STREQUAL:${TOMAS_BINS},40>:TOMAS40>
         ""
 )
+add_subdirectory(HETP EXCLUDE_FROM_ALL)
 add_subdirectory(Cloud-J EXCLUDE_FROM_ALL)
 add_subdirectory(GEOS-Chem EXCLUDE_FROM_ALL)
 

diff --git a/src/GEOS-Chem b/src/GEOS-Chem
diff --git a/src/HETP b/src/HETP
+3 −0		CHANGELOG.md
+0 −1		CMakeLists.txt
+3 −3		GeosCore/CMakeLists.txt
+2 −2		GeosCore/aerosol_mod.F90
+96 −79		GeosCore/aerosol_thermodynamics_mod.F90
+44 −20		GeosCore/apm_driv_mod.F90
+17 −17		GeosCore/chemistry_mod.F90
+2 −2		GeosCore/cleanup.F90
+2 −2		GeosCore/planeflight_mod.F90
+1 −1		GeosCore/tomas_mod.F90
+1 −1		Headers/state_chm_mod.F90
+0 −13		ISORROPIA/.gitignore
+0 −12		ISORROPIA/CMakeLists.txt
+0 −38,093		ISORROPIA/isorropiaII_main_mod.F
+4 −2		Interfaces/GCHP/Chem_GridCompMod.F90
+1 −1		KPP/aciduptake/aciduptake.kpp
+1 −1		KPP/fullchem/commonIncludeVars.H
+1 −1		KPP/fullchem/fullchem_HetStateFuncs.F90
+0 −9		LICENSE.txt