Merging AGCM and DAS Tags

Steps in Merging AGCM and DAS Tags

This is an attempt at documenting how to merge a GCM tag with a DAS tag.

Checkout DAS Tag with DAS Module

$ mkdir -p ModelDir/DASdir
$ cd ModelDir/DASdir
$ cvs co -r DAS_Tag DAS_Module

Tag DAS checkout with Merge Tag

$ cd ModelDir/DASdir/GEOSadas/src
$ cvs tag Merge_Tag

Checkout DAS Tag with AGCM Module

$ mkdir -p ModelDir/AGCMdir
$ cd ModelDir/AGCMdir
$ cvs co -r DAS_Tag AGCM_Module

Compare and Merge Tags

$ cd ModelDir/AGCMdir/GEOSagcm/src
$ cvscmp Model_Tag

At this point you will need to manually merge. Possibly you will need to introduce directories never tagged by the DAS_Tag, e.g., use xxdiff. Once all is good. Try a build:

$ make -j4 pinstall

If it builds, you are probably okay. Maybe try running it? Then, tag with Merge Tag:

$ cvs tag -F Merge_Tag 

Update DAS Checkout with Merge Tag

$ cd ModelDir/DASdir/GEOSadas/src
$ cvs upd -r Model_Tag

Now, you might need to do a cvs co -r Model_Tag on specific directories if not in the DAS?

Test Build of the Merged DAS Checkout

$ make -j4 pinstall

At this point, if all works, send Merge_Tag to DAS maintainers. Once all is done, remove the Merge_Tag.

Category:SI Team