[petsc-dev] C++ error with just PETSc includes

[Mark Adams]

Thanks, (off list)

I've got a git problem.

I rebased over master a few times in the past week (including this AM). The
first time I did this I got a lot of conflicts from DM partitioner routines
that I fixed manually, and after that these rebases were smooth.

Today I made some fixes on another machine and pushed them. You had given
me the idiom 'git pull --rebase; git push', but I did not do this. I think
this caused a massive problem.

I tried rebasing aging over master from my home machine and I got all kinds
of conflicts, starting with these DM partitioning things. I started fixing
these again and was getting conflicts as git replay commits, over and over.
I gave up eventually.

So I am stuck. Is there something like a fix of history that is causing
this problem, plz. This is branch adams/feature-dmplex-snes-landau.

The real diffs are in plex and the two plex header files.

Thanks again,
Mark


On Mon, Jul 13, 2020 at 11:24 AM Satish Balay <balay at mcs.anl.gov> wrote:

> Checking src/mat/tests/ex231.cxx  you need:
>
> diff --git a/src/dm/impls/plex/landau/kokkos/tutorials/ex1.cxx
> b/src/dm/impls/plex/landau/kokkos/tutorials/ex1.cxx
> index d04eaf96e7..967efc3625 100644
> --- a/src/dm/impls/plex/landau/kokkos/tutorials/ex1.cxx
> +++ b/src/dm/impls/plex/landau/kokkos/tutorials/ex1.cxx
> @@ -1,5 +1,7 @@
>  static char help[] = "Simple Kokkos test\n\n";
>
> +#define PETSC_SKIP_CXX_COMPLEX_FIX
>  #include <petscdmplex.h>
>
>
>
> Also #requiresdefine is not meant for example makefile. You can use:
>
> build: requires: in /*TEST section
>
> Satish
>
>
> On Mon, 13 Jul 2020, Mark Adams wrote:
>
> > I have a wip C++ test that just calls PetscInitialize and Finalize, and I
> > am getting some sort of error in the include file:
> >
> > https://gitlab.com/petsc/petsc/-/jobs/635768809
> >
> > All I do is:
> >
> > #include <petscdmplex.h>
> >
> > Any ideas?
> > Thanks,
> > Mark
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20200713/8a61d37e/attachment.html>