-
Notifications
You must be signed in to change notification settings - Fork 3
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
Comparison of BLAZE_9184 and CABLE-POP_TRENDY branches #237
Conversation
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8497 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8498 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8505 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8506 b483b3d9-cc7d-4f55-9e4c-b4562452379e
… 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
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@8786 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9010 b483b3d9-cc7d-4f55-9e4c-b4562452379e
- 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
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9081 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9082 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9083 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9084 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9085 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9086 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9087 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9088 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9089 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9090 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9179 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9184 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Users/inh599/BLAZE_9184@9208 b483b3d9-cc7d-4f55-9e4c-b4562452379e
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
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9616 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9617 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9618 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Users/inh599/BLAZE_9184@9630 b483b3d9-cc7d-4f55-9e4c-b4562452379e
git-svn-id: https://trac.nci.org.au/svn/cable/branches/Share/NESP2pt9_BLAZE@9631 b483b3d9-cc7d-4f55-9e4c-b4562452379e
…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
…ug in do_equil section)
…s to streamline log_out file
# 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.
@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? |
@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. |
Forgot I could only change the base branch and not the upstream branch. So closing this and starting a PR for the correct merge. |
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
rkill
added toLandscape
type in POP_types module andZeroPOP()
ADJUST_POP_FOR_FIRE()
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.