Commit f8f74908 authored by Amaury Johnen's avatar Amaury Johnen

propagate master changes

parent 2956a123
......@@ -138,7 +138,7 @@ MEdge MEdgeN::getEdge() const
SPoint3 MEdgeN::pnt(double u) const
{
int tagLine = ElementType::getTag(TYPE_LIN, getPolynomialOrder());
int tagLine = ElementType::getType(TYPE_LIN, getPolynomialOrder());
const nodalBasis *fs = BasisFactory::getNodalBasis(tagLine);
double f[100];
......@@ -155,7 +155,7 @@ SPoint3 MEdgeN::pnt(double u) const
SVector3 MEdgeN::tangent(double u) const
{
int tagLine = ElementType::getTag(TYPE_LIN, getPolynomialOrder());
int tagLine = ElementType::getType(TYPE_LIN, getPolynomialOrder());
const nodalBasis *fs = BasisFactory::getNodalBasis(tagLine);
double sf[100][3];
......@@ -172,7 +172,7 @@ SVector3 MEdgeN::tangent(double u) const
double MEdgeN::interpolate(const double val[], double u, int stride) const
{
int tagLine = ElementType::getTag(TYPE_LIN, getPolynomialOrder());
int tagLine = ElementType::getType(TYPE_LIN, getPolynomialOrder());
const nodalBasis *fs = BasisFactory::getNodalBasis(tagLine);
double f[100];
......
......@@ -682,7 +682,7 @@ const nodalBasis* MElement::getFunctionSpace(int order, bool serendip) const
const JacobianBasis* MElement::getJacobianFuncSpace(int order) const
{
if (order == -1) return BasisFactory::getJacobianBasis(getTypeForMSH());
int tag = ElementType::getTag(getType(), order);
int tag = ElementType::getType(getType(), order);
return BasisFactory::getJacobianBasis(tag);
}
......
......@@ -141,7 +141,7 @@ MFace MFaceN::getFace() const
SPoint3 MFaceN::pnt(double u, double v) const
{
int tag = ElementType::getTag(_type, _order);
int tag = ElementType::getType(_type, _order);
const nodalBasis *fs = BasisFactory::getNodalBasis(tag);
double f[100];
......@@ -160,7 +160,7 @@ SVector3 MFaceN::tangent(double u, double v, int num) const
{
if (num != 0 && num != 1) num = 0;
int tag = ElementType::getTag(_type, _order);
int tag = ElementType::getType(_type, _order);
const nodalBasis *fs = BasisFactory::getNodalBasis(tag);
double sf[100][3];
......@@ -177,7 +177,7 @@ SVector3 MFaceN::tangent(double u, double v, int num) const
SVector3 MFaceN::normal(double u, double v) const
{
int tag = ElementType::getTag(_type, _order);
int tag = ElementType::getType(_type, _order);
const nodalBasis *fs = BasisFactory::getNodalBasis(tag);
double sf[100][3];
......@@ -201,7 +201,7 @@ SVector3 MFaceN::normal(double u, double v) const
void MFaceN::frame(double u, double v,
SVector3 &t0, SVector3 &t1, SVector3 &n) const
{
int tag = ElementType::getTag(_type, _order);
int tag = ElementType::getType(_type, _order);
const nodalBasis *fs = BasisFactory::getNodalBasis(tag);
double sf[100][3];
......@@ -224,7 +224,7 @@ void MFaceN::frame(double u, double v,
void MFaceN::frame(double u, double v, SPoint3 &p,
SVector3 &t0, SVector3 &t1, SVector3 &n) const
{
int tag = ElementType::getTag(_type, _order);
int tag = ElementType::getType(_type, _order);
const nodalBasis *fs = BasisFactory::getNodalBasis(tag);
double f[100];
......
......@@ -53,11 +53,11 @@ void incompleteBasis::_computeCoefficientsTriangle()
incompleteBasis::incompleteBasis(int tag)
// If the element is complete, compute the incomplete basis anyway
: nodalBasis(ElementType::getTag(ElementType::ParentTypeFromTag(tag),
ElementType::OrderFromTag(tag), true)),
: nodalBasis(ElementType::getType(ElementType::getParentType(tag),
ElementType::getOrder(tag), true)),
polyBasis(NULL), completeBasis(NULL)
{
int tagComplete = ElementType::getTag(parentType, order, false);
int tagComplete = ElementType::getType(parentType, order, false);
switch (parentType) {
case TYPE_LIN:
case TYPE_PNT:
......
......@@ -639,8 +639,8 @@ namespace ClosureGen {
bool serendip, const fullMatrix<double> &points)
{
closure.clear();
const int typeTri = ElementType::getTag(TYPE_TRI, order, serendip);
const int typeQua = ElementType::getTag(TYPE_QUA, order, serendip);
const int typeTri = ElementType::getType(TYPE_TRI, order, serendip);
const int typeQua = ElementType::getType(TYPE_QUA, order, serendip);
const nodalBasis *fsFaceTri = BasisFactory::getNodalBasis(typeTri);
const nodalBasis *fsFaceQua = BasisFactory::getNodalBasis(typeQua);
......
......@@ -2572,257 +2572,257 @@ return tSetTag;
case 201:
YY_RULE_SETUP
#line 298 "Gmsh.l"
return tSetTag;
return tSetNumber;
YY_BREAK
case 202:
YY_RULE_SETUP
#line 299 "Gmsh.l"
return tSetNumber;
return tSetPartition;
YY_BREAK
case 203:
YY_RULE_SETUP
#line 300 "Gmsh.l"
return tSetPartition;
return tSetString;
YY_BREAK
case 204:
YY_RULE_SETUP
#line 301 "Gmsh.l"
return tSetString;
return tShapeFromFile;
YY_BREAK
case 205:
YY_RULE_SETUP
#line 302 "Gmsh.l"
return tShapeFromFile;
return tShow;
YY_BREAK
case 206:
YY_RULE_SETUP
#line 303 "Gmsh.l"
return tShow;
return tSin;
YY_BREAK
case 207:
YY_RULE_SETUP
#line 304 "Gmsh.l"
return tSin;
return tSinh;
YY_BREAK
case 208:
YY_RULE_SETUP
#line 305 "Gmsh.l"
return tSinh;
return tSlide;
YY_BREAK
case 209:
YY_RULE_SETUP
#line 306 "Gmsh.l"
return tSlide;
return tSmoother;
YY_BREAK
case 210:
YY_RULE_SETUP
#line 307 "Gmsh.l"
return tSmoother;
return tSphere;
YY_BREAK
case 211:
YY_RULE_SETUP
#line 308 "Gmsh.l"
return tSphere;
return tSpline;
YY_BREAK
case 212:
YY_RULE_SETUP
#line 309 "Gmsh.l"
return tSpline;
return tSplit;
YY_BREAK
case 213:
YY_RULE_SETUP
#line 310 "Gmsh.l"
return tSplit;
return tSprintf;
YY_BREAK
case 214:
YY_RULE_SETUP
#line 311 "Gmsh.l"
return tSprintf;
return tSqrt;
YY_BREAK
case 215:
YY_RULE_SETUP
#line 312 "Gmsh.l"
return tSqrt;
return tStr;
YY_BREAK
case 216:
YY_RULE_SETUP
#line 313 "Gmsh.l"
return tStr;
return tStrCat;
YY_BREAK
case 217:
YY_RULE_SETUP
#line 314 "Gmsh.l"
return tStrCat;
return tStrChoice;
YY_BREAK
case 218:
YY_RULE_SETUP
#line 315 "Gmsh.l"
return tStrChoice;
return tStrCmp;
YY_BREAK
case 219:
YY_RULE_SETUP
#line 316 "Gmsh.l"
return tStrCmp;
return tStrFind;
YY_BREAK
case 220:
YY_RULE_SETUP
#line 317 "Gmsh.l"
return tStrFind;
return tStrLen;
YY_BREAK
case 221:
YY_RULE_SETUP
#line 318 "Gmsh.l"
return tStrLen;
return tStrPrefix;
YY_BREAK
case 222:
YY_RULE_SETUP
#line 319 "Gmsh.l"
return tStrPrefix;
return tStrRelative;
YY_BREAK
case 223:
YY_RULE_SETUP
#line 320 "Gmsh.l"
return tStrRelative;
return tStrReplace;
YY_BREAK
case 224:
YY_RULE_SETUP
#line 321 "Gmsh.l"
return tStrReplace;
return tStrSub;
YY_BREAK
case 225:
YY_RULE_SETUP
#line 322 "Gmsh.l"
return tStrSub;
return tStringToName;
YY_BREAK
case 226:
YY_RULE_SETUP
#line 323 "Gmsh.l"
return tStringToName;
return tDefineStruct;
YY_BREAK
case 227:
YY_RULE_SETUP
#line 324 "Gmsh.l"
return tDefineStruct;
return tSurface;
YY_BREAK
case 228:
YY_RULE_SETUP
#line 325 "Gmsh.l"
return tSurface;
return tSymmetry;
YY_BREAK
case 229:
YY_RULE_SETUP
#line 326 "Gmsh.l"
return tSymmetry;
return tSyncModel;
YY_BREAK
case 230:
YY_RULE_SETUP
#line 327 "Gmsh.l"
return tSyncModel;
#line 328 "Gmsh.l"
return tText2D;
YY_BREAK
case 231:
YY_RULE_SETUP
#line 329 "Gmsh.l"
return tText2D;
return tText3D;
YY_BREAK
case 232:
YY_RULE_SETUP
#line 330 "Gmsh.l"
return tText3D;
return tTime;
YY_BREAK
case 233:
YY_RULE_SETUP
#line 331 "Gmsh.l"
return tTime;
return tTan;
YY_BREAK
case 234:
YY_RULE_SETUP
#line 332 "Gmsh.l"
return tTan;
return tTanh;
YY_BREAK
case 235:
YY_RULE_SETUP
#line 333 "Gmsh.l"
return tTanh;
return tTestLevel;
YY_BREAK
case 236:
YY_RULE_SETUP
#line 334 "Gmsh.l"
return tTestLevel;
return tTextAttributes;
YY_BREAK
case 237:
YY_RULE_SETUP
#line 335 "Gmsh.l"
return tTextAttributes;
return tThickSolid;
YY_BREAK
case 238:
YY_RULE_SETUP
#line 336 "Gmsh.l"
return tThickSolid;
return tThruSections;
YY_BREAK
case 239:
YY_RULE_SETUP
#line 337 "Gmsh.l"
return tThruSections;
return tToday;
YY_BREAK
case 240:
YY_RULE_SETUP
#line 338 "Gmsh.l"
return tToday;
return tTorus;
YY_BREAK
case 241:
YY_RULE_SETUP
#line 339 "Gmsh.l"
return tTorus;
return tTotalMemory;
YY_BREAK
case 242:
YY_RULE_SETUP
#line 340 "Gmsh.l"
return tTotalMemory;
return tTransfQuadTri;
YY_BREAK
case 243:
YY_RULE_SETUP
#line 341 "Gmsh.l"
return tTransfQuadTri;
return tTransfinite;
YY_BREAK
case 244:
YY_RULE_SETUP
#line 342 "Gmsh.l"
return tTransfinite;
return tTranslate;
YY_BREAK
case 245:
YY_RULE_SETUP
#line 343 "Gmsh.l"
return tTranslate;
#line 344 "Gmsh.l"
return tUndefineConstant;
YY_BREAK
case 246:
YY_RULE_SETUP
#line 345 "Gmsh.l"
return tUndefineConstant;
return tUnique;
YY_BREAK
case 247:
YY_RULE_SETUP
#line 346 "Gmsh.l"
return tUnique;
return tUpperCase;
YY_BREAK
case 248:
YY_RULE_SETUP
#line 347 "Gmsh.l"
return tUpperCase;
return tUsing;
YY_BREAK
case 249:
YY_RULE_SETUP
#line 348 "Gmsh.l"
return tUsing;
#line 349 "Gmsh.l"
return tVolume;
YY_BREAK
case 250:
YY_RULE_SETUP
#line 350 "Gmsh.l"
return tVolume;
#line 351 "Gmsh.l"
return tWedge;
YY_BREAK
case 251:
YY_RULE_SETUP
#line 352 "Gmsh.l"
return tWedge;
return tWire;
YY_BREAK
case 252:
#line 355 "Gmsh.l"
......@@ -2832,22 +2832,22 @@ case 254:
#line 357 "Gmsh.l"
case 255:
YY_RULE_SETUP
#line 358 "Gmsh.l"
#line 357 "Gmsh.l"
{ gmsh_yylval.d = atof((char *)gmsh_yytext); return tDOUBLE; }
YY_BREAK
case 256:
YY_RULE_SETUP
#line 360 "Gmsh.l"
#line 359 "Gmsh.l"
{ gmsh_yylval.c = strsave((char*)gmsh_yytext); return tSTRING; }
YY_BREAK
case 257:
YY_RULE_SETUP
#line 362 "Gmsh.l"
#line 361 "Gmsh.l"
return gmsh_yytext[0];
YY_BREAK
case 258:
YY_RULE_SETUP
#line 364 "Gmsh.l"
#line 363 "Gmsh.l"
ECHO;
YY_BREAK
#line 2854 "Gmsh.yy.cpp"
......@@ -3847,7 +3847,7 @@ void gmsh_yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
#line 364 "Gmsh.l"
#line 363 "Gmsh.l"
......
......@@ -438,7 +438,7 @@ namespace BoundaryLayerCurver
vertices[i]->z() = newxyzLow(i, 2);
}
const int tagLine = ElementType::getTag(TYPE_LIN, orderCurve);
const int tagLine = ElementType::getType(TYPE_LIN, orderCurve);
const nodalBasis *nb = BasisFactory::getNodalBasis(tagLine);
const fullMatrix<double> &refpnts = nb->getReferenceNodes();
......@@ -528,10 +528,10 @@ namespace BoundaryLayerCurver
fullMatrix<double> Me; // leg coeff p n -> lag coeff p n
if (typeElement == TYPE_LIN) {
int tagLine = ElementType::getTag(TYPE_LIN, order);
int tagLine = ElementType::getType(TYPE_LIN, order);
const nodalBasis *fs = BasisFactory::getNodalBasis(tagLine);
const fullMatrix<double> &refNodes = fs->getReferenceNodes();
int tagLineh = ElementType::getTag(TYPE_LIN, order+1);
int tagLineh = ElementType::getType(TYPE_LIN, order+1);
// FIXME replace with BasisFactory::getNodalBasis(funcSpaceData);
const nodalBasis *fsh = BasisFactory::getNodalBasis(tagLineh);
const fullMatrix<double> &refNodesh = fsh->getReferenceNodes();
......@@ -898,7 +898,7 @@ namespace BoundaryLayerCurver
MElement* createPrimaryElement(MElement *el)
{
int tagLinear = ElementType::getTag(el->getType(), 1);
int tagLinear = ElementType::getType(el->getType(), 1);
std::vector<MVertex *> vertices;
el->getVertices(vertices);
MElementFactory f;
......@@ -962,7 +962,7 @@ namespace BoundaryLayerCurver
fullMatrix<double> Leg2Lag(szSpace, szSpace, true);
{
int tagLine = ElementType::getTag(TYPE_LIN, order);
int tagLine = ElementType::getType(TYPE_LIN, order);
const nodalBasis *fs = BasisFactory::getNodalBasis(tagLine);
const fullMatrix<double> &refNodes = fs->getReferenceNodes();
for (int i = 0; i < szSpace; ++i) {
......@@ -1313,7 +1313,7 @@ namespace BoundaryLayerCurver
SVector3 &w)
{
int nVertices = (int)bottomVertices.size();
int tagLine = ElementType::getTag(TYPE_LIN, nVertices-1);
int tagLine = ElementType::getType(TYPE_LIN, nVertices-1);
const nodalBasis *fs = BasisFactory::getNodalBasis(tagLine);
for (int i = 0; i < nVertices; ++i) {
......
......@@ -358,10 +358,10 @@ namespace BoundaryLayerCurver
_coeffb.assign(sizeParameters, 0);
_coeffc.assign(sizeParameters, 0);
int tagPrimary = ElementType::getTag(_nCorner == 4 ? TYPE_QUA : TYPE_TRI, 1);
int tagPrimary = ElementType::getType(_nCorner == 4 ? TYPE_QUA : TYPE_TRI, 1);
_primaryFs = BasisFactory::getNodalBasis(tagPrimary);
int tag = ElementType::getTag(_nCorner == 4 ? TYPE_QUA : TYPE_TRI, _order,
int tag = ElementType::getType(_nCorner == 4 ? TYPE_QUA : TYPE_TRI, _order,
incomplete);
_fs = BasisFactory::getNodalBasis(tag);
const fullMatrix<double> &refPoints = _fs->getReferenceNodes();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment