Feature hamocc beyond cmip6 #237
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
* Initial restructuring of sediment-related tracer declaration and initialization * Introducing mapping function * Remove unncessary comments * Fixed diagnostics bug and updated index naming
Introducing a static 3D sediment porosity field that can be optionally read in with effects on molecular pore water diffusion and shifting.
…sedbypass=true` (NorESMhub#198) * Removing bodensed - Initialization of sediment parameters and fields now in mo_sedmnt
…es have been converted to MKS [meter, kg, seconds] instead of CGS [cm, gram, seconds] with necessary coefficients. The default option which is CGS reproduce old results. The new option MKS cannot reproduce because of machine precision.
Make the surface mixed layer depth fractional index `hOBL` available for use in iHAMOCC, and adjust the internal iHAMOCC index `kmle` according to `hOBL`. Default value `kmle = 2` is retained for consistency with isopycnic coordinates.
Support for NUOPC driver
* Fixing the reading of variable porosity input field in preparation for the NorESM 2.0.6 release Cherry-picked from private Ncycleprivate branch 0d56930e2fdd62caba964d375b57304942568926 * Provide number of layers (3rd dim) via ks and not hard-coded * minor clean-up
…ions (default off).
Correct unit of diagnostic field and make conservation and checksum diagnostics selectable by namelist options
* add pCO2m (moist), CO2 piston velocity and solubility output - caution: kwco2 piston velocity now really holds only piston velocity (and not times solubility)
* Add variables used by PNETCDF to explicit use staements. * Move implicit none statments * update explicit use statement for pnetcdf
Fixed sediment clay units.
- Removed "CGS" CPP flag. - Changed some unit conversion factors from variables to parameters. - Introduced rho0 (= 1/alpha0) parameter. - Updated copyright statements.
Updates and corrections for CGS/MKS unit systems
Conflicts: phy/mod_dia.F
Merged master into SI_units branch
Fixing a missing ' that only showed up when using `cisonew`
Initiate naming convention for shell variables in buildnml such as NAMELIST_VARIABLE Co-authored-by: Tomas Torsvik <[email protected]>
Co-authored-by: Tomas Torsvik <[email protected]>
Add linear ramping-up scenario for ocean alkalinisation
Quick fix on buildnml after incomplete shell variable renaming from PR 224
… history and provide common hook again
TomasTorsvik
approved these changes
Feb 9, 2023
jmaerz
added a commit
to jmaerz/BLOM
that referenced
this pull request
Aug 9, 2023
Merge latest `master` changes into the `feature-hamocc_beyond-CMIP6` and align commit history again getting a new common hook.
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.
We locally merged
masterintofeature-hamocc_beyond-CMIP6, resolved merge conflict and pushed it to my fork. This should provide a common, updated hook again to also align the commit history again. This should provide a recipe how to easier continue with thebeyond-CMIP6branch and dealing with conflicts.