diff --git a/Plugin/Integrate.cpp b/Plugin/Integrate.cpp index d7bfe1b065d067c4047ebaff20688250bb1446c2..95520bcf64d1d79e3aeea911f4d0ad7fea1c687c 100644 --- a/Plugin/Integrate.cpp +++ b/Plugin/Integrate.cpp @@ -87,7 +87,6 @@ PView *GMSH_IntegratePlugin::execute(PView * v) bool scalar = (numComp == 1); bool circulation = (numComp == 3 && numEdges == 1); bool flux = (numComp == 3 && (numEdges == 3 || numEdges == 4)); - //if(!scalar && !circulation && !flux) continue; int numNodes = data1->getNumNodes(step, ent, ele); int dim = data1->getDimension(step, ent, ele); double x[8], y[8], z[8], val[8 * 3]; @@ -98,6 +97,7 @@ PView *GMSH_IntegratePlugin::execute(PView * v) } if(numNodes == 1){ simpleSum = true; + res += val[0]; for(int comp = 0; comp < numComp; comp++) resv[comp] += val[comp]; } @@ -118,7 +118,7 @@ PView *GMSH_IntegratePlugin::execute(PView * v) if(simpleSum) Msg::Info("Step %d: sum = %g %g %g %g %g %g %g %g %g", step, resv[0], resv[1], resv[2], resv[3], resv[4], resv[5], resv[6], resv[7], - resv[8], resv[9]); + resv[8]); else Msg::Info("Step %d: integral = %.16g", step, res); List_Add(data2->SP, &res); diff --git a/benchmarks/2d/recombine.geo b/benchmarks/2d/recombine.geo index 7f2f386287651ecc1d4464374dad49b51cf44bc6..15bc57a7f9c67bff202a01aeaf07ea6e6f32b5c3 100644 --- a/benchmarks/2d/recombine.geo +++ b/benchmarks/2d/recombine.geo @@ -1,4 +1,4 @@ -lc = 0.01; +lc = 0.03; Point(1) = {0, 0, 0, lc/5}; Point(2) = {.1, 0, 0, lc/5}; Point(3) = {.1, .3, 0, lc}; @@ -10,3 +10,4 @@ Line(4) = {4,1} ; Line Loop(5) = {4,1,-2,3} ; Plane Surface(6) = {5} ; Recombine Surface{6}; +Mesh.SubdivisionAlgorithm = 1;