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

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);
};
}
}
......
......@@ -47,12 +47,12 @@
#include <LibUtilities/BasicUtils/NekFactory.hpp>
#include <NekMeshUtils/MeshElements/Mesh.h>
using namespace Nektar::NekMeshUtils;
namespace Nektar
{
namespace Utilities
{
using namespace Nektar::NekMeshUtils;
/**
* Denotes different types of mesh converter modules: so far only
* input, output and process modules are defined.
......@@ -71,7 +71,7 @@ namespace Nektar
"Output"
};
typedef map<int, pair<FaceSharedPtr, vector<int> > > PerMap;
typedef std::map<int, std::pair<FaceSharedPtr, std::vector<int> > > PerMap;
/**
* @brief Represents a command-line configuration option.
......@@ -85,7 +85,7 @@ namespace Nektar
* @param defValue Default value of the option.
* @param desc Description of the option.
*/
ConfigOption(bool isBool, string defValue, string desc) :
ConfigOption(bool isBool, std::string defValue, std::string desc) :
isBool(isBool), beenSet(false), value(), defValue(defValue),
desc(desc) {}
ConfigOption() :
......@@ -137,11 +137,11 @@ namespace Nektar
/// line. If false, the default value will be put into #value.
bool beenSet;
/// The value of the configuration option.
string value;
std::string value;
/// Default value of the configuration option.
string defValue;
std::string defValue;
/// Description of the configuration option.
string desc;
std::string desc;
};
......@@ -156,7 +156,7 @@ namespace Nektar
Module(MeshSharedPtr p_m) : m_mesh(p_m) {}
virtual void Process() = 0;
void RegisterConfig(string key, string value);
void RegisterConfig(std::string key, std::string value);
void PrintConfig();
void SetDefaults();
MeshSharedPtr GetMesh()
......@@ -181,15 +181,15 @@ namespace Nektar
/// Mesh object
MeshSharedPtr m_mesh;
/// List of configuration values.
map<string, ConfigOption> m_config;
std::map<std::string, ConfigOption> m_config;
void ReorderPrisms(PerMap &perFaces);
void PrismLines (int prism,
PerMap &perFaces,
set<int> &prismsDone,
vector<ElementSharedPtr> &line);
void ReorderPrisms(PerMap &perFaces);
void PrismLines (int prism,
PerMap &perFaces,
std::set<int> &prismsDone,
std::vector<ElementSharedPtr> &line);
};
/**
......
......@@ -67,8 +67,8 @@ public:
private:
void FindContiguousSurface(ElementSharedPtr start,
set<int> &doneIds,
vector<ElementSharedPtr> &block);
std::set<int> &doneIds,
std::vector<ElementSharedPtr> &block);
};
}
}
......
......@@ -62,15 +62,15 @@ public:
virtual void Process();
protected:
void GenerateNormals(vector<ElementSharedPtr> &el,
void GenerateNormals(std::vector<ElementSharedPtr> &el,
MeshSharedPtr &mesh);
double CrossProdMag (Node &a, Node &b);
void UnitCrossProd (Node &a, Node &b, Node &c);
double Blend (double r);
void SuperBlend (vector<double> &r,
vector<Node> &Q,
void SuperBlend (std::vector<double> &r,
std::vector<Node> &Q,
Node &P,
vector<double> &blend);
std::vector<double> &blend);
};
}
......
......@@ -8,6 +8,8 @@
#include <MultiRegions/ExpList2DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous1D.h>
#include <MultiRegions/ExpList3DHomogeneous2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -42,6 +42,7 @@
#include <MultiRegions/ExpList3D.h>
#include <MultiRegions/ExpList3DHomogeneous1D.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;
int main(int argc, char *argv[])
......
......@@ -43,6 +43,7 @@
#include <MultiRegions/ExpList3D.h>
#include <MultiRegions/ExpList3DHomogeneous1D.h>
using namespace std;
using namespace Nektar;
Array<OneD, NekDouble> GetQ(
......
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