-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Auto PR - develop → MAPL-v3 - add new res #1003
Merged
Merged
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
…GridComp.F90, GEOS_LandGridComp.F90, GEOS_CatchGridComp.F90, catchment.F90)
…OS_CatchGridComp.F90)
This PR updates the ESMF CMake target to `ESMF::ESMF` which is the correct canonical target name for ESMF. This is necessary for Spack compatibility. NOTE: This requires ESMF 8.6.1 or later.
add new res to BCS package
…_export add land constants as HISTORY export variables
…rget Update ESMF CMake target to ESMF::ESMF
Fixes #984, bug in which ZLCL was unfilled with BACM or MGB2
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.
📝 Automatic PR:
develop
→release/MAPL-v3
Description
add new res
📁 Modified files
CMakeLists.txt | 2 +-
GEOSagcm_GridComp/CMakeLists.txt | 4 +-
.../GEOSphysics_GridComp/CMakeLists.txt | 2 +-
.../GEOSgwd_GridComp/CMakeLists.txt | 2 +-
.../GEOSmoist_GridComp/CMakeLists.txt | 2 +-
.../GEOS_BACM_1M_InterfaceMod.F90 | 10 +
.../GEOS_MGB2_2M_InterfaceMod.F90 | 9 +
.../GEOSsurface_GridComp/CMakeLists.txt | 2 +-
.../GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90 | 300 +++++++++++++++++++--
.../GEOSlake_GridComp/CMakeLists.txt | 2 +-
.../GEOSland_GridComp/CMakeLists.txt | 2 +-
.../GEOSland_GridComp/GEOS_LandGridComp.F90 | 39 ++-
.../GEOScatchCN_GridComp/CMakeLists.txt | 2 +-
.../GEOScatchCNCLM40_GridComp/CLM40/CMakeLists.txt | 2 +-
.../GEOScatchCNCLM40_GridComp/CMakeLists.txt | 2 +-
.../GEOScatchCNCLM45_GridComp/CLM45/CMakeLists.txt | 2 +-
.../GEOScatchCNCLM45_GridComp/CMakeLists.txt | 2 +-
.../GEOScatch_GridComp/CMakeLists.txt | 2 +-
.../GEOScatch_GridComp/GEOS_CatchGridComp.F90 | 228 +++++++++++++---
.../GEOScatch_GridComp/catchment.F90 | 2 +-
.../GEOSigni_GridComp/CMakeLists.txt | 6 +-
.../GEOSroute_GridComp/CMakeLists.txt | 2 +-
.../GEOSvegdyn_GridComp/CMakeLists.txt | 2 +-
.../GEOSland_GridComp/Shared/CMakeLists.txt | 2 +-
.../GEOSlandice_GridComp/CMakeLists.txt | 2 +-
.../GEOSsaltwater_GridComp/CMakeLists.txt | 2 +-
.../Utils/Raster/makebcs/CMakeLists.txt | 2 +-
.../Utils/Raster/makebcs/make_bcs_questionary.py | 3 +-
.../Utils/mk_restarts/CMakeLists.txt | 2 +-
.../GEOSturbulence_GridComp/CMakeLists.txt | 2 +-
.../GEOSsuperdyn_GridComp/CMakeLists.txt | 2 +-
.../GEOSdatmodyn_GridComp/CMakeLists.txt | 2 +-
GEOSdataatm_GridComp/CMakeLists.txt | 2 +-
GEOSmkiau_GridComp/CMakeLists.txt | 2 +-
GEOSogcm_GridComp/CMakeLists.txt | 2 +-
.../GEOS_OceanBioGeoChemGridComp/CMakeLists.txt | 2 +-
.../GEOS_OradBioGridComp/CMakeLists.txt | 2 +-
GEOSogcm_GridComp/GEOS_OradGridComp/CMakeLists.txt | 2 +-
.../CICE_GEOSPlug/cice6_cmake/CMakeLists.txt | 2 +-
.../GEOSseaice_GridComp/CMakeLists.txt | 4 +-
.../GEOSCICEDyna_GridComp/CMakeLists.txt | 2 +-
.../GEOSMITDyna_GridComp/CMakeLists.txt | 8 +-
.../GEOSdataseaice_GridComp/CMakeLists.txt | 6 +-
GEOSwgcm_GridComp/CMakeLists.txt | 2 +-
GEOSwgcm_GridComp/GEOSumwm_GridComp/CMakeLists.txt | 2 +-
.../GEOSumwm_GridComp/umwm_cmake/CMakeLists.txt | 2 +-
.../GEOSwavewatch_GridComp/CMakeLists.txt | 2 +-
.../ww3_multi_esmf/CMakeLists.txt | 2 +-
48 files changed, 565 insertions(+), 126 deletions(-)