summaryrefslogtreecommitdiff
path: root/cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp')
-rw-r--r--cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp48
1 files changed, 48 insertions, 0 deletions
diff --git a/cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp b/cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp
new file mode 100644
index 000000000000..2985db17481f
--- /dev/null
+++ b/cad/gmsh/files/patch-contrib_domhex_surfaceFiller.cpp
@@ -0,0 +1,48 @@
+--- contrib/domhex/surfaceFiller.cpp.orig 2024-03-29 22:06:54 UTC
++++ contrib/domhex/surfaceFiller.cpp
+@@ -85,10 +85,10 @@ bool compute4neighbors(
+ metricField = SMetric3(1. / (L * L));
+
+ // get the unit normal at that point
+- Pair<SVector3, SVector3> der =
++ std::pair<SVector3, SVector3> der =
+ gf->firstDer(SPoint2(midpoint[0], midpoint[1]));
+- SVector3 s1 = der.first();
+- SVector3 s2 = der.second();
++ SVector3 s1 = der.first;
++ SVector3 s2 = der.second;
+ SVector3 n = crossprod(s1, s2);
+ n.normalize();
+ t1 -= n*dot(t1,n);
+@@ -259,10 +259,10 @@ bool compute4neighbors(
+ // // 0
+
+ // // get the unit normal at that point
+-// Pair<SVector3, SVector3> der =
++// std::pair<SVector3, SVector3> der =
+ // gf->firstDer(SPoint2(midpoint[0], midpoint[1]));
+-// SVector3 s1 = der.first();
+-// SVector3 s2 = der.second();
++// SVector3 s1 = der.first;
++// SVector3 s2 = der.second;
+ // SVector3 n = crossprod(s1, s2);
+ // n.normalize();
+
+@@ -490,7 +490,7 @@ void packingOfParallelograms(GFace *gf, std::vector<MV
+ double du[4] = {0,0,0,0}, dv[4]= {0,0,0,0};
+
+ // printf("cop %d\n",(*it)->getNum());
+-
++
+ for (int i=0;i<2;i++){
+ if (gf->periodic(i)){
+ reparamMeshVertexOnFace(*it, gf, midpoint);
+@@ -513,7 +513,7 @@ void packingOfParallelograms(GFace *gf, std::vector<MV
+ }
+
+ if (NP == 0)NP=1;
+-
++
+ for (int i=0;i<NP;i++){
+ bool singular = !compute4neighbors(gf, *it, midpoint, newp, metricField, cross_field, du[i],dv[i],globalMult );
+ // printf("there %d %g %g\n",singular,du[i],dv[i]);