Difference between revisions of "How to track WRF Fire/SFIRE changes"

From openwfm
Jump to navigation Jump to search
Line 10: Line 10:
  
 
==Examining differences by GitHub comparison view==
 
==Examining differences by GitHub comparison view==
 +
Compare release 4.0.2 with fire code 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 release 4.0.3 with 4.0.3 and fire files copied from {{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
  
 
==Examining and merging differences locally==
 
==Examining and merging differences locally==

Revision as of 07:54, 20 January 2019

Repositories and branches

Examining differences by GitHub comparison view

Compare release 4.0.2 with fire code 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 release 4.0.3 with 4.0.3 and fire files copied from 452ba93376d Jan 9 2019:

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

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.

See also