How to track WRF Fire/SFIRE changes: Difference between revisions

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:

https://github.com/openwfm/WRF-Fire-merge/compare/v4.0.2...openwfm:v4.0.2-fire-submitted-to-3.3?diff=split

Compare fire files in 4.0.3 and copied from recent wrf-fire 452ba93376d Jan 9 2019:

https://github.com/openwfm/WRF-Fire-merge/compare/release-v4.0.3...openwfm:v4.0.3-track-fire?diff=split

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.

@@ Line 1: / Line 1: @@
-==Evolution==
-===Common base===
-{{WRF-Fire-commit|fa26d08d8154124ac51514b11bc671eb312e20f8|WRF-Fire submit Nov 20, 2010}}  + {{WRF-Fire-commit|b964224219585ab198d58510c8f7a0cf129b1990|Jan 17, 2011 bug fix}} was submitted to WRF3.3 and can be found at [https://github.com/openwfm/wrf-fire/commit/3cdb542af7ce3eeaaab6dee2f2341a96557282fe 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 [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 fork of [https://github.com/wrf-model/WRF WRF] with master branch from [https://github.com/openwfm/wrf-fire wrf-fire] added.
-** The [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
+** 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-3.3] tag <tt>submitted-to-3.3</tt> is the last code submitted to WRF release (WRF 3.3 in 2011)
+** 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.
+** See also [https://repo.or.cz/git-browser/by-commit.html?r=WRF-Fire-merge.git graphic mirror]
-==Looking at differences==
+==Examining differences by GitHub comparison view==
-Clone the repositories at the desired branches first:
+Compare fire files in release 4.0.2 with fire files submitted to 3.3:
+https://github.com/openwfm/WRF-Fire-merge/compare/v4.0.2...openwfm:v4.0.2-fire-submitted-to-3.3?diff=split
+Compare fire files in 4.0.3 and copied from recent wrf-fire {{wrf-fire-merge-commit|452ba93376d|Jan 9 2019}}:
+https://github.com/openwfm/WRF-Fire-merge/compare/release-v4.0.3...openwfm:v4.0.3-track-fire?diff=split
+==Examining and merging differences locally==
+===Setup===
+Clone 3 copies of the repository and position them at the desired commits:
 <pre>
 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
+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 ..
-git clone ssh://git@github.com/openwfm/WRF-Fire-merge.git WRF-Fire-merge-baseline
+cd WRF-Fire-merge-develop
+git checkout develop; cd ..
 cd WRF-Fire-merge-baseline
-git checkout wrf-fire-track/submitted-to-WRF3.3; cd ..
+git checkout wrf-fire-track/submitted-to-3.3; cd ..
 </pre>
+===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>
+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>
+With a common ancestor, which will distinguish changes better and reduce hand-editing:
+<pre>
+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>
+etc.
-==External links==
+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>
+See changes in wrf-fire to date:
+<pre>
+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
+</pre>
+Etc. for the other files.
 ==See also==
+* [[Tracking WRF Fire/SFIRE changes]]
+* [[List of WRF-Fire commits]]
 * [[How to set up WRF-Fire-merge tracking branches]]
 * [[Fire code in WRF release]]
 * [[WRF-SFIRE user guide]]
+* [[WRF-SFIRE fuel moisture model commits]]