Commits

Matt Knepley committed 50f2307 Merge

Merge branch 'knepley/feature-plex-fas' into next

* knepley/feature-plex-fas:
DMPlex: Fix for C++ build, small fix for PetscFE

Comments (0)

Files changed (2)

src/dm/dt/interface/dtfe.c

 @*/
 PetscErrorCode PetscFERefine(PetscFE fe, PetscFE *feRef)
 {
-  PetscSpaceType   typename;
+  PetscSpaceType   tname;
   PetscSpace       P, Pref;
   PetscDualSpace   Q, Qref;
   DM               K, Kref;
   ierr = PetscDualSpaceGetDM(Q, &K);CHKERRQ(ierr);
   /* Create space */
   ierr = PetscSpaceCreate(PetscObjectComm((PetscObject) fe), &Pref);CHKERRQ(ierr);
-  ierr = PetscObjectGetType((PetscObject) P, &typename);CHKERRQ(ierr);
-  ierr = PetscSpaceSetType(Pref, typename);CHKERRQ(ierr);
+  ierr = PetscObjectGetType((PetscObject) P, &tname);CHKERRQ(ierr);
+  ierr = PetscSpaceSetType(Pref, tname);CHKERRQ(ierr);
   ierr = PetscSpacePolynomialGetNumVariables(P, &dim);CHKERRQ(ierr);
   ierr = PetscSpacePolynomialSetNumVariables(Pref, dim);CHKERRQ(ierr);
   ierr = PetscSpaceGetOrder(P,   &order);CHKERRQ(ierr);
   ierr = PetscSpaceSetUp(Pref);CHKERRQ(ierr);
   /* Create dual space */
   ierr = PetscDualSpaceCreate(PetscObjectComm((PetscObject) fe), &Qref);CHKERRQ(ierr);
-  ierr = PetscObjectGetType((PetscObject) Q, &typename);CHKERRQ(ierr);
-  ierr = PetscDualSpaceSetType(Qref, typename);CHKERRQ(ierr);
+  ierr = PetscObjectGetType((PetscObject) Q, &tname);CHKERRQ(ierr);
+  ierr = PetscDualSpaceSetType(Qref, tname);CHKERRQ(ierr);
   ierr = DMRefine(K, PetscObjectComm((PetscObject) fe), &Kref);CHKERRQ(ierr);
   ierr = PetscDualSpaceSetDM(Qref, Kref);CHKERRQ(ierr);
   ierr = DMDestroy(&Kref);CHKERRQ(ierr);

src/dm/impls/plex/plex.c

     ierr = PetscViewerASCIIPrintf(viewer, "[%D]", rank);CHKERRQ(ierr);
     for (j = 0; j < numCIndices; j++) {
 #if defined(PETSC_USE_COMPLEX)
-      ierr = PetscViewerASCIIPrintf(viewer, " (%g,%g)", (double)PetscRealPart(values[i*numIndices+j]), (double)PetscImaginaryPart(values[i*numCIndices+j]));CHKERRQ(ierr);
+      ierr = PetscViewerASCIIPrintf(viewer, " (%g,%g)", (double)PetscRealPart(values[i*numCIndices+j]), (double)PetscImaginaryPart(values[i*numCIndices+j]));CHKERRQ(ierr);
 #else
       ierr = PetscViewerASCIIPrintf(viewer, " %g", (double)values[i*numCIndices+j]);CHKERRQ(ierr);
 #endif