Skip to content

Commit 30a332d

Browse files
Nightly Botcwsmith
authored andcommitted
Merging develop into master
2 parents 6ae8ffd + 897ffda commit 30a332d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ree/reeResidualFunctionals.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,12 +710,13 @@ static void getOrderedTetsandFaces(apf::Mesh* mesh, apf::MeshEntity* edge,
710710
else {
711711
apf::Up up;
712712
mesh->getUp(edge, up);
713-
apf::MeshEntity* firstFace;
713+
apf::MeshEntity* firstFace = nullptr;
714714
for (int i = 0; i < up.n; i++) {
715715
if ( isOnDomainBoundary(mesh, up.e[i]) ) {
716716
firstFace = up.e[i]; break;
717717
}
718718
}
719+
PCU_ALWAYS_ASSERT(firstFace);
719720
faces.push_back(firstFace);
720721
mesh->getUp(firstFace, up);
721722
PCU_ALWAYS_ASSERT(up.n == 1);

test/xgc_split.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ int main(int argc, char** argv)
7676
char without_extension[256];
7777
snprintf(without_extension,strlen(argv[3])-3,"%s",argv[3]);
7878

79-
char vtk_fname[32];
79+
char vtk_fname[512];
8080
sprintf(vtk_fname,"%s",without_extension);
8181
pumi_mesh_write(m, vtk_fname, "vtk");
8282

0 commit comments

Comments
 (0)