How to track WRF Fire/SFIRE changes

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.

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===
See/merge differences from old file to new; the merge window on the bottom is initialized by the content of the second file and 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

With a common ancestor, but not sure if that makes any difference:

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  -ancestor WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_phys.F

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.

See also

• 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