Difference between revisions of "How to track WRF Fire/SFIRE changes"
Jump to navigation
Jump to search
| Line 9: | Line 9: | ||
==Evolution to v3.3== | ==Evolution to v3.3== | ||
| − | * In [https://github.com/openwfm/wrf-fire wrf-fire], imported to [https://github.com/openwfm/WRF-Fire-merge WRF-Fire-merge] | + | * In [https://github.com/openwfm/wrf-fire wrf-fire], imported to [https://github.com/openwfm/WRF-Fire-merge WRF-Fire-merge] as wrf-fire-track/: |
** {{wrf-fire-commit|fa26d08d8154|WRF-Fire submitted Nov 20, 2010}} on {{WRF-Fire-merge-branch|wrf-fire-track/master}} | ** {{wrf-fire-commit|fa26d08d8154|WRF-Fire submitted Nov 20, 2010}} on {{WRF-Fire-merge-branch|wrf-fire-track/master}} | ||
** {{wrf-fire-commit|b96422421958|bug fix submitted Jan 17, 2011 bug fix}} on {{{{WRF-Fire-merge-branch|wrf-fire-track/master}} | ** {{wrf-fire-commit|b96422421958|bug fix submitted Jan 17, 2011 bug fix}} on {{{{WRF-Fire-merge-branch|wrf-fire-track/master}} | ||
Revision as of 17:37, 19 January 2019
Repositories and branches
- https://github.com/openwfm/wrf-fire The original repository of WRF-Fire, later known as WRF-SFIRE
- https://github.com/wrf-model/WRF The official repository for the Weather Research and Forecasting (WRF) model.
- https://github.com/openwfm/WRF-Fire-merge A fork of WRF with commits from wrf-fire added.
- Branches master and develop branches track WRF automatically
- Branch wrf-fire-track/master tracks https://github.com/openwfm/wrf-fire/tree/master automatically.
- Branch wrf-fire-track/submitted-to-3.3 tag submitted-to-3.3 is the last code submitted to WRF release (WRF 3.3 in 2011)
- Branch master-track-fire-submitted-to-3.3 is branch master with the fire model files replaced by those from wrf-fire-track/submitted-to-3.3, for comparison only - it will not compile. The branch has tags same as master with -fire-submitted-to-3.3 added: release_v3.3-fire-submitted-to-3.3 etc.
Evolution to v3.3
- In wrf-fire, imported to WRF-Fire-merge as wrf-fire-track/:
Looking at differences
Clone 3 copies of the repository and position them at the desired commits:
git clone ssh://git@github.com/openwfm/WRF-Fire-merge.git WRF-Fire-merge-develop cd WRF-Fire-merge-develop git checkout develop; cd .. git clone ssh://git@github.com/openwfm/WRF-Fire-merge.git WRF-Fire-merge-wrf-fire-track-master cd WRF-Fire-merge-wrf-fire-track-master git checkout wrf-fire-track/master; cd .. git clone ssh://git@github.com/openwfm/WRF-Fire-merge.git WRF-Fire-merge-baseline cd WRF-Fire-merge-baseline git checkout wrf-fire-track/submitted-to-WRF3.3; cd ..
Changes at NCAR to date:
opendiff WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_phys.F WRF-Fire-merge-develop/phys/module_fr_fire_phys.F
Changes in wrf-fire to date:
opendiff WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_phys.F WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/module_fr_sfire_phys.F
Three-way comparison:
opendiff WRF-Fire-merge-develop/phys/module_fr_fire_phys.F WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/module_fr_sfire_phys.F -ancestor WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_phys.F