Commit 5e8fae77 authored by Christoph Grueninger's avatar Christoph Grueninger
Browse files

[cleanup] Use shared_ptr from std:: instead of Dune::

Same for make_shared and some includes.
(reviewed by fetzer)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15050 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent d3d32d32
......@@ -76,7 +76,7 @@ public:
DiffusionProblem1P(TimeManager &timeManager, const GridView &gridView)
: ParentType(timeManager, gridView), gravity_(0)
{
spatialParams_ = Dune::make_shared<SpatialParams>(gridView);
spatialParams_ = std::make_shared<SpatialParams>(gridView);
gravity_ = 0;
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
......@@ -104,7 +104,7 @@ public:
DiffusionProblem1P(const GridView &gridView)
: ParentType(gridView, false), gravity_(0)
{
spatialParams_ = Dune::make_shared<SpatialParams>(gridView);
spatialParams_ = std::make_shared<SpatialParams>(gridView);
gravity_ = 0;
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
......@@ -240,7 +240,7 @@ private:
GlobalPosition gravity_;
// fluids and material properties
Dune::shared_ptr<SpatialParams> spatialParams_;
std::shared_ptr<SpatialParams> spatialParams_;
};
}
......
......@@ -73,12 +73,12 @@ public:
DiffusionProblem2P(TimeManager &timeManager, const GridView &gridView)
: ParentType(timeManager, gridView), gravity_(0)
{
spatialParams_ = Dune::make_shared<SpatialParams>(gridView);
spatialParams_ = std::make_shared<SpatialParams>(gridView);
gravity_ = 0;
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
pressModel_ = Dune::make_shared<PressureModel>(asImp_());
pressModel_ = std::make_shared<PressureModel>(asImp_());
}
/*!
* \brief Constructs a DiffusionProblem2P object
......@@ -95,7 +95,7 @@ public:
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
pressModel_ = Dune::make_shared<PressureModel>(asImp_());
pressModel_ = std::make_shared<PressureModel>(asImp_());
}
/*!
......@@ -106,12 +106,12 @@ public:
DiffusionProblem2P(const GridView &gridView)
: ParentType(gridView, false), gravity_(0)
{
spatialParams_ = Dune::make_shared<SpatialParams>(gridView);
spatialParams_ = std::make_shared<SpatialParams>(gridView);
gravity_ = 0;
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
pressModel_ = Dune::make_shared<PressureModel>(asImp_());
pressModel_ = std::make_shared<PressureModel>(asImp_());
}
/*!
* \brief Constructs a DiffusionProblem2P object
......@@ -127,7 +127,7 @@ public:
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim - 1] = -9.81;
pressModel_ = Dune::make_shared<PressureModel>(asImp_());
pressModel_ = std::make_shared<PressureModel>(asImp_());
}
/*!
......@@ -248,9 +248,9 @@ private:
GlobalPosition gravity_;
// fluids and material properties
Dune::shared_ptr<SpatialParams> spatialParams_;
std::shared_ptr<SpatialParams> spatialParams_;
bool newSpatialParams_;
Dune::shared_ptr<PressureModel> pressModel_;
std::shared_ptr<PressureModel> pressModel_;
};
}
......
......@@ -79,7 +79,7 @@ public:
: ParentType(timeManager, gridView),
gravity_(0)
{
spatialParams_ = Dune::make_shared<SpatialParams>(gridView);
spatialParams_ = std::make_shared<SpatialParams>(gridView);
gravity_ = 0;
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
......@@ -192,7 +192,7 @@ private:
GlobalPosition gravity_;
// fluids and material properties
Dune::shared_ptr<SpatialParams> spatialParams_;
std::shared_ptr<SpatialParams> spatialParams_;
};
}
......
......@@ -482,9 +482,9 @@ public:
DUNE_THROW(Dune::NotImplemented, "Velocity type not supported!");
}
capillaryFlux_ = Dune::make_shared<CapillaryFlux>(problem);
gravityFlux_ = Dune::make_shared<GravityFlux>(problem);
velocity_ = Dune::make_shared<Velocity>(problem);
capillaryFlux_ = std::make_shared<CapillaryFlux>(problem);
gravityFlux_ = std::make_shared<GravityFlux>(problem);
velocity_ = std::make_shared<Velocity>(problem);
vtkOutputLevel_ = GET_PARAM_FROM_GROUP(TypeTag, int, Vtk, OutputLevel);
porosityThreshold_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, PorosityThreshold);
......@@ -500,9 +500,9 @@ private:
{ return *static_cast<const Implementation *>(this); }
Problem& problem_;
Dune::shared_ptr<Velocity> velocity_;
Dune::shared_ptr<CapillaryFlux> capillaryFlux_;
Dune::shared_ptr<GravityFlux> gravityFlux_;
std::shared_ptr<Velocity> velocity_;
std::shared_ptr<CapillaryFlux> capillaryFlux_;
std::shared_ptr<GravityFlux> gravityFlux_;
int vtkOutputLevel_;
Scalar porosityThreshold_;
......
......@@ -98,7 +98,7 @@ public:
{
cFLFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor);
spatialParams_ = Dune::make_shared<SpatialParams>(gridView);
spatialParams_ = std::make_shared<SpatialParams>(gridView);
gravity_ = 0;
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
......@@ -241,7 +241,7 @@ private:
GlobalPosition gravity_;
// material properties
Dune::shared_ptr<SpatialParams> spatialParams_;
std::shared_ptr<SpatialParams> spatialParams_;
Scalar cFLFactor_;
};
......
......@@ -78,7 +78,7 @@ protected:
int globalIdx_;
Scalar perimeter_;
Dune::shared_ptr<FluidState> fluidState_;
std::shared_ptr<FluidState> fluidState_;
FluxData fluxData_;
public:
......@@ -353,7 +353,7 @@ public:
FluidState& manipulateFluidState()
{
if(!fluidState_)
fluidState_ = Dune::make_shared<FluidState>();
fluidState_ = std::make_shared<FluidState>();
return *fluidState_;
}
......
......@@ -62,7 +62,7 @@ private:
private:
int subdomain_;
int fluidStateType_;
Dune::shared_ptr<SimpleFluidState> simpleFluidState_;
std::shared_ptr<SimpleFluidState> simpleFluidState_;
// FluxData fluxData_;
public:
......@@ -283,7 +283,7 @@ public:
}
if(!simpleFluidState_)
simpleFluidState_ = Dune::make_shared<SimpleFluidState>();
simpleFluidState_ = std::make_shared<SimpleFluidState>();
return *simpleFluidState_;
}
//! Allows manipulation of the complex fluid state
......@@ -301,7 +301,7 @@ public:
if(!this->fluidState_)
{
this->fluidState_ = Dune::make_shared<FluidState>();
this->fluidState_ = std::make_shared<FluidState>();
// properly initialize pressure, since it is evaluated later:
this->fluidState_->setPressure(wPhaseIdx, 1e5);
this->fluidState_->setPressure(nPhaseIdx, 1e5);
......
......@@ -223,7 +223,7 @@ public:
problem_(problem), switchNormals_(GET_PARAM_FROM_GROUP(TypeTag, bool, Impet, SwitchNormals)),
subCFLFactor_(1.0), accumulatedDt_(0), dtThreshold_(1e-6)
{
evalCflFluxFunction_ = Dune::make_shared<EvalCflFluxFunction>(problem);
evalCflFluxFunction_ = std::make_shared<EvalCflFluxFunction>(problem);
Scalar cFLFactor = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, CFLFactor);
subCFLFactor_ = std::min(GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, SubCFLFactor), cFLFactor);
......@@ -255,7 +255,7 @@ private:
Problem& problem_;
bool switchNormals_;
Dune::shared_ptr<EvalCflFluxFunction> evalCflFluxFunction_;
std::shared_ptr<EvalCflFluxFunction> evalCflFluxFunction_;
std::vector<LocalTimesteppingData> timeStepData_;
bool localTimeStepping_;
Scalar subCFLFactor_;
......
......@@ -124,14 +124,14 @@ public:
bBoxMax_[i] = gridView.comm().max(bBoxMax_[i]);
}
pressModel_ = Dune::make_shared<PressureModel>(asImp_());
pressModel_ = std::make_shared<PressureModel>(asImp_());
transportModel_ = Dune::make_shared<TransportModel>(asImp_());
model_ = Dune::make_shared<IMPETModel>(asImp_()) ;
transportModel_ = std::make_shared<TransportModel>(asImp_());
model_ = std::make_shared<IMPETModel>(asImp_()) ;
// create an Object to handle adaptive grids
if (adaptiveGrid)
gridAdapt_ = Dune::make_shared<GridAdaptModel>(asImp_());
gridAdapt_ = std::make_shared<GridAdaptModel>(asImp_());
vtkOutputLevel_ = GET_PARAM_FROM_GROUP(TypeTag, int, Vtk, OutputLevel);
dtVariationRestrictionFactor_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, DtVariationRestrictionFactor);
......@@ -806,7 +806,7 @@ public:
std::cout << "Writing result file for current time step\n";
if (!resultWriter_)
resultWriter_ = Dune::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
resultWriter_ = std::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
if (adaptiveGrid)
resultWriter_->gridChanged();
resultWriter_->beginWrite(timeManager().time() + timeManager().timeStepSize());
......@@ -822,14 +822,14 @@ protected:
VtkMultiWriter& resultWriter()
{
if (!resultWriter_)
resultWriter_ = Dune::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
resultWriter_ = std::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
return *resultWriter_;
}
//! \copydoc Dumux::IMPETProblem::resultWriter()
VtkMultiWriter& resultWriter() const
{
if (!resultWriter_)
resultWriter_ = Dune::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
resultWriter_ = std::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
return *resultWriter_;
}
......@@ -856,15 +856,15 @@ private:
Variables variables_;
Dune::shared_ptr<PressureModel> pressModel_;//!< object including the pressure model
Dune::shared_ptr<TransportModel> transportModel_;//!< object including the saturation model
Dune::shared_ptr<IMPETModel> model_;
std::shared_ptr<PressureModel> pressModel_;//!< object including the pressure model
std::shared_ptr<TransportModel> transportModel_;//!< object including the saturation model
std::shared_ptr<IMPETModel> model_;
Dune::shared_ptr<VtkMultiWriter> resultWriter_;
std::shared_ptr<VtkMultiWriter> resultWriter_;
int outputInterval_;
Scalar outputTimeInterval_;
int vtkOutputLevel_;
Dune::shared_ptr<GridAdaptModel> gridAdapt_;
std::shared_ptr<GridAdaptModel> gridAdapt_;
Scalar dtVariationRestrictionFactor_;
};
......
......@@ -107,9 +107,9 @@ public:
}
}
timeManager_ = Dune::make_shared<TimeManager>(verbose);
timeManager_ = std::make_shared<TimeManager>(verbose);
model_ = Dune::make_shared<Model>(asImp_()) ;
model_ = std::make_shared<Model>(asImp_()) ;
}
//! Constructs an object of type OneModelProblemProblem
......@@ -137,7 +137,7 @@ public:
timeManager_ = Dune::stackobject_to_shared_ptr<TimeManager>(timeManager);
model_ = Dune::make_shared<Model>(asImp_()) ;
model_ = std::make_shared<Model>(asImp_()) ;
}
/*!
......@@ -451,7 +451,7 @@ public:
if (verbose && gridView().comm().rank() == 0)
std::cout << "Writing result file for current time step\n";
if (!resultWriter_)
resultWriter_ = Dune::make_shared<VtkMultiWriter>(gridView(), asImp_().name());
resultWriter_ = std::make_shared<VtkMultiWriter>(gridView(), asImp_().name());
resultWriter_->beginWrite(timeManager().time() + timeManager().timeStepSize());
model().addOutputVtkFields(*resultWriter_);
asImp_().addOutputVtkFields();
......@@ -627,14 +627,14 @@ protected:
VtkMultiWriter& resultWriter()
{
if (!resultWriter_)
resultWriter_ = Dune::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
resultWriter_ = std::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
return *resultWriter_;
}
VtkMultiWriter& resultWriter() const
{
if (!resultWriter_)
resultWriter_ = Dune::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
resultWriter_ = std::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
return *resultWriter_;
}
......@@ -655,13 +655,13 @@ private:
GlobalPosition bBoxMin_;
GlobalPosition bBoxMax_;
Dune::shared_ptr<TimeManager> timeManager_;
std::shared_ptr<TimeManager> timeManager_;
Variables variables_;
Dune::shared_ptr<Model> model_;
std::shared_ptr<Model> model_;
Dune::shared_ptr<VtkMultiWriter> resultWriter_;
std::shared_ptr<VtkMultiWriter> resultWriter_;
int outputInterval_;
Scalar outputTimeInterval_;
};
......
......@@ -79,9 +79,9 @@ private:
{
int numVertices = this->problem().gridView().size(dim);
aBlocked_ = Dune::make_shared<BlockMatrix>(numVertices, numVertices, BlockMatrix::random);
xBlocked_ = Dune::make_shared<BlockVector>(numVertices);
bBlocked_ = Dune::make_shared<BlockVector>(numVertices);
aBlocked_ = std::make_shared<BlockMatrix>(numVertices, numVertices, BlockMatrix::random);
xBlocked_ = std::make_shared<BlockVector>(numVertices);
bBlocked_ = std::make_shared<BlockVector>(numVertices);
// find out the global indices of the neighboring vertices of
// each vertex
......
......@@ -143,35 +143,35 @@ public:
{
problemPtr_ = &problem;
constraints_ = Dune::make_shared<Constraints>();
constraints_ = std::make_shared<Constraints>();
pressureFEM_ = Dune::make_shared<PressureFEM>(problemPtr_->gridView());
pressureScalarGFS_ = Dune::make_shared<PressureScalarGFS>(problemPtr_->gridView(), *pressureFEM_, *constraints_);
pressureGFS_ = Dune::make_shared<PressureGFS>(*pressureScalarGFS_);
pressureFEM_ = std::make_shared<PressureFEM>(problemPtr_->gridView());
pressureScalarGFS_ = std::make_shared<PressureScalarGFS>(problemPtr_->gridView(), *pressureFEM_, *constraints_);
pressureGFS_ = std::make_shared<PressureGFS>(*pressureScalarGFS_);
displacementFEM_ = Dune::make_shared<DisplacementFEM>(problemPtr_->gridView());
displacementScalarGFS_ = Dune::make_shared<DisplacementScalarGFS>(problemPtr_->gridView(), *displacementFEM_, *constraints_);
displacementGFS_ = Dune::make_shared<DisplacementGFS>(*displacementScalarGFS_);
displacementFEM_ = std::make_shared<DisplacementFEM>(problemPtr_->gridView());
displacementScalarGFS_ = std::make_shared<DisplacementScalarGFS>(problemPtr_->gridView(), *displacementFEM_, *constraints_);
displacementGFS_ = std::make_shared<DisplacementGFS>(*displacementScalarGFS_);
gridFunctionSpace_ = Dune::make_shared<GridFunctionSpace>(*pressureGFS_, *displacementGFS_);
gridFunctionSpace_ = std::make_shared<GridFunctionSpace>(*pressureGFS_, *displacementGFS_);
constraintsTrafo_ = Dune::make_shared<ConstraintsTrafo>();
constraintsTrafo_ = std::make_shared<ConstraintsTrafo>();
// initialize the grid operator spaces
localOperator_ = Dune::make_shared<LocalOperator>(problemPtr_->model());
localOperator_ = std::make_shared<LocalOperator>(problemPtr_->model());
gridOperator_ =
Dune::make_shared<GridOperator>(*gridFunctionSpace_, *constraintsTrafo_,
std::make_shared<GridOperator>(*gridFunctionSpace_, *constraintsTrafo_,
*gridFunctionSpace_, *constraintsTrafo_, *localOperator_);
// allocate raw matrix
matrix_ = Dune::make_shared<JacobianMatrix>(*gridOperator_);
matrix_ = std::make_shared<JacobianMatrix>(*gridOperator_);
// initialize the jacobian matrix and the right hand side
// vector
*matrix_ = 0;
reuseMatrix_ = false;
residual_ = Dune::make_shared<SolutionVector>(*gridFunctionSpace_);
residual_ = std::make_shared<SolutionVector>(*gridFunctionSpace_);
int numVertices = gridView_().size(dim);
int numElements = gridView_().size(0);
......@@ -575,9 +575,9 @@ private:
Problem *problemPtr_;
// the jacobian matrix
Dune::shared_ptr<JacobianMatrix> matrix_;
std::shared_ptr<JacobianMatrix> matrix_;
// the right-hand side
Dune::shared_ptr<SolutionVector> residual_;
std::shared_ptr<SolutionVector> residual_;
// attributes required for jacobian matrix recycling
bool reuseMatrix_;
......@@ -594,17 +594,17 @@ private:
Scalar reassembleTolerance_;
Dune::shared_ptr<Constraints> constraints_;
Dune::shared_ptr<PressureFEM> pressureFEM_;
Dune::shared_ptr<DisplacementFEM> displacementFEM_;
Dune::shared_ptr<PressureScalarGFS> pressureScalarGFS_;
Dune::shared_ptr<DisplacementScalarGFS> displacementScalarGFS_;
Dune::shared_ptr<PressureGFS> pressureGFS_;
Dune::shared_ptr<DisplacementGFS> displacementGFS_;
Dune::shared_ptr<GridFunctionSpace> gridFunctionSpace_;
Dune::shared_ptr<ConstraintsTrafo> constraintsTrafo_;
Dune::shared_ptr<LocalOperator> localOperator_;
Dune::shared_ptr<GridOperator> gridOperator_;
std::shared_ptr<Constraints> constraints_;
std::shared_ptr<PressureFEM> pressureFEM_;
std::shared_ptr<DisplacementFEM> displacementFEM_;
std::shared_ptr<PressureScalarGFS> pressureScalarGFS_;
std::shared_ptr<DisplacementScalarGFS> displacementScalarGFS_;
std::shared_ptr<PressureGFS> pressureGFS_;
std::shared_ptr<DisplacementGFS> displacementGFS_;
std::shared_ptr<GridFunctionSpace> gridFunctionSpace_;
std::shared_ptr<ConstraintsTrafo> constraintsTrafo_;
std::shared_ptr<LocalOperator> localOperator_;
std::shared_ptr<GridOperator> gridOperator_;
};
} // namespace PDELab
......
......@@ -105,11 +105,11 @@ public:
boxVolume_.resize(numDofs);
localJacobian_.init(problem_());
jacAsm_ = Dune::make_shared<JacobianAssembler>();
jacAsm_ = std::make_shared<JacobianAssembler>();
jacAsm_->init(problem_());
uCur_ = Dune::make_shared<SolutionVector>(jacAsm_->gridFunctionSpace());
uPrev_ = Dune::make_shared<SolutionVector>(jacAsm_->gridFunctionSpace());
uCur_ = std::make_shared<SolutionVector>(jacAsm_->gridFunctionSpace());
uPrev_ = std::make_shared<SolutionVector>(jacAsm_->gridFunctionSpace());
asImp_().applyInitialSolution_();
......@@ -627,7 +627,7 @@ public:
void resetJacobianAssembler ()
{
jacAsm_.template reset<JacobianAssembler>(0);
jacAsm_ = Dune::make_shared<JacobianAssembler>();
jacAsm_ = std::make_shared<JacobianAssembler>();
jacAsm_->init(problem_());
}
......@@ -1000,15 +1000,15 @@ protected:
LocalJacobian localJacobian_;
// Linearizes the problem at the current time step using the
// local jacobian
Dune::shared_ptr<JacobianAssembler> jacAsm_;
std::shared_ptr<JacobianAssembler> jacAsm_;
// the set of all indices of vertices on the boundary
std::vector<bool> boundaryIndices_;
// cur is the current iterative solution, prev the converged
// solution of the previous time step
Dune::shared_ptr<SolutionVector> uCur_;
Dune::shared_ptr<SolutionVector> uPrev_;
std::shared_ptr<SolutionVector> uCur_;
std::shared_ptr<SolutionVector> uPrev_;
Dune::BlockVector<Dune::FieldVector<Scalar, 1> > boxVolume_;
......
......@@ -271,7 +271,7 @@ private:
int numVerticesGlobal = this->gridView_().size(dim);
// allocate raw matrix
this->matrix_ = Dune::make_shared<JacobianMatrix>(numVerticesGlobal, numVerticesGlobal, JacobianMatrix::random);
this->matrix_ = std::make_shared<JacobianMatrix>(numVerticesGlobal, numVerticesGlobal, JacobianMatrix::random);
// find out the global indices of the neighboring vertices of
// each vertex
......
......@@ -142,7 +142,7 @@ private:
int numElements = this->gridView_().size(0);
// allocate raw matrix
this->matrix_ = Dune::make_shared<JacobianMatrix>(numElements, numElements, JacobianMatrix::random);
this->matrix_ = std::make_shared<JacobianMatrix>(numElements, numElements, JacobianMatrix::random);
// find out the global indices of the neighboring elements of
// each element
......
......@@ -528,7 +528,7 @@ protected:
Problem *problemPtr_;
// the jacobian matrix
Dune::shared_ptr<JacobianMatrix> matrix_;
std::shared_ptr<JacobianMatrix> matrix_;
// the right-hand side
SolutionVector residual_;
......
......@@ -109,7 +109,7 @@ public:
boxVolume_.resize(numDofs);
localJacobian_.init(problem_());
jacAsm_ = Dune::make_shared<JacobianAssembler>();
jacAsm_ = std::make_shared<JacobianAssembler>();
jacAsm_->init(problem_());
asImp_().applyInitialSolution_();
......@@ -711,7 +711,7 @@ public:
void resetJacobianAssembler ()
{
jacAsm_.template reset<JacobianAssembler>(0);
jacAsm_ = Dune::make_shared<JacobianAssembler>();
jacAsm_ = std::make_shared<JacobianAssembler>();
jacAsm_->init(problem_());
}
......@@ -1093,7 +1093,7 @@ protected:
LocalJacobian localJacobian_;
// Linearizes the problem at the current time step using the
// local jacobian
Dune::shared_ptr<JacobianAssembler> jacAsm_;
std::shared_ptr<JacobianAssembler> jacAsm_;
// the set of all indices of vertices on the boundary
std::vector<bool> boundaryIndices_;
......
......@@ -77,7 +77,7 @@ public:
: ParentType(timeManager, gridView),
gravity_(0)
{
spatialParams_ = Dune::make_shared<SpatialParams>(gridView);
spatialParams_ = std::make_shared<SpatialParams>(gridView);
if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
gravity_[dim-1] = -9.81;
......@@ -155,7 +155,7 @@ protected:
GlobalPosition gravity_;
// fluids and material properties
Dune::shared_ptr<SpatialParams> spatialParams_;
std::shared_ptr<SpatialParams> spatialParams_;
};
}
......
......@@ -127,7 +127,7 @@ public:
// if we are calculating on an adaptive grid get the grid adapt model
if (adaptiveGrid)
gridAdapt_ = Dune::make_shared<GridAdaptModel>(asImp_());
gridAdapt_ = std::make_shared<GridAdaptModel>(asImp_());
}
/*!
......@@ -920,7 +920,7 @@ private:
void createResultWriter_()
{
if (!resultWriter_)
resultWriter_ = Dune::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
resultWriter_ = std::make_shared<VtkMultiWriter>(gridView_, asImp_().name());
// Tell the result writer that the grid changes if we are adaptive
if (adaptiveGrid)
......@@ -945,9 +945,9 @@ private:
NewtonMethod newtonMethod_;
NewtonController newtonCtl_;
Dune::shared_ptr<VtkMultiWriter> resultWriter_;
std::shared_ptr<VtkMultiWriter> resultWriter_;