Sync develop into main #1017
Merged
Sync develop into main #1017
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)
…urfaceGridComp.F90)
…ove_WET1_filling # Conflicts: # GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.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.
gcc14: Compile icepack data file at -O0
Bug fix: Previously, minimal CAPAC values were converted into runoff by adding them directly into total RUNOFF, but not into one of its components (RUNSRF or BFLOW), which violated the definition of total RUNOFF (=RUNSRF + BFLOW). This fix adds the minimal CAPAC into RUNSRF and thus preserves the equation of total RUNOFF.
Bug fix (CatchCN): Previously, minimal CAPAC values were converted into runoff by adding them directly into total RUNOFF, but not into one of its components (RUNSRF or BFLOW), which violated the definition of total RUNOFF (=RUNSRF + BFLOW). This fix adds the minimal CAPAC into RUNSRF and thus preserves the equation of total RUNOFF.
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
…ling remove filling of WET1 (a.k.a. GWETTOP) with 1s over non-land
…inimal_CAPAC_to_RUNOFF Fixed conversion of minimal CAPAC to RUNOFF (catchment.F90)
send clear message to log when mk_lakelandicesaltwater failed
…-units Fixes #1009, incorrect units in GF precip fluxes
sdrabenh
added
the
0 diff
mathomp4
approved these changes
Oct 18, 2024
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.
No description provided.