Commit f6a50853 authored by Dave Moxey's avatar Dave Moxey

Merge branch 'feature/CollapseExpList' into 'master'

collapse and tidy up MultiRegions so that ExpList is reduced to one class

See merge request !988
parents 96e8d53c a6e856f7
......@@ -12,8 +12,8 @@ IF (NEKTAR_BUILD_PYTHON)
# Set the Python3 status flag as the opposite of the Python3 flag by
# default on first run to ensure Python is searched for.
IF (NOT DEFINED NEKTAR_PYTHON3_STATUS)
SET(NEKTAR_PYTHON3_STATUS NOT ${NEKTAR_USE_PYTHON3} CACHE INTERNAL "")
IF (NOT NEKTAR_PYTHON3_STATUS)
SET(NEKTAR_PYTHON3_STATUS NOT ${NEKTAR_USE_PYTHON3} CACHE INTERNAL "" )
ENDIF()
IF (NOT NEKTAR_PYTHON3_STATUS STREQUAL NEKTAR_USE_PYTHON3)
......
......@@ -40,7 +40,7 @@
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/BasicUtils/Timer.h>
#include <LibUtilities/Communication/Comm.h>
#include <MultiRegions/ExpList3D.h>
#include <MultiRegions/ExpList.h>
#include <Collections/Collection.h>
#include <SpatialDomains/MeshGraph.h>
......@@ -53,11 +53,10 @@ MultiRegions::ExpListSharedPtr SetupExpList(
SpatialDomains::MeshGraphSharedPtr graph,
Collections::ImplementationType impType)
{
graph->SetExpansionsToPolyOrder(N);
graph->SetExpansionInfoToNumModes(N);
MultiRegions::ExpListSharedPtr expList =
MemoryManager<MultiRegions::ExpList3D>::AllocateSharedPtr(
session, graph);
MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(session, graph);
expList->CreateCollections(impType);
......
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
// Print summary of solution details
flags.set(eUseGlobal, false);
const SpatialDomains::ExpansionMap &expansions = graph2D->GetExpansions();
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::ExpansionMap &expansions = graph2D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
......
......@@ -67,16 +67,16 @@ int main(int argc, char *argv[])
// Print summary of solution details
flags.set(eUseGlobal, false);
const SpatialDomains::ExpansionMap &expansions = graph1D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfo();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
cout << "Calculating Derivatives (Homogeneous in yz-plane):" << endl;
cout << " Ly : " << ly << endl;
cout << " Lz : " << lz << endl;
cout << "Calculating Derivatives (Homogeneous in yz-plane):" << endl;
cout << " Ly : " << ly << endl;
cout << " Lz : " << lz << endl;
cout << " N.modes : " << bkey0.GetNumModes() << endl;
cout << " N.Y homo modes : " << BkeyY.GetNumModes() << endl;
cout << " N.Z homo modes : " << BkeyZ.GetNumModes() << endl;
cout << " N.Z homo modes : " << BkeyZ.GetNumModes() << endl;
cout << endl;
//----------------------------------------------
......
#include <MultiRegions/ExpList1D.h>
#include <MultiRegions/ExpList.h>
#include <LibUtilities/Kernel/kernel.h>
#include <SpatialDomains/MeshGraph.h>
......@@ -22,11 +22,11 @@ int main(int argc, char *argv[])
/***********************************************************/
// Construct an object from the class ExpList1D.
// Construct an object from the class ExpList.
// This is the class which represents a multi-elemental expansion
// This object can be constructed based on the input mesh
MultiRegions::ExpList1DSharedPtr u =
MemoryManager<MultiRegions::ExpList1D>::AllocateSharedPtr(vSession,graph1D);
MultiRegions::ExpListSharedPtr u =
MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(vSession,graph1D);
/***********************************************************/
// Get the number of elements
......@@ -63,11 +63,13 @@ int main(int argc, char *argv[])
/******************* Post-Processing ***********************/
// Construct the appropriate post-processed multi-element expansion object
int post_order = 2*order;
LibUtilities::PointsType pType = base[0]->GetPointsType();
LibUtilities::PointsKey pKey(post_order+1,pType);
LibUtilities::BasisKey upost_bkey(base[0]->GetBasisType(),post_order,pKey);
MultiRegions::ExpList1DSharedPtr u_post =
MemoryManager<MultiRegions::ExpList1D>::AllocateSharedPtr(vSession,upost_bkey,graph1D);
// reset expansiosn to be of new order
graph1D->SetExpansionInfosToPolyOrder(post_order);
MultiRegions::ExpListSharedPtr u_post =
MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(vSession,
graph1D);
// The post-processing for the first element
// Step1: Define the element ID on which the post-processing is done
......
......@@ -3,7 +3,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <MultiRegions/ContField1D.h>
#include <MultiRegions/ContField.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -19,7 +19,7 @@ int main(int argc, char *argv[])
LibUtilities::SessionReaderSharedPtr vSession
= LibUtilities::SessionReader::CreateInstance(argc, argv);
MultiRegions::ContField1DSharedPtr Exp,Sol;
MultiRegions::ContFieldSharedPtr Exp,Sol;
int i,j;
int order, nq;
......@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
const SpatialDomains::ExpansionMap &expansions = graph1D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfos();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
int nmodes = bkey0.GetNumModes();
......@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::ContField1D>
Exp = MemoryManager<MultiRegions::ContField>
::AllocateSharedPtr(vSession,graph1D,vSession->GetVariable(0));
//----------------------------------------------
......@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Setup Temporary expansion and put in solution
Sol = MemoryManager<MultiRegions::ContField1D>
Sol = MemoryManager<MultiRegions::ContField>
::AllocateSharedPtr(*Exp);
Sol->SetPhys(sol);
//----------------------------------------------
......
......@@ -3,7 +3,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <MultiRegions/ContField2D.h>
#include <MultiRegions/ContField.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
LibUtilities::SessionReaderSharedPtr vSession
= LibUtilities::SessionReader::CreateInstance(argc, argv);
MultiRegions::ContField2DSharedPtr Exp,Fce;
MultiRegions::ContFieldSharedPtr Exp,Fce;
int i, j, nq, coordim;
Array<OneD,NekDouble> fce;
Array<OneD,NekDouble> xc0,xc1,xc2;
......@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
const SpatialDomains::ExpansionMap &expansions = graph2D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
LibUtilities::BasisKey bkey1
......@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::ContField2D>::AllocateSharedPtr(vSession,graph2D,vSession->GetVariable(0));
Exp = MemoryManager<MultiRegions::ContField>::AllocateSharedPtr(vSession,graph2D,vSession->GetVariable(0));
//----------------------------------------------
//----------------------------------------------
......@@ -91,8 +91,8 @@ int main(int argc, char *argv[])
}
//---------------------------------------------
// Set up ContField2DD containing the solution
Fce = MemoryManager<MultiRegions::ContField2D>::AllocateSharedPtr(*Exp);
// Set up ContFieldD containing the solution
Fce = MemoryManager<MultiRegions::ContField>::AllocateSharedPtr(*Exp);
Fce->SetPhys(fce);
//---------------------------------------------
......
......@@ -4,7 +4,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <MultiRegions/MultiRegions.hpp>
#include <MultiRegions/ContField3D.h>
#include <MultiRegions/ContField.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -18,7 +18,7 @@ int main(int argc, char *argv[])
LibUtilities::SessionReaderSharedPtr vSession
= LibUtilities::SessionReader::CreateInstance(argc, argv);
MultiRegions::ContField3DSharedPtr Exp,Fce;
MultiRegions::ContFieldSharedPtr Exp,Fce;
int i, j, nq, coordim;
Array<OneD,NekDouble> fce;
Array<OneD,NekDouble> xc0,xc1,xc2;
......@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
const SpatialDomains::ExpansionMap &expansions = graph3D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph3D->GetExpansionInfos();
LibUtilities::BasisKey bkey
= expansions.begin()->second->m_basisKeyVector[0];
int nmodes = bkey.GetNumModes();
......@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::ContField3D>
Exp = MemoryManager<MultiRegions::ContField>
::AllocateSharedPtr(vSession,graph3D,vSession->GetVariable(0));
//----------------------------------------------
......@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
//---------------------------------------------
// Set up ExpList1D containing the solution
Fce = MemoryManager<MultiRegions::ContField3D>::AllocateSharedPtr(*Exp);
Fce = MemoryManager<MultiRegions::ContField>::AllocateSharedPtr(*Exp);
Fce->SetPhys(fce);
//---------------------------------------------
......
......@@ -5,7 +5,7 @@
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
#include <MultiRegions/MultiRegions.hpp>
#include <MultiRegions/ContField3D.h>
#include <MultiRegions/ContField.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -19,14 +19,14 @@ int main(int argc, char *argv[])
LibUtilities::SessionReaderSharedPtr vSession
= LibUtilities::SessionReader::CreateInstance(argc, argv);
MultiRegions::ContField3DSharedPtr Exp,Fce;
MultiRegions::ContFieldSharedPtr Exp,Fce;
int nq, coordim;
Array<OneD,NekDouble> fce;
Array<OneD,NekDouble> xc0,xc1,xc2;
if(argc != 3)
{
fprintf(stderr,"Usage: ProjectContField3D meshfile \n");
fprintf(stderr,"Usage: ProjectContField meshfile \n");
exit(1);
}
......@@ -37,7 +37,8 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
const SpatialDomains::ExpansionMap &expansions = graph3D->GetExpansions();
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;
......@@ -47,7 +48,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::ContField3D>::AllocateSharedPtr(vSession,graph3D,vSession->GetVariable(0));
Exp = MemoryManager<MultiRegions::ContField>::AllocateSharedPtr(vSession,graph3D,vSession->GetVariable(0));
//----------------------------------------------
//----------------------------------------------
......@@ -83,7 +84,7 @@ int main(int argc, char *argv[])
//---------------------------------------------
// Set up ExpList containing the solution
Fce = MemoryManager<MultiRegions::ContField3D>::AllocateSharedPtr(*Exp);
Fce = MemoryManager<MultiRegions::ContField>::AllocateSharedPtr(*Exp);
Fce->SetPhys(fce);
//---------------------------------------------
......
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
#include <MultiRegions/ExpList1D.h>
#include <MultiRegions/ExpList.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
LibUtilities::SessionReaderSharedPtr vSession
= LibUtilities::SessionReader::CreateInstance(argc, argv);
MultiRegions::ExpList1DSharedPtr Exp,Sol;
MultiRegions::ExpListSharedPtr Exp,Sol;
int i,j;
int nq;
int coordim;
......@@ -28,11 +28,12 @@ int main(int argc, char *argv[])
SpatialDomains::MeshGraphSharedPtr graph1D = SpatialDomains::MeshGraph::Read(vSession);
// Define Expansion
const SpatialDomains::ExpansionMap &expansions = graph1D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph1D->GetExpansionInfos();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
int nmodes = bkey0.GetNumModes();
Exp = MemoryManager<MultiRegions::ExpList1D>::AllocateSharedPtr(vSession,bkey0,graph1D);
Exp = MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(vSession,
graph1D);
//----------------------------------------------
// Define solution to be projected
......@@ -74,8 +75,8 @@ int main(int argc, char *argv[])
}
//---------------------------------------------
// Set up ExpList1D containing the solution
Sol = MemoryManager<MultiRegions::ExpList1D>::AllocateSharedPtr(*Exp);
// Set up ExpList containing the solution
Sol = MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(*Exp);
Sol->SetPhys(sol);
//---------------------------------------------
......
......@@ -4,7 +4,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
#include <MultiRegions/ExpList2D.h>
#include <MultiRegions/ExpList.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -18,7 +18,7 @@ int main(int argc, char *argv[])
LibUtilities::SessionReaderSharedPtr vSession
= LibUtilities::SessionReader::CreateInstance(argc, argv);
MultiRegions::ExpList2DSharedPtr Exp,Fce;
MultiRegions::ExpListSharedPtr Exp,Fce;
int i, j, nq, coordim;
Array<OneD,NekDouble> fce;
Array<OneD,NekDouble> xc0,xc1,xc2;
......@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
const SpatialDomains::ExpansionMap &expansions = graph2D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
LibUtilities::BasisKey bkey0 = expansions.begin()->second->m_basisKeyVector[0];
LibUtilities::BasisKey bkey1 = expansions.begin()->second->m_basisKeyVector[1];
int nmodes = bkey0.GetNumModes();
......@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::ExpList2D>::AllocateSharedPtr(vSession,graph2D);
Exp = MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(vSession,graph2D);
//----------------------------------------------
//----------------------------------------------
......@@ -93,8 +93,8 @@ int main(int argc, char *argv[])
}
//---------------------------------------------
// Set up ExpList1D containing the solution
Fce = MemoryManager<MultiRegions::ExpList2D>::AllocateSharedPtr(*Exp);
// Set up ExpList containing the solution
Fce = MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(*Exp);
Fce->SetPhys(fce);
//---------------------------------------------
......
......@@ -4,7 +4,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
#include <MultiRegions/ExpList3D.h>
#include <MultiRegions/ExpList.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -18,7 +18,7 @@ int main(int argc, char *argv[])
LibUtilities::SessionReaderSharedPtr vSession
= LibUtilities::SessionReader::CreateInstance(argc, argv);
MultiRegions::ExpList3DSharedPtr Exp,Fce;
MultiRegions::ExpListSharedPtr Exp,Fce;
int i, j, nq, coordim;
Array<OneD,NekDouble> fce, tmp, tmp2;
Array<OneD,NekDouble> xc0,xc1,xc2;
......@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Print summary of solution details
const SpatialDomains::ExpansionMap &expansions = graph3D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph3D->GetExpansionInfos();
LibUtilities::BasisKey bkey = expansions.begin()->second->m_basisKeyVector[0];
int nmodes = bkey.GetNumModes();
if (vSession->GetComm()->GetRank() == 0)
......@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::ExpList3D>::AllocateSharedPtr(vSession,graph3D);
Exp = MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(vSession,graph3D);
//----------------------------------------------
//----------------------------------------------
......@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
//---------------------------------------------
// Set up ExpList1D containing the solution
Fce = MemoryManager<MultiRegions::ExpList3D>::AllocateSharedPtr(*Exp);
Fce = MemoryManager<MultiRegions::ExpList>::AllocateSharedPtr(*Exp);
Fce->SetPhys(fce);
//---------------------------------------------
......
......@@ -3,7 +3,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <MultiRegions/ContField2D.h>
#include <MultiRegions/ContField.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
LibUtilities::SessionReaderSharedPtr vSession
= LibUtilities::SessionReader::CreateInstance(argc, argv);
MultiRegions::ContField2DSharedPtr Exp,Fce;
MultiRegions::ContFieldSharedPtr Exp,Fce;
int nq, coordim;
Array<OneD,NekDouble> fce;
Array<OneD,NekDouble> xc0,xc1,xc2;
......@@ -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::ExpansionMap &expansions = graph2D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfos();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
LibUtilities::BasisKey bkey1
......@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::ContField2D>::
Exp = MemoryManager<MultiRegions::ContField>::
AllocateSharedPtr(vSession,graph2D,vSession->GetVariable(0));
//----------------------------------------------
......@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Setup expansion containing the forcing function
Fce = MemoryManager<MultiRegions::ContField2D>::AllocateSharedPtr(*Exp);
Fce = MemoryManager<MultiRegions::ContField>::AllocateSharedPtr(*Exp);
Fce->SetPhys(fce);
//----------------------------------------------
Timing("Define forcing ..");
......
......@@ -4,7 +4,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
#include <MultiRegions/DisContField1D.h>
#include <MultiRegions/DisContField.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
......@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
LibUtilities::CommSharedPtr vComm = vSession->GetComm();
MultiRegions::DisContField1DSharedPtr Exp,Fce;
MultiRegions::DisContFieldSharedPtr Exp,Fce;
int i, nq, coordim;
Array<OneD,NekDouble> fce;
Array<OneD,NekDouble> xc0,xc1,xc2;
......@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::DisContField1D>::
Exp = MemoryManager<MultiRegions::DisContField>::
AllocateSharedPtr(vSession,graph1D,vSession->GetVariable(0));
//----------------------------------------------
......@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Setup expansion containing the forcing function
Fce = MemoryManager<MultiRegions::DisContField1D>::AllocateSharedPtr(*Exp);
Fce = MemoryManager<MultiRegions::DisContField>::AllocateSharedPtr(*Exp);
Fce->SetPhys(fce);
//----------------------------------------------
......
......@@ -4,7 +4,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
#include <MultiRegions/DisContField2D.h>
#include <MultiRegions/DisContField.h>
#include <SpatialDomains/MeshGraph.h>
//#define TIMING
......@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
LibUtilities::CommSharedPtr vComm = vSession->GetComm();
MultiRegions::DisContField2DSharedPtr Exp,Fce;
MultiRegions::DisContFieldSharedPtr Exp,Fce;
MultiRegions::ExpListSharedPtr DerExp1,DerExp2;
int i, nq, coordim;
Array<OneD,NekDouble> fce;
......@@ -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::ExpansionMap &expansions = graph2D->GetExpansions();
const SpatialDomains::ExpansionInfoMap &expansions = graph2D->GetExpansionInfo();
LibUtilities::BasisKey bkey0
= expansions.begin()->second->m_basisKeyVector[0];
......@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Define Expansion
Exp = MemoryManager<MultiRegions::DisContField2D>::
Exp = MemoryManager<MultiRegions::DisContField>::
AllocateSharedPtr(vSession,graph2D,vSession->GetVariable(0));
//----------------------------------------------
Timing("Read files and define exp ..");
......@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
//----------------------------------------------
// Setup expansion containing the forcing function
Fce = MemoryManager<MultiRegions::DisContField2D>::AllocateSharedPtr(*Exp);
Fce = MemoryManager<MultiRegions::DisContField>::AllocateSharedPtr(*Exp);
Fce->SetPhys(fce);
//----------------------------------------------
Timing("Define forcing ..");
......
......@@ -4,7 +4,7 @@
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
#include <LibUtilities/Communication/Comm.h>
#include <MultiRegions/DisContField3D.h>
#include <MultiRegions/DisContField.h>
#include <SpatialDomains/MeshGraph.h>
//#define TIMING
......@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
LibUtilities::CommSharedPtr vComm = vSession->GetComm();
MultiRegions::DisContField3DSharedPtr Exp, Fce;
MultiRegions::DisContFieldSharedPtr Exp, Fce;
int i, nq, coordim;
Array<OneD,NekDouble> fce;