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 of NESP2pt9_BLAZE with CABLE-POP_TRENDY #362

Draft
wants to merge 47 commits into
base: CABLE-POP_TRENDY
Choose a base branch
from
Draft

Merge of NESP2pt9_BLAZE with CABLE-POP_TRENDY #362

wants to merge 47 commits into from

Commits on Oct 27, 2021

  1. Work in progress on SIMFIRE-BLAZE re-implementation. 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8497 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    db4abda View commit details
    Browse the repository at this point in the history

  2. Added namelist file for BLAZE. 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8498 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    e37233c View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2021

  1. updates for SIMFIRE-BLAZE 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8505 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    452576d View commit details
    Browse the repository at this point in the history

  2. Set BA-source back to SIMFIRE 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8506 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    b84c2a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2022

  1. - SIMFIRE will no longer STOP when there is no valid lan-pixel in the… 

    … HYDE-dataset. Instead zero human population density will be used.

- SF%RES has been reset to 0.5 deg as this is the resolution SIMFIRE has been trained on. NEEDS TESTING!


git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8749 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Mar 9, 2022
    Configuration menu
    Copy the full SHA
    42f9d43 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Corrected two bugs for compiling 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8786 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    moc801 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    bbdb0c5 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2022

  1. Remove symlinks, will add back as a file 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9010 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    5d880cb View commit details
    Browse the repository at this point in the history

  2. Addition to previous commit: 

    - Coupling BLAZE-POP fixed 
- Carbon balance fixed (missing removal of carbon from live-biomass) 
- Missing fluxes from fire into the atmosphere have been added to casa-output
Left to do: 
- imbalances due to precision issues 
- tuning of BLAZE for Australia. 


git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9011 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Jul 15, 2022
    Configuration menu
    Copy the full SHA
    e83507c View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. added Petrichor configuration to compile CABLE in CSIRO HPC system 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9081 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    yc3714 committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    4afc028 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. Fixed double precision bug in the C-from-fire fluxes 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9082 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    7591cc5 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. Debugging out-of-bounds (Entered BLAZE%NCELLS) 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9083 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    c48b250 View commit details
    Browse the repository at this point in the history

  2. more tests 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9084 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    51288d7 View commit details
    Browse the repository at this point in the history

  3. Added missing dependencies for blaze_driver and simfire. 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9085 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    f2523d2 View commit details
    Browse the repository at this point in the history

  4. pop_grid indexing bug fixed in BLAZE 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9086 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    00f82ff View commit details
    Browse the repository at this point in the history

  5. bug fix 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9087 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    6a3b139 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2022

  1. In consitencey in interpolate_firemortality. 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9088 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    0acf334 View commit details
    Browse the repository at this point in the history

  2. Interpolate_fire fixed from division by zero. 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9089 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    319fb6f View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. debugging flags 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9090 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    yc3714 committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    f995397 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2022

  1. Bug in BLAZE_TURNOVER fixed 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9179 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Nov 8, 2022
    Configuration menu
    Copy the full SHA
    09062de View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. Initialise cx2, which is 2*Gammastar in dryLeaf 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9184 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    moc801 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    a93fc83 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. copy of BLAZE branch @ 9184 for ACCESS-POP assessment 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Users/inh599/BLAZE_9184@9208 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    inh599 committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    b2bec2e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Bugfixes for Fire fluxes in BLAZE. 

    Bugfix for uninitialised variables in cable_canopy.F90. 


git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9612 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    lpn599 committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    a8fd6ed View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Updated gadi and explor build pathes and options 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9616 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    moc801 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    028fc91 View commit details
    Browse the repository at this point in the history

  2. Added params and namelists of BIOS3 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9617 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    moc801 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    d527c88 View commit details
    Browse the repository at this point in the history

  3. Merged run_cable-pop with BIOS setup 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9618 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    moc801 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    ea4037f View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. added inh599 info to run script 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Users/inh599/BLAZE_9184@9630 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    inh599 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    5e9818f View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. added missing blaze data path to Lars cosmos system 

    git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9631 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    yc3714 committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    bd8d5af View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. fixed BLAZE outputs, added fire and other disturbance fluxes to NBP, … 

    …added new NEP output in CABLE file

