Difference between revisions of "How to track WRF Fire/SFIRE changes"
Jump to navigation
Jump to search
m (Jmandel moved page Tracking WRF Fire/SFIRE changes to How to track WRF Fire/SFIRE changes) |
|||
| (4 intermediate revisions by the same user not shown) | |||
| Line 8: | Line 8: | ||
** Branch [https://github.com/openwfm/WRF-Fire-merge/tree/master-track-fire-submitted-to-3.3 master-track-fire-submitted-to-3.3] is branch [https://github.com/openwfm/WRF-Fire-merge/tree/master master] with the fire model files replaced by those from [https://github.com/openwfm/WRF-Fire-merge/commit/3cdb542af7ce3eeaaab6dee2f2341a96557282fe wrf-fire-track/submitted-to-3.3], for comparison only - it will not compile. The branch has tags same as master with <tt>-fire-submitted-to-3.3</tt> added: <tt>release_v3.3-fire-submitted-to-3.3</tt> etc. | ** Branch [https://github.com/openwfm/WRF-Fire-merge/tree/master-track-fire-submitted-to-3.3 master-track-fire-submitted-to-3.3] is branch [https://github.com/openwfm/WRF-Fire-merge/tree/master master] with the fire model files replaced by those from [https://github.com/openwfm/WRF-Fire-merge/commit/3cdb542af7ce3eeaaab6dee2f2341a96557282fe wrf-fire-track/submitted-to-3.3], for comparison only - it will not compile. The branch has tags same as master with <tt>-fire-submitted-to-3.3</tt> added: <tt>release_v3.3-fire-submitted-to-3.3</tt> etc. | ||
** Branch [https://github.com/openwfm/WRF-Fire-merge/tree/master-track-fire master-track-fire] is branch [https://github.com/openwfm/WRF-Fire-merge/tree/wrf-fire-track/master wrf-fire-track/master], for comparison only - it will not compile. | ** Branch [https://github.com/openwfm/WRF-Fire-merge/tree/master-track-fire master-track-fire] is branch [https://github.com/openwfm/WRF-Fire-merge/tree/wrf-fire-track/master wrf-fire-track/master], for comparison only - it will not compile. | ||
| + | ** See also [https://repo.or.cz/git-browser/by-commit.html?r=WRF-Fire-merge.git graphic mirror] | ||
==Examining differences by GitHub comparison view== | ==Examining differences by GitHub comparison view== | ||
| Line 31: | Line 32: | ||
cd WRF-Fire-merge-baseline | cd WRF-Fire-merge-baseline | ||
git checkout wrf-fire-track/submitted-to-3.3; cd .. | git checkout wrf-fire-track/submitted-to-3.3; cd .. | ||
| + | </pre> | ||
===Running Opendiff=== | ===Running Opendiff=== | ||
| − | + | Merge differences from old file to new; the merge window on the bottom is initialized by the content of the second file (on the right) and it can be edited and saved: | |
<pre> | <pre> | ||
opendiff WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/module_fr_sfire_phys.F WRF-Fire-merge-develop/phys/module_fr_fire_phys.F | opendiff WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/module_fr_sfire_phys.F WRF-Fire-merge-develop/phys/module_fr_fire_phys.F | ||
</pre> | </pre> | ||
| − | With a common ancestor, | + | With a common ancestor, which will distinguish changes better and reduce hand-editing: |
<pre> | <pre> | ||
| − | opendiff WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/ | + | f=phys; opendiff WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/module_fr_sfire_$f.F WRF-Fire-merge-develop/phys/module_fr_fire_$f.F -ancestor WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_$f.F |
</pre> | </pre> | ||
| − | + | etc. | |
| + | |||
| + | To see changes at NCAR to date: | ||
<pre>opendiff WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_phys.F WRF-Fire-merge-develop/phys/module_fr_fire_phys.F | <pre>opendiff WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_phys.F WRF-Fire-merge-develop/phys/module_fr_fire_phys.F | ||
</pre> | </pre> | ||
| Line 50: | Line 54: | ||
==See also== | ==See also== | ||
| + | * [[Tracking WRF Fire/SFIRE changes]] | ||
* [[List of WRF-Fire commits]] | * [[List of WRF-Fire commits]] | ||
* [[How to set up WRF-Fire-merge tracking branches]] | * [[How to set up WRF-Fire-merge tracking branches]] | ||
Latest revision as of 07:54, 22 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 master branch 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.
- Branch master-track-fire is branch wrf-fire-track/master, for comparison only - it will not compile.
- See also graphic mirror
Examining differences by GitHub comparison view
Compare fire files in release 4.0.2 with fire files submitted to 3.3:
Compare fire files in 4.0.3 and copied from recent wrf-fire 452ba93376d Jan 9 2019:
Examining and merging differences locally
Setup
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 git clone ssh://git@github.com/openwfm/WRF-Fire-merge.git WRF-Fire-merge-wrf-fire-track-master git clone ssh://git@github.com/openwfm/WRF-Fire-merge.git WRF-Fire-merge-baseline cd WRF-Fire-merge-wrf-fire-track-master git checkout wrf-fire-track/master; cd .. cd WRF-Fire-merge-develop git checkout develop; cd .. cd WRF-Fire-merge-baseline git checkout wrf-fire-track/submitted-to-3.3; cd ..
Running Opendiff
Merge differences from old file to new; the merge window on the bottom is initialized by the content of the second file (on the right) and it can be edited and saved:
opendiff WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/module_fr_sfire_phys.F WRF-Fire-merge-develop/phys/module_fr_fire_phys.F
With a common ancestor, which will distinguish changes better and reduce hand-editing:
f=phys; opendiff WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/module_fr_sfire_$f.F WRF-Fire-merge-develop/phys/module_fr_fire_$f.F -ancestor WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_$f.F
etc.
To see 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
See 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
Etc. for the other files.