Matt Knepley avatar Matt Knepley committed 3276990 Merge

Merge branch 'knepley/fix-fem-0d' into knepley/pylith

* knepley/fix-fem-0d:
PetscDualSpace: Updated to new PetscQuadrature names

Comments (0)

Files changed (1)

src/dm/dt/interface/dtfe.c

     }
     ierr = DMPlexRestoreTransitiveClosure(dm, pStart[depth], PETSC_TRUE, &closureSize, &closure);CHKERRQ(ierr);
   } else if (!dim) {
-    sp->functional[f].numQuadPoints = 1;
-    ierr = PetscMalloc(sp->functional[f].numQuadPoints * sizeof(PetscReal), &qpoints);CHKERRQ(ierr);
-    ierr = PetscMalloc(sp->functional[f].numQuadPoints * sizeof(PetscReal), &qweights);CHKERRQ(ierr);
+    sp->functional[f].numPoints = 1;
+    ierr = PetscMalloc(sp->functional[f].numPoints * sizeof(PetscReal), &qpoints);CHKERRQ(ierr);
+    ierr = PetscMalloc(sp->functional[f].numPoints * sizeof(PetscReal), &qweights);CHKERRQ(ierr);
     qpoints[0]  = 0.0;
     qweights[0] = 1.0;
-    sp->functional[f].quadPoints  = qpoints;
-    sp->functional[f].quadWeights = qweights;
+    sp->functional[f].points  = qpoints;
+    sp->functional[f].weights = qweights;
     ++f;
     lag->numDof[0] = 1;
   } else SETERRQ1(PETSC_COMM_SELF, PETSC_ERR_ARG_WRONG, "Cannot handle cells with cone size %d", coneSize);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.