Commit 401ac32f authored by Spencer Sherwin's avatar Spencer Sherwin

Updates after review comments

parent b25a6824
...@@ -90,47 +90,59 @@ namespace Nektar ...@@ -90,47 +90,59 @@ namespace Nektar
bool m_signChange; bool m_signChange;
// store how many consecutive similar blocks there are in R and Rinv // store how many consecutive similar blocks there
// are in R and Rinv
std::vector<std::pair<int,int> > m_sameBlock; std::vector<std::pair<int,int> > m_sameBlock;
private: private:
void SetupBlockTransformationMatrix(void); void SetupBlockTransformationMatrix(void);
void SetUpReferenceElements( typedef std::map<LibUtilities::ShapeType, DNekScalMatSharedPtr>
std::map<LibUtilities::ShapeType, DNekScalMatSharedPtr> &maxRmat, ShapeToDNekMap;
std::map<LibUtilities::ShapeType, LocalRegions::ExpansionSharedPtr > &maxElmt, typedef std::map<LibUtilities::ShapeType,
std::map<LibUtilities::ShapeType, Array<OneD, unsigned int> > &vertMapMaxR, LocalRegions::ExpansionSharedPtr > ShapeToExpMap;
std::map<LibUtilities::ShapeType, Array<OneD, Array<OneD, unsigned int> > > &edgeMapMaxR); typedef std::map<LibUtilities::ShapeType,
Array<OneD, unsigned int> > ShapeToIntArrayMap;
typedef std::map<LibUtilities::ShapeType,
Array<OneD, Array<OneD, unsigned int> > >
ShapeToIntArrayArrayMap;
void SetUpReferenceElements(ShapeToDNekMap &maxRmat,
ShapeToExpMap &maxElmt,
ShapeToIntArrayMap &vertMapMaxR,
ShapeToIntArrayArrayMap &edgeMapMaxR);
void SetUpPyrMaxRMat(int nummodesmax, void SetUpPyrMaxRMat(int nummodesmax,
LocalRegions::PyrExpSharedPtr &PyrExp, LocalRegions::PyrExpSharedPtr &PyrExp,
std::map<LibUtilities::ShapeType, DNekScalMatSharedPtr> &maxRmat, ShapeToDNekMap &maxRmat,
std::map<LibUtilities::ShapeType, Array<OneD, unsigned int> > &vertMapMaxR, ShapeToIntArrayMap &vertMapMaxR,
std::map<LibUtilities::ShapeType, Array<OneD, Array<OneD, unsigned int> > > &edgeMapMaxR, ShapeToIntArrayArrayMap &edgeMapMaxR,
std::map<LibUtilities::ShapeType, Array<OneD, Array<OneD, unsigned int> > > &faceMapMaxR); ShapeToIntArrayArrayMap &faceMapMaxR);
void ReSetTetMaxRMat(int nummodesmax, void ReSetTetMaxRMat(int nummodesmax,
LocalRegions::TetExpSharedPtr &TetExp, LocalRegions::TetExpSharedPtr &TetExp,
std::map<LibUtilities::ShapeType, DNekScalMatSharedPtr> &maxRmat, ShapeToDNekMap &maxRmat,
std::map<LibUtilities::ShapeType, Array<OneD, unsigned int> > &vertMapMaxR, ShapeToIntArrayMap &vertMapMaxR,
std::map<LibUtilities::ShapeType, Array<OneD, Array<OneD, unsigned int> > > &edgeMapMaxR, ShapeToIntArrayArrayMap &edgeMapMaxR,
std::map<LibUtilities::ShapeType, Array<OneD, Array<OneD, unsigned int> > > &faceMapMaxR); ShapeToIntArrayArrayMap &faceMapMaxR);
void ReSetPrismMaxRMat(int nummodesmax, void ReSetPrismMaxRMat(int nummodesmax,
LocalRegions::PrismExpSharedPtr &PirsmExp, LocalRegions::PrismExpSharedPtr &PirsmExp,
std::map<LibUtilities::ShapeType, DNekScalMatSharedPtr> &maxRmat, ShapeToDNekMap &maxRmat,
std::map<LibUtilities::ShapeType, Array<OneD, unsigned int> > &vertMapMaxR, ShapeToIntArrayMap &vertMapMaxR,
std::map<LibUtilities::ShapeType, Array<OneD, Array<OneD, unsigned int> > > &edgeMapMaxR, ShapeToIntArrayArrayMap &edgeMapMaxR,
std::map<LibUtilities::ShapeType, Array<OneD, Array<OneD, unsigned int> > > &faceMapMaxR, ShapeToIntArrayArrayMap &faceMapMaxR,
bool UseTetOnly); bool UseTetOnly);
DNekMatSharedPtr ExtractLocMat(
StdRegions::StdExpansionSharedPtr &locExp,
DNekScalMatSharedPtr &maxRmat,
LocalRegions::ExpansionSharedPtr &expMax,
Array<OneD, unsigned int> &vertMapMaxR,
Array<OneD, Array<OneD, unsigned int> > &edgeMapMaxR);
DNekMatSharedPtr ExtractLocMat(StdRegions::StdExpansionSharedPtr &locExp,
DNekScalMatSharedPtr &maxRmat,
LocalRegions::ExpansionSharedPtr &expMax,
Array<OneD, unsigned int> &vertMapMaxR,
Array<OneD, Array<OneD, unsigned int> > &edgeMapMaxR);
void CreateMultiplicityMap(void); void CreateMultiplicityMap(void);
SpatialDomains::TetGeomSharedPtr CreateRefTetGeom(void); SpatialDomains::TetGeomSharedPtr CreateRefTetGeom(void);
......
...@@ -186,11 +186,13 @@ namespace Nektar ...@@ -186,11 +186,13 @@ namespace Nektar
"HybridDGLamToU", "HybridDGLamToU",
"FwdTrans", "FwdTrans",
"PreconR", "PreconR",
"PreconRT", "PreconRMass",
"PreconLinearSpace", "PreconLinearSpace",
"PreconLinearSpaceMass",
"InterpGauss", "InterpGauss",
"GaussDG", "GaussDG",
"PhysInterpToEquiSpaced" "PhysInterpToEquiSpaced"
"EquiSpacedToCoeffs"
}; };
enum VarCoeffType enum VarCoeffType
......
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