Skip to content
Snippets Groups Projects
Commit 4536124f authored by Michael Turner's avatar Michael Turner Committed by Dave Moxey
Browse files

add std after namespace clearup

(cherry picked from commit 07f53196)
parent 3ded9cd2
No related branches found
No related tags found
No related merge requests found
...@@ -64,46 +64,46 @@ public: ...@@ -64,46 +64,46 @@ public:
void ReadZone(int &nComposite); void ReadZone(int &nComposite);
protected: protected:
void GenElement3D(vector<NodeSharedPtr> &Nodes, void GenElement3D(std::vector<NodeSharedPtr> &Nodes,
int i, int i,
vector<int> &ElementFaces, std::vector<int> &ElementFaces,
map<int, vector<int> > &FaceNodes, std::map<int, std::vector<int> > &FaceNodes,
int ncomposite, int ncomposite,
bool DoOrient); bool DoOrient);
void GenElement2D(vector<NodeSharedPtr> &Nodes, void GenElement2D(std::vector<NodeSharedPtr> &Nodes,
int i, int i,
vector<int> &FaceNodes, std::vector<int> &FaceNodes,
int ncomposite); int ncomposite);
Array<OneD, int> SortEdgeNodes(vector<NodeSharedPtr> &Nodes, Array<OneD, int> SortEdgeNodes(std::vector<NodeSharedPtr> &Nodes,
vector<int> &FaceNodes); std::vector<int> &FaceNodes);
Array<OneD, int> SortFaceNodes(vector<NodeSharedPtr> &Nodes, Array<OneD, int> SortFaceNodes(std::vector<NodeSharedPtr> &Nodes,
vector<int> &ElementFaces, std::vector<int> &ElementFaces,
map<int, vector<int> > &FaceNodes); std::map<int, std::vector<int> > &FaceNodes);
void ResetNodes(vector<NodeSharedPtr> &Nodes, void ResetNodes(std::vector<NodeSharedPtr> &Nodes,
Array<OneD, vector<int> > &ElementFaces, Array<OneD, std::vector<int> > &ElementFaces,
map<int, vector<int> > &FaceNodes); std::map<int, std::vector<int> > &FaceNodes);
private: private:
CCMIOError m_ccmErr; // Star CCM error flag CCMIOError m_ccmErr; // Star CCM error flag
CCMIOID m_ccmTopology; // Star CCM mesh topology CCMIOID m_ccmTopology; // Star CCM mesh topology
CCMIOID m_ccmProcessor; CCMIOID m_ccmProcessor;
map<int, string> m_faceLabels; // label from CCM into composite std::map<int, std::string> m_faceLabels; // label from CCM into composite
void InitCCM(void); void InitCCM(void);
void ReadNodes(std::vector<NodeSharedPtr> &Nodes); void ReadNodes(std::vector<NodeSharedPtr> &Nodes);
void ReadInternalFaces(map<int, vector<int> > &FacesNodes, void ReadInternalFaces(std::map<int, std::vector<int> > &FacesNodes,
Array<OneD, vector<int> > &ElementFaces); Array<OneD, std::vector<int> > &ElementFaces);
void ReadBoundaryFaces(vector<vector<int> > &BndElementFaces, void ReadBoundaryFaces(std::vector<std::vector<int> > &BndElementFaces,
map<int, vector<int> > &FacesNodes, std::map<int, std::vector<int> > &FacesNodes,
Array<OneD, vector<int> > &ElementFaces, Array<OneD, std::vector<int> > &ElementFaces,
vector<string> &facelabels); std::vector<std::string> &facelabels);
void SetupElements(void); void SetupElements(void);
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment