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

From openwfm
Jump to navigation Jump to search
Line 1: Line 1:
 
==Evolution==
 
==Evolution==
===Common base===
+
* In wrf-fire repository
{{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]
+
** {{wrf-fire-commit|fa26d08d8154|WRF-Fire submitted Nov 20, 2010}} on wrf-fire-track/master
 +
** {{wrf-fire-commit|b96422421958|bug fix submitted Jan 17, 2011 bug fix}} on wrf-fire-track/master
 +
** {{wrf-fire-commit|3cdb542af7ce|baseline submitted-to-WRF3.3}} on wrf-fire-track/submitted-to-WRF3.3
  
 
==Repositories and branches==
 
==Repositories and branches==

Revision as of 17:23, 19 January 2019

Evolution

Repositories and branches

Path to the fire code in v3.3

Looking at differences

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 ..
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-WRF3.3; cd ..

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

Three-way comparison:

opendiff WRF-Fire-merge-develop/phys/module_fr_fire_phys.F  WRF-Fire-merge-wrf-fire-track-master/wrfv2_fire/phys/module_fr_sfire_phys.F -ancestor WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_phys.F

External links

See also