On 09/23/2014 01:45 PM, Karl Rupp wrote:
Hi Dominic,
> PR #178 gets you most of the way. src/ksp/ksp/examples/tests/ex32.c
uses
DMDA's which require a few additional fixes. I haven't opened a pull
request for these yet but I will do that before Thursday.
Regarding the rebase, wouldn't it be preferable to just resolve the
conflicts in the merge commit? In any event, I've merged these branches
several times into local integration branches created off of recent
petsc/master branches so I'm pretty familiar with the conflicts and how
to resolve them. I can help with the merge or do a rebase, whichever you
prefer.
Ok, I'll give the merge a try and see how things go. :-)
Best regards,
Karli
I can join a google+ or skype session to assist if that helps. Let me
know if you run into problems.
Cheers,
Dominic
--
Dominic Meiser
Tech-X Corporation
5621 Arapahoe Avenue
Boulder, CO 80303
USA
Telephone: 303-996-2036
Fax: 303-448-7756
www.txcorp.com
