diff --git a/utilities/NekMesh/InputModules/InputStar.h b/utilities/NekMesh/InputModules/InputStar.h index b2fdd128d157db4ba58d6878800365f6e065ae27..4edcbbc52df7e1f439b881a324f13e89b41274c0 100644 --- a/utilities/NekMesh/InputModules/InputStar.h +++ b/utilities/NekMesh/InputModules/InputStar.h @@ -64,46 +64,46 @@ public: void ReadZone(int &nComposite); protected: - void GenElement3D(vector<NodeSharedPtr> &Nodes, + void GenElement3D(std::vector<NodeSharedPtr> &Nodes, int i, - vector<int> &ElementFaces, - map<int, vector<int> > &FaceNodes, + std::vector<int> &ElementFaces, + std::map<int, std::vector<int> > &FaceNodes, int ncomposite, bool DoOrient); - void GenElement2D(vector<NodeSharedPtr> &Nodes, + void GenElement2D(std::vector<NodeSharedPtr> &Nodes, int i, - vector<int> &FaceNodes, + std::vector<int> &FaceNodes, int ncomposite); - Array<OneD, int> SortEdgeNodes(vector<NodeSharedPtr> &Nodes, - vector<int> &FaceNodes); + Array<OneD, int> SortEdgeNodes(std::vector<NodeSharedPtr> &Nodes, + std::vector<int> &FaceNodes); - Array<OneD, int> SortFaceNodes(vector<NodeSharedPtr> &Nodes, - vector<int> &ElementFaces, - map<int, vector<int> > &FaceNodes); + Array<OneD, int> SortFaceNodes(std::vector<NodeSharedPtr> &Nodes, + std::vector<int> &ElementFaces, + std::map<int, std::vector<int> > &FaceNodes); - void ResetNodes(vector<NodeSharedPtr> &Nodes, - Array<OneD, vector<int> > &ElementFaces, - map<int, vector<int> > &FaceNodes); + void ResetNodes(std::vector<NodeSharedPtr> &Nodes, + Array<OneD, std::vector<int> > &ElementFaces, + std::map<int, std::vector<int> > &FaceNodes); private: CCMIOError m_ccmErr; // Star CCM error flag CCMIOID m_ccmTopology; // Star CCM mesh topology 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 ReadNodes(std::vector<NodeSharedPtr> &Nodes); - void ReadInternalFaces(map<int, vector<int> > &FacesNodes, - Array<OneD, vector<int> > &ElementFaces); + void ReadInternalFaces(std::map<int, std::vector<int> > &FacesNodes, + Array<OneD, std::vector<int> > &ElementFaces); - void ReadBoundaryFaces(vector<vector<int> > &BndElementFaces, - map<int, vector<int> > &FacesNodes, - Array<OneD, vector<int> > &ElementFaces, - vector<string> &facelabels); + void ReadBoundaryFaces(std::vector<std::vector<int> > &BndElementFaces, + std::map<int, std::vector<int> > &FacesNodes, + Array<OneD, std::vector<int> > &ElementFaces, + std::vector<std::string> &facelabels); void SetupElements(void); };