Difference between revisions of "How to track WRF Fire/SFIRE changes"
Jump to navigation
Jump to search
| Line 9: | Line 9: | ||
==Examining differences by GitHub comparison view== | ==Examining differences by GitHub comparison view== | ||
| + | |||
==Examining and merging differences locally== | ==Examining and merging differences locally== | ||
===Setup=== | ===Setup=== | ||
Revision as of 07:30, 20 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.
Examining differences by GitHub comparison view
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 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 ..
To use common ancestor, also:
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-3.3; cd ..
Running Opendiff
Merging differences from old file to new; the merge window on the bottom seems initialized by the content of the second file:
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
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
Etc. for the other files.