Difference between revisions of "Merging WPS"
Jump to navigation
Jump to search
Line 40: | Line 40: | ||
</pre> | </pre> | ||
Now the top level directory has the contents of the WPS subdirectory only and files outside of WPS subdirectory are stripped from all commits. | Now the top level directory has the contents of the WPS subdirectory only and files outside of WPS subdirectory are stripped from all commits. | ||
− | + | ||
+ | ==Notable branches and tags== | ||
+ | * {{wps-merge-branch|master}} tracks upstream WPS master | ||
+ | * {{wps-merge-branch|wrf-fire-wps-track}} WPS filtered from |
Revision as of 02:11, 27 April 2019
Issue description
Our custom version of WPS is based on WPS 3.x and the wrfinput files it produces are no longer compatible with current WRF. Also, its geotiff support is not compatible with current geotiff files from LANDFIRE. Consequently we can't run with WRF4+ or update our geographical databases.
Progress
Clone WPS and add wrf-fire repository as a branch
git clone git@github.com:wrf-model/WPS.git cd WPS git remote add wrf-fire git@github.com:openwfm/wrf-fire.git git fetch git@github.com:openwfm/wrf-fire.git git fetch wrf-fire git checkout -b wrf-fire-track/master wrf-fire/master git checkout -b wrf-fire-track/wps3.4 wrf-fire/wps3.4
Compare WPS versions
git checkout wrf-fire-track/wps3.4 git checkout HEAD^ HEAD is now at 5e1819bd WPS update to version 3.3.1 cp -a WPS ../wps3.3.1 git checkout RELEASE-3-3-1 HEAD is now at bedb19c7 tagging 3.3.1 release diff -r -x .git . ../wps3.3.1 Only in .: test_suite Only in ./util: make_regression_data.tar Only in ./util: regtest_wps.csh Only in ./util: wps_reg.html Only in ./util: wps_reg_html_maker.csh Only in ./util: zap_reg.csh
Filtering
git checkout wrf-fire-track/master git checkout -b wrf-fire-wps-track git filter-branch -f --subdirectory-filter WPS @
Now the top level directory has the contents of the WPS subdirectory only and files outside of WPS subdirectory are stripped from all commits.
Notable branches and tags
- branch master tracks upstream WPS master
- branch wrf-fire-wps-track WPS filtered from