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

Refactor and fix per-age-class history outputs #1225

Closed
wants to merge 21 commits into from

Commits on Jul 17, 2024

  1. Rename internal area-related history variables for clarity.

    FATES_PATCHAREA_LU and FATES_PATCHAREA_AP are not in units of m2, but rather m2/m2. It is thus misleading for them to be named "AREA". In the interest of not messing up user workflows, I'm not changing those---at least for now. However, this commit renames related internal variables in the history code for clarity.
    
    Specifically, "area" is replaced with "fracarea" (fractional area, relative to site area) in the following:
    - ih_area_si_landuse
    - ih_area_si_age
    - hio_area_si_landuse
    - hio_fracarea_si_age
    samsrabin committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    ffc5e40 View commit details
    Browse the repository at this point in the history
  2. FatesHistoryInterfaceMod: Rename frac_area to patch_fracarea.

    1) Makes it clearer that this is a patch-level variable.
    2) Uses "fracarea" instead of "area" for clarity and consistency with previous commit.
    samsrabin committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    fcf2b54 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4adb665 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d7a8d60 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6950195 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    76a7062 View commit details
    Browse the repository at this point in the history
  7. Refactor (but don't fix) bad age-class weighting of several outputs.

    - FATES_ZSTAR_AP
    - FATES_SECONDAREA_ANTHRODIST_AP
    - FATES_SECONDAREA_DIST_AP
    - FATES_BURNFRAC_AP
    - FATES_FIRE_INTENSITY_BURNFRAC_AP
    - FATES_VEGC_AP
    - FATES_FUEL_AMOUNT_AP
    - FATES_CANOPYAREA_AP
    samsrabin committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    57723c7 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    395732d View commit details
    Browse the repository at this point in the history
  9. Align a comment.

    samsrabin committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    cdb5600 View commit details
    Browse the repository at this point in the history
  10. Refactor calculation of FATES_GPP_AP, FATES_NPP_AP.

    Using fates_patch_type%area_by_age allows consolidation into one block, rather than splitting the calculation across two parts of update_history_hifrq2.
    samsrabin committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    79044a7 View commit details
    Browse the repository at this point in the history
  11. Refactor calculation of FATES_LBLAYER_COND_AP, FATES_STOMATAL_COND_AP.

    Moving calculation of canopy_area_by_age to an earlier patch loop allows consolidation into one block, rather than splitting the calculation across two parts of update_history_hifrq2.
    samsrabin committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    ff87ce1 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Configuration menu
    Copy the full SHA
    5942a0d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    66cc4f8 View commit details
    Browse the repository at this point in the history
  3. Fix denominator of FATES_NPP_APPF and FATES_VEGC_APPF.

    Instead of dividing by total site area, divide by age class area.
    samsrabin committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    99adff9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2ee7502 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    87d3bfe View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0bb23b9 View commit details
    Browse the repository at this point in the history
  7. All history vars with age class multiplexed should divide by age clas…

    …s area, not site area.
    samsrabin committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    1ec6d6e View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Configuration menu
    Copy the full SHA
    103fdc9 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Configuration menu
    Copy the full SHA
    a0881c5 View commit details
    Browse the repository at this point in the history
  2. scag_denominator_area needs to be in patchloop.

    Should fix FATES_MORTALITY_CANOPY_SZAP and FATES_MORTALITY_USTORY_SZAP.
    samsrabin committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    f21fa95 View commit details
    Browse the repository at this point in the history