-
Notifications
You must be signed in to change notification settings - Fork 25
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
Merged master into SI_units branch #218
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
Fix timestep inventory
Add pause-resume function
This merge replaces the last remaining fix form *.F files in iHAMOCC with equivalent free form *.F90 files.
* 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
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.
Conflicts: phy/mod_dia.F
milicak
approved these changes
Dec 12, 2022
jmaerz
pushed a commit
to jmaerz/BLOM
that referenced
this pull request
Aug 9, 2023
Merged master into SI_units branch
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.
Master have been merged into SI_units branch and conflicts resolved. Code still reproduces with CGS units. The branch should be ready for a pull request into master.