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

Comparison of BLAZE_9184 and CABLE-POP_TRENDY branches #237

Closed
wants to merge 46 commits into from
Closed

Comparison of BLAZE_9184 and CABLE-POP_TRENDY branches #237

wants to merge 46 commits into from

Conversation

ccarouge
Copy link
Collaborator

@ccarouge ccarouge commented Apr 18, 2024 •
edited

This pull request is to document the differences between the 2 branches while we start on #232 . This can provide a space for discussion on specific differences or simply an overview of the differences.

core/biogeochem/POP.F90

  • A lot of formatting differences hiding important differences
  • rkill added to Landscape type in POP_types module and ZeroPOP()
  • Changes in ADJUST_POP_FOR_FIRE()
  • Change is INTERPOLATE_FIREMORTALITY()

Updating the formatting in BLAZE_9184 branch would help identifying the scientific differences.

core/biogeochem/casa_inout.F90

Additional variables added for BLAZE

core/blaze

Presumably, we would want to keep these files unchanged from BLAZE_9184. Some differences here are linked to differences in other files (e.g. cable_common.F90)

namelists/cable.nml

We will work from defined configurations outside this repository so differences in this namelist file should not matter.

build differences

We should try and compile the code on various architectures as people will need to run that code on different machines.

lpn599 and others added 28 commits October 27, 2021 15:17
Work in progress on SIMFIRE-BLAZE re-implementation.
db4abda 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8497 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Added namelist file for BLAZE.
e37233c 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8498 b483b3d9-cc7d-4f55-9e4c-b4562452379e
updates for SIMFIRE-BLAZE
452576d 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8505 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Set BA-source back to SIMFIRE
b84c2a4 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8506 b483b3d9-cc7d-4f55-9e4c-b4562452379e
- SIMFIRE will no longer STOP when there is no valid lan-pixel in the…
42f9d43 
… 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
Corrected two bugs for compiling
bbdb0c5 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8786 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Remove symlinks, will add back as a file
5d880cb 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9010 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Addition to previous commit:
e83507c 
- 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
added Petrichor configuration to compile CABLE in CSIRO HPC system
4afc028 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9081 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Fixed double precision bug in the C-from-fire fluxes
7591cc5 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9082 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Debugging out-of-bounds (Entered BLAZE%NCELLS)
c48b250 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9083 b483b3d9-cc7d-4f55-9e4c-b4562452379e
more tests
51288d7 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9084 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Added missing dependencies for blaze_driver and simfire.
f2523d2 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9085 b483b3d9-cc7d-4f55-9e4c-b4562452379e
pop_grid indexing bug fixed in BLAZE
00f82ff 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9086 b483b3d9-cc7d-4f55-9e4c-b4562452379e
bug fix
6a3b139 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9087 b483b3d9-cc7d-4f55-9e4c-b4562452379e
In consitencey in interpolate_firemortality.
0acf334 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9088 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Interpolate_fire fixed from division by zero.
319fb6f 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9089 b483b3d9-cc7d-4f55-9e4c-b4562452379e
debugging flags
f995397 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9090 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Bug in BLAZE_TURNOVER fixed
09062de 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9179 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Initialise cx2, which is 2*Gammastar in dryLeaf
a93fc83 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9184 b483b3d9-cc7d-4f55-9e4c-b4562452379e
copy of BLAZE branch @ 9184 for ACCESS-POP assessment
b2bec2e 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Users/inh599/BLAZE_9184@9208 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Bugfixes for Fire fluxes in BLAZE.
a8fd6ed 
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
Updated gadi and explor build pathes and options
028fc91 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9616 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Added params and namelists of BIOS3
d527c88 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9617 b483b3d9-cc7d-4f55-9e4c-b4562452379e
Merged run_cable-pop with BIOS setup
ea4037f 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9618 b483b3d9-cc7d-4f55-9e4c-b4562452379e
added inh599 info to run script
5e9818f 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Users/inh599/BLAZE_9184@9630 b483b3d9-cc7d-4f55-9e4c-b4562452379e
added missing blaze data path to Lars cosmos system
bd8d5af 
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9631 b483b3d9-cc7d-4f55-9e4c-b4562452379e
fixed BLAZE outputs, added fire and other disturbance fluxes to NBP, …
32ecc0d 
…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
@ccarouge ccarouge mentioned this pull request Apr 18, 2024
Open
9 tasks
@har917 har917 linked an issue Apr 29, 2024 that may be closed by this pull request
updating BLAZE_9184 branches with updates since branching from svn repository #272
Closed
3 tasks
@har917 har917 mentioned this pull request Apr 29, 2024
Closed
3 tasks
@ccarouge ccarouge removed a link to an issue Apr 29, 2024
updating BLAZE_9184 branches with updates since branching from svn repository #272
Closed
3 tasks
@ccarouge ccarouge added this to the BIOS3 milestone Jul 3, 2024
AlisonBennett and others added 7 commits July 4, 2024 15:19
@AlisonBennett
Remove dubugging code and remove litter reference in TotSoilCarb desc…
e1a9958 
…ription.
@AlisonBennett
Merge Spin 1951 to BLAZE_9184 (#323)
a4e30d3 
# 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.
adding potential evaporation as output in BLAZE_9184; partner changes…
1f666d3 
…et to #346
modifications to %epot variable. partner changeset to #346
0f297f2
removing uncessary run scripts for repo
fdc5973
removing some write statements from cable_LUC_EXPT_INIT
acd2d2e
tidying up commented out lines in casa_inout
eb3ea56
@har917
Copy link
Collaborator

har917 commented Aug 5, 2024

@ccarouge Now that we've merged BLAZE_9184 into NESP2pt9_BLAZE I think this PR - while still relevant - is comparing the wrong pair of branches.

This is preventing the deletion of the BLAZE_9184 branch.

How should we manage this?

@ccarouge
Copy link
Collaborator Author

ccarouge commented Aug 7, 2024

@har917 We are not merging it. But I've updated the branch it will pull from and the title to correspond to our current work plan.

@ccarouge
Copy link
Collaborator Author

ccarouge commented Aug 7, 2024

Forgot I could only change the base branch and not the upstream branch. So closing this and starting a PR for the correct merge.

@ccarouge ccarouge closed this Aug 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
BIOS3
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ccarouge @har917 @AlisonBennett