Commit 054d826d authored by Spencer Sherwin's avatar Spencer Sherwin
Browse files

Fixes from last merge

parent 0f680411
......@@ -1655,7 +1655,7 @@ namespace Nektar
return NullDNekMatSharedPtr;
}
void StdExpansion::v_PhysInterpToSimplexEquiSpaced(
void StdExpansion::PhysInterpToSimplexEquiSpaced(
const Array<OneD, const NekDouble> &inarray,
Array<OneD, NekDouble> &outarray)
{
......
......@@ -1291,14 +1291,9 @@ namespace Nektar
* better distribution of points more suitable for most
* postprocessing
*/
STD_REGIONS_EXPORT void PhysInterpToSimplexEquiSpaced(const Array<OneD, const NekDouble> &inarray, Array<OneD, NekDouble> &outarray);
STD_REGIONS_EXPORT void PhysInterpToSimplexEquiSpaced(
const Array<OneD, const NekDouble> &inarray,
Array<OneD, NekDouble> &outarray)
{
v_PhysInterpToSimplexEquiSpaced(inarray, outarray);
}
Array<OneD, NekDouble> &outarray);
/** \brief This function provides the connectivity of
* local simplices (triangles or tets) to connect the
......
......@@ -86,7 +86,7 @@ void ProcessIsoContourUtils::Process(po::variables_map &vm)
ASSERTL0(m_f->m_fieldPts != NullFieldPts,
"Need to specify an input .dat file with isocontourutil module");
LoadFeldPtsToIso(iso);
LoadFieldPtsToIso(iso);
bool smoothing = m_config["smooth"].m_beenSet;
bool globalcondense = m_config["globalcondense"].m_beenSet;
......@@ -116,7 +116,7 @@ void ProcessIsoContourUtils::Process(po::variables_map &vm)
}
}
void ProcessIsoContourUtils::LoadFeldPtsToIso(vector<IsoSharedPtr> &iso)
void ProcessIsoContourUtils::LoadFieldPtsToIso(vector<IsoSharedPtr> &iso)
{
int nfields = m_f->m_fieldPts->m_pts.num_elements();
......
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