Commit 373aa860 authored by Gianmarco Mengaldo's avatar Gianmarco Mengaldo

Merge branch 'feature/Isocontour3DH1D' into 'master'

Feature/isocontour3dh1d

This MR extends the EquiSpacedOutput and IsoContour modules of FieldConvert to 3DH1D expansions.

See merge request !525
parents 0ba7ee30 99fa0425
......@@ -278,7 +278,7 @@ void InputXml::Process(po::variables_map &vm)
}
// reset expansion defintion to use equispaced points if required.
if(m_requireEquiSpaced) // set up points to be equispaced
if(m_requireEquiSpaced || vm.count("output-points"))
{
int nPointsNew = 0;
......
......@@ -65,6 +65,8 @@ class ProcessEquiSpacedOutput : public ProcessModule
ProcessEquiSpacedOutput(){};
void SetupEquiSpacedField(void);
void SetHomogeneousConnectivity(void);
void GenOrthoModes(int n,
const Array<OneD,const NekDouble> &phys,
Array<OneD, NekDouble> &coeffs);
......
......@@ -295,10 +295,10 @@ vector<IsoSharedPtr> ProcessIsoContour::ExtractContour(
{
vector<IsoSharedPtr> returnval;
int coordim = m_f->m_exp[0]->GetCoordim(0);
int coordim = m_f->m_fieldPts->GetDim();
int nfields = m_f->m_fieldPts->GetNFields() + coordim;
ASSERTL0(coordim == 3,
ASSERTL0(m_f->m_fieldPts->GetPtsType() == LibUtilities::ePtsTetBlock,
"This methods is currently only set up for 3D fields");
ASSERTL1(coordim + fieldid < nfields,
"field id is larger than number contained in FieldPts");
......
......@@ -138,14 +138,14 @@ class Iso
void resize_fields(int size)
{
if(size > m_x.size()) // add 100 element to vectors
if(size > m_x.size()) // add 1000 element to vectors
{
m_x.resize(size+1000);
m_y.resize(size+1000);
m_z.resize(size+1000);;
for(int i = 0; i < m_fields.size(); ++i)
{
m_fields[i].resize(size+100);
m_fields[i].resize(size+1000);
}
}
......
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