Difference between revisions of "How to track WRF Fire/SFIRE changes"
Jump to navigation
Jump to search
Line 7: | Line 7: | ||
* https://github.com/wrf-model/WRF The official repository for the Weather Research and Forecasting (WRF) model. | * 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 clone of [https://github.com/wrf-model/WRF WRF] with commits from [https://github.com/openwfm/wrf-fire wrf-fire] added. | * https://github.com/openwfm/WRF-Fire-merge A clone of [https://github.com/wrf-model/WRF WRF] with commits from [https://github.com/openwfm/wrf-fire wrf-fire] added. | ||
− | ** | + | ** Branches [https://github.com/openwfm/WRF-Fire-merge/tree/master master] and [https://github.com/openwfm/WRF-Fire-merge/tree/develop develop] branches track [https://github.com/wrf-model/WRF WRF] automatically |
− | ** [https://github.com/openwfm/WRF-Fire-merge/tree/wrf-fire-track/master wrf-fire-track/master] tracks https://github.com/openwfm/wrf-fire/tree/master automatically. | + | ** Branch [https://github.com/openwfm/WRF-Fire-merge/tree/wrf-fire-track/master wrf-fire-track/master] tracks https://github.com/openwfm/wrf-fire/tree/master automatically. |
− | ** [https://github.com/openwfm/WRF-Fire-merge/commit/3cdb542af7ce3eeaaab6dee2f2341a96557282fe wrf-fire-track/submitted-to-WRF3.3] is the last code submitted to WRF release (WRF 3.3 in 2011) | + | ** Branch [https://github.com/openwfm/WRF-Fire-merge/commit/3cdb542af7ce3eeaaab6dee2f2341a96557282fe wrf-fire-track/submitted-to-WRF3.3] is the last code submitted to WRF release (WRF 3.3 in 2011) |
+ | ** Branch [https://github.com/openwfm/WRF-Fire-merge/tree/wrf-fire-submitted-to-WRF3.3] is branch <tt>master</tt> with the fire model files replaced by those that were submitted to WRF3.3, for comparison | ||
==Looking at differences== | ==Looking at differences== |
Revision as of 06:48, 18 January 2019
Evolution
Common base
WRF-Fire submit Nov 20, 2010 + Jan 17, 2011 bug fix was submitted to WRF3.3 and can be found at submitted-to-WRF3.3
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 clone 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-WRF3.3 is the last code submitted to WRF release (WRF 3.3 in 2011)
- Branch [1] is branch master with the fire model files replaced by those that were submitted to WRF3.3, for comparison
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