Commit 92a9d46b authored by Dave Moxey's avatar Dave Moxey

Run new FieldUtils library through clang-format

parent 38c18f5b
......@@ -14,4 +14,3 @@ IndentCaseLabels: true
Standard: Cpp03
AccessModifierOffset: -4
BinPackParameters: false
BinPackArguments: false
......@@ -39,25 +39,25 @@
#include <boost/shared_ptr.hpp>
#include <LibUtilities/BasicUtils/NekFactory.hpp>
#include <LibUtilities/BasicUtils/PtsIO.h>
#include <LibUtilities/BasicUtils/PtsField.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/BasicUtils/PtsIO.h>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <SpatialDomains/MeshGraph.h>
#include <MultiRegions/ExpList.h>
#include <MultiRegions/ContField1D.h>
#include <MultiRegions/ExpList2DHomogeneous1D.h>
#include <MultiRegions/ContField3DHomogeneous1D.h>
#include <MultiRegions/ContField3DHomogeneous2D.h>
#include <MultiRegions/ContField2D.h>
#include <MultiRegions/ContField3D.h>
#include <MultiRegions/ContField3DHomogeneous1D.h>
#include <MultiRegions/ContField3DHomogeneous2D.h>
#include <MultiRegions/ExpList.h>
#include <MultiRegions/ExpList2DHomogeneous1D.h>
#include <MultiRegions/DisContField1D.h>
#include <MultiRegions/DisContField3DHomogeneous1D.h>
#include <MultiRegions/DisContField3DHomogeneous2D.h>
#include <MultiRegions/DisContField2D.h>
#include <MultiRegions/DisContField3D.h>
#include <MultiRegions/DisContField3DHomogeneous1D.h>
#include <MultiRegions/DisContField3DHomogeneous2D.h>
#include "FieldUtilsDeclspec.h"
......@@ -68,16 +68,16 @@ namespace Nektar
namespace FieldUtils
{
struct Field {
FIELD_UTILS_EXPORT Field() : m_verbose(false),
m_declareExpansionAsContField(false),
m_declareExpansionAsDisContField(false),
m_requireBoundaryExpansion(false),
m_writeBndFld(false),
m_fldToBnd(false),
m_addNormals(false),
m_setUpEquiSpacedFields(false),
m_fieldPts(LibUtilities::NullPtsField){}
struct Field
{
FIELD_UTILS_EXPORT Field()
: m_verbose(false), m_declareExpansionAsContField(false),
m_declareExpansionAsDisContField(false),
m_requireBoundaryExpansion(false), m_writeBndFld(false),
m_fldToBnd(false), m_addNormals(false),
m_setUpEquiSpacedFields(false), m_fieldPts(LibUtilities::NullPtsField)
{
}
FIELD_UTILS_EXPORT ~Field()
{
......@@ -86,54 +86,53 @@ struct Field {
m_comm->Finalise();
}
}
bool m_verbose;
bool m_verbose;
vector<LibUtilities::FieldDefinitionsSharedPtr> m_fielddef;
vector<vector<double> > m_data;
vector<MultiRegions::ExpListSharedPtr> m_exp;
vector<vector<double> > m_data;
vector<MultiRegions::ExpListSharedPtr> m_exp;
bool m_declareExpansionAsContField;
bool m_declareExpansionAsDisContField;
bool m_declareExpansionAsContField;
bool m_declareExpansionAsDisContField;
bool m_requireBoundaryExpansion;
bool m_requireBoundaryExpansion;
bool m_useFFT;
bool m_useFFT;
LibUtilities::CommSharedPtr m_comm;
LibUtilities::SessionReaderSharedPtr m_session;
SpatialDomains::MeshGraphSharedPtr m_graph;
LibUtilities::FieldIOSharedPtr m_fld;
LibUtilities::PtsIOSharedPtr m_ptsIO;
map<string, vector<string> > m_inputfiles;
LibUtilities::CommSharedPtr m_comm;
LibUtilities::SessionReaderSharedPtr m_session;
SpatialDomains::MeshGraphSharedPtr m_graph;
LibUtilities::FieldIOSharedPtr m_fld;
LibUtilities::PtsIOSharedPtr m_ptsIO;
map<string, vector<string> > m_inputfiles;
bool m_writeBndFld;
vector<unsigned int> m_bndRegionsToWrite;
bool m_fldToBnd;
bool m_addNormals;
bool m_writeBndFld;
vector<unsigned int> m_bndRegionsToWrite;
bool m_fldToBnd;
bool m_addNormals;
bool m_setUpEquiSpacedFields;
bool m_setUpEquiSpacedFields;
LibUtilities::PtsFieldSharedPtr m_fieldPts;
LibUtilities::PtsFieldSharedPtr m_fieldPts;
MultiRegions::AssemblyMapCGSharedPtr m_locToGlobalMap;
MultiRegions::AssemblyMapCGSharedPtr m_locToGlobalMap;
LibUtilities::FieldMetaDataMap m_fieldMetaDataMap;
LibUtilities::FieldMetaDataMap m_fieldMetaDataMap;
FIELD_UTILS_EXPORT MultiRegions::ExpListSharedPtr SetUpFirstExpList(
int NumHomogeneousDir,
bool fldfilegiven = false)
int NumHomogeneousDir, bool fldfilegiven = false)
{
MultiRegions::ExpListSharedPtr exp;
// Set up expansion list
int expdim = m_graph->GetMeshDimension();
int expdim = m_graph->GetMeshDimension();
bool dealiasing = false;
m_session->MatchSolverInfo("USEFFT", "FFTW", m_useFFT, false);
switch (expdim)
{
case 1:
case 1:
{
ASSERTL0(NumHomogeneousDir <= 2,
"Quasi-3D approach is only set up for 1 or 2 "
......@@ -148,7 +147,7 @@ struct Field {
NekDouble ly;
LibUtilities::BasisType btype;
if(fldfilegiven)
if (fldfilegiven)
{
nplanes = m_fielddef[0]->m_numModes[1];
ly = m_fielddef[0]->m_homogeneousLengths[0];
......@@ -157,43 +156,40 @@ struct Field {
else
{
m_session->LoadParameter("HomModesZ", nplanes);
m_session->LoadParameter("LY",ly);
m_session->LoadParameter("LY", ly);
btype = LibUtilities::eFourier;
}
// Choose points to be at evenly spaced points at
// nplanes points
const LibUtilities::PointsKey
Pkey(nplanes, LibUtilities::eFourierEvenlySpaced);
const LibUtilities::PointsKey Pkey(
nplanes, LibUtilities::eFourierEvenlySpaced);
const LibUtilities::BasisKey Bkey(btype, nplanes, Pkey);
if(m_declareExpansionAsContField||
m_declareExpansionAsDisContField)
if (m_declareExpansionAsContField ||
m_declareExpansionAsDisContField)
{
ASSERTL0(false,"ContField2DHomogeneous1D or "
"DisContField2DHomogenenous1D has "
"not been implemented");
ASSERTL0(false, "ContField2DHomogeneous1D or "
"DisContField2DHomogenenous1D has "
"not been implemented");
}
Exp2DH1 = MemoryManager<MultiRegions::
ExpList2DHomogeneous1D>::
AllocateSharedPtr(m_session, Bkey, ly,
m_useFFT, dealiasing,
m_graph);
Exp2DH1 =
MemoryManager<MultiRegions::ExpList2DHomogeneous1D>::
AllocateSharedPtr(m_session, Bkey, ly, m_useFFT,
dealiasing, m_graph);
exp = Exp2DH1;
}
else if (NumHomogeneousDir == 2)
{
MultiRegions::ExpList3DHomogeneous2DSharedPtr Exp3DH2;
int nylines,nzlines;
NekDouble ly,lz;
LibUtilities::BasisType btype1,btype2;
int nylines, nzlines;
NekDouble ly, lz;
LibUtilities::BasisType btype1, btype2;
if(fldfilegiven)
if (fldfilegiven)
{
nylines = m_fielddef[0]->m_numModes[1];
nzlines = m_fielddef[0]->m_numModes[2];
......@@ -206,47 +202,44 @@ struct Field {
{
m_session->LoadParameter("HomModesY", nylines);
m_session->LoadParameter("HomModesZ", nzlines);
m_session->LoadParameter("LY",ly);
m_session->LoadParameter("LZ",lz);
m_session->LoadParameter("LY", ly);
m_session->LoadParameter("LZ", lz);
btype1 = LibUtilities::eFourier;
btype2 = LibUtilities::eFourier;
}
// Choose points to be at evenly spaced points at
// nplanes points
const LibUtilities::PointsKey
PkeyY(nylines, LibUtilities::eFourierEvenlySpaced);
const LibUtilities::PointsKey PkeyY(
nylines, LibUtilities::eFourierEvenlySpaced);
const LibUtilities::BasisKey BkeyY(btype1, nylines, PkeyY);
const LibUtilities::PointsKey
PkeyZ(nzlines, LibUtilities::eFourierEvenlySpaced);
const LibUtilities::PointsKey PkeyZ(
nzlines, LibUtilities::eFourierEvenlySpaced);
const LibUtilities::BasisKey BkeyZ(btype2, nzlines, PkeyZ);
if(m_declareExpansionAsContField)
if (m_declareExpansionAsContField)
{
Exp3DH2 = MemoryManager<MultiRegions::
ContField3DHomogeneous2D>::
AllocateSharedPtr(m_session, BkeyY, BkeyZ,
ly, lz, m_useFFT, dealiasing,
m_graph,
Exp3DH2 = MemoryManager<
MultiRegions::ContField3DHomogeneous2D>::
AllocateSharedPtr(m_session, BkeyY, BkeyZ, ly, lz,
m_useFFT, dealiasing, m_graph,
m_session->GetVariable(0));
}
else if(m_declareExpansionAsDisContField)
else if (m_declareExpansionAsDisContField)
{
Exp3DH2 = MemoryManager<MultiRegions::
DisContField3DHomogeneous2D>::
AllocateSharedPtr(m_session, BkeyY, BkeyZ,
ly, lz, m_useFFT, dealiasing,
m_graph,
Exp3DH2 = MemoryManager<
MultiRegions::DisContField3DHomogeneous2D>::
AllocateSharedPtr(m_session, BkeyY, BkeyZ, ly, lz,
m_useFFT, dealiasing, m_graph,
m_session->GetVariable(0));
}
else
{
Exp3DH2 = MemoryManager<MultiRegions::
ExpList3DHomogeneous2D>::
AllocateSharedPtr(m_session, BkeyY, BkeyZ,
ly, lz, m_useFFT, dealiasing,
m_graph);
Exp3DH2 = MemoryManager<
MultiRegions::ExpList3DHomogeneous2D>::
AllocateSharedPtr(m_session, BkeyY, BkeyZ, ly, lz,
m_useFFT, dealiasing, m_graph);
}
exp = Exp3DH2;
......@@ -255,29 +248,29 @@ struct Field {
{
MultiRegions::ExpList1DSharedPtr Exp1D;
if(m_declareExpansionAsContField)
if (m_declareExpansionAsContField)
{
Exp1D = MemoryManager<MultiRegions::ContField1D>
::AllocateSharedPtr(m_session, m_graph,
m_session->GetVariable(0));
Exp1D = MemoryManager<MultiRegions::ContField1D>::
AllocateSharedPtr(m_session, m_graph,
m_session->GetVariable(0));
}
else if(m_declareExpansionAsDisContField)
else if (m_declareExpansionAsDisContField)
{
Exp1D = MemoryManager<MultiRegions::DisContField1D>
::AllocateSharedPtr(m_session, m_graph,
m_session->GetVariable(0));
Exp1D = MemoryManager<MultiRegions::DisContField1D>::
AllocateSharedPtr(m_session, m_graph,
m_session->GetVariable(0));
}
else
{
Exp1D = MemoryManager<MultiRegions::ExpList1D>
::AllocateSharedPtr(m_session, m_graph);
Exp1D = MemoryManager<MultiRegions::ExpList1D>::
AllocateSharedPtr(m_session, m_graph);
}
exp = Exp1D;
}
}
break;
case 2:
case 2:
{
ASSERTL0(NumHomogeneousDir <= 1,
"NumHomogeneousDir is only set up for 1");
......@@ -291,16 +284,17 @@ struct Field {
NekDouble lz;
LibUtilities::BasisType btype;
if(fldfilegiven)
if (fldfilegiven)
{
nplanes = m_fielddef[0]->m_numModes[2];
nplanes = m_fielddef[0]->m_numModes[2];
lz = m_fielddef[0]->m_homogeneousLengths[0];
btype = m_fielddef[0]->m_basis[2];
if (btype == LibUtilities::eFourierSingleMode)
{
btype = LibUtilities::eFourier;
m_fielddef[0]->m_basis[2] = LibUtilities::eFourierSingleMode;
m_fielddef[0]->m_basis[2] =
LibUtilities::eFourierSingleMode;
if (nplanes <= 2)
{
nplanes = 4;
......@@ -310,38 +304,37 @@ struct Field {
else
{
m_session->LoadParameter("HomModesZ", nplanes);
m_session->LoadParameter("LZ",lz);
m_session->LoadParameter("LZ", lz);
btype = LibUtilities::eFourier;
}
// Choose points to be at evenly spaced points at
// nplanes points
const LibUtilities::PointsKey
Pkey(nplanes, LibUtilities::eFourierEvenlySpaced);
const LibUtilities::PointsKey Pkey(
nplanes, LibUtilities::eFourierEvenlySpaced);
const LibUtilities::BasisKey Bkey(btype, nplanes, Pkey);
const LibUtilities::BasisKey Bkey(btype, nplanes, Pkey);
if(m_declareExpansionAsContField)
if (m_declareExpansionAsContField)
{
Exp3DH1 = MemoryManager<MultiRegions::
ContField3DHomogeneous1D>::
Exp3DH1 = MemoryManager<
MultiRegions::ContField3DHomogeneous1D>::
AllocateSharedPtr(m_session, Bkey, lz, m_useFFT,
dealiasing, m_graph,
m_session->GetVariable(0));
}
else if (m_declareExpansionAsDisContField)
{
Exp3DH1 = MemoryManager<MultiRegions::
DisContField3DHomogeneous1D>::
AllocateSharedPtr(m_session,
Bkey, lz, m_useFFT,
Exp3DH1 = MemoryManager<
MultiRegions::DisContField3DHomogeneous1D>::
AllocateSharedPtr(m_session, Bkey, lz, m_useFFT,
dealiasing, m_graph,
m_session->GetVariable(0));
}
else
{
Exp3DH1 = MemoryManager<MultiRegions::
ExpList3DHomogeneous1D>::
Exp3DH1 = MemoryManager<
MultiRegions::ExpList3DHomogeneous1D>::
AllocateSharedPtr(m_session, Bkey, lz, m_useFFT,
dealiasing, m_graph);
}
......@@ -351,67 +344,66 @@ struct Field {
{
MultiRegions::ExpList2DSharedPtr Exp2D;
if(m_declareExpansionAsContField)
if (m_declareExpansionAsContField)
{
Exp2D = MemoryManager<MultiRegions::ContField2D>
::AllocateSharedPtr(m_session,m_graph,
m_session->GetVariable(0));
Exp2D = MemoryManager<MultiRegions::ContField2D>::
AllocateSharedPtr(m_session, m_graph,
m_session->GetVariable(0));
}
else if(m_declareExpansionAsDisContField)
else if (m_declareExpansionAsDisContField)
{
Exp2D = MemoryManager<MultiRegions::DisContField2D>
::AllocateSharedPtr(m_session,m_graph,
m_session->GetVariable(0));
Exp2D = MemoryManager<MultiRegions::DisContField2D>::
AllocateSharedPtr(m_session, m_graph,
m_session->GetVariable(0));
}
else
{
Exp2D = MemoryManager<MultiRegions::ExpList2D>
::AllocateSharedPtr(m_session,m_graph);
Exp2D = MemoryManager<MultiRegions::ExpList2D>::
AllocateSharedPtr(m_session, m_graph);
}
exp = Exp2D;
}
}
break;
case 3:
case 3:
{
MultiRegions::ExpList3DSharedPtr Exp3D;
if(m_declareExpansionAsContField)
if (m_declareExpansionAsContField)
{
Exp3D = MemoryManager<MultiRegions::ContField3D>
::AllocateSharedPtr(m_session,m_graph,
m_session->GetVariable(0));
Exp3D = MemoryManager<MultiRegions::ContField3D>::
AllocateSharedPtr(m_session, m_graph,
m_session->GetVariable(0));
}
else if(m_declareExpansionAsDisContField)
else if (m_declareExpansionAsDisContField)
{
Exp3D = MemoryManager<MultiRegions::DisContField3D>
::AllocateSharedPtr(m_session,m_graph,
m_session->GetVariable(0));
Exp3D = MemoryManager<MultiRegions::DisContField3D>::
AllocateSharedPtr(m_session, m_graph,
m_session->GetVariable(0));
}
else
{
Exp3D = MemoryManager<MultiRegions::ExpList3D>
::AllocateSharedPtr(m_session, m_graph);
Exp3D = MemoryManager<
MultiRegions::ExpList3D>::AllocateSharedPtr(m_session,
m_graph);
}
exp = Exp3D;
}
break;
default:
ASSERTL0(false, "Expansion dimension not recognised");
break;
default:
ASSERTL0(false, "Expansion dimension not recognised");
break;
}
return exp;
};
FIELD_UTILS_EXPORT MultiRegions::ExpListSharedPtr AppendExpList(
int NumHomogeneousDir,
string var = "DefaultVar",
bool NewField = false)
int NumHomogeneousDir, string var = "DefaultVar", bool NewField = false)
{
if(var.compare("DefaultVar") == 0 && m_requireBoundaryExpansion)
if (var.compare("DefaultVar") == 0 && m_requireBoundaryExpansion)
{
if (m_session->GetVariables().size())
{
......@@ -421,288 +413,287 @@ struct Field {
MultiRegions::ExpListSharedPtr tmp;
switch (m_graph->GetMeshDimension())
{
case 1:
case 1:
{
if (NumHomogeneousDir == 1)
{
ASSERTL0( !(m_declareExpansionAsContField ||
m_declareExpansionAsDisContField),
ASSERTL0(!(m_declareExpansionAsContField ||
m_declareExpansionAsDisContField),
"ContField2DHomogeneous1D or "
"DisContField2DHomogenenous1D has not been "
"implemented");
MultiRegions::ExpList2DHomogeneous1DSharedPtr tmp2 =
boost::dynamic_pointer_cast<MultiRegions::
ExpList2DHomogeneous1D>(m_exp[0]);
boost::dynamic_pointer_cast<
MultiRegions::ExpList2DHomogeneous1D>(m_exp[0]);
tmp = MemoryManager<MultiRegions::
ExpList2DHomogeneous1D>::
tmp = MemoryManager<MultiRegions::ExpList2DHomogeneous1D>::
AllocateSharedPtr(*tmp2);
}
else if (NumHomogeneousDir == 2)
{
if(m_declareExpansionAsContField)
if (m_declareExpansionAsContField)
{
MultiRegions::ContField3DHomogeneous2DSharedPtr tmp2 =
boost::dynamic_pointer_cast<MultiRegions::
ContField3DHomogeneous2D>(m_exp[0]);
boost::dynamic_pointer_cast<
MultiRegions::ContField3DHomogeneous2D>(
m_exp[0]);
tmp = MemoryManager<MultiRegions::
ContField3DHomogeneous2D>::
tmp = MemoryManager<
MultiRegions::ContField3DHomogeneous2D>::
AllocateSharedPtr(*tmp2);
}
else if(m_declareExpansionAsDisContField)
else if (m_declareExpansionAsDisContField)
{
MultiRegions::DisContField3DHomogeneous2DSharedPtr tmp2 =
boost::dynamic_pointer_cast<MultiRegions::
DisContField3DHomogeneous2D>(m_exp[0]);
MultiRegions::DisContField3DHomogeneous2DSharedPtr
tmp2 = boost::dynamic_pointer_cast<
MultiRegions::DisContField3DHomogeneous2D>(
m_exp[0]);
tmp = MemoryManager<MultiRegions::
DisContField3DHomogeneous2D>::
tmp = MemoryManager<
MultiRegions::DisContField3DHomogeneous2D>::
AllocateSharedPtr(*tmp2);
}
else
{
MultiRegions::ExpList3DHomogeneous2DSharedPtr tmp2 =
boost::dynamic_pointer_cast<MultiRegions::
ExpList3DHomogeneous2D>(m_exp[0]);
boost::dynamic_pointer_cast<
MultiRegions::ExpList3DHomogeneous2D>(m_exp[0]);
tmp = MemoryManager<MultiRegions::
ExpList3DHomogeneous2D>::
tmp = MemoryManager<
MultiRegions::ExpList3DHomogeneous2D>::
AllocateSharedPtr(*tmp2);
}
}
else
{
if(m_declareExpansionAsContField)
if (m_declareExpansionAsContField)
{
MultiRegions::ContField1DSharedPtr tmp2 =
boost::dynamic_pointer_cast<MultiRegions::
ContField1D>(m_exp[0]);
boost::dynamic_pointer_cast<
MultiRegions::ContField1D>(m_exp[0]);
tmp = MemoryManager<MultiRegions::ContField1D>::
AllocateSharedPtr(m_session,m_graph,var);
AllocateSharedPtr(m_session, m_graph, var);
}
else if(m_declareExpansionAsDisContField)
else if (m_declareExpansionAsDisContField)
{
MultiRegions::DisContField1DSharedPtr tmp2 =
boost::dynamic_pointer_cast<MultiRegions::
DisContField1D>(m_exp[0]);
boost::dynamic_pointer_cast<
MultiRegions::DisContField1D>(m_exp[0]);
tmp = MemoryManager<MultiRegions::DisContField1D>::
AllocateSharedPtr(m_session,m_graph,var);
AllocateSharedPtr(m_session, m_graph, var);
}
else
{