Merging master into feature-hamocc_beyond-CMIP6 #268
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
add BLOM regression test functionality
…ixed 1D box atmosphere for air-sea exchange of CO2 (and C-isotopes). There is currently no way to activate this option other than adding the preprocessor flag -DBOXATM in cime_config/buildcpp.
…ed technically but not validated, build script will still refuse to run this combination of options)
* renaming beleg_parm to mo_parambgc_ini without any further changes - not executable * adjust description to new module name * adjust description * initial step to rewrite mo_parambgc_ini to real module - compilable * Restructuring mo_parambgc_ini * Placing the nml-read call * First working namelist read for BGC parameters * Re-arrange parameter initialization and tidy up a bit * add the namelist to the cime config buildnml file - for expert use only * Add missing parameters to the log-writing subroutine * Declare local parameters for cisonew * Remove unused parameter * fix compile error wrt AGG=true * Add typical tuning parameters to namelist and introduce readjust routine for parameters that depend on tuning parameters * add white space * add Martin curve sinking parameters to bgc-namelist * Add information to NML-readme file * Remove old attached version of beleg_parm * Cleaning write of parameters * add some white space * rename mo_parambgc_ini * Adjust files to new name
jmaerz
changed the title
|
BLOM |
TomasTorsvik
approved these changes
Aug 22, 2023
There was a problem hiding this comment.
@jmaerz - thanks for checking! I think you can go ahead with the merging.
JorgSchwinger
approved these changes
Aug 27, 2023
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.
Once the recent
masterhas been tested by @matsbn to be compatible with the MCT driver, it can be merged into thefeature-hamocc_beyond-CMIP6branch.