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

Fe updates from UCI #464

Draft
wants to merge 15 commits into
base: development
Choose a base branch
from

Commits on Sep 9, 2022

  1. add variable C to N

    nicola-wiseman committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    70afe1f View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Configuration menu
    Copy the full SHA
    97bbb1b View commit details
    Browse the repository at this point in the history
  2. Fix code consistency issues in Fortran

    Cleaned up some trailing white space, converted hard tabs to soft, and added a
    few missing _r8 modifiers
    mnlevy1981 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    9422a43 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    961ca65 View commit details
    Browse the repository at this point in the history
  4. Re-enable Fe balance check, clean up code

    Stand-alone build found some unused variables and imports that I removed
    mnlevy1981 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    6681874 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Configuration menu
    Copy the full SHA
    caf8308 View commit details
    Browse the repository at this point in the history
  2. Update the 4p2z settings file and input files

    Also removed trailing whitespace I inadvertantly added to marbl_diagnostics_mod
    in the last commit
    mnlevy1981 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    b51320f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d3a3cdb View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. Clean up variable P:C and N:C logic

    Some settings in marbl_settings_mod.F90 only need to be defined if
    lvariable_PtoC (or NtoC) is true. Also, found a couple block in
    marbl_init_tracer_metadata_mod.F90 that wasn't verifying N_ind > 0 before
    modifying N tracers (N_ind = 0 if lvariable_NtoC = .false.)
    mnlevy1981 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    46a90f6 View commit details
    Browse the repository at this point in the history
  2. Update older settings files

    For cesm2.0 and cesm2.1 (3p1z or 4p1z), add lvariable_NtoC but set the default
    to .false.; also renamed gQfe_0 -> gQfe_max and added the non-N settings from
    the settings_latest files.
    mnlevy1981 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    123888a View commit details
    Browse the repository at this point in the history
  3. Add most of the new settings to SPECRTA file

    Don't know what to use for Qn_fixed, waiting to hear back from UCI and NOAA
    folks... so this will still fail the init.py test (but with fewer MARBL ERROR
    lines)
    mnlevy1981 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    e04257d View commit details
    Browse the repository at this point in the history
  4. Add fixed_NtoC settings file for testing

    Also generate the 4p2z settings file from JSON as part of testing
    mnlevy1981 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    f771fd6 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Remove Qn_fixed from autotroph_settings_type

    After discussion with Keith L, it looks like Qn_fixed and Qn_zoo were added to
    the code base so the fixed N:C configuration looked more like the fixed P:C
    configuration... but it isn't necessary since we want to use the same fixed N:C
    throughout the code (as opposed to fixed P:C, which really does vary from among
    the different functional types even when fixed spatially / temporally)
    mnlevy1981 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    df02542 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Changes to pass call_compute_subroutines tests

    Modify marbl_io_mod to initialize N tracers to C tracers * 16/112 and set
    feredsedflux and feventflux = 0.
    Modify marbl_diagnostics_mod.F90 to include dust%remin*dust_to_Fe in integrand,
    not righthand-side of iron conservation check
    Modify marbl_interior_tendency_mod.F90 to sflux_in * desportion in P_iron%remin
    before computing sflux_out.
    
    Also cleaned up a few small things in interior_tendency_mod (use unit_system
    instead of assuming cgs; initialize Lig_prod and declare it as inout in some
    routines)
    mnlevy1981 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    be7794d View commit details
    Browse the repository at this point in the history
  2. initialize coccoN by scaling spC

    no coccoC in this initial condition file, but coccoC = 0.07*spC
    mnlevy1981 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    9733088 View commit details
    Browse the repository at this point in the history