Commit f1ae1c42 authored by Luca Pasquale's avatar Luca Pasquale
Browse files

ETA tests and tutorials now use the non-deprecated FESpace constructor

parent ec9f30b1
......@@ -121,8 +121,11 @@ ETA_ADR2DTest::run()
2.0, 2.0,
-0.0, -0.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, M_comm);
boost::shared_ptr< mesh_Type > meshPtr (meshPart.meshPartition() );
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, M_comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -170,10 +173,10 @@ ETA_ADR2DTest::run()
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 2, 1 > > ETuSpace
( new ETFESpace< mesh_Type, MapEpetra, 2, 1 > (meshPart, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), M_comm) );
( new ETFESpace< mesh_Type, MapEpetra, 2, 1 > (meshPtr, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), M_comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 2, 2 > > ETbetaSpace
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPart, & (betaSpace->refFE() ), & (betaSpace->fe().geoMap() ), M_comm) );
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPtr, & (betaSpace->refFE() ), & (betaSpace->fe().geoMap() ), M_comm) );
if (verbose)
{
......
......@@ -118,8 +118,11 @@ ETA_Blocks2DTest::run()
2.0, 2.0,
-0.0, -0.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, M_comm);
boost::shared_ptr< mesh_Type > meshPtr (meshPart.meshPartition() );
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, M_comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -146,10 +149,10 @@ ETA_Blocks2DTest::run()
( new FESpace< mesh_Type, MapEpetra > (meshPtr, uOrder, 1, M_comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 2, 2 > > ETuSpace
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPart, &feTriaP2, & (uSpace->fe().geoMap() ), M_comm) );
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPtr, &feTriaP2, & (uSpace->fe().geoMap() ), M_comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 2, 1 > > ETpSpace
( new ETFESpace< mesh_Type, MapEpetra, 2, 1 > (meshPart, &feTriaP1, & (uSpace->fe().geoMap() ), M_comm) );
( new ETFESpace< mesh_Type, MapEpetra, 2, 1 > (meshPtr, &feTriaP1, & (uSpace->fe().geoMap() ), M_comm) );
if (verbose)
{
......
......@@ -114,8 +114,11 @@ ETA_InterpolateGradient2DTest::run()
2.0, 2.0,
-1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, M_comm);
boost::shared_ptr< mesh_Type > meshPtr (meshPart.meshPartition() );
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, M_comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -155,7 +158,7 @@ ETA_InterpolateGradient2DTest::run()
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 2, 2 > > ETuSpace
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPart, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), M_comm) );
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPtr, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), M_comm) );
if (verbose)
{
......
......@@ -115,8 +115,11 @@ ETA_VectorialADR2DTest::run()
2.0, 2.0,
-0.0, -0.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, M_comm);
boost::shared_ptr< mesh_Type > meshPtr (meshPart.meshPartition() );
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, M_comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -164,10 +167,10 @@ ETA_VectorialADR2DTest::run()
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 2, 2 > > ETuSpace
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPart, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), M_comm) );
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPtr, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), M_comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 2, 2 > > ETbetaSpace
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPart, & (betaSpace->refFE() ), & (betaSpace->fe().geoMap() ), M_comm) );
( new ETFESpace< mesh_Type, MapEpetra, 2, 2 > (meshPtr, & (betaSpace->refFE() ), & (betaSpace->fe().geoMap() ), M_comm) );
if (verbose)
{
......
......@@ -154,7 +154,11 @@ int main ( int argc, char** argv )
2.0, 2.0, 2.0,
-1.0, -1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -183,7 +187,7 @@ int main ( int argc, char** argv )
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > uSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPart, &feTetraP1, Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPtr, &feTetraP1, Comm) );
if (verbose)
{
......
......@@ -153,7 +153,11 @@ int main ( int argc, char** argv )
2.0, 2.0, 2.0,
-1.0, -1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -193,10 +197,10 @@ int main ( int argc, char** argv )
std::string bOrder ("P1");
boost::shared_ptr<FESpace< mesh_Type, MapEpetra > > uSpace
( new FESpace< mesh_Type, MapEpetra > (meshPart, uOrder, 1, Comm) );
( new FESpace< mesh_Type, MapEpetra > (meshPtr, uOrder, 1, Comm) );
boost::shared_ptr<FESpace< mesh_Type, MapEpetra > > betaSpace
( new FESpace< mesh_Type, MapEpetra > (meshPart, bOrder, 3, Comm) );
( new FESpace< mesh_Type, MapEpetra > (meshPtr, bOrder, 3, Comm) );
if (verbose)
{
......@@ -213,10 +217,10 @@ int main ( int argc, char** argv )
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > ETuSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPart, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPtr, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), Comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 3 > > ETbetaSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 3 > (meshPart, & (betaSpace->refFE() ), & (betaSpace->fe().geoMap() ), Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 3 > (meshPtr, & (betaSpace->refFE() ), & (betaSpace->fe().geoMap() ), Comm) );
if (verbose)
{
......
......@@ -150,7 +150,11 @@ int main ( int argc, char** argv )
2.0, 2.0, 2.0,
-1.0, -1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -171,7 +175,7 @@ int main ( int argc, char** argv )
}
std::string uOrder ("P1");
boost::shared_ptr<FESpace< mesh_Type, MapEpetra > > uSpace ( new FESpace< mesh_Type, MapEpetra > (meshPart, uOrder, 1, Comm) );
boost::shared_ptr<FESpace< mesh_Type, MapEpetra > > uSpace ( new FESpace< mesh_Type, MapEpetra > (meshPtr, uOrder, 1, Comm) );
if (verbose)
{
......@@ -187,7 +191,7 @@ int main ( int argc, char** argv )
std::cout << " -- Building the ETFESpace ... " << std::flush;
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > ETuSpace ( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPart, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), Comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > ETuSpace ( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPtr, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), Comm) );
if (verbose)
{
......
......@@ -124,7 +124,11 @@ int main ( int argc, char** argv )
2.0, 2.0, 2.0,
-1.0, -1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -154,7 +158,7 @@ int main ( int argc, char** argv )
std::string uOrder ("P1");
boost::shared_ptr<FESpace< mesh_Type, MapEpetra > > uSpace
( new FESpace< mesh_Type, MapEpetra > (meshPart, uOrder, 3, Comm) );
( new FESpace< mesh_Type, MapEpetra > (meshPtr, uOrder, 3, Comm) );
if (verbose)
{
......@@ -171,7 +175,7 @@ int main ( int argc, char** argv )
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 3 > > ETuSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 3 > (meshPart, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 3 > (meshPtr, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), Comm) );
if (verbose)
{
......
......@@ -121,7 +121,11 @@ int main ( int argc, char** argv )
2.0, 2.0, 2.0,
-1.0, -1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -142,7 +146,7 @@ int main ( int argc, char** argv )
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > scalarSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPart, &feTetraP1, Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPtr, &feTetraP1, Comm) );
if (verbose)
{
......
......@@ -221,7 +221,11 @@ int main ( int argc, char** argv )
2.0, 2.0, 2.0,
-1.0, -1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -243,9 +247,9 @@ int main ( int argc, char** argv )
}
std::string uOrder ("P1");
boost::shared_ptr<FESpace< mesh_Type, MapEpetra > > uSpace ( new FESpace< mesh_Type, MapEpetra > (meshPart, uOrder, 1, Comm) );
boost::shared_ptr<FESpace< mesh_Type, MapEpetra > > uSpace ( new FESpace< mesh_Type, MapEpetra > (meshPtr, uOrder, 1, Comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > ETuSpace ( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPart, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), Comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > ETuSpace ( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPtr, & (uSpace->refFE() ), & (uSpace->fe().geoMap() ), Comm) );
if (verbose)
{
......
......@@ -140,7 +140,11 @@ int main ( int argc, char** argv )
2.0, 2.0, 2.0,
-1.0, -1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -165,13 +169,13 @@ int main ( int argc, char** argv )
std::string uOrder ("P2");
boost::shared_ptr<FESpace< mesh_Type, MapEpetra > > uSpace
( new FESpace< mesh_Type, MapEpetra > (meshPart, uOrder, 1, Comm) );
( new FESpace< mesh_Type, MapEpetra > (meshPtr, uOrder, 1, Comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 3 > > ETuSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 3 > (meshPart, &feTetraP2, & (uSpace->fe().geoMap() ), Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 3 > (meshPtr, &feTetraP2, & (uSpace->fe().geoMap() ), Comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > ETpSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPart, &feTetraP1, & (uSpace->fe().geoMap() ), Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPtr, &feTetraP1, & (uSpace->fe().geoMap() ), Comm) );
if (verbose)
{
......
......@@ -137,7 +137,11 @@ int main ( int argc, char** argv )
2.0, 2.0, 2.0,
-1.0, -1.0, -1.0);
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
boost::shared_ptr< mesh_Type > meshPtr;
{
MeshPartitioner< mesh_Type > meshPart (fullMeshPtr, Comm);
meshPtr = meshPart.meshPartition();
}
fullMeshPtr.reset();
......@@ -162,13 +166,13 @@ int main ( int argc, char** argv )
}
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 3 > > ETuSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 3 > (meshPart, &feTetraP2, Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 3 > (meshPtr, &feTetraP2, Comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > ETpSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPart, &feTetraP1, Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPtr, &feTetraP1, Comm) );
boost::shared_ptr<ETFESpace< mesh_Type, MapEpetra, 3, 1 > > ETuCompSpace
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPart, &feTetraP2, Comm) );
( new ETFESpace< mesh_Type, MapEpetra, 3, 1 > (meshPtr, &feTetraP2, Comm) );
if (verbose)
{
......
Supports Markdown
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