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

From openwfm
Jump to navigation Jump to search
Line 11: Line 11:
 
* In [https://github.com/openwfm/wrf-fire wrf-fire], imported to [https://github.com/openwfm/WRF-Fire-merge WRF-Fire-merge] as wrf-fire-track/:  
 
* In [https://github.com/openwfm/wrf-fire wrf-fire], imported to [https://github.com/openwfm/WRF-Fire-merge WRF-Fire-merge] as wrf-fire-track/:  
 
** {{wrf-fire-commit|fa26d08d8154|WRF-Fire submitted Nov 20, 2010}} on {{WRF-Fire-merge-branch|wrf-fire-track/master}}
 
** {{wrf-fire-commit|fa26d08d8154|WRF-Fire submitted Nov 20, 2010}} on {{WRF-Fire-merge-branch|wrf-fire-track/master}}
** {{wrf-fire-commit|b96422421958|bug fix submitted Jan 17, 2011 bug fix}} on {{{{WRF-Fire-merge-branch|wrf-fire-track/master}}
+
** {{wrf-fire-commit|b96422421958|bug fix submitted Jan 17, 2011 bug fix}} on {{WRF-Fire-merge-branch|wrf-fire-track/master}}
 
** {{wrf-fire-commit|3cdb542af7ce|baseline submitted-to-WRF3.3}} at {{WRF-Fire-merge-branch|wrf-fire-track/submitted-to-WRF3.3}}
 
** {{wrf-fire-commit|3cdb542af7ce|baseline submitted-to-WRF3.3}} at {{WRF-Fire-merge-branch|wrf-fire-track/submitted-to-WRF3.3}}
  

Revision as of 17:38, 19 January 2019

Repositories and branches

Evolution to 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