Merge GOCART v2.4.0 into GCMv12 branch#320
Closed
sdrabenh wants to merge 140 commits intofeature/sdrabenh/gcm_v12from
Closed
Merge GOCART v2.4.0 into GCMv12 branch#320sdrabenh wants to merge 140 commits intofeature/sdrabenh/gcm_v12from
sdrabenh wants to merge 140 commits intofeature/sdrabenh/gcm_v12from
Conversation
This PR updates the "in-repo" components to match GEOSgcm v11.1.0. This is mainly used for build testing of GOCART without the full model. This PR also updates the CI to point to Baselibs 7.13.0 which is the version used by GEOSgcm v11.1.0.
… as a climatology after the end of the CEDS dataset
… as a climatology after the end of the CEDS dataset
…optional rc argument is provided.
…to make AOD long names more intuitive for users, addressing issue #233
add changes for fengsha
… is merged and finds its way into the ufs-weather-model dependency tree
…/MAPL#2320 is merged and finds its way into the ufs-weather-model dependency tree
adding soil_drylimit_factor for the fengsha scheme. Note that soil_moisture_factor was also used in the k14 scheme. Not duplicating here.
Fix/fengsha moist
…tack150 Workaround for MAPL dependencies
…CompMod_logic Feature/pcolarco/#263/su2g_gridcompmod logic
# Conflicts: # CHANGELOG.md # ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc
Feature/pcolarco/carbon chem loss upd
Set `k` in `SUvolcanicEmissions` to be integer
Fixes #289 Correct CHANGELOG.md
SU_Volcanic: file path and protection for missing file
# Conflicts: # .circleci/config.yml # CMakeLists.txt # ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml # ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml # ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt # ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml # ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml # ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc # ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml # ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc # components.yaml
…-2025Jan16 Merge main into develop - 2025-Jan-16
Reverted to intended 'rhod' reading
Merging develop in preparation for release 2.4.0
Contributor
|
This has already been addressed in separate PR |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
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.