diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp index 2221cd6887d499210f675a82cc59dd2cd27cd165..86b48e84ab9de892e1599d223e025cfd5780bd28 100644 --- a/Geo/GFaceCompound.cpp +++ b/Geo/GFaceCompound.cpp @@ -40,6 +40,7 @@ #include "discreteFace.h" #include "eigenSolver.h" #include "multiscaleLaplace.h" +//#include "rbf.h" static void fixEdgeToValue(GEdge *ed, double value, dofManager<double> &myAssembler) { @@ -687,8 +688,9 @@ bool GFaceCompound::parametrize() const return paramOK; } -void GFaceCompound::setParam(std::map<MVertex*, SPoint3> rbf_param) const{ +void GFaceCompound::setParam(std::map<MVertex*, SPoint3> rbf_param) {//, rbf *myRBF){ + //_rbf = myRBF; coordinates = rbf_param; } @@ -1676,6 +1678,13 @@ GPoint GFaceCompound::point(double par1, double par2) const if(!oct) parametrize(); + if (_mapping == RBF){ + double x, y,z; + //_rbf->UVStoXYZ(par1, par2,x,y,z); + //printf("XYZ =%g %g %g \n", x,y,z); + //exit(1); + //return GPoint(x,y,z); + } double U,V; double par[2] = {par1,par2}; GFaceCompoundTriangle *lt; diff --git a/Geo/GFaceCompound.h b/Geo/GFaceCompound.h index 9543de75a05b71b9ddbb27f976223b059c0d6978..7e79b65bf964fb2614b3e33469281be910b5452a 100644 --- a/Geo/GFaceCompound.h +++ b/Geo/GFaceCompound.h @@ -19,6 +19,7 @@ #include "GEdgeCompound.h" #include "meshGFaceOptimize.h" #include "linearSystem.h" +//#include "rbf.h" #define AR_MAX 5 //maximal geometrical aspect ratio @@ -50,6 +51,7 @@ class GFaceCompoundTriangle { }; class Octree; +//class rbf; class GFaceCompound : public GFace { public: @@ -57,8 +59,9 @@ class GFaceCompound : public GFace { typedef enum {HARMONIC=1,CONFORMAL=2, CONVEXCOMBINATION=3, MULTISCALE=4, RBF=5} typeOfMapping; typedef enum {UNITCIRCLE, SQUARE} typeOfIsomorphism; void computeNormals(std::map<MVertex*, SVector3> &normals) const; - void setParam(std::map<MVertex*, SPoint3> rbf_param) const; + void setParam(std::map<MVertex*, SPoint3> rbf_param); //, rbf *myRBF); protected: + //rbf *_rbf; simpleFunction<double> *ONE; simpleFunction<double> *MONE; std::list<GFace*> _compound;