No commit message

No commit message

Numeric/JacobianBasis.h

@@ -62,7 +62,7 @@ class JacobianBasis {
   inline void primJac2Jac(const fullVector<double> &primJac, fullVector<double> &jac) const {
     matrixPrimJac2Jac.mult(primJac,jac);
   }
-  inline void subDivisor(const fullVector<double> &bez, fullVector<double> &result) const {
+  inline void subdivideBezierCoeff(const fullVector<double> &bez, fullVector<double> &result) const {
     bezier->subDivisor.mult(bez,result);
   }
 

Numeric/bezierBasis.cpp

@@ -287,6 +287,14 @@ static std::vector< fullMatrix<double> > generateSubPointsPyr(int order)
   prox.add(.5);
 
   for (int i = 0; i < 8; ++i) {
+    if (i == 0) {
+      for (int j = 0; j < nPts; ++j) {
+        const double factor = (1. - 2*subPoints[i](j, 2));
+        subPoints[i](j, 0) = subPoints[i](j, 0) * factor;
+        subPoints[i](j, 1) = subPoints[i](j, 1) * factor;
+      }
+      continue;
+    }
     for (int j = 0; j < nPts; ++j) {
       const double factor = (1. - subPoints[i](j, 2));
       subPoints[i](j, 0) = subPoints[i](j, 0) * factor;

Plugin/AnalyseCurvedMesh.cpp

@@ -336,7 +336,7 @@ int GMSH_AnalyseCurvedMeshPlugin::subDivision(const JacobianBasis *jb,
                                               int depth)
 {
   fullVector<double> newJacobian(jb->getNumSubNodes());
-  jb->subDivisor(jacobian, newJacobian);
+  jb->subdivideBezierCoeff(jacobian, newJacobian);
 
   for (int i = 0; i < jb->getNumDivisions(); i++)
   for (int j = 0; j < jb->getNumLagCoeff(); j++)

Plugin/AnalyseCurvedMesh.h

@@ -72,7 +72,7 @@ private:
 public:
   BezierJacobian(fullVector<double> &, const JacobianBasis *, int depth);
   void subDivisions(fullVector<double> &vect) const
-    {_jfs->subDivisor(_jacBez, vect);}
+    {_jfs->subdivideBezierCoeff(_jacBez, vect);}
   
   inline int depth() const {return _depthSub;}
   inline double minJ() const {return _minJ;}