git-svn-id: https://trac.nci.org.au/svn/cable/branches/Users/inh599/BLAZE_9184@9671 b483b3d9-cc7d-4f55-9e4c-b4562452379e
    inh599 committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    32ecc0d View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. increments to BLAZE_9184 branch to address issue #272

    Ian Harman committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    0286829 View commit details
    Browse the repository at this point in the history

  2. increments to BLAZE_9184 branch to address issue #272

    Ian Harman committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    d049a76 View commit details
    Browse the repository at this point in the history

  3. updates to run scripts

    Ian Harman committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    19f3016 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. mods to run scripts for ACT and 100pts cases: S2 set up

    Ian Harman committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    4be59f0 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. update to ACT BIOS run script to enable end-to-end runs (run script b… 

    …ug in do_equil section)
    Ian Harman committed May 9, 2024
    Configuration menu
    Copy the full SHA
    7dead54 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. changes for potential stem npp and spin 1951

    @AlisonBennett
    AlisonBennett committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    91774b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. applying minimum value to vapour pressure to catch errors in AGCD inputs

    Ian Harman committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    37fc28c View commit details
    Browse the repository at this point in the history

  2. commenting out some write statements in blaze_mpi and simfire routine… 

    …s to streamline log_out file
    Ian Harman committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    156106b View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. change spinup period to 1951-1980 and replace MOD with MODULUS in rec… 

    …ycle calculation
    @AlisonBennett
    AlisonBennett committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    8e66695 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'BLAZE_9184' into Spin_1951_draft_ACB

    @AlisonBennett
    AlisonBennett authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    9a5bf2b View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Added bios future run script

    @AlisonBennett
    AlisonBennett committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    d7b1da3 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Remove dubugging code and remove litter reference in TotSoilCarb desc… 

    …ription.
    @AlisonBennett
    AlisonBennett committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    e1a9958 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Merge Spin 1951 to BLAZE_9184 (#323) 

    # CABLE

Thank you for submitting a pull request to the CABLE Project.

## Description

Merge of minor differences in the Spin_1951_draft_ACB branch with the
BLAZE_9184 branch in preparation for merge of BLAZE_9184 into
NESP2pt9_BLAZE.

## Type of change

Branch Merge.

Please add a reviewer when ready for review.
    @AlisonBennett
    AlisonBennett authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    a4e30d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. adding potential evaporation as output in BLAZE_9184; partner changes… 

    …et to #346
    Ian Harman committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    1f666d3 View commit details
    Browse the repository at this point in the history

  2. modifications to %epot variable. partner changeset to #346

    Ian Harman committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    0f297f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. removing uncessary run scripts for repo

    Ian Harman committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    fdc5973 View commit details
    Browse the repository at this point in the history

  2. removing some write statements from cable_LUC_EXPT_INIT

    Ian Harman committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    acd2d2e View commit details
    Browse the repository at this point in the history

  3. tidying up commented out lines in casa_inout

    Ian Harman committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    eb3ea56 View commit details
    Browse the repository at this point in the history

  4. Blaze 9184 (#320) 

    # CABLE

Thank you for submitting a pull request to the CABLE Project.

## Description

This PR is to merge recent local developments of the BIOS and BLAZE
capabilities into a consolidated branch.

Fixes #356 

## Type of change

Code management

## Checklist

- [ ] The new content is accessible and located in the appropriate
section.
- [ ] I have checked that links are valid and point to the intended
content.
- [x] I have checked my code/text and corrected any misspellings
    @har917
    har917 authored Aug 5, 2024
    Configuration menu
    Copy the full SHA
    5cf0d11 View commit details
    Browse the repository at this point in the history