diff --git a/.gitmodules b/.gitmodules index 035f2dc87..daea64969 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ path = src/GCHP_GridComp/GEOSChem_GridComp/geos-chem url = https://github.com/geoschem/geos-chem.git [submodule "HEMCO"] - path = src/GCHP_GridComp/HEMCO_GridComp/HEMCO + path = src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO url = https://github.com/geoschem/HEMCO.git [submodule "yaFyaml"] path = src/yaFyaml @@ -32,5 +32,8 @@ path = docs/source/geos-chem-shared-docs url = https://github.com/geoschem/geos-chem-shared-docs.git [submodule "Cloud-J"] - path = src/GCHP_GridComp/Cloud-J + path = src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J url = https://github.com/geoschem/Cloud-J +[submodule "HETP"] + path = src/GCHP_GridComp/GEOSChem_GridComp/HETP + url = https://github.com/geoschem/HETerogeneous-vectorized-or-Parallel.git diff --git a/CHANGELOG.md b/CHANGELOG.md index ea674e3c1..47acbdfa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ This file documents all notable changes to the GCHP wrapper repository starting in version 14.0.0. See also CHANGELOG files for individual submodules, such as: - src/GCHP_GridComp/GEOSChem_GridComp/geos-chem/CHANGELOG.md -- src/GCHP_GridComp/HEMCO_GridComp/HEMCO/CHANGELOG.md +- src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/CHANGELOG.md +- src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J/CHANGELOG.md +- src/GCHP_GridComp/GEOSChem_GridComp/HETP/CHANGELOG.md - src/MAPL/CHANGELOG.md The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). @@ -10,10 +12,13 @@ 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 +- Changed subdirectory name HEMCO_GridComp to HEMCO since not its own gridded component +- Moved HEMCO and Cloud-J submodules from GCHP_GridComp to GCHP_GridComp/GEOSChem_GridComp where they are used ### Removed - GitHub config files `.github/stale.yml` and `.github/no-response.yml` @@ -23,6 +28,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Now print container name being read by ExtData when `CAP.EXTDATA` is set to `DEBUG` in `logging.yml` - Added new pre-processer setting GCHP_WRAPPER for use in submodules - Added PLEadv export to FV3 submodule for inclusion in GCHP HISTORY.rc files +- Added git submodule for HETP aerosol thermodynamics ### Changed - Updated GEOS-Chem submodule to 14.3.1 diff --git a/src/GCHP_GridComp/CMakeLists.txt b/src/GCHP_GridComp/CMakeLists.txt index e0a8b7e71..747a36058 100755 --- a/src/GCHP_GridComp/CMakeLists.txt +++ b/src/GCHP_GridComp/CMakeLists.txt @@ -5,35 +5,23 @@ #--------------- set(FV_PRECISION R8 ) # FV3 precision is R8 set(GCHP_WRAPPER TRUE ) # GCHP model configuration -set(CLOUDJ_EXTERNAL_CONFIG TRUE ) # Not Cloud-J standalone -set(HEMCO_EXTERNAL_CONFIG TRUE ) # Not HEMCO standalone set(GC_EXTERNAL_CONFIG TRUE ) # Not GEOS-Chem Classic set(MAPL_ESMF TRUE ) # HEMCO and GEOS-Chem will use MAPL/ESMF set(MAPL_ACG ${CMAKE_CURRENT_SOURCE_DIR}/../MAPL/Apps/mapl_acg.pl) -#--------------- -# Add FV3 -#--------------- +#------------------------------------------- +# Add DYNAMICS gridded component (advection) +#------------------------------------------- add_subdirectory(FVdycoreCubed_GridComp EXCLUDE_FROM_ALL) -#--------------- -# Add Cloud-J -#--------------- -add_subdirectory(Cloud-J EXCLUDE_FROM_ALL) - -#--------------- -# Add HEMCO -#--------------- -add_subdirectory(HEMCO_GridComp EXCLUDE_FROM_ALL) - -#--------------- -# Add GEOS-Chem -#--------------- +#------------------------------------------- +# Add GCHPchem gridded component (GEOS-Chem) +#------------------------------------------- add_subdirectory(GEOSChem_GridComp EXCLUDE_FROM_ALL) -#--------------- -# Add GCHPctmEnv -#--------------- +#---------------------------------------------------- +# Add GCHPctmEnv gridded component (pre-advection) +#---------------------------------------------------- add_subdirectory(GCHPctmEnv_GridComp EXCLUDE_FROM_ALL) #-------------------------------- diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt b/src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt index 595975119..1036e4ec4 100755 --- a/src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt +++ b/src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt @@ -19,6 +19,9 @@ set(FASTJX OFF CACHE BOOL # Local variables set(GC_EXTERNAL_CONFIG TRUE) +set(CLOUDJ_EXTERNAL_CONFIG TRUE) # Not Cloud-J standalone +set(HETP_EXTERNAL_CONFIG TRUE) # Not HETP standalone test +set(HEMCO_EXTERNAL_CONFIG TRUE) # Not HEMCO standalone set(GTMM FALSE) set(MECH "fullchem" CACHE STRING "Name of the chemistry mechanism to use") set(GCHP TRUE) @@ -26,6 +29,9 @@ set(MODEL_GCHP TRUE) set(MODEL_GCHPCTM TRUE) # Add directories to build +add_subdirectory(Cloud-J EXCLUDE_FROM_ALL) +add_subdirectory(HETP EXCLUDE_FROM_ALL) +add_subdirectory(HEMCO EXCLUDE_FROM_ALL) add_subdirectory(geos-chem EXCLUDE_FROM_ALL) # Configure build properties for GEOS-Chem diff --git a/src/GCHP_GridComp/Cloud-J b/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J similarity index 100% rename from src/GCHP_GridComp/Cloud-J rename to src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J diff --git a/src/GCHP_GridComp/HEMCO_GridComp/CMakeLists.txt b/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/CMakeLists.txt similarity index 90% rename from src/GCHP_GridComp/HEMCO_GridComp/CMakeLists.txt rename to src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/CMakeLists.txt index 4c74567a7..6421c3513 100644 --- a/src/GCHP_GridComp/HEMCO_GridComp/CMakeLists.txt +++ b/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/CMakeLists.txt @@ -1,4 +1,4 @@ -# HEMCO_GridComp/CMakeLists.txt +# HEMCO/CMakeLists.txt add_subdirectory(HEMCO EXCLUDE_FROM_ALL) diff --git a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO b/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO similarity index 100% rename from src/GCHP_GridComp/HEMCO_GridComp/HEMCO rename to src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/HETP b/src/GCHP_GridComp/GEOSChem_GridComp/HETP new file mode 160000 index 000000000..2a99b2462 --- /dev/null +++ b/src/GCHP_GridComp/GEOSChem_GridComp/HETP @@ -0,0 +1 @@ +Subproject commit 2a99b24625ed26cf87ae88697ddd6cf8bbdec812 diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 203a480b6..90da22bed 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 203a480b666012a800e68cf943d816d2ab6506ba +Subproject commit 90da22bedc673888e0ee0d0b80283a8179ebc2bb