Commit 7a8921bd authored by Spencer Sherwin's avatar Spencer Sherwin

Updates from Dave's comments, compiling but still need to fix some tests (or...

Updates from Dave's comments, compiling but still need to fix some tests (or see if they need tweaking)
parent 0f2d0efa
......@@ -53,7 +53,7 @@ MultiRegions::ExpListSharedPtr SetupExpList(
SpatialDomains::MeshGraphSharedPtr graph,
Collections::ImplementationType impType)
{
graph->SetExpansionInfosToPolyOrder(N);
graph->SetExpansionInfoToNumModes(N);
MultiRegions::ExpListSharedPtr expList =
MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(session, graph);
......
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
flags.set(eUseGlobal, false);
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
flags.set(eUseGlobal, false);
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
flags.set(eUseGlobal, false);
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -37,7 +37,8 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
const SpatialDomains::ExpansionInfoMap &expansions = graph3D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph3D->
GetExpansionInfo();
LibUtilities::BasisKey bkey
= expansions.begin()->second->m_basisKeyVector[0];
cout << "Solving 3D C0 continuous Projection (with boundary conditions)" << endl;
......
......@@ -32,8 +32,8 @@ int main(int argc, char *argv[])
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
int nmodes = bkey0.GetNumModes();
Exp = MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr
(vSession,graph1D);
Exp = MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(vSession,
graph1D);
//----------------------------------------------
// Define solution to be projected
......
......@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
factors[StdRegions::eFactorTau] = 1.0;
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
factors[StdRegions::eFactorTau] = 1.0;
const SpatialDomains::ExpansionInfoMap &expansions = graph3D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph3D->GetExpansionInfo();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
factors[StdRegions::eFactorTau] = 1.0;
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
cout << "Solving 3D Helmholtz (Homogeneous in z-direction):" << endl;
......
......@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
if (vComm->GetRank() ==0)
......
......@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
if (vSession->GetComm()->GetRank() == 0)
......
......@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
factors[StdRegions::eFactorLambda] =
vSession->GetParameter("Lambda");
const SpatialDomains::ExpansionInfoMap &expansions =
graph3D->GetExpansionInfos();
graph3D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 =
expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
factors[StdRegions::eFactorTau] = 1.0;
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
factors[StdRegions::eFactorLambda] = vSession->GetParameter("Lambda");
factors[StdRegions::eFactorTau] = 1.0;
const SpatialDomains::ExpansionInfoMap &expansions = graph3D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph3D->GetExpansionInfo();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
lambda = vSession->GetParameter("Lambda");
cout << " Lambda : " << lambda << endl;
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
LibUtilities::BasisKey bkey1
......
......@@ -310,8 +310,7 @@ struct Field
// Choose points to be at evenly spaced points at
// nplanes points
const LibUtilities::PointsKey Pkey(
nplanes, ptype);
const LibUtilities::PointsKey Pkey(nplanes, ptype);
const LibUtilities::BasisKey Bkey(btype, nplanes, Pkey);
......
......@@ -310,7 +310,7 @@ void OutputFileBase::ConvertExpToEquispaced(po::variables_map &vm)
{
nPointsNew = vm["output-points"].as<int>();
}
m_f->m_graph->SetExpansionInfosToEvenlySpacedPoints(nPointsNew);
m_f->m_graph->SetExpansionInfoToEvenlySpacedPoints(nPointsNew);
// Save original expansion
vector<MultiRegions::ExpListSharedPtr> expOld = m_f->m_exp;
......
......@@ -91,7 +91,7 @@ void ProcessAddFld::Process(po::variables_map &vm)
if (m_f->m_graph)
{
const SpatialDomains::ExpansionInfoMap &expansions =
m_f->m_graph->GetExpansionInfos();
m_f->m_graph->GetExpansionInfo();
// if Range has been speficied it is possible to have a
// partition which is empty so check this and return if
......
......@@ -87,7 +87,7 @@ void ProcessCreateExp::Process(po::variables_map &vm)
m_f->m_numHomogeneousDir = m_f->m_fielddef[0]->m_numHomogeneousDir;
// Set up Expansion information to use mode order from field
m_f->m_graph->SetExpansionInfos(m_f->m_fielddef);
m_f->m_graph->SetExpansionInfo(m_f->m_fielddef);
}
else
{
......@@ -141,7 +141,7 @@ void ProcessCreateExp::Process(po::variables_map &vm)
if (vm.count("output-points"))
{
int nPointsNew = vm["output-points"].as<int>();
m_f->m_graph->SetExpansionInfosToPointOrder(nPointsNew);
m_f->m_graph->SetExpansionInfoToNumModes(nPointsNew);
}
if (m_f->m_verbose)
......
......@@ -145,7 +145,7 @@ void ProcessInterpField::Process(po::variables_map &vm)
// Read in local from field partitions
const SpatialDomains::ExpansionInfoMap &expansions =
fromField->m_graph->GetExpansionInfos();
fromField->m_graph->GetExpansionInfo();
// check for case where no elements are specified on this
// parallel partition
......@@ -171,7 +171,7 @@ void ProcessInterpField::Process(po::variables_map &vm)
//----------------------------------------------
// Set up Expansion information to use mode order from field
fromField->m_graph->SetExpansionInfos(fromField->m_fielddef);
fromField->m_graph->SetExpansionInfo(fromField->m_fielddef);
int nfields = fromField->m_fielddef[0]->m_fields.size();
......
......@@ -169,7 +169,7 @@ void ProcessInterpPoints::Process(po::variables_map &vm)
// Read in local from field partitions
const SpatialDomains::ExpansionInfoMap &expansions =
fromField->m_graph->GetExpansionInfos();
fromField->m_graph->GetExpansionInfo();
Array<OneD, int> ElementGIDs(expansions.size());
int i = 0;
......@@ -189,7 +189,7 @@ void ProcessInterpPoints::Process(po::variables_map &vm)
//----------------------------------------------
// Set up Expansion information to use mode order from field
fromField->m_graph->SetExpansionInfos(fromField->m_fielddef);
fromField->m_graph->SetExpansionInfo(fromField->m_fielddef);
int nfields = fromField->m_fielddef[0]->m_fields.size();
fromField->m_exp.resize(nfields);
fromField->m_exp[0] = fromField->SetUpFirstExpList(NumHomogeneousDir, true);
......
......@@ -148,7 +148,7 @@ void ProcessMultiShear::Process(po::variables_map &vm)
}
// Set up Expansion information to use mode order from field
fromField[i]->m_graph->SetExpansionInfos(fromField[i]->m_fielddef);
fromField[i]->m_graph->SetExpansionInfo(fromField[i]->m_fielddef);
// Set up expansions, and extract data.
fromField[i]->m_exp.resize(nfields);
......
......@@ -45,7 +45,7 @@ namespace Nektar
namespace LocalRegions
{
Expansion::Expansion(SpatialDomains::GeometrySharedPtr pGeom) :
m_IndexMapManager
m_indexMapManager
(std::bind(&Expansion::CreateIndexMap,this, std::placeholders::_1),
std::string("ExpansionIndexMap")),
m_geom(pGeom),
......@@ -77,7 +77,7 @@ namespace Nektar
Expansion::Expansion(const Expansion &pSrc) :
StdExpansion(pSrc),
m_IndexMapManager(pSrc.m_IndexMapManager),
m_indexMapManager(pSrc.m_indexMapManager),
m_geom(pSrc.m_geom),
m_metricinfo(pSrc.m_metricinfo)
{
......@@ -198,39 +198,39 @@ namespace Nektar
switch(itype)
{
case eEdgeToElement:
case eEdgeToElement:
{
GetTraceToElementMap(entity,map,sign,orient);
}
break;
case eFaceToElement:
case eFaceToElement:
{
GetTraceToElementMap(entity,map,sign,orient);
}
break;
case eEdgeInterior:
case eEdgeInterior:
{
ASSERTL0(false,"Boundary Index Map not implemented yet.");
//v_GetEdgeInteriorMap(entity,orient,map,sign);
}
break;
case eFaceInterior:
case eFaceInterior:
{
ASSERTL0(false,"Boundary Index Map not implemented yet.");
//v_GetFaceInteriorMap(entity,orient,map,sign);
}
break;
case eBoundary:
case eBoundary:
{
ASSERTL0(false,"Boundary Index Map not implemented yet.");
}
break;
case eVertex:
case eVertex:
{
ASSERTL0(false,"Vertex Index Map not implemented yet.");
}
break;
default:
default:
{
ASSERTL0(false,"The Index Map you are requiring "
"is not between the possible options.");
......@@ -681,8 +681,8 @@ namespace Nektar
"Method does not exist for this shape or library" );
}
void Expansion::v_ReOrientTracePhysMap
(const StdRegions::Orientation orient,
void Expansion::v_ReOrientTracePhysMap(
const StdRegions::Orientation orient,
Array<OneD, int> &idmap,
const int nq0, const int nq1)
{
......
This diff is collapsed.
......@@ -100,8 +100,8 @@ namespace Nektar
const Array<OneD, Array<OneD, NekDouble> > &vec);
virtual const NormalVector &v_GetTraceNormal(const int edge) const;
virtual void v_ReOrientTracePhysMap
(const StdRegions::Orientation orient,
virtual void v_ReOrientTracePhysMap(
const StdRegions::Orientation orient,
Array<OneD, int> &idmap,
const int nq0, const int nq1);
......
......@@ -61,8 +61,10 @@ namespace Nektar
LOCAL_REGIONS_EXPORT Expansion3D(SpatialDomains::Geometry3DSharedPtr pGeom): Expansion(pGeom), StdExpansion3D(), m_requireNeg() {}
LOCAL_REGIONS_EXPORT virtual ~Expansion3D() {}
LOCAL_REGIONS_EXPORT void SetTraceToGeomOrientation(Array<OneD, NekDouble> &inout);
LOCAL_REGIONS_EXPORT void SetFaceToGeomOrientation(const int face, Array<OneD, NekDouble> &inout);
LOCAL_REGIONS_EXPORT void SetTraceToGeomOrientation
(Array<OneD, NekDouble> &inout);
LOCAL_REGIONS_EXPORT void SetFaceToGeomOrientation
(const int face, Array<OneD, NekDouble> &inout);
inline void AddHDGHelmholtzFaceTerms(
const NekDouble tau,
const int edge,
......@@ -93,23 +95,24 @@ namespace Nektar
inline SpatialDomains::Geometry3DSharedPtr GetGeom3D() const;
LOCAL_REGIONS_EXPORT void v_ReOrientTracePhysMap
(const StdRegions::Orientation orient,
LOCAL_REGIONS_EXPORT void v_ReOrientTracePhysMap(
const StdRegions::Orientation orient,
Array<OneD, int> &idmap,
const int nq0,
const int nq1);
void v_NormVectorIProductWRTBase(
const Array<OneD, const Array<OneD, NekDouble> > &Fvec,
Array<OneD, NekDouble> &outarray);
const Array<OneD, const Array<OneD, NekDouble> > &Fvec,
Array<OneD, NekDouble> &outarray);
LOCAL_REGIONS_EXPORT Array<OneD, unsigned int>
GetEdgeInverseBoundaryMap(int eid);
GetEdgeInverseBoundaryMap(int eid);
LOCAL_REGIONS_EXPORT Array<OneD, unsigned int>
GetTraceInverseBoundaryMap(int fid,
StdRegions::Orientation faceOrient = StdRegions::eNoOrientation,
int P1=-1, int P2=-1);
GetTraceInverseBoundaryMap(int fid,
StdRegions::Orientation
faceOrient = StdRegions::eNoOrientation,
int P1=-1, int P2=-1);
LOCAL_REGIONS_EXPORT void GetInverseBoundaryMaps(
Array<OneD, unsigned int> &vmap,
......
......@@ -801,14 +801,7 @@ cout<<"deps/dx ="<<inarray_d0[i]<<" deps/dy="<<inarray_d1[i]<<endl;
map = Array<OneD, int>(1);
if(vertex == 0)
{
map[0] = 0;
}
else
{
map[0] = nquad - 1;
}
map[0] = vertex == 0 ? 0: nquad - 1;
}
//-----------------------------
......
......@@ -11,7 +11,6 @@ DisContField.cpp
DisContField3DHomogeneous1D.cpp
DisContField3DHomogeneous2D.cpp
ExpList.cpp
ExpListConstructors.cpp
ExpListHomogeneous1D.cpp
ExpListHomogeneous2D.cpp
ExpList2DHomogeneous1D.cpp
......
This diff is collapsed.
......@@ -72,7 +72,7 @@ namespace Nektar
ExpListHomogeneous1D(e3DH1D, pSession,HomoBasis,
lhom,useFFT,dealiasing)
{
GenExpList3DHomogeneous1D(graph2D->GetExpansionInfos(var),ImpType);
GenExpList3DHomogeneous1D(graph2D->GetExpansionInfo(var),ImpType);
m_expType = e3DH1D;
m_graph = graph2D;
}
......
This diff is collapsed.
......@@ -349,7 +349,7 @@ void DriverAdaptive::v_Execute(ostream &out)
// Write new expansion section to the session reader and re-read graph.
ReplaceExpansion(fields, deltaP);
m_graph->ReadExpansionInfos();
m_graph->ReadExpansionInfo();
// Reset GlobalLinSys Manager to avoid using too much memory
//
......
......@@ -433,9 +433,9 @@ namespace Nektar
m_fields[0] = firstfield;
for (i = 1; i < m_fields.size(); i++)
{
if (m_graph->
SameExpansionInfos(m_session->GetVariable(0),
m_session->GetVariable(i)))
if (m_graph->SameExpansionInfo(
m_session->GetVariable(0),
m_session->GetVariable(i)))
{
m_fields[i] = MemoryManager<MultiRegions::
ContField>::AllocateSharedPtr(
......@@ -490,7 +490,7 @@ namespace Nektar
m_fields[0] = firstfield;
for (i = 1; i < m_fields.size(); i++)
{
if(m_graph->SameExpansionInfos(m_session->GetVariable(0),
if(m_graph->SameExpansionInfo(m_session->GetVariable(0),
m_session->GetVariable(i)))
{
m_fields[i] = MemoryManager<MultiRegions
......@@ -879,7 +879,7 @@ namespace Nektar
LibUtilities::BasisKeyVector Tkeys, Qkeys;
// make a copy of the ExpansionInfoMap
SpatialDomains::ExpansionInfoMap NewExpInfo = m_graph->GetExpansionInfos();
SpatialDomains::ExpansionInfoMap NewExpInfo = m_graph->GetExpansionInfo();
SpatialDomains::ExpansionInfoMapShPtr ExpInfo=
MemoryManager<SpatialDomains::ExpansionInfoMap>::AllocateSharedPtr(NewExpInfo);
......
......@@ -658,7 +658,7 @@ class Interpolator;
inline int EquationSystem::GetNumExpModes(void)
{
return m_graph->GetExpansionInfos().begin()->second->m_basisKeyVector[0]
return m_graph->GetExpansionInfo().begin()->second->m_basisKeyVector[0]
.GetNumModes();
}
......
......@@ -165,7 +165,7 @@ MeshGraphSharedPtr MeshGraph::Read(
void MeshGraph::FillGraph()
{
ReadExpansionInfos();
ReadExpansionInfo();
switch (m_meshDimension)
{
......@@ -652,7 +652,7 @@ void MeshGraph::GetCompositeList(const std::string &compositeStr,
/**
*
*/
const ExpansionInfoMap &MeshGraph::GetExpansionInfos(const std::string variable)
const ExpansionInfoMap &MeshGraph::GetExpansionInfo(const std::string variable)
{
ExpansionInfoMapShPtr returnval;
......@@ -705,7 +705,7 @@ ExpansionInfoShPtr MeshGraph::GetExpansionInfo(GeometrySharedPtr geom,
/**
*
*/
void MeshGraph::SetExpansionInfos(
void MeshGraph::SetExpansionInfo(
std::vector<LibUtilities::FieldDefinitionsSharedPtr> &fielddef)
{
int i, j, k, cnt, id;
......@@ -1252,7 +1252,7 @@ void MeshGraph::SetExpansionInfos(
default:
ASSERTL0(
false,
"Need to set up for pyramid and prism 3D ExpansionInfos");
"Need to set up for pyramid and prism 3D ExpansionInfo");
break;
}
......@@ -1272,7 +1272,7 @@ void MeshGraph::SetExpansionInfos(
/**
*
*/
void MeshGraph::SetExpansionInfos(
void MeshGraph::SetExpansionInfo(
std::vector<LibUtilities::FieldDefinitionsSharedPtr> &fielddef,
std::vector<std::vector<LibUtilities::PointsType>> &pointstype)
{
......@@ -1474,7 +1474,7 @@ void MeshGraph::SetExpansionInfos(
default:
ASSERTL0(
false,
"Need to set up for pyramid and prism 3D ExpansionInfos");
"Need to set up for pyramid and prism 3D ExpansionInfo");
break;
}
......@@ -1496,7 +1496,7 @@ void MeshGraph::SetExpansionInfos(
* optional arguemt of \a npoints which redefines how many
* points are to be used.
*/
void MeshGraph::SetExpansionInfosToEvenlySpacedPoints(int npoints)
void MeshGraph::SetExpansionInfoToEvenlySpacedPoints(int npoints)
{
// iterate over all defined expansions
for (auto it = m_expansionMapShPtrMap.begin();
......@@ -1538,7 +1538,7 @@ void MeshGraph::SetExpansionInfosToEvenlySpacedPoints(int npoints)
* the number of points the same difference from the number
* of modes as the original expansion definition
*/
void MeshGraph::SetExpansionInfosToPolyOrder(int nmodes)
void MeshGraph::SetExpansionInfoToNumModes(int nmodes)
{
// iterate over all defined expansions
for (auto it = m_expansionMapShPtrMap.begin();
......@@ -1571,7 +1571,7 @@ void MeshGraph::SetExpansionInfosToPolyOrder(int nmodes)
* the number of points the same difference from the number
* of modes as the original expansion definition
*/
void MeshGraph::SetExpansionInfosToPointOrder(int npts)
void MeshGraph::SetExpansionInfoToPointOrder(int npts)
{
// iterate over all defined expansions
for (auto it = m_expansionMapShPtrMap.begin();
......@@ -2648,7 +2648,7 @@ std::string MeshGraph::GetCompositeString(CompositeSharedPtr comp)
return s.str();
}
void MeshGraph::ReadExpansionInfos()
void MeshGraph::ReadExpansionInfo()
{
// Find the Expansions tag
TiXmlElement *expansionTypes = m_session->GetElement("NEKTAR/EXPANSIONS");
......@@ -3184,7 +3184,7 @@ void MeshGraph::ReadExpansionInfos()
f->ImportFieldDefs(LibUtilities::XmlDataSource::create(m_session->GetDocument()),
fielddefs, true);
cout << " Number of elements: " << fielddefs.size() << endl;
SetExpansionInfos(fielddefs);
SetExpansionInfo(fielddefs);
}
else if (expType == "F")
{
......@@ -3199,7 +3199,7 @@ void MeshGraph::ReadExpansionInfos()
LibUtilities::FieldIOSharedPtr f =
LibUtilities::FieldIO::CreateForFile(m_session, filenameStr);
f->Import(filenameStr, fielddefs);
SetExpansionInfos(fielddefs);
SetExpansionInfo(fielddefs);
}
else
{
......
......@@ -206,7 +206,7 @@ public:
PointGeomSharedPtr p);
////////////////////
SPATIAL_DOMAINS_EXPORT void ReadExpansionInfos();
SPATIAL_DOMAINS_EXPORT void ReadExpansionInfo();
/* ---- Helper functions ---- */
/// Dimension of the mesh (can be a 1D curve in 3D space).
......@@ -273,35 +273,35 @@ public:
return m_domain[domain];
}
SPATIAL_DOMAINS_EXPORT const ExpansionInfoMap &GetExpansionInfos(
SPATIAL_DOMAINS_EXPORT const ExpansionInfoMap &GetExpansionInfo(
const std::string variable = "DefaultVar");
SPATIAL_DOMAINS_EXPORT ExpansionInfoShPtr GetExpansionInfo(
GeometrySharedPtr geom, const std::string variable = "DefaultVar");
/// Sets expansions given field definitions
SPATIAL_DOMAINS_EXPORT void SetExpansionInfos(
SPATIAL_DOMAINS_EXPORT void SetExpansionInfo(
std::vector<LibUtilities::FieldDefinitionsSharedPtr> &fielddef);
/// Sets expansions given field definition, quadrature points.
SPATIAL_DOMAINS_EXPORT void SetExpansionInfos(
SPATIAL_DOMAINS_EXPORT void SetExpansionInfo(
std::vector<LibUtilities::FieldDefinitionsSharedPtr> &fielddef,
std::vector<std::vector<LibUtilities::PointsType>> &pointstype);
/// Sets expansions to have equispaced points
SPATIAL_DOMAINS_EXPORT void SetExpansionInfosToEvenlySpacedPoints(
SPATIAL_DOMAINS_EXPORT void SetExpansionInfoToEvenlySpacedPoints(
int npoints = 0);
/// Reset expansion to have specified polynomial order \a nmodes
SPATIAL_DOMAINS_EXPORT void SetExpansionInfosToPolyOrder(int nmodes);
SPATIAL_DOMAINS_EXPORT void SetExpansionInfoToNumModes(int nmodes);
/// Reset expansion to have specified point order \a
/// npts
SPATIAL_DOMAINS_EXPORT void SetExpansionInfosToPointOrder(int npts);
SPATIAL_DOMAINS_EXPORT void SetExpansionInfoToPointOrder(int npts);
/// This function sets the expansion #exp in map with
/// entry #variable
inline void SetExpansionInfos(const std::string variable,
inline void SetExpansionInfo(const std::string variable,
ExpansionInfoMapShPtr &exp);
inline void SetSession(LibUtilities::SessionReaderSharedPtr pSession);
......@@ -311,11 +311,13 @@ public:
LibUtilities::BasisKeyVector &keys,
std::string var = "DefaultVar");
SPATIAL_DOMAINS_EXPORT void ResetExpansionInfoToBasisKey(ExpansionInfoMapShPtr &expansionMap,
LibUtilities::ShapeType shape,
LibUtilities::BasisKeyVector &keys);
inline bool SameExpansionInfos(const std::string var1, const std::string var2);
SPATIAL_DOMAINS_EXPORT void ResetExpansionInfoToBasisKey(
ExpansionInfoMapShPtr &expansionMap,