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

From openwfm
Jump to navigation Jump to search
Line 12: Line 12:
  
 
==Looking at differences==
 
==Looking at differences==
Clone the repositories at the desired branches first:  
+
Clone 3 copies of the repository and position them at the desired commits:
 
<pre>
 
<pre>
 
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-develop
Line 23: Line 23:
 
cd WRF-Fire-merge-baseline
 
cd WRF-Fire-merge-baseline
 
git checkout wrf-fire-track/submitted-to-WRF3.3; cd ..
 
git checkout wrf-fire-track/submitted-to-WRF3.3; cd ..
 +
</pre>
 +
Changes at NCAR to date:
 +
<pre>opendiff WRF-Fire-merge-baseline/wrfv2_fire/phys/module_fr_sfire_phys.F WRF-Fire-merge-develop/phys/module_fr_fire_phys.F
 +
</pre>
 +
Changes in wrf-fire to date:
 +
<pre>
 +
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
 +
</pre>
 +
Three-way comparison:
 +
<pre>
 +
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
 
</pre>
 
</pre>
  

Revision as of 21:51, 17 January 2019

Evolution

Common base

WRF-Fire submit Nov 20, 2010 + Jan 17, 2011 bug fix was submitted to WRF3.3 and can be found at submitted-to-WRF3.3

Repositories and branches

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