Merging WPS - Revision history

Jmandel: /* Notable branches and tags */

2019-04-28T14:23:19Z

Notable branches and tags

← Older revision		Revision as of 14:23, 28 April 2019
Line 61:		Line 61:

	==Notable branches and tags==		==Notable branches and tags==
	* {{wps-merge-branch\|master}} tracks upstream ~~WPS~~ master		* {{wps-merge-branch\|master}} tracks upstream master
	* {{wps-merge-branch\|wrf-fire-wps-~~track~~}} ~~WPS filtered from~~		* {{wps-merge-branch\|wrf-fire-wps-filtered/master}}

2019-04-28T14:22:08Z

Progress

← Older revision		Revision as of 14:22, 28 April 2019
Line 4:		Line 4:
	Our custom version of {{wrf-fire-path\|WPS\|WPS}} is based on WPS 3.x and the wrfinput files it produces are no longer compatible with current WRF. Also, its [[WPS with GeoTIFF support\|geotiff support]] is not compatible with current geotiff files from [https://www.landfire.gov/ LANDFIRE]. Consequently we can't run with WRF4+ or update our geographical databases.		Our custom version of {{wrf-fire-path\|WPS\|WPS}} is based on WPS 3.x and the wrfinput files it produces are no longer compatible with current WRF. Also, its [[WPS with GeoTIFF support\|geotiff support]] is not compatible with current geotiff files from [https://www.landfire.gov/ LANDFIRE]. Consequently we can't run with WRF4+ or update our geographical databases.

	==~~Progress~~==		==Checking==
	===Clone WPS and add wrf-fire repository as a branch===		===Clone WPS and add wrf-fire repository as a branch===
	<pre>		<pre>

2019-04-28T14:21:25Z

Merge

← Older revision		Revision as of 14:21, 28 April 2019
Line 55:		Line 55:
	git remote add filtered git@github.com:janmandel/wrf-fire-wps-filtered.git		git remote add filtered git@github.com:janmandel/wrf-fire-wps-filtered.git
	git fetch filtered		git fetch filtered
	git checkout -b wrf-fire-~~track~~/master filtered/master		git checkout -b wrf-fire-filtered/master filtered/master
	git checkout -b wrf-fire-~~track~~/jb/wps filtered/jb/wps		git checkout -b wrf-fire-filtered/jb/wps filtered/jb/wps
	git push -u origin --all		git push -u origin --all
	</pre>		</pre>

2019-04-28T13:18:04Z

Filtering

← Older revision		Revision as of 13:18, 28 April 2019
Line 35:		Line 35:
	==Filtering==		==Filtering==
	<pre>		<pre>
	mkdir wrf-fire-wps		mkdir wrf-fire-wps-filtered
	cd wrf-fire-wps		cd wrf-fire-wps-filtered
	git clone --bare github:/openwfm/wrf-fire.git .git		git clone --bare github:/openwfm/wrf-fire.git .git
	git config --bool core.bare false		git config --bool core.bare false

2019-04-28T05:37:58Z

Merge

← Older revision		Revision as of 05:37, 28 April 2019
Line 57:		Line 57:
	git checkout -b wrf-fire-track/master filtered/master		git checkout -b wrf-fire-track/master filtered/master
	git checkout -b wrf-fire-track/jb/wps filtered/jb/wps		git checkout -b wrf-fire-track/jb/wps filtered/jb/wps
	git push -u origin -a		git push -u origin --all
	</pre>		</pre>

2019-04-28T05:36:52Z

Merge

← Older revision		Revision as of 05:36, 28 April 2019
Line 52:		Line 52:
	<pre>		<pre>
	git clone git@github.com:openwfm/WPS-merge.git		git clone git@github.com:openwfm/WPS-merge.git
	cd WPS-merge~~.git~~		cd WPS-merge
	git remote add filtered git@github.com:janmandel/wrf-fire-wps-filtered.git		git remote add filtered git@github.com:janmandel/wrf-fire-wps-filtered.git
	git fetch filtered		git fetch filtered

2019-04-28T05:36:09Z

Merge

← Older revision		Revision as of 05:36, 28 April 2019
Line 49:		Line 49:

	==Merge==		==Merge==
	Fork https://github.com/wrf-model/WPS as https://github.com/openwfm/WPS-merge ~~and clone~~		Fork https://github.com/wrf-model/WPS as https://github.com/openwfm/WPS-merge then
	<pre>		<pre>
			git clone git@github.com:openwfm/WPS-merge.git
			cd WPS-merge.git
	git remote add filtered git@github.com:janmandel/wrf-fire-wps-filtered.git		git remote add filtered git@github.com:janmandel/wrf-fire-wps-filtered.git
	git fetch filtered		git fetch filtered

2019-04-28T05:14:29Z

Merge

← Older revision		Revision as of 05:14, 28 April 2019
Line 51:		Line 51:
	Fork https://github.com/wrf-model/WPS as https://github.com/openwfm/WPS-merge and clone		Fork https://github.com/wrf-model/WPS as https://github.com/openwfm/WPS-merge and clone
	<pre>		<pre>
	git remote add filtered git@github.com:janmandel/wrf-fire-wps.git		git remote add filtered git@github.com:janmandel/wrf-fire-wps-filtered.git
	git fetch filtered		git fetch filtered
	git checkout -b wrf-fire-track/master filtered/master		git checkout -b wrf-fire-track/master filtered/master

2019-04-28T05:14:13Z

Filtering

← Older revision		Revision as of 05:14, 28 April 2019
Line 44:		Line 44:
	Now the top level directory has the contents of the WPS subdirectory only and files outside of WPS subdirectory are stripped from all commits. All branches that touch WPS are kept.		Now the top level directory has the contents of the WPS subdirectory only and files outside of WPS subdirectory are stripped from all commits. All branches that touch WPS are kept.
	<pre>		<pre>
	git remote add filtered git@github.com:janmandel/wrf-fire-wps.git		git remote add filtered git@github.com:janmandel/wrf-fire-wps-filtered.git
	git push filtered --mirror		git push filtered --mirror
	</pre>		</pre>

2019-04-27T05:44:50Z

Filtering

← Older revision		Revision as of 05:44, 27 April 2019
Line 35:		Line 35:
	==Filtering==		==Filtering==
	<pre>		<pre>
	~~git checkout~~ wrf-fire-~~track/master~~		mkdir wrf-fire-wps
	git ~~checkout~~ -b wrf-fire-~~wps~~-~~track~~		cd wrf-fire-wps
	git filter-branch -f --subdirectory-~~filter~~ WPS @		git clone --bare github:/openwfm/wrf-fire.git .git
			git config --bool core.bare false
			git reset --hard
			git filter-branch --subdirectory-filter WPS --tag-name-filter cat -- --all
			</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. All branches that touch WPS are kept.
			<pre>
			git remote add filtered git@github.com:janmandel/wrf-fire-wps.git
			git push filtered --mirror
			</pre>

			==Merge==
			Fork https://github.com/wrf-model/WPS as https://github.com/openwfm/WPS-merge and clone
			<pre>
			git remote add filtered git@github.com:janmandel/wrf-fire-wps.git
			git fetch filtered
			git checkout -b wrf-fire-track/master filtered/master
			git checkout -b wrf-fire-track/jb/wps filtered/jb/wps
			git push -u origin -a
	</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.~~

	==Notable branches and tags==		==Notable branches and tags==
	* {{wps-merge-branch\|master}} tracks upstream WPS master		* {{wps-merge-branch\|master}} tracks upstream WPS master
	* {{wps-merge-branch\|wrf-fire-wps-track}} WPS filtered from		* {{wps-merge-branch\|wrf-fire-wps-track}} WPS filtered from