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

new and fixed parameters for nutrients, phenology, seeds, fire and age-mortality #595

Merged
merged 30 commits into from
Jan 4, 2020
Merged

new and fixed parameters for nutrients, phenology, seeds, fire and age-mortality #595

merged 30 commits into from
Jan 4, 2020

Commits on Nov 26, 2019

  1. Added ECA parameters to the default parameter file.

    @rgknox
    rgknox committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    73c1880 View commit details
    Browse the repository at this point in the history

  2. Added new eca entries to parameter file

    @rgknox
    rgknox committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    8260afb View commit details
    Browse the repository at this point in the history

  3. Updated parameter file metadata for branch and seed turnover, as well… 

    … as germination
    @rgknox
    rgknox committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    0cc3cb3 View commit details
    Browse the repository at this point in the history

  4. Updated names and metadata for seed decay and germination parameters

    @rgknox
    rgknox committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    19ae640 View commit details
    Browse the repository at this point in the history

  5. Added parameter for active fire flag.

    @rgknox
    rgknox committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    eaf8cb8 View commit details
    Browse the repository at this point in the history

  6. Added non-woody cold-size and stem drop parameters for phenology

    @rgknox
    rgknox committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    53817e0 View commit details
    Browse the repository at this point in the history

  7. ran the parameter ordering script on the default file.

    @rgknox
    rgknox committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    d84a19a View commit details
    Browse the repository at this point in the history

  8. Added parameter definitions for prescribed N/P uptake

    @rgknox
    rgknox committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    3af6ab2 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. Moved active_crown_fire to a scalar parameter.

    @rgknox
    rgknox committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    dfd6297 View commit details
    Browse the repository at this point in the history

  2. Fixed comment that had turnover timescale instead of rate

    @rgknox
    rgknox committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    face185 View commit details
    Browse the repository at this point in the history

  3. Added the read-in calls on nfix1 and nfix2, even though they aren't u… 

    …sed, these calls enforce that the parameter file has these names current.
    @rgknox
    rgknox committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    b0f666a View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2019

  1. bug fixes on new parameter dimensions

    @rgknox
    rgknox committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    446e939 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

  1. Updated active_crown_fire flag to logical

    @rgknox
    rgknox committed Dec 16, 2019
    1 Configuration menu
    Copy the full SHA
    6e90589 View commit details
    Browse the repository at this point in the history

  2. removed initialization of fates_fire_flag, fixed comment.

    @rgknox
    rgknox committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    ab4db72 View commit details
    Browse the repository at this point in the history

  3. [Size and age dependent mortality parameters into default param file ] 

    [Set of changes to follow with size- and age-dependent mortality
modelled as increases in mortality rate with cohort size/age. Here
just adding the parameters for these functions to the default param
file. There is a rate of change and inflection point for size and age.
Cohort age fusion parameter is also included - in age dependent
mortality we track cohort age - cohorts cannot be fused if they are
too different in age. ]

Fixes: [NGT-ED Github issue #]

User interface changes?: [Yes - users will have to specify these parameters]

Code review: [Names]

Test suite: [suite name, machine, compilers]
Test baseline:
Test namelist changes:
Test answer changes: [bit for bit, roundoff, climate changing]
Test summary: No testing.
    @rgknox
    Jessica Needham authored and rgknox committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    2264782 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8 from rgknox/parameters-eca-phen-fire-w-tage 

    merging Jessie's mort age parameters
    @rgknox
    rgknox authored Dec 16, 2019
    Configuration menu
    Copy the full SHA
    c6be3dd View commit details
    Browse the repository at this point in the history

  5. Minor formatting updates to default parameter file, updated sorting t… 

    …ool to accept new ageco history dimension.
    @rgknox
    rgknox committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    46e51ec View commit details
    Browse the repository at this point in the history

  6. tweaked some age parameter metadata and naming conventions

    @rgknox
    rgknox committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    b080b80 View commit details
    Browse the repository at this point in the history

  7. fixed omission of name change of fates_cohort_size_fusion_tol

    @rgknox
    rgknox committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    a121a65 View commit details
    Browse the repository at this point in the history

  8. definition for nearzero

    @rgknox
    rgknox committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    2dadd0e View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. Updated name of fates_cohort_size_fusion_tol in EDParamsMod.

    @rgknox
    rgknox committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    fb8db54 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. Added cg strikes parameter to the default file

    @rgknox
    rgknox committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    26ab287 View commit details
    Browse the repository at this point in the history

  2. Update parameter_files/fates_params_default.cdl 

    Co-Authored-By: Charlie Koven <ckoven@users.noreply.github.com>
    @rgknox @ckoven
    rgknox and ckoven authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    1ddcbc3 View commit details
    Browse the repository at this point in the history

  3. Update parameter_files/fates_params_default.cdl 

    Co-Authored-By: Charlie Koven <ckoven@users.noreply.github.com>
    @rgknox @ckoven
    rgknox and ckoven authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    5633ce9 View commit details
    Browse the repository at this point in the history

  4. Update parameter_files/fates_params_default.cdl 

    Co-Authored-By: Charlie Koven <ckoven@users.noreply.github.com>
    @rgknox @ckoven
    rgknox and ckoven authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    ceb94db View commit details
    Browse the repository at this point in the history

  5. Update parameter_files/fates_params_default.cdl 

    Co-Authored-By: Charlie Koven <ckoven@users.noreply.github.com>
    @rgknox @ckoven
    rgknox and ckoven authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    24824f5 View commit details
    Browse the repository at this point in the history

  6. Update parameter_files/fates_params_default.cdl 

    Co-Authored-By: Charlie Koven <ckoven@users.noreply.github.com>
    @rgknox @ckoven
    rgknox and ckoven authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    ce4c4f8 View commit details
    Browse the repository at this point in the history

  7. Update parameter_files/fates_params_default.cdl 

    Co-Authored-By: Charlie Koven <ckoven@users.noreply.github.com>
    @rgknox @ckoven
    rgknox and ckoven authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    1358282 View commit details
    Browse the repository at this point in the history

  8. Update parameter_files/fates_params_default.cdl 

    Co-Authored-By: Charlie Koven <ckoven@users.noreply.github.com>
    @rgknox @ckoven
    rgknox and ckoven authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    37f5735 View commit details
    Browse the repository at this point in the history

  9. Update parameter_files/fates_params_default.cdl 

    Co-Authored-By: Charlie Koven <ckoven@users.noreply.github.com>
    @rgknox @ckoven
    rgknox and ckoven authored Dec 18, 2019
    Configuration menu
    Copy the full SHA
    25ff0f6 View commit details
    Browse the repository at this point in the history