Commit 3a08b7a2 authored by Christophe Geuzaine's avatar Christophe Geuzaine

fix compile

parent 66a25e9b
......@@ -81,7 +81,7 @@ struct contextGeometryOptions {
int matchGeomAndMesh;
double matchMeshScaleFactor;
double matchMeshTolerance;
int hideCompounds, orientedPhysicals, doubleClickedEntityTag;
int hideCompounds, orientedPhysicals;
int reparamOnFaceRobust;
// geometry display
int draw, light, lightTwoSide, points, curves, surfaces, volumes;
......
This diff is collapsed.
......@@ -192,15 +192,15 @@ void GEntity::addVerticesInSet(std::set<MVertex*>&vtcs,bool closure) const
switch (dim()) {
case 3:
{
std::list<GFace*> clos = faces();
std::list<GFace*>::iterator cIter = clos.begin();
std::vector<GFace*> clos = faces();
std::vector<GFace*>::iterator cIter = clos.begin();
for (;cIter!=clos.end();++cIter) (*cIter)->addVerticesInSet(vtcs,true);
break;
}
case 2:
{
std::list<GEdge*> clos = edges();
std::list<GEdge*>::iterator cIter = clos.begin();
std::vector<GEdge*> clos = edges();
std::vector<GEdge*>::iterator cIter = clos.begin();
for (;cIter!=clos.end();++cIter) (*cIter)->addVerticesInSet(vtcs,true);
break;
}
......@@ -215,7 +215,8 @@ void GEntity::addVerticesInSet(std::set<MVertex*>&vtcs,bool closure) const
}
}
void GEntity::updateCorrespondingVertices() {
void GEntity::updateCorrespondingVertices()
{
if (_meshMaster != this && affineTransform.size() == 16) {
......@@ -262,8 +263,8 @@ void GEntity::updateCorrespondingVertices() {
}
}
void GEntity::copyMasterCoordinates() {
void GEntity::copyMasterCoordinates()
{
if (_meshMaster != this && affineTransform.size() == 16) {
......@@ -308,5 +309,5 @@ void GEntity::copyMasterCoordinates() {
}
}
>>>>>>> origin/cgnsUnstructured
}
......@@ -465,7 +465,7 @@ void createTopologyFromMesh2D(GModel *gm, int &num)
int order = parent->getPolynomialOrder();
bool serendipity = parent->getIsOnlySerendipity();
int tag = ElementType::getTag(type,order,serendipity);
int tag = ElementType::getType(type,order,serendipity);
MLine* edge = dynamic_cast<MLine*> (eltFactory.create(tag,vtcs));
......@@ -504,7 +504,7 @@ void createTopologyFromMesh2D(GModel *gm, int &num)
GFace* gf = gfToge->first;
std::set<GEdge*>& gEdgeSet = gfToge->second;
std::list<GEdge*> gEdges;
std::vector<GEdge*> gEdges;
gEdges.insert(gEdges.begin(),gEdgeSet.begin(),gEdgeSet.end());
gf->set(gEdges);
......@@ -665,7 +665,7 @@ void createTopologyFromMesh3D(GModel *gm, int &num)
int type = tf.getType();
int order = parent->getPolynomialOrder();
bool serendipity = parent->getIsOnlySerendipity();
int tag = ElementType::getTag(type,order,serendipity);
int tag = ElementType::getType(type,order,serendipity);
MElement* face = eltFactory.create(tag,vtcs);
......@@ -681,10 +681,10 @@ void createTopologyFromMesh3D(GModel *gm, int &num)
GRegionToGFacesMap::iterator itTo = gRegionToGFaces.begin();
for (;itTo !=gRegionToGFaces.end();++itTo) {
GRegion* gr = itTo->first;
std::list<GFace*> faces;
std::vector<GFace*> faces;
faces.insert (faces.begin(), itTo->second.begin(), itTo->second.end());
gr->set(faces);
for (std::list<GFace*>::iterator it3 = faces.begin() ; it3 != faces.end() ; ++it3)
for (std::vector<GFace*>::iterator it3 = faces.begin() ; it3 != faces.end() ; ++it3)
(*it3)->addRegion(itTo->first);
}
}
......
......@@ -904,8 +904,8 @@ public: // transformation operations
// --- definition of a set for storing periodic connections --------------------
struct CGNSStruPeriodicLess {
class CGNSStruPeriodicLess {
public:
bool operator() (const CGNSStruPeriodic& f,const CGNSStruPeriodic& d) {
int s = f.srcName.compare(d.srcName);
if (s != 0) return (s < 0);
......@@ -1096,8 +1096,8 @@ bool matchGEntities(GModel* model,int dim) {
// -----------------------------------------------------------------------------
struct CGNSUnstPeriodicLess {
class CGNSUnstPeriodicLess {
public:
bool operator() (const CGNSUnstPeriodic& f,const CGNSUnstPeriodic& d) {
if (f.nbPoints() == d.nbPoints()) {
......@@ -1300,6 +1300,7 @@ bool readCGNSPeriodicConnections(int fileIndex,
if (connType != Abutting1to1) {
Msg::Error("Non-conformal connection not supported");
return false;
}
cgsize_t* tgtPts = new cgsize_t[tgtSize];
......@@ -1654,7 +1655,7 @@ int GModel::readCGNSUnstructured(const std::string& fileName)
int eltType = tagFromCGNSType(myType);
int eltSize = ElementType::NbNodesFromTag(eltType);
int eltSize = ElementType::getNumVertices(eltType);
int* renum = NULL;
......@@ -1800,7 +1801,7 @@ int GModel::readCGNSStructured(const std::string &name)
Msg::Debug("Reading zone to compute MG level %i.", index_zone);
CG_ZoneType_t zoneType;
ZoneType_t zoneType;
cg_zone_type(index_file, index_base, index_zone, &zoneType);
if ( zoneType == Unstructured ) {
Msg::Info("Unstructured zone detected");
......@@ -1893,9 +1894,9 @@ int GModel::readCGNSStructured(const std::string &name)
int offset = vnum;
CG_ZoneType_t zoneType;
ZoneType_t zoneType;
cg_zone_type(index_file, index_base, index_zone, &zoneType);
if ( zoneType == CG_Unstructured ) {
if ( zoneType == Unstructured ) {
Msg::Debug("Unstructured zone detected, skipping.");
continue;
}
......@@ -1930,7 +1931,7 @@ int GModel::readCGNSStructured(const std::string &name)
int nCoords;
cg_ncoords(index_file, index_base, index_zone, &nCoords);
CG_DataType_t dataType;
DataType_t dataType;
char coordName[35];
void* coord;
double nodes[nnodesZone][nCoords];
......@@ -1946,7 +1947,7 @@ int GModel::readCGNSStructured(const std::string &name)
Msg::Debug("Reading coordinate %i : %s.", iCoord+1, coordName);
switch(dataType) {
case CG_RealSingle:
case RealSingle:
Msg::Debug(" [Type is float]");
coord = new float[nnodesZone];
if ( cg_coord_read(index_file, index_base, index_zone,
......@@ -1960,7 +1961,7 @@ int GModel::readCGNSStructured(const std::string &name)
}
delete [] (float*)coord;
break;
case CG_RealDouble:
case RealDouble:
Msg::Debug(" [Type is double]");
coord = new double[nnodesZone];
if ( cg_coord_read(index_file, index_base, index_zone,
......
......@@ -239,7 +239,7 @@ GeomMeshMatcher:: matchFaces(GModel* m1, GModel* m2,
GFace* f1 = (GFace*) *fit;
std::vector<std::list<GFace*> > lists;
std::vector<std::vector<GFace*> > lists;
std::vector<GEdge*> boundary_edges = f1->edges();
......@@ -334,11 +334,11 @@ GeomMeshMatcher::matchRegions(GModel* m1, GModel* m2,
num_total_regions++;
//std::vector<list<GRegion*> > lists;
std::list<GFace*> boundary_faces = ((GFace*)(*entity1))->faces();
std::list<GFace*> coresp_bound_faces;
std::vector<GFace*> boundary_faces = ((GFace*)(*entity1))->faces();
std::vector<GFace*> coresp_bound_faces;
std::vector<GRegion*> common_regions;
for (std::list<GFace*>::iterator boundary_face = boundary_faces.begin();
for (std::vector<GFace*>::iterator boundary_face = boundary_faces.begin();
boundary_face != boundary_faces.end(); boundary_face++) {
coresp_bound_faces.push_back(findMatching<GFace*>(*coresp_f,*boundary_face));
}
......@@ -347,7 +347,7 @@ GeomMeshMatcher::matchRegions(GModel* m1, GModel* m2,
entity2++)
{
if((*entity2)->dim() != 3) continue;
std::vector<std::list<GFace*> > lists;
std::vector<std::vector<GFace*> > lists;
lists.push_back(coresp_bound_faces);
lists.push_back(((GRegion*)*entity2)->faces());
std::vector<GFace*> common_faces;
......@@ -369,7 +369,7 @@ GeomMeshMatcher::matchRegions(GModel* m1, GModel* m2,
/*
This is made in a backward fashion compared to the other entities...
*/
std::list<GEdge*> boundaries = ((GRegion*) *entity1)->edges();
std::vector<GEdge*> boundaries = ((GRegion*) *entity1)->edges();
// Then, compute the minimal bounding box
SOrientedBoundingBox geo_obb = ((GRegion*) *entity1)->getOBB();
......
......@@ -298,7 +298,7 @@ void updateBoVec<2, MEdge>
{
// Get the edge entities that are connected to the vertex
std::list<GEdge*> gEdgeList = ent->edges();
std::vector<GEdge*> gEdgeList = ent->edges();
// Find edge entities that are connected to elements in the zone
std::vector<std::pair<GEdge*, int> > useGEdge;
const int nFace = faces.size();
......@@ -531,9 +531,9 @@ void updateBoVec<3, MFace>
switch(ent->dim()) {
case 0:
{
std::list<GEdge*> gEdgeList = ent->edges();
std::vector<GEdge*> gEdgeList = ent->edges();
std::list<GFace*> gFaceList;
for(std::list<GEdge*>::const_iterator gEIt = gEdgeList.begin();
for(std::vector<GEdge*>::const_iterator gEIt = gEdgeList.begin();
gEIt != gEdgeList.end(); ++gEIt) {
std::vector<GFace*> alist = (*gEIt)->faces();
gFaceList.insert(gFaceList.end(), alist.begin(), alist.end());
......@@ -555,7 +555,7 @@ void updateBoVec<3, MFace>
//--zone
std::list<const GFace*> useGFace;
std::list<GEdge*> gEdgeList;
std::vector<GEdge*> gEdgeList;
const int nFace = faces.size();
for(int iFace = 0; iFace != nFace; ++iFace) {
if(zoneIndex == faces[iFace].zoneIndex) {
......
......@@ -70,18 +70,11 @@ class SVector3 {
P[0] = a[0]; P[1] = a[1]; P[2] = a[2];
return *this;
}
SVector3 & operator = (double v)
{
P[0] = v; P[1] = v; P[2] = v;
return *this;
}
SVector3 & operator = (const SVector3& a)
{
P[0] = a[0]; P[1] = a[1]; P[2] = a[2];
return *this;
}
operator double *() { return P; }
void print(std::string name="") const
{
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
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