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.

Sign up for GitHub

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

Jump to bottom

Merge master into feature-hamocc_beyond-CMIP6 branch #226

Merged
merged 26 commits into from
Jan 25, 2023
Merged

Merge master into feature-hamocc_beyond-CMIP6 branch #226

merged 26 commits into from
Jan 25, 2023

Commits on Sep 8, 2022

  1. Dynamic mapping of pore water tracers to ocean tracers (NorESMhub#192) 

    * Initial restructuring of sediment-related tracer declaration and initialization

* Introducing mapping function

* Remove unncessary comments

* Fixed diagnostics bug and updated index naming
    @jmaerz
    jmaerz authored Sep 8, 2022
    Configuration menu
    Copy the full SHA
    3e4eb0f View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. Added initial support for NUOPC driver.

    @matsbn
    matsbn committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    53d31b1 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. Lon-lat variable sediment porosity (NorESMhub#189) 

    Introducing a static 3D sediment porosity field that can be optionally read in with effects on molecular pore water diffusion and shifting.
    @jmaerz
    jmaerz authored Sep 15, 2022
    Configuration menu
    Copy the full SHA
    88d6208 View commit details
    Browse the repository at this point in the history

  2. Added wave forcing fields.

    @matsbn
    matsbn committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    1178bb3 View commit details
    Browse the repository at this point in the history

  3. Renamed folder for MCT driver.

    @matsbn
    matsbn committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    1c581b5 View commit details
    Browse the repository at this point in the history

  4. Moved MCT specific file from drivers/cpl_share/ to drivers/mct/.

    @matsbn
    matsbn committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    a198394 View commit details
    Browse the repository at this point in the history

  5. Rename drivers/mct/mod_swtfrz.F to drivers/mct/mod_swtfrz.F90.

    @matsbn
    matsbn committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    49821fd View commit details
    Browse the repository at this point in the history

  6. Rewrite to drivers/mct/mod_swtfrz.F90 to free format Fortran.

    @matsbn
    matsbn committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    8b6c43c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. Merge remote-tracking branch 'upstream/master' into feature-nuopc

    @matsbn
    matsbn committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    997104a View commit details
    Browse the repository at this point in the history

  2. Remove redundant definition of kOBL.

    @TomasTorsvik
    TomasTorsvik committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    e37d846 View commit details
    Browse the repository at this point in the history

  3. Redefine kOBL, cast as integer

    @TomasTorsvik
    TomasTorsvik committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    83d9237 View commit details
    Browse the repository at this point in the history

  4. Fixing variable sediment porosity - field initialization in case of `… 

    …sedbypass=true` (NorESMhub#198)

* Removing bodensed -  Initialization of sediment parameters and fields now in mo_sedmnt
    @jmaerz
    jmaerz authored Sep 27, 2022
    Configuration menu
    Copy the full SHA
    c863a47 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Hamocc hybrid coord2 (NorESMhub#179) 

    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.
    @TomasTorsvik
    TomasTorsvik authored Oct 3, 2022
    Configuration menu
    Copy the full SHA
    2a80c23 View commit details
    Browse the repository at this point in the history

  2. Merge pull request NorESMhub#199 from matsbn/feature-nuopc 

    Support for NUOPC driver
    @matsbn
    matsbn authored Oct 3, 2022
    Configuration menu
    Copy the full SHA
    a0c5421 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2022

  1. Fix porosity read (NorESMhub#201) 

    * 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
    @jmaerz
    jmaerz authored Nov 9, 2022
    Configuration menu
    Copy the full SHA
    613b8bc View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2022

  1. Correct unit of diagnostic variable dp_trc.

    @matsbn
    matsbn committed Nov 20, 2022
    Configuration menu
    Copy the full SHA
    a6d1c88 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Made conservation and checksum diagnostics selectable by namelist opt… 

    …ions (default off).
    @matsbn
    matsbn committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    e291c3b View commit details
    Browse the repository at this point in the history

  2. Merge pull request NorESMhub#205 from matsbn/feature-r13fixes 

    Correct unit of diagnostic field and make conservation and checksum diagnostics selectable by namelist options
    @matsbn
    matsbn authored Nov 21, 2022
    Configuration menu
    Copy the full SHA
    8385d62 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2022

  1. pCO2, Piston velocity and solubility output (NorESMhub#202) 

    * add pCO2m (moist), CO2 piston velocity and solubility output - caution: kwco2 piston velocity now really holds only piston velocity (and not times solubility)
    @jmaerz
    jmaerz authored Nov 22, 2022
    Configuration menu
    Copy the full SHA
    98ade59 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2022

  1. Bugfix pnetcdf (NorESMhub#208) 

    * Add variables used by PNETCDF to explicit use staements.

* Move implicit none statments

* update explicit use statement for pnetcdf
    @TomasTorsvik
    TomasTorsvik authored Nov 25, 2022
    Configuration menu
    Copy the full SHA
    81f6c58 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2022

  1. fixed units and renamed calcium burial to CaCO3 burial (NorESMhub#212) 

    Fixed sediment clay units.
    @jmaerz
    jmaerz authored Dec 2, 2022
    Configuration menu
    Copy the full SHA
    8f5acc1 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. Add option for surface pH output (NorESMhub#221)

    @JorgSchwinger
    JorgSchwinger authored Jan 6, 2023
    Configuration menu
    Copy the full SHA
    0802d11 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2023

  1. Remove unused parameters in wrt* subroutine calls in ncout_hamocc.F90

    @JorgSchwinger
    JorgSchwinger committed Jan 10, 2023
    Configuration menu
    Copy the full SHA
    440de2d View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. merge master into branch of feature-hamocc_beyond-CMIP6 branch

    @jmaerz
    jmaerz committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    c10eefd View commit details
    Browse the repository at this point in the history

  2. Import get_bgc_namelist only in subroutine where it is needed. (NorES… 

    …Mhub#225)
    @TomasTorsvik
    TomasTorsvik authored Jan 25, 2023
    Configuration menu
    Copy the full SHA
    56d7d9b View commit details
    Browse the repository at this point in the history

  3. merged latest master change

    @jmaerz
    jmaerz committed Jan 25, 2023
    Configuration menu
    Copy the full SHA
    a55ec2a View commit details
    Browse the repository at this point in the history