Commit 85934d6a authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Finished updating utilities.

parent ef56bb52
......@@ -9,6 +9,7 @@
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -15,6 +15,7 @@
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -14,6 +14,7 @@
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -14,6 +14,7 @@
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -3,6 +3,7 @@
#include <MultiRegions/ExpList.h>
using namespace std;
using namespace Nektar;
bool CheckTetRotation(Array<OneD, NekDouble> &xc, Array<OneD, NekDouble> &yc,
......
......@@ -4,6 +4,7 @@
#include <LibUtilities/BasicUtils/ErrorUtil.hpp> // for ASSERTL0
#include <SpatialDomains/MeshGraph.h> // for FieldDefinitions, etc
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -9,6 +9,7 @@
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -9,6 +9,7 @@
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -8,7 +8,7 @@
#include <MultiRegions/ContField3DHomogeneous1D.h>
#include <MultiRegions/ContField3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -4,6 +4,7 @@
#include <StdRegions/StdTriExp.h>
#include <SpatialDomains/MeshGraph.h> // for FieldDefinitions, etc
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -25,8 +25,7 @@
#include <MultiRegions/ContField3DHomogeneous1D.h>
#include <MultiRegions/ContField3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -16,6 +16,7 @@ namespace po = boost::program_options;
#include <MultiRegions/ExpList2D.h>
#include <LocalRegions/Expansion2D.h>
using namespace std;
using namespace Nektar;
/**
......
......@@ -4,6 +4,7 @@
#include <LibUtilities/BasicUtils/ErrorUtil.hpp> // for ASSERTL0
#include <SpatialDomains/MeshGraph.h> // for FieldDefinitions, etc
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -10,6 +10,7 @@
#include <MultiRegions/ContField3D.h>
#include <MultiRegions/ContField2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -8,6 +8,7 @@
#include <MultiRegions/ContField3D.h>
#include <MultiRegions/ContField2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -8,6 +8,7 @@
#include <MultiRegions/ContField3D.h>
#include <MultiRegions/ContField2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -10,6 +10,7 @@
#include <MultiRegions/ContField3D.h>
#include <MultiRegions/ContField2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -69,12 +69,12 @@ public:
private:
int GetNnodes(unsigned int InputGmshEntity);
vector<int> CreateReordering(unsigned int InputGmshEntity);
vector<int> TriReordering(ElmtConfig conf);
vector<int> QuadReordering(ElmtConfig conf);
vector<int> HexReordering(ElmtConfig conf);
vector<int> PrismReordering(ElmtConfig conf);
vector<int> TetReordering(ElmtConfig conf);
std::vector<int> CreateReordering(unsigned int InputGmshEntity);
std::vector<int> TriReordering(ElmtConfig conf);
std::vector<int> QuadReordering(ElmtConfig conf);
std::vector<int> HexReordering(ElmtConfig conf);
std::vector<int> PrismReordering(ElmtConfig conf);
std::vector<int> TetReordering(ElmtConfig conf);
};
}
}
......
......@@ -79,12 +79,12 @@ private:
/**
* Maps a curve tag to a filename containing surface information.
*/
std::map<string, pair<NekCurve, string> > curveTags;
std::map<std::string, std::pair<NekCurve, std::string> > curveTags;
/**
* Maps a curve tag to the high-order surface data for that tag.
*/
std::map<string, HOSurfSet> hoData;
std::map<std::string, HOSurfSet> hoData;
/**
* Maps ordering of hsf standard element to Nektar++ ordering.
......
......@@ -62,30 +62,30 @@ public:
void ReadZone(int &nComposite);
protected:
void GenElement3D(vector<NodeSharedPtr> &Nodes,
void GenElement3D(std::vector<NodeSharedPtr> &Nodes,
int i,
vector<int> &ElementFaces,
vector<vector<int> > &FaceNodes,
std::vector<int> &ElementFaces,
std::vector<std::vector<int> > &FaceNodes,
int ncomposite,
bool DoOrient);
void GenElement2D(vector<NodeSharedPtr> &Nodes,
void GenElement2D(std::vector<NodeSharedPtr> &Nodes,
int i,
vector<int> &ElementFaces,
vector<vector<int> > &FaceNodes,
std::vector<int> &ElementFaces,
std::vector<std::vector<int> > &FaceNodes,
int ncomposite);
Array<OneD, int> SortEdgeNodes(vector<NodeSharedPtr> &Nodes,
vector<int> &ElementFaces,
vector<vector<int> > &FaceNodes);
Array<OneD, int> SortEdgeNodes(std::vector<NodeSharedPtr> &Nodes,
std::vector<int> &ElementFaces,
std::vector<std::vector<int> > &FaceNodes);
Array<OneD, int> SortFaceNodes(vector<NodeSharedPtr> &Nodes,
vector<int> &ElementFaces,
vector<vector<int> > &FaceNodes);
Array<OneD, int> SortFaceNodes(std::vector<NodeSharedPtr> &Nodes,
std::vector<int> &ElementFaces,
std::vector<std::vector<int> > &FaceNodes);
void ResetNodes(vector<NodeSharedPtr> &Nodes,
Array<OneD, vector<int> > &ElementFaces,
vector<vector<int> > &FaceNodes);
void ResetNodes(std::vector<NodeSharedPtr> &Nodes,
Array<OneD, std::vector<int> > &ElementFaces,
std::vector<std::vector<int> > &FaceNodes);
};
}
}
......
Supports Markdown
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