Skip to content
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 43 commits into from
Dec 12, 2022
Merged

Conversation

matsbn
Copy link
Contributor

@matsbn matsbn commented Dec 11, 2022

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.

jmaerz and others added 30 commits June 22, 2022 18:04
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.
TomasTorsvik and others added 13 commits September 27, 2022 13:11
…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.
* 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
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
@matsbn matsbn requested a review from milicak December 11, 2022 00:04
@matsbn matsbn merged commit ae20b35 into NorESMhub:SI_units Dec 12, 2022
@matsbn matsbn deleted the SI_units branch March 23, 2023 15:28
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants