From 13f2f93ec8961a016f27557278fe8139b5bb53eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicente=20Mataix=20Ferr=C3=A1ndiz?= Date: Thu, 31 Aug 2017 12:14:55 +0200 Subject: [PATCH] Replacing boost for std (just core, for testing) TESTS CRASH Replacing: boost::shared_ptr -> std::shared_ptr boost::weak_ptr -> std::weak_ptr boost::make_shared -> std::make_shared --- kratos/containers/buffer.h | 2 +- kratos/containers/pointer_hash_map_set.h | 2 +- kratos/containers/pointer_vector.h | 2 +- kratos/containers/pointer_vector_map.h | 2 +- kratos/containers/pointer_vector_set.h | 2 +- kratos/containers/weak_pointer_vector.h | 2 +- .../containers/weak_pointer_vector_iterator.h | 2 +- kratos/geometries/geometry.h | 4 +- kratos/geometries/hexahedra_3d_20.h | 2 +- kratos/geometries/hexahedra_3d_27.h | 2 +- kratos/geometries/hexahedra_3d_8.h | 2 +- kratos/geometries/hexahedra_interface_3d_8.h | 2 +- kratos/geometries/line_2d.h | 2 +- kratos/geometries/line_2d_2.h | 2 +- kratos/geometries/line_2d_3.h | 2 +- kratos/geometries/line_3d_2.h | 2 +- kratos/geometries/line_3d_3.h | 2 +- kratos/geometries/line_gl_3d_2.h | 2 +- kratos/geometries/point_2d.h | 2 +- kratos/geometries/point_3d.h | 2 +- kratos/geometries/prism_3d_15.h | 2 +- kratos/geometries/prism_3d_6.h | 2 +- kratos/geometries/prism_interface_3d_6.h | 2 +- kratos/geometries/quadrilateral_2d_4.h | 10 ++-- kratos/geometries/quadrilateral_2d_8.h | 10 ++-- kratos/geometries/quadrilateral_2d_9.h | 10 ++-- kratos/geometries/quadrilateral_3d_4.h | 2 +- kratos/geometries/quadrilateral_3d_8.h | 10 ++-- kratos/geometries/quadrilateral_3d_9.h | 10 ++-- .../geometries/quadrilateral_interface_2d_4.h | 10 ++-- .../geometries/quadrilateral_interface_3d_4.h | 2 +- kratos/geometries/sphere_3d_1.h | 2 +- kratos/geometries/tetrahedra_3d_10.h | 2 +- kratos/geometries/tetrahedra_3d_4.h | 2 +- kratos/geometries/triangle_2d_3.h | 8 ++-- kratos/geometries/triangle_2d_6.h | 8 ++-- kratos/geometries/triangle_3d_3.h | 10 ++-- kratos/geometries/triangle_3d_6.h | 8 ++-- kratos/includes/communicator.h | 12 ++--- kratos/includes/define.h | 12 ++--- kratos/includes/io.h | 2 +- kratos/includes/kratos_parameters.h | 12 ++--- kratos/includes/model_part.h | 4 +- kratos/includes/model_part_io.h | 8 ++-- kratos/includes/neighbours.h | 4 +- kratos/includes/node.h | 12 ++--- kratos/includes/serializer.h | 16 +++---- kratos/linear_solvers/bicgstab_solver.h | 2 +- kratos/linear_solvers/cg_solver.h | 2 +- kratos/linear_solvers/deflated_cg_solver.h | 2 +- kratos/linear_solvers/iterative_solver.h | 2 +- kratos/linear_solvers/mixedup_linear_solver.h | 2 +- kratos/modeler/mesh_suite_modeler.h | 2 +- ...ulate_signed_distance_to_3d_skin_process.h | 4 +- kratos/python/add_logger_to_python.cpp | 2 +- kratos/python/add_model_part_to_python.cpp | 2 +- kratos/python/add_strategies_to_python.cpp | 16 +++---- kratos/python/add_testing_to_python.cpp | 2 +- kratos/python/matrix_python_interface.h | 4 +- kratos/sources/model_part.cpp | 10 ++-- kratos/sources/model_part_io.cpp | 20 ++++---- kratos/spaces/dense_space.h | 4 +- kratos/spaces/ublas_space.h | 4 +- kratos/templates/geometry_template | 4 +- ...est_calculate_distance_to_skin_process.cpp | 48 +++++++++---------- kratos/tests/sources/test_model_part_io.cpp | 8 ++-- 66 files changed, 187 insertions(+), 187 deletions(-) diff --git a/kratos/containers/buffer.h b/kratos/containers/buffer.h index e018a883f0de..8cf6d4a5e002 100644 --- a/kratos/containers/buffer.h +++ b/kratos/containers/buffer.h @@ -245,7 +245,7 @@ class Buffer is in charge of storing pointers correctly. */ template - void push_back(boost::shared_ptr const& rValue) + void push_back(std::shared_ptr const& rValue) { KRATOS_THROW_ERROR(std::logic_error, "You cannot store a pointer in the buffer try the Serializer instead", "" ); } diff --git a/kratos/containers/pointer_hash_map_set.h b/kratos/containers/pointer_hash_map_set.h index 5fa1c321145d..e0ecf1810e4c 100644 --- a/kratos/containers/pointer_hash_map_set.h +++ b/kratos/containers/pointer_hash_map_set.h @@ -64,7 +64,7 @@ namespace Kratos template, class TGetKeyType = SetIdentityFunction, - class TPointerType = boost::shared_ptr > + class TPointerType = std::shared_ptr > class PointerHashMapSet { diff --git a/kratos/containers/pointer_vector.h b/kratos/containers/pointer_vector.h index dc2b6d1edc29..1052ed08d4f0 100644 --- a/kratos/containers/pointer_vector.h +++ b/kratos/containers/pointer_vector.h @@ -66,7 +66,7 @@ namespace Kratos deleting. */ template, + class TPointerType = std::shared_ptr, class TContainerType = std::vector > class PointerVector { diff --git a/kratos/containers/pointer_vector_map.h b/kratos/containers/pointer_vector_map.h index 1a4e2a21e551..67d0a42c0150 100644 --- a/kratos/containers/pointer_vector_map.h +++ b/kratos/containers/pointer_vector_map.h @@ -65,7 +65,7 @@ namespace Kratos template, - class TPointerType = boost::shared_ptr, + class TPointerType = std::shared_ptr, class TContainerType = std::vector > > class PointerVectorMap { diff --git a/kratos/containers/pointer_vector_set.h b/kratos/containers/pointer_vector_set.h index c13b039199b3..e84c005bae5a 100644 --- a/kratos/containers/pointer_vector_set.h +++ b/kratos/containers/pointer_vector_set.h @@ -70,7 +70,7 @@ template, class TCompareType = std::less, class TEqualType = std::equal_to, - class TPointerType = boost::shared_ptr, + class TPointerType = std::shared_ptr, class TContainerType = std::vector > class PointerVectorSet { diff --git a/kratos/containers/weak_pointer_vector.h b/kratos/containers/weak_pointer_vector.h index 589703f813c1..7544f8cd6fdc 100644 --- a/kratos/containers/weak_pointer_vector.h +++ b/kratos/containers/weak_pointer_vector.h @@ -64,7 +64,7 @@ namespace Kratos deleting. */ template, + class TPointerType = std::weak_ptr, class TContainerType = std::vector > class WeakPointerVector { diff --git a/kratos/containers/weak_pointer_vector_iterator.h b/kratos/containers/weak_pointer_vector_iterator.h index bee8eccbca50..be137960534d 100644 --- a/kratos/containers/weak_pointer_vector_iterator.h +++ b/kratos/containers/weak_pointer_vector_iterator.h @@ -141,7 +141,7 @@ class WeakPointerVectorIterator typename BaseType::reference dereference() const { - return *(boost::shared_ptr(*(this->base()))); + return *(std::shared_ptr(*(this->base()))); } ///@} diff --git a/kratos/geometries/geometry.h b/kratos/geometries/geometry.h index 855eedb96827..5bd5de6011be 100644 --- a/kratos/geometries/geometry.h +++ b/kratos/geometries/geometry.h @@ -390,7 +390,7 @@ class Geometry : public PointerVector *i = typename PointType::Pointer( new PointType( **i ) ); } - virtual boost::shared_ptr< Geometry< Point<3> > > Clone() const + virtual std::shared_ptr< Geometry< Point<3> > > Clone() const { Geometry< Point<3> >::PointsArrayType NewPoints; @@ -398,7 +398,7 @@ class Geometry : public PointerVector for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i])); + NewPoints.push_back(std::make_shared< Point<3> >((*this)[i])); } //NewPoints[i] = typename Point<3>::Pointer(new Point<3>(*mPoints[i])); diff --git a/kratos/geometries/hexahedra_3d_20.h b/kratos/geometries/hexahedra_3d_20.h index 028805105b5f..7b78df8305e9 100644 --- a/kratos/geometries/hexahedra_3d_20.h +++ b/kratos/geometries/hexahedra_3d_20.h @@ -349,7 +349,7 @@ template class Hexahedra3D20 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i])); + NewPoints.push_back(std::make_shared< Point<3> >((*this)[i])); } diff --git a/kratos/geometries/hexahedra_3d_27.h b/kratos/geometries/hexahedra_3d_27.h index da8ca9879650..94f6e236778e 100644 --- a/kratos/geometries/hexahedra_3d_27.h +++ b/kratos/geometries/hexahedra_3d_27.h @@ -369,7 +369,7 @@ template class Hexahedra3D27 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i])); + NewPoints.push_back(std::make_shared< Point<3> >((*this)[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/hexahedra_3d_8.h b/kratos/geometries/hexahedra_3d_8.h index 447f975e6376..2433f46fabb0 100644 --- a/kratos/geometries/hexahedra_3d_8.h +++ b/kratos/geometries/hexahedra_3d_8.h @@ -311,7 +311,7 @@ template class Hexahedra3D8 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i])); + NewPoints.push_back(std::make_shared< Point<3> >((*this)[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/hexahedra_interface_3d_8.h b/kratos/geometries/hexahedra_interface_3d_8.h index e083cd8d2652..6ee82492cacd 100644 --- a/kratos/geometries/hexahedra_interface_3d_8.h +++ b/kratos/geometries/hexahedra_interface_3d_8.h @@ -486,7 +486,7 @@ template class HexahedraInterface3D8 : public Geometrysize() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i])); + NewPoints.push_back(std::make_shared< Point<3> >((*this)[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/line_2d.h b/kratos/geometries/line_2d.h index 4d7e310c7da5..e728e8cfff68 100644 --- a/kratos/geometries/line_2d.h +++ b/kratos/geometries/line_2d.h @@ -267,7 +267,7 @@ class Line2D : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/line_2d_2.h b/kratos/geometries/line_2d_2.h index 443dab5e1e71..8d525adc056b 100644 --- a/kratos/geometries/line_2d_2.h +++ b/kratos/geometries/line_2d_2.h @@ -273,7 +273,7 @@ class Line2D2 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i])); + NewPoints.push_back(std::make_shared< Point<3> >((*this)[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/line_2d_3.h b/kratos/geometries/line_2d_3.h index 99ad9150167a..44351136de4b 100644 --- a/kratos/geometries/line_2d_3.h +++ b/kratos/geometries/line_2d_3.h @@ -266,7 +266,7 @@ class Line2D3 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i])); + NewPoints.push_back(std::make_shared< Point<3> >((*this)[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/line_3d_2.h b/kratos/geometries/line_3d_2.h index 43fa7d07215a..846f97cc93a1 100644 --- a/kratos/geometries/line_3d_2.h +++ b/kratos/geometries/line_3d_2.h @@ -272,7 +272,7 @@ class Line3D2 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/line_3d_3.h b/kratos/geometries/line_3d_3.h index 9bfca89f34b7..4a4bf3b9ef9f 100644 --- a/kratos/geometries/line_3d_3.h +++ b/kratos/geometries/line_3d_3.h @@ -266,7 +266,7 @@ class Line3D3 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/line_gl_3d_2.h b/kratos/geometries/line_gl_3d_2.h index 11fa70ee6e62..25d8cf04b0dd 100644 --- a/kratos/geometries/line_gl_3d_2.h +++ b/kratos/geometries/line_gl_3d_2.h @@ -270,7 +270,7 @@ class LineGL3D2 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < BaseType::Points().size() ; i++ ) - NewPoints.push_back(boost::make_shared< Point<3> >((*this)[i])); + NewPoints.push_back(std::make_shared< Point<3> >((*this)[i])); //creating a geometry with the new points Geometry< Point<3> >::Pointer p_clone( new LineGL3D2< Point<3> >( NewPoints ) ); diff --git a/kratos/geometries/point_2d.h b/kratos/geometries/point_2d.h index 0f2a1ce33dc3..d39591665445 100644 --- a/kratos/geometries/point_2d.h +++ b/kratos/geometries/point_2d.h @@ -263,7 +263,7 @@ class Point2D : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/point_3d.h b/kratos/geometries/point_3d.h index 4d15b29fc6e1..9b475fcbce07 100644 --- a/kratos/geometries/point_3d.h +++ b/kratos/geometries/point_3d.h @@ -264,7 +264,7 @@ class Point3D : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/prism_3d_15.h b/kratos/geometries/prism_3d_15.h index 6077f3b67892..8b2057226c6b 100644 --- a/kratos/geometries/prism_3d_15.h +++ b/kratos/geometries/prism_3d_15.h @@ -332,7 +332,7 @@ template class Prism3D15 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/prism_3d_6.h b/kratos/geometries/prism_3d_6.h index f30a8e81a6e0..7d72fd829755 100644 --- a/kratos/geometries/prism_3d_6.h +++ b/kratos/geometries/prism_3d_6.h @@ -303,7 +303,7 @@ template class Prism3D6 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/prism_interface_3d_6.h b/kratos/geometries/prism_interface_3d_6.h index b6440da03698..0349bfa035a6 100644 --- a/kratos/geometries/prism_interface_3d_6.h +++ b/kratos/geometries/prism_interface_3d_6.h @@ -328,7 +328,7 @@ template class PrismInterface3D6 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/quadrilateral_2d_4.h b/kratos/geometries/quadrilateral_2d_4.h index 4e2099e549e6..61d5a1e9c83d 100644 --- a/kratos/geometries/quadrilateral_2d_4.h +++ b/kratos/geometries/quadrilateral_2d_4.h @@ -325,7 +325,7 @@ template class Quadrilateral2D4 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -504,10 +504,10 @@ template class Quadrilateral2D4 GeometriesArrayType Edges( void ) override { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 3 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 3 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/quadrilateral_2d_8.h b/kratos/geometries/quadrilateral_2d_8.h index 2dc87714b36f..927a51b256be 100644 --- a/kratos/geometries/quadrilateral_2d_8.h +++ b/kratos/geometries/quadrilateral_2d_8.h @@ -323,7 +323,7 @@ template class Quadrilateral2D8 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -930,10 +930,10 @@ template class Quadrilateral2D8 GeometriesArrayType Edges( void ) override { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/quadrilateral_2d_9.h b/kratos/geometries/quadrilateral_2d_9.h index c56d6305fbfe..938d08fcbd75 100644 --- a/kratos/geometries/quadrilateral_2d_9.h +++ b/kratos/geometries/quadrilateral_2d_9.h @@ -325,7 +325,7 @@ template class Quadrilateral2D9 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -486,10 +486,10 @@ template class Quadrilateral2D9 : public Geometry GeometriesArrayType Edges( void ) override { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/quadrilateral_3d_4.h b/kratos/geometries/quadrilateral_3d_4.h index ca957ad9d692..fb543bb2fbb9 100644 --- a/kratos/geometries/quadrilateral_3d_4.h +++ b/kratos/geometries/quadrilateral_3d_4.h @@ -325,7 +325,7 @@ template class Quadrilateral3D4 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/quadrilateral_3d_8.h b/kratos/geometries/quadrilateral_3d_8.h index b2bab85e18bb..8ca99402a43d 100644 --- a/kratos/geometries/quadrilateral_3d_8.h +++ b/kratos/geometries/quadrilateral_3d_8.h @@ -316,7 +316,7 @@ template class Quadrilateral3D8 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -995,10 +995,10 @@ template class Quadrilateral3D8 GeometriesArrayType Edges( void ) override { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/quadrilateral_3d_9.h b/kratos/geometries/quadrilateral_3d_9.h index a41f4827dae4..126b9f6c608e 100644 --- a/kratos/geometries/quadrilateral_3d_9.h +++ b/kratos/geometries/quadrilateral_3d_9.h @@ -325,7 +325,7 @@ template class Quadrilateral3D9 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -988,10 +988,10 @@ template class Quadrilateral3D9 : public Geometry GeometriesArrayType Edges( void ) override { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 4 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 5 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 6 ), this->pGetPoint( 3 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 7 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/quadrilateral_interface_2d_4.h b/kratos/geometries/quadrilateral_interface_2d_4.h index c6e9940386b8..5b0c506f7654 100644 --- a/kratos/geometries/quadrilateral_interface_2d_4.h +++ b/kratos/geometries/quadrilateral_interface_2d_4.h @@ -354,7 +354,7 @@ template class QuadrilateralInterface2D4 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -859,10 +859,10 @@ template class QuadrilateralInterface2D4 GeometriesArrayType Edges( void ) override { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 3 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 3 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 3 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/quadrilateral_interface_3d_4.h b/kratos/geometries/quadrilateral_interface_3d_4.h index 51d8298d1ca9..d775e1be6eff 100644 --- a/kratos/geometries/quadrilateral_interface_3d_4.h +++ b/kratos/geometries/quadrilateral_interface_3d_4.h @@ -362,7 +362,7 @@ template class QuadrilateralInterface3D4 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/sphere_3d_1.h b/kratos/geometries/sphere_3d_1.h index 5c075caf133c..6727896cb258 100644 --- a/kratos/geometries/sphere_3d_1.h +++ b/kratos/geometries/sphere_3d_1.h @@ -268,7 +268,7 @@ class Sphere3D1 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/tetrahedra_3d_10.h b/kratos/geometries/tetrahedra_3d_10.h index 8d503fd0f302..5c842e5e4e70 100644 --- a/kratos/geometries/tetrahedra_3d_10.h +++ b/kratos/geometries/tetrahedra_3d_10.h @@ -317,7 +317,7 @@ template class Tetrahedra3D10 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/tetrahedra_3d_4.h b/kratos/geometries/tetrahedra_3d_4.h index 8e1037ae2fda..4bc03249be9f 100644 --- a/kratos/geometries/tetrahedra_3d_4.h +++ b/kratos/geometries/tetrahedra_3d_4.h @@ -292,7 +292,7 @@ template class Tetrahedra3D4 : public Geometry //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points diff --git a/kratos/geometries/triangle_2d_3.h b/kratos/geometries/triangle_2d_3.h index 343a655c6af6..74c1aab27af7 100644 --- a/kratos/geometries/triangle_2d_3.h +++ b/kratos/geometries/triangle_2d_3.h @@ -323,7 +323,7 @@ template class Triangle2D3 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -744,9 +744,9 @@ template class Triangle2D3 { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/triangle_2d_6.h b/kratos/geometries/triangle_2d_6.h index 457f1159ef80..6a549e0aa979 100644 --- a/kratos/geometries/triangle_2d_6.h +++ b/kratos/geometries/triangle_2d_6.h @@ -335,7 +335,7 @@ template class Triangle2D6 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -618,9 +618,9 @@ template class Triangle2D6 { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 3 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 4 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 5 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 3 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 4 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 5 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/triangle_3d_3.h b/kratos/geometries/triangle_3d_3.h index e7f9c6c59ebd..034f2149dec7 100644 --- a/kratos/geometries/triangle_3d_3.h +++ b/kratos/geometries/triangle_3d_3.h @@ -315,14 +315,14 @@ template class Triangle3D3 } - boost::shared_ptr< Geometry< Point<3> > > Clone() const override + std::shared_ptr< Geometry< Point<3> > > Clone() const override { Geometry< Point<3> >::PointsArrayType NewPoints; //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - NewPoints.push_back(boost::make_shared< Point<3> >(( *this )[i])); + NewPoints.push_back(std::make_shared< Point<3> >(( *this )[i])); } //creating a geometry with the new points @@ -1239,9 +1239,9 @@ template class Triangle3D3 { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/geometries/triangle_3d_6.h b/kratos/geometries/triangle_3d_6.h index f0f144eff45b..6a8afe13b041 100644 --- a/kratos/geometries/triangle_3d_6.h +++ b/kratos/geometries/triangle_3d_6.h @@ -335,7 +335,7 @@ template class Triangle3D6 //making a copy of the nodes TO POINTS (not Nodes!!!) for ( IndexType i = 0 ; i < this->size() ; i++ ) { - Point<3>::Pointer pnew_point = boost::make_shared< Point<3> >(( *this )[i]); + Point<3>::Pointer pnew_point = std::make_shared< Point<3> >(( *this )[i]); NewPoints.push_back(pnew_point); } @@ -1131,9 +1131,9 @@ template class Triangle3D6 { GeometriesArrayType edges = GeometriesArrayType(); - edges.push_back( boost::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 3 ), this->pGetPoint( 1 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 4 ), this->pGetPoint( 2 ) ) ); - edges.push_back( boost::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 5 ), this->pGetPoint( 0 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 0 ), this->pGetPoint( 3 ), this->pGetPoint( 1 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 1 ), this->pGetPoint( 4 ), this->pGetPoint( 2 ) ) ); + edges.push_back( std::make_shared( this->pGetPoint( 2 ), this->pGetPoint( 5 ), this->pGetPoint( 0 ) ) ); return edges; } diff --git a/kratos/includes/communicator.h b/kratos/includes/communicator.h index 73590464ec90..88207f8743a8 100644 --- a/kratos/includes/communicator.h +++ b/kratos/includes/communicator.h @@ -177,9 +177,9 @@ class Communicator mpInterfaceMesh(MeshType::Pointer(new MeshType)) { MeshType mesh; - mLocalMeshes.push_back(boost::make_shared(mesh.Clone())); - mGhostMeshes.push_back(boost::make_shared(mesh.Clone())); - mInterfaceMeshes.push_back(boost::make_shared(mesh.Clone())); + mLocalMeshes.push_back(std::make_shared(mesh.Clone())); + mGhostMeshes.push_back(std::make_shared(mesh.Clone())); + mInterfaceMeshes.push_back(std::make_shared(mesh.Clone())); } /// Copy constructor. @@ -267,9 +267,9 @@ class Communicator for (IndexType i = 0; i < mNumberOfColors; i++) { - mLocalMeshes.push_back(boost::make_shared(mesh.Clone())); - mGhostMeshes.push_back(boost::make_shared(mesh.Clone())); - mInterfaceMeshes.push_back(boost::make_shared(mesh.Clone())); + mLocalMeshes.push_back(std::make_shared(mesh.Clone())); + mGhostMeshes.push_back(std::make_shared(mesh.Clone())); + mInterfaceMeshes.push_back(std::make_shared(mesh.Clone())); } } diff --git a/kratos/includes/define.h b/kratos/includes/define.h index 9149d6b3a33c..2ad8bb2e079d 100644 --- a/kratos/includes/define.h +++ b/kratos/includes/define.h @@ -31,13 +31,13 @@ -#define KRATOS_CLASS_POINTER_DEFINITION(a) typedef boost::shared_ptr Pointer; \ -typedef boost::shared_ptr SharedPointer; \ -typedef boost::weak_ptr WeakPointer +#define KRATOS_CLASS_POINTER_DEFINITION(a) typedef std::shared_ptr Pointer; \ +typedef std::shared_ptr SharedPointer; \ +typedef std::weak_ptr WeakPointer -#define KRATOS_CLASS_POINTER_DEFINITION_WITHTYPENAME(a) typedef boost::shared_ptr Pointer; \ -typedef typename boost::shared_ptr SharedPointer; \ -typedef typename boost::weak_ptr WeakPointer +#define KRATOS_CLASS_POINTER_DEFINITION_WITHTYPENAME(a) typedef std::shared_ptr Pointer; \ +typedef typename std::shared_ptr SharedPointer; \ +typedef typename std::weak_ptr WeakPointer //----------------------------------------------------------------- // diff --git a/kratos/includes/io.h b/kratos/includes/io.h index 51b234a41ed0..9c4fc7f2da9d 100644 --- a/kratos/includes/io.h +++ b/kratos/includes/io.h @@ -217,7 +217,7 @@ class KRATOS_API(KRATOS_CORE) IO KRATOS_ERROR << "Calling base class member. Please check the definition of derived class" << std::endl; } - virtual void DivideInputToPartitions(boost::shared_ptr * Streams, + virtual void DivideInputToPartitions(std::shared_ptr * Streams, SizeType NumberOfPartitions, GraphType const& DomainsColoredGraph, PartitionIndicesType const& NodesPartitions, PartitionIndicesType const& ElementsPartitions, diff --git a/kratos/includes/kratos_parameters.h b/kratos/includes/kratos_parameters.h index 494da2b461a0..09186fecb9f5 100644 --- a/kratos/includes/kratos_parameters.h +++ b/kratos/includes/kratos_parameters.h @@ -66,7 +66,7 @@ class Parameters value_iterator mValueIterator; std::unique_ptr mpParameters; public: - iterator_adaptor(value_iterator it, boost::shared_ptr pdoc) :mValueIterator(it), mpParameters(new Parameters(&it->value, pdoc)) {} + iterator_adaptor(value_iterator it, std::shared_ptr pdoc) :mValueIterator(it), mpParameters(new Parameters(&it->value, pdoc)) {} iterator_adaptor(const iterator_adaptor& it) : mValueIterator(it.mValueIterator), mpParameters(new Parameters(*(it.mpParameters))) {} iterator_adaptor& operator++() { mValueIterator++; return *this; } iterator_adaptor operator++(int) { iterator_adaptor tmp(*this); operator++(); return tmp; } @@ -85,7 +85,7 @@ class Parameters value_iterator mValueIterator; std::unique_ptr mpParameters; public: - const_iterator_adaptor(value_iterator it, boost::shared_ptr pdoc) :mValueIterator(it), mpParameters(new Parameters(const_cast(&it->value), pdoc)) {} + const_iterator_adaptor(value_iterator it, std::shared_ptr pdoc) :mValueIterator(it), mpParameters(new Parameters(const_cast(&it->value), pdoc)) {} const_iterator_adaptor(const const_iterator_adaptor& it) : mValueIterator(it.mValueIterator), mpParameters(new Parameters(*(it.mpParameters))) {} const_iterator_adaptor& operator++() { mValueIterator++; return *this; } const_iterator_adaptor operator++(int) { const_iterator_adaptor tmp(*this); operator++(); return tmp; } @@ -109,7 +109,7 @@ class Parameters Parameters(const std::string json_string) { - mpdoc = boost::shared_ptr(new rapidjson::Document() ); + mpdoc = std::shared_ptr(new rapidjson::Document() ); rapidjson::ParseResult ok = mpdoc->Parse<0>(json_string.c_str()); if( !ok ) @@ -143,7 +143,7 @@ class Parameters //generates a clone of the current document Parameters Clone() { - boost::shared_ptr pnew_cloned_doc = boost::shared_ptr(new rapidjson::Document() ); + std::shared_ptr pnew_cloned_doc = std::shared_ptr(new rapidjson::Document() ); rapidjson::ParseResult ok = pnew_cloned_doc->Parse<0>(this->WriteJsonString().c_str()); if( !ok ) { @@ -570,12 +570,12 @@ class Parameters private: //ATTENTION: please DO NOT use this constructor. It assumes rapidjson and hence it should be considered as an implementation detail - Parameters(rapidjson::Value* pvalue, boost::shared_ptr pdoc): mpvalue(pvalue),mpdoc(pdoc) + Parameters(rapidjson::Value* pvalue, std::shared_ptr pdoc): mpvalue(pvalue),mpdoc(pdoc) { } rapidjson::Value* mpvalue; - boost::shared_ptr mpdoc; + std::shared_ptr mpdoc; //ATTENTION: please DO NOT use this method. It is a low level accessor, and may change in the future rapidjson::Value* GetUnderlyingStorage() const diff --git a/kratos/includes/model_part.h b/kratos/includes/model_part.h index b47c3b0f3580..5be182f0c501 100644 --- a/kratos/includes/model_part.h +++ b/kratos/includes/model_part.h @@ -587,7 +587,7 @@ class KRATOS_API(KRATOS_CORE) ModelPart : public DataValueContainer, public Flag } else { - PropertiesType::Pointer pnew_property = boost::make_shared(PropertiesId); + PropertiesType::Pointer pnew_property = std::make_shared(PropertiesId); GetMesh(ThisIndex).AddProperties(pnew_property); return pnew_property; } @@ -612,7 +612,7 @@ class KRATOS_API(KRATOS_CORE) ModelPart : public DataValueContainer, public Flag } else { - PropertiesType::Pointer pnew_property = boost::make_shared(PropertiesId); + PropertiesType::Pointer pnew_property = std::make_shared(PropertiesId); GetMesh(ThisIndex).AddProperties(pnew_property); return *pnew_property; } diff --git a/kratos/includes/model_part_io.h b/kratos/includes/model_part_io.h index 561388798fc1..31d1a146248a 100644 --- a/kratos/includes/model_part_io.h +++ b/kratos/includes/model_part_io.h @@ -86,7 +86,7 @@ class KRATOS_API(KRATOS_CORE) ModelPartIO : public IO ModelPartIO(std::string const& Filename, const Flags Options = IO::READ|IO::NOT_IGNORE_VARIABLES_ERROR); /// Constructor with stream. - ModelPartIO(boost::shared_ptr Stream); + ModelPartIO(std::shared_ptr Stream); /// Constructor with filenames. @@ -174,7 +174,7 @@ class KRATOS_API(KRATOS_CORE) ModelPartIO : public IO PartitionIndicesContainerType const& ElementsAllPartitions, PartitionIndicesContainerType const& ConditionsAllPartitions) override; - void DivideInputToPartitions(boost::shared_ptr * Streams, + void DivideInputToPartitions(std::shared_ptr * Streams, SizeType NumberOfPartitions, GraphType const& DomainsColoredGraph, PartitionIndicesType const& NodesPartitions, PartitionIndicesType const& ElementsPartitions, @@ -183,7 +183,7 @@ class KRATOS_API(KRATOS_CORE) ModelPartIO : public IO PartitionIndicesContainerType const& ElementsAllPartitions, PartitionIndicesContainerType const& ConditionsAllPartitions) override; - void SwapStreamSource(boost::shared_ptr newStream); + void SwapStreamSource(std::shared_ptr newStream); ///@} @@ -281,7 +281,7 @@ class KRATOS_API(KRATOS_CORE) ModelPartIO : public IO std::string mFilename; Flags mOptions; - boost::shared_ptr mpStream; + std::shared_ptr mpStream; ///@} diff --git a/kratos/includes/neighbours.h b/kratos/includes/neighbours.h index ced0c662cb4e..74fdbf017bca 100644 --- a/kratos/includes/neighbours.h +++ b/kratos/includes/neighbours.h @@ -70,9 +70,9 @@ class Neighbours typedef std::size_t IndexType; - typedef boost::weak_ptr NodeWeakPointer; + typedef std::weak_ptr NodeWeakPointer; - typedef boost::weak_ptr ElementWeakPointer; + typedef std::weak_ptr ElementWeakPointer; /** An array of pointers to elements. */ typedef WeakPointerVector NeighbourElementsArrayType; diff --git a/kratos/includes/node.h b/kratos/includes/node.h index 289ac9714104..124ddb9d86d9 100755 --- a/kratos/includes/node.h +++ b/kratos/includes/node.h @@ -339,7 +339,7 @@ class Node : public Point, public IndexedObject, public Flags typename Node::Pointer Clone() { - Node<3>::Pointer p_new_node = boost::make_shared >( this->Id(), (*this)[0], (*this)[1], (*this)[2]); + Node<3>::Pointer p_new_node = std::make_shared >( this->Id(), (*this)[0], (*this)[1], (*this)[2]); p_new_node->mSolutionStepsNodalData = this->mSolutionStepsNodalData; Node<3>::DofsContainerType& my_dofs = (this)->GetDofs(); @@ -1025,7 +1025,7 @@ class Node : public Point, public IndexedObject, public Flags return *(it_dof.base()); } - typename DofType::Pointer p_new_dof = boost::make_shared(Id(), &mSolutionStepsNodalData, rDofVariable); + typename DofType::Pointer p_new_dof = std::make_shared(Id(), &mSolutionStepsNodalData, rDofVariable); mDofs.insert(mDofs.begin(), p_new_dof); // if(!mDofs.IsSorted()) @@ -1053,7 +1053,7 @@ class Node : public Point, public IndexedObject, public Flags return *(it_dof.base()); } - typename DofType::Pointer p_new_dof = boost::make_shared(SourceDof); + typename DofType::Pointer p_new_dof = std::make_shared(SourceDof); mDofs.insert(mDofs.begin(), p_new_dof); p_new_dof->SetId(Id()); @@ -1091,7 +1091,7 @@ class Node : public Point, public IndexedObject, public Flags return *(it_dof.base()); } - typename DofType::Pointer p_new_dof = boost::make_shared(Id(), &mSolutionStepsNodalData, rDofVariable, rDofReaction); + typename DofType::Pointer p_new_dof = std::make_shared(Id(), &mSolutionStepsNodalData, rDofVariable, rDofReaction); mDofs.insert(mDofs.begin(), p_new_dof); // if(!mDofs.IsSorted()) @@ -1122,7 +1122,7 @@ class Node : public Point, public IndexedObject, public Flags return *it_dof; } - typename DofType::Pointer p_new_dof = boost::make_shared(Id(), &mSolutionStepsNodalData, rDofVariable); + typename DofType::Pointer p_new_dof = std::make_shared(Id(), &mSolutionStepsNodalData, rDofVariable); mDofs.insert(mDofs.begin(), p_new_dof); // if(!mDofs.IsSorted()) @@ -1158,7 +1158,7 @@ class Node : public Point, public IndexedObject, public Flags return *it_dof; } - typename DofType::Pointer p_new_dof = boost::make_shared(Id(), &mSolutionStepsNodalData, rDofVariable, rDofReaction); + typename DofType::Pointer p_new_dof = std::make_shared(Id(), &mSolutionStepsNodalData, rDofVariable, rDofReaction); mDofs.insert(mDofs.begin(), p_new_dof); // if(!mDofs.IsSorted()) diff --git a/kratos/includes/serializer.h b/kratos/includes/serializer.h index 1655102bb156..6a13c7a85728 100644 --- a/kratos/includes/serializer.h +++ b/kratos/includes/serializer.h @@ -194,7 +194,7 @@ class KRATOS_API(KRATOS_CORE) Serializer } template - void load(std::string const & rTag, boost::shared_ptr& pValue) + void load(std::string const & rTag, std::shared_ptr& pValue) { PointerType pointer_type = SP_INVALID_POINTER; void* p_pointer; @@ -209,7 +209,7 @@ class KRATOS_API(KRATOS_CORE) Serializer if(pointer_type == SP_BASE_CLASS_POINTER) { if(!pValue) - pValue = boost::shared_ptr(new TDataType); + pValue = std::shared_ptr(new TDataType); load(rTag, *pValue); } @@ -223,7 +223,7 @@ class KRATOS_API(KRATOS_CORE) Serializer KRATOS_THROW_ERROR(std::runtime_error, "There is no object registered in Kratos with name : ", object_name) if(!pValue) - pValue = boost::shared_ptr(static_cast((i_prototype->second)())); + pValue = std::shared_ptr(static_cast((i_prototype->second)())); load(rTag, *pValue); @@ -231,7 +231,7 @@ class KRATOS_API(KRATOS_CORE) Serializer mLoadedPointers[p_pointer]=&pValue; } else - pValue = *static_cast*>((i_pointer->second)); + pValue = *static_cast*>((i_pointer->second)); } } @@ -280,7 +280,7 @@ class KRATOS_API(KRATOS_CORE) Serializer } template - void load(std::string const & rTag, boost::weak_ptr& pValue) + void load(std::string const & rTag, std::weak_ptr& pValue) { // This is for testing. I have to change it. Pooyan. //KRATOS_THROW_ERROR(std::logic_error, "The serialization for weak_ptrs is not implemented yet", "") @@ -416,7 +416,7 @@ class KRATOS_API(KRATOS_CORE) Serializer template - void save(std::string const & rTag, boost::shared_ptr pValue) + void save(std::string const & rTag, std::shared_ptr pValue) { save(rTag, pValue.get()); } @@ -477,7 +477,7 @@ class KRATOS_API(KRATOS_CORE) Serializer } template - void save(std::string const & rTag, boost::weak_ptr pValue) + void save(std::string const & rTag, std::weak_ptr pValue) { // This is for testing. I have to implement it. Pooyan. //KRATOS_THROW_ERROR(std::logic_error, "The serialization for weak_ptrs is not implemented yet", "") @@ -493,7 +493,7 @@ class KRATOS_API(KRATOS_CORE) Serializer } template - void save(std::string const & rTag, boost::shared_ptr pValue) + void save(std::string const & rTag, std::shared_ptr pValue) { // This is for testing. I have to change it. Pooyan. // save_trace_point(rTag); diff --git a/kratos/linear_solvers/bicgstab_solver.h b/kratos/linear_solvers/bicgstab_solver.h index 6343ecfbcaa8..c438fd4997da 100644 --- a/kratos/linear_solvers/bicgstab_solver.h +++ b/kratos/linear_solvers/bicgstab_solver.h @@ -85,7 +85,7 @@ class BICGSTABSolver : public IterativeSolver()): + BICGSTABSolver(Parameters settings, typename TPreconditionerType::Pointer pNewPreconditioner = std::make_shared()): BaseType(settings, pNewPreconditioner) {} /// Copy constructor. diff --git a/kratos/linear_solvers/cg_solver.h b/kratos/linear_solvers/cg_solver.h index 4c75c22b72e3..1944aa8cfce6 100644 --- a/kratos/linear_solvers/cg_solver.h +++ b/kratos/linear_solvers/cg_solver.h @@ -90,7 +90,7 @@ class CGSolver : public IterativeSolver()): + CGSolver(Parameters settings, typename TPreconditionerType::Pointer pNewPreconditioner = std::make_shared()): BaseType(settings, pNewPreconditioner) {} diff --git a/kratos/linear_solvers/deflated_cg_solver.h b/kratos/linear_solvers/deflated_cg_solver.h index b2810dd8e1c6..664fd0e37157 100644 --- a/kratos/linear_solvers/deflated_cg_solver.h +++ b/kratos/linear_solvers/deflated_cg_solver.h @@ -113,7 +113,7 @@ class DeflatedCGSolver : public IterativeSolver() + typename TPreconditionerType::Pointer pNewPreconditioner = std::make_shared() ): BaseType () { diff --git a/kratos/linear_solvers/iterative_solver.h b/kratos/linear_solvers/iterative_solver.h index 57513bf7b68c..5aca12786697 100644 --- a/kratos/linear_solvers/iterative_solver.h +++ b/kratos/linear_solvers/iterative_solver.h @@ -128,7 +128,7 @@ class IterativeSolver : public LinearSolver() + typename TPreconditionerType::Pointer pNewPreconditioner = std::make_shared() ): mResidualNorm(0), mIterationsNumber(0), diff --git a/kratos/linear_solvers/mixedup_linear_solver.h b/kratos/linear_solvers/mixedup_linear_solver.h index 60b456146a8b..f666e3b8bbd8 100644 --- a/kratos/linear_solvers/mixedup_linear_solver.h +++ b/kratos/linear_solvers/mixedup_linear_solver.h @@ -1013,7 +1013,7 @@ class MixedUPLinearSolver : #pragma omp parallel if ( OpenMPUtils::ThisThread() == k) { -// boost::shared_ptr< IndexVector > pNext( new IndexVector(rL.size1() ) ); +// std::shared_ptr< IndexVector > pNext( new IndexVector(rL.size1() ) ); // IndexVector& Next = *pNext; // Keeps track of which columns were filled IndexVector Next(rL.size1()); for (unsigned int m = 0; m < rL.size1(); m++) Next[m] = -1; diff --git a/kratos/modeler/mesh_suite_modeler.h b/kratos/modeler/mesh_suite_modeler.h index 40dae5db8881..e4e275872e7b 100644 --- a/kratos/modeler/mesh_suite_modeler.h +++ b/kratos/modeler/mesh_suite_modeler.h @@ -519,7 +519,7 @@ class MeshSuiteModeler : public malla for(int j = 0; j >( r_model_nodes(ii) ) ); + //neighbours.push_back(std::weak_ptr< Node<3> >( r_model_nodes(ii) ) ); neighbours.push_back( r_model_nodes(ii) ); } } diff --git a/kratos/processes/calculate_signed_distance_to_3d_skin_process.h b/kratos/processes/calculate_signed_distance_to_3d_skin_process.h index dc330dfecc1a..f95758320aa7 100644 --- a/kratos/processes/calculate_signed_distance_to_3d_skin_process.h +++ b/kratos/processes/calculate_signed_distance_to_3d_skin_process.h @@ -1680,7 +1680,7 @@ class CalculateSignedDistanceTo3DSkinProcess { Timer::Start("Generating Octree"); //std::cout << "Generating the Octree..." << std::endl; - boost::shared_ptr temp_octree = boost::shared_ptr( new OctreeType() ); + std::shared_ptr temp_octree = std::shared_ptr( new OctreeType() ); //OctreeType::Pointer temp_octree = OctreeType::Pointer(new OctreeType() ); mpOctree.swap(temp_octree); @@ -2601,7 +2601,7 @@ class CalculateSignedDistanceTo3DSkinProcess DistanceSpatialContainersConfigure::data_type mOctreeNodes; - boost::shared_ptr mpOctree; + std::shared_ptr mpOctree; static const double epsilon; diff --git a/kratos/python/add_logger_to_python.cpp b/kratos/python/add_logger_to_python.cpp index 1c70308ce376..bd216e515539 100644 --- a/kratos/python/add_logger_to_python.cpp +++ b/kratos/python/add_logger_to_python.cpp @@ -63,7 +63,7 @@ object print(tuple args, dict kwargs) { void AddLoggerToPython() { using namespace boost::python; - class_, boost::noncopyable>("Logger", no_init) + class_, boost::noncopyable>("Logger", no_init) .def("Print", raw_function(print,1)) .staticmethod("Print"); } diff --git a/kratos/python/add_model_part_to_python.cpp b/kratos/python/add_model_part_to_python.cpp index f31e7eb75ac4..5b92873798dd 100644 --- a/kratos/python/add_model_part_to_python.cpp +++ b/kratos/python/add_model_part_to_python.cpp @@ -69,7 +69,7 @@ ModelPart::MeshType::Pointer ModelPartGetMesh2(ModelPart& rModelPart, ModelPart: // adding necessary meshes to the model part. ModelPart::MeshType empty_mesh; for(ModelPart::IndexType i = number_of_meshes ; i < MeshIndex + 1 ; i++) - rModelPart.GetMeshes().push_back(boost::make_shared(empty_mesh.Clone())); + rModelPart.GetMeshes().push_back(std::make_shared(empty_mesh.Clone())); return rModelPart.pGetMesh(MeshIndex); } diff --git a/kratos/python/add_strategies_to_python.cpp b/kratos/python/add_strategies_to_python.cpp index a8e109351ce9..960e8b2a1a14 100644 --- a/kratos/python/add_strategies_to_python.cpp +++ b/kratos/python/add_strategies_to_python.cpp @@ -173,24 +173,24 @@ namespace Kratos return dummy.CreateEmptyVectorPointer(); } - // boost::shared_ptr< CompressedMatrix > CreateEmptyMatrixPointer() + // std::shared_ptr< CompressedMatrix > CreateEmptyMatrixPointer() // { - // boost::shared_ptr pNewMat = boost::shared_ptr(new CompressedMatrix() ); + // std::shared_ptr pNewMat = std::shared_ptr(new CompressedMatrix() ); // return pNewMat; // } // - // boost::shared_ptr< Vector > CreateEmptyVectorPointer() + // std::shared_ptr< Vector > CreateEmptyVectorPointer() // { - // boost::shared_ptr pNewVec = boost::shared_ptr(new Vector() ); + // std::shared_ptr pNewVec = std::shared_ptr(new Vector() ); // return pNewVec; // } - CompressedMatrix& GetMatRef(boost::shared_ptr& dummy) + CompressedMatrix& GetMatRef(std::shared_ptr& dummy) { return *dummy; } - Vector& GetVecRef(boost::shared_ptr& dummy) + Vector& GetVecRef(std::shared_ptr& dummy) { return *dummy; } @@ -203,7 +203,7 @@ namespace Kratos // def("CreateEmptyMatrixPointer",CreateEmptyMatrixPointer); // def("CreateEmptyVectorPointer",CreateEmptyVectorPointer); - class_< boost::shared_ptr >("CompressedMatrixPointer", init >()) + class_< std::shared_ptr >("CompressedMatrixPointer", init >()) .def("GetReference", GetMatRef, return_value_policy ()) // .def("GetReference", GetRef, return_internal_reference<1>() ) ; @@ -211,7 +211,7 @@ namespace Kratos // // // class_< CompressedMatrix , boost::noncopyable >("CompressedMatrix", init< >() ); - class_< boost::shared_ptr >("VectorPointer", init< boost::shared_ptr >()) + class_< std::shared_ptr >("VectorPointer", init< std::shared_ptr >()) .def("GetReference", GetVecRef, return_value_policy ()) ; // // // class_< Vector , boost::noncopyable >("Vector", init< >() ); diff --git a/kratos/python/add_testing_to_python.cpp b/kratos/python/add_testing_to_python.cpp index 808984aea56d..1ac443baf0b7 100644 --- a/kratos/python/add_testing_to_python.cpp +++ b/kratos/python/add_testing_to_python.cpp @@ -31,7 +31,7 @@ void ListOfAllTestCases() { void AddTestingToPython() { using namespace boost::python; - scope tester_scope = class_, boost::noncopyable>("Tester", no_init) + scope tester_scope = class_, boost::noncopyable>("Tester", no_init) // Properties .def("SetVerbosity",&Testing::Tester::SetVerbosity) diff --git a/kratos/python/matrix_python_interface.h b/kratos/python/matrix_python_interface.h index 068815db4ca8..e5b40b733fa0 100644 --- a/kratos/python/matrix_python_interface.h +++ b/kratos/python/matrix_python_interface.h @@ -193,7 +193,7 @@ class MatrixPythonInterface : public ReadonlyMatrixPythonInterface fill_row(ThisMatrix, i, Value, TFunctorType()); } -// static class_ > CreateInterface(std::string const& Name) +// static class_ > CreateInterface(std::string const& Name) static class_ CreateInterface(std::string const& Name) { // boost::python::converter::registry::push_back( @@ -201,7 +201,7 @@ class MatrixPythonInterface : public ReadonlyMatrixPythonInterface // &construct1, // boost::python::type_id()); -// return class_ >(Name.c_str()) +// return class_ >(Name.c_str()) return class_(Name.c_str()) .def(init()) /* .def("Resize", &BaseType::resize1) */ diff --git a/kratos/sources/model_part.cpp b/kratos/sources/model_part.cpp index a986f99d6c4f..c9327e514c23 100644 --- a/kratos/sources/model_part.cpp +++ b/kratos/sources/model_part.cpp @@ -42,7 +42,7 @@ ModelPart::ModelPart() { mName = "Default"; MeshType mesh; - mMeshes.push_back(boost::make_shared(mesh.Clone())); + mMeshes.push_back(std::make_shared(mesh.Clone())); mpCommunicator->SetLocalMesh(pGetMesh()); // assigning the current mesh to the local mesh of communicator for openmp cases } @@ -60,7 +60,7 @@ ModelPart::ModelPart(std::string const& NewName) { mName = NewName; MeshType mesh; - mMeshes.push_back(boost::make_shared(mesh.Clone())); + mMeshes.push_back(std::make_shared(mesh.Clone())); mpCommunicator->SetLocalMesh(pGetMesh()); // assigning the current mesh to the local mesh of communicator for openmp cases } @@ -78,7 +78,7 @@ ModelPart::ModelPart(std::string const& NewName, IndexType NewBufferSize) { mName = NewName; MeshType mesh; - mMeshes.push_back(boost::make_shared(mesh.Clone())); + mMeshes.push_back(std::make_shared(mesh.Clone())); mpCommunicator->SetLocalMesh(pGetMesh()); // assigning the current mesh to the local mesh of communicator for openmp cases } @@ -336,7 +336,7 @@ ModelPart::NodeType::Pointer ModelPart::CreateNewNode(int Id, double x, double y } //create a new node - NodeType::Pointer p_new_node = boost::make_shared< NodeType >( Id, x, y, z ); + NodeType::Pointer p_new_node = std::make_shared< NodeType >( Id, x, y, z ); // Giving model part's variables list to the node p_new_node->SetSolutionStepVariablesList(pNewVariablesList); @@ -382,7 +382,7 @@ ModelPart::NodeType::Pointer ModelPart::CreateNewNode(ModelPart::IndexType Id, d } //create a new node - NodeType::Pointer p_new_node = boost::make_shared< NodeType >( Id, x, y, z, mpVariablesList, pThisData, mBufferSize); + NodeType::Pointer p_new_node = std::make_shared< NodeType >( Id, x, y, z, mpVariablesList, pThisData, mBufferSize); //add the new node to the list of nodes GetMesh(ThisIndex).AddNode(p_new_node); diff --git a/kratos/sources/model_part_io.cpp b/kratos/sources/model_part_io.cpp index d801153b1a96..4ef12363fdee 100644 --- a/kratos/sources/model_part_io.cpp +++ b/kratos/sources/model_part_io.cpp @@ -26,7 +26,7 @@ namespace Kratos , mFilename(Filename + ".mdpa") , mOptions(Options) { - boost::shared_ptr pFile = boost::make_shared(); + std::shared_ptr pFile = std::make_shared(); std::fstream::openmode OpenMode; // Set the mode @@ -63,15 +63,15 @@ namespace Kratos } /// Constructor with stream - ModelPartIO::ModelPartIO(boost::shared_ptr Stream) + ModelPartIO::ModelPartIO(std::shared_ptr Stream) : mNumberOfLines(1) { - // nullptr test can be confusing with boost::shared_ptr. Commented until we move to std::shared_ptr + // nullptr test can be confusing with std::shared_ptr. Commented until we move to std::shared_ptr // if (Stream == nullptr) // KRATOS_THROW_ERROR(std::invalid_argument, "Error: ModelPartIO Stream is invalid ", ""); // Check if the pointer was .reset() or never initialized and if its a NULL pointer) - // if (Stream == NULL || Stream == boost::shared_ptr(NULL)) + // if (Stream == NULL || Stream == std::shared_ptr(NULL)) // KRATOS_THROW_ERROR(std::invalid_argument, "Error: ModelPartIO Stream is invalid ", ""); mpStream = Stream; @@ -726,7 +726,7 @@ namespace Kratos } void ModelPartIO::DivideInputToPartitions( - boost::shared_ptr * Streams, + std::shared_ptr * Streams, SizeType NumberOfPartitions, GraphType const& DomainsColoredGraph, PartitionIndicesType const& NodesPartitions, PartitionIndicesType const& ElementsPartitions, @@ -1144,7 +1144,7 @@ namespace Kratos ExtractValue(word, y); ReadWord(word); ExtractValue(word, z); - NodeType::Pointer temp_node = boost::make_shared< NodeType >( ReorderedNodeId(temp_id), x, y, z); + NodeType::Pointer temp_node = std::make_shared< NodeType >( ReorderedNodeId(temp_id), x, y, z); temp_node->X0() = temp_node->X(); temp_node->Y0() = temp_node->Y(); temp_node->Z0() = temp_node->Z(); @@ -1330,7 +1330,7 @@ namespace Kratos { KRATOS_TRY - Properties::Pointer props = boost::make_shared(); + Properties::Pointer props = std::make_shared(); Properties& temp_properties = *props; //Properties temp_properties; @@ -2710,7 +2710,7 @@ namespace Kratos // adding necessary meshes to the model part. MeshType empty_mesh; for(SizeType i = number_of_meshes ; i < mesh_id + 1 ; i++) - rModelPart.GetMeshes().push_back(boost::make_shared(empty_mesh.Clone())); + rModelPart.GetMeshes().push_back(std::make_shared(empty_mesh.Clone())); MeshType& mesh = rModelPart.GetMesh(mesh_id); @@ -2916,7 +2916,7 @@ namespace Kratos { KRATOS_TRY - Properties::Pointer props = boost::make_shared(); + Properties::Pointer props = std::make_shared(); Properties& temp_properties = *props; // Properties temp_properties; @@ -4695,7 +4695,7 @@ namespace Kratos mNumberOfLines = 1; } - void ModelPartIO::SwapStreamSource(boost::shared_ptr newStream) + void ModelPartIO::SwapStreamSource(std::shared_ptr newStream) { mpStream.swap(newStream); } diff --git a/kratos/spaces/dense_space.h b/kratos/spaces/dense_space.h index 70f516d93136..189b1a4efa05 100644 --- a/kratos/spaces/dense_space.h +++ b/kratos/spaces/dense_space.h @@ -74,8 +74,8 @@ class DenseSpace typedef std::size_t IndexType; - typedef typename boost::shared_ptr< TMatrixType > MatrixPointerType; - typedef typename boost::shared_ptr< TVectorType > VectorPointerType; + typedef typename std::shared_ptr< TMatrixType > MatrixPointerType; + typedef typename std::shared_ptr< TVectorType > VectorPointerType; ///@} ///@name Life Cycle diff --git a/kratos/spaces/ublas_space.h b/kratos/spaces/ublas_space.h index f29b82cab732..8f22ceca9447 100644 --- a/kratos/spaces/ublas_space.h +++ b/kratos/spaces/ublas_space.h @@ -125,8 +125,8 @@ class UblasSpace typedef std::size_t SizeType; - typedef typename boost::shared_ptr< TMatrixType > MatrixPointerType; - typedef typename boost::shared_ptr< TVectorType > VectorPointerType; + typedef typename std::shared_ptr< TMatrixType > MatrixPointerType; + typedef typename std::shared_ptr< TVectorType > VectorPointerType; ///@} ///@name Life Cycle diff --git a/kratos/templates/geometry_template b/kratos/templates/geometry_template index 46c462b4623f..0d2298f3c22d 100644 --- a/kratos/templates/geometry_template +++ b/kratos/templates/geometry_template @@ -229,7 +229,7 @@ namespace Kratos ///@name Operations ///@{ - virtual boost::shared_ptr< Geometry< Point<3> > > Clone() const + virtual std::shared_ptr< Geometry< Point<3> > > Clone() const { Geometry< Point<3> >::PointsArrayType NewPoints; @@ -238,7 +238,7 @@ namespace Kratos NewPoints.push_back(mPoints[i]); //creating a geometry with the new points - boost::shared_ptr< Geometry< Point<3> > > p_clone(new ClassName< Point<3> >(NewPoints)); + std::shared_ptr< Geometry< Point<3> > > p_clone(new ClassName< Point<3> >(NewPoints)); p_clone->ClonePoints(); return p_clone; diff --git a/kratos/tests/processes/test_calculate_distance_to_skin_process.cpp b/kratos/tests/processes/test_calculate_distance_to_skin_process.cpp index b43e189e8cab..02139dd6ff36 100644 --- a/kratos/tests/processes/test_calculate_distance_to_skin_process.cpp +++ b/kratos/tests/processes/test_calculate_distance_to_skin_process.cpp @@ -26,14 +26,14 @@ namespace Kratos { { // Generate a volume mesh (done with the StructuredMeshGeneratorProcess) - Point<3>::Pointer p_point1 = boost::make_shared>(0.00, 0.00, 0.00); - Point<3>::Pointer p_point2 = boost::make_shared>(10.00, 0.00, 0.00); - Point<3>::Pointer p_point3 = boost::make_shared>(10.00, 10.00, 0.00); - Point<3>::Pointer p_point4 = boost::make_shared>(0.00, 10.00, 0.00); - Point<3>::Pointer p_point5 = boost::make_shared>(0.00, 0.00, 10.00); - Point<3>::Pointer p_point6 = boost::make_shared>(10.00, 0.00, 10.00); - Point<3>::Pointer p_point7 = boost::make_shared>(10.00, 10.00, 10.00); - Point<3>::Pointer p_point8 = boost::make_shared>(0.00, 10.00, 10.00); + Point<3>::Pointer p_point1 = std::make_shared>(0.00, 0.00, 0.00); + Point<3>::Pointer p_point2 = std::make_shared>(10.00, 0.00, 0.00); + Point<3>::Pointer p_point3 = std::make_shared>(10.00, 10.00, 0.00); + Point<3>::Pointer p_point4 = std::make_shared>(0.00, 10.00, 0.00); + Point<3>::Pointer p_point5 = std::make_shared>(0.00, 0.00, 10.00); + Point<3>::Pointer p_point6 = std::make_shared>(10.00, 0.00, 10.00); + Point<3>::Pointer p_point7 = std::make_shared>(10.00, 10.00, 10.00); + Point<3>::Pointer p_point8 = std::make_shared>(0.00, 10.00, 10.00); Hexahedra3D8 > geometry(p_point1, p_point2, p_point3, p_point4, p_point5, p_point6, p_point7, p_point8); @@ -74,14 +74,14 @@ namespace Kratos { { // Generate a volume mesh (done with the StructuredMeshGeneratorProcess) - Point<3>::Pointer p_point1 = boost::make_shared>(0.00, 0.00, 0.00); - Point<3>::Pointer p_point2 = boost::make_shared>(10.00, 0.00, 0.00); - Point<3>::Pointer p_point3 = boost::make_shared>(10.00, 10.00, 0.00); - Point<3>::Pointer p_point4 = boost::make_shared>(0.00, 10.00, 0.00); - Point<3>::Pointer p_point5 = boost::make_shared>(0.00, 0.00, 10.00); - Point<3>::Pointer p_point6 = boost::make_shared>(10.00, 0.00, 10.00); - Point<3>::Pointer p_point7 = boost::make_shared>(10.00, 10.00, 10.00); - Point<3>::Pointer p_point8 = boost::make_shared>(0.00, 10.00, 10.00); + Point<3>::Pointer p_point1 = std::make_shared>(0.00, 0.00, 0.00); + Point<3>::Pointer p_point2 = std::make_shared>(10.00, 0.00, 0.00); + Point<3>::Pointer p_point3 = std::make_shared>(10.00, 10.00, 0.00); + Point<3>::Pointer p_point4 = std::make_shared>(0.00, 10.00, 0.00); + Point<3>::Pointer p_point5 = std::make_shared>(0.00, 0.00, 10.00); + Point<3>::Pointer p_point6 = std::make_shared>(10.00, 0.00, 10.00); + Point<3>::Pointer p_point7 = std::make_shared>(10.00, 10.00, 10.00); + Point<3>::Pointer p_point8 = std::make_shared>(0.00, 10.00, 10.00); Hexahedra3D8 > geometry(p_point1, p_point2, p_point3, p_point4, p_point5, p_point6, p_point7, p_point8); @@ -123,14 +123,14 @@ namespace Kratos { { // Generate a volume mesh (done with the StructuredMeshGeneratorProcess) - Point<3>::Pointer p_point1 = boost::make_shared>(0.00, 0.00, 0.00); - Point<3>::Pointer p_point2 = boost::make_shared>(10.00, 0.00, 0.00); - Point<3>::Pointer p_point3 = boost::make_shared>(10.00, 10.00, 0.00); - Point<3>::Pointer p_point4 = boost::make_shared>(0.00, 10.00, 0.00); - Point<3>::Pointer p_point5 = boost::make_shared>(0.00, 0.00, 10.00); - Point<3>::Pointer p_point6 = boost::make_shared>(10.00, 0.00, 10.00); - Point<3>::Pointer p_point7 = boost::make_shared>(10.00, 10.00, 10.00); - Point<3>::Pointer p_point8 = boost::make_shared>(0.00, 10.00, 10.00); + Point<3>::Pointer p_point1 = std::make_shared>(0.00, 0.00, 0.00); + Point<3>::Pointer p_point2 = std::make_shared>(10.00, 0.00, 0.00); + Point<3>::Pointer p_point3 = std::make_shared>(10.00, 10.00, 0.00); + Point<3>::Pointer p_point4 = std::make_shared>(0.00, 10.00, 0.00); + Point<3>::Pointer p_point5 = std::make_shared>(0.00, 0.00, 10.00); + Point<3>::Pointer p_point6 = std::make_shared>(10.00, 0.00, 10.00); + Point<3>::Pointer p_point7 = std::make_shared>(10.00, 10.00, 10.00); + Point<3>::Pointer p_point8 = std::make_shared>(0.00, 10.00, 10.00); Hexahedra3D8 > geometry(p_point1, p_point2, p_point3, p_point4, p_point5, p_point6, p_point7, p_point8); diff --git a/kratos/tests/sources/test_model_part_io.cpp b/kratos/tests/sources/test_model_part_io.cpp index dc466ab27111..28c5ac07d64e 100644 --- a/kratos/tests/sources/test_model_part_io.cpp +++ b/kratos/tests/sources/test_model_part_io.cpp @@ -29,7 +29,7 @@ namespace Kratos { KRATOS_TEST_CASE_IN_SUITE(ModelPartIOSubModelPartsDivision, KratosCoreFastSuite) { - boost::shared_ptr p_input(new std::stringstream( + std::shared_ptr p_input(new std::stringstream( R"input( Begin ModelPartData DENSITY 2700.000000 @@ -101,9 +101,9 @@ namespace Kratos { ModelPartIO model_part_io(p_input); - boost::shared_ptr p_output_0(new std::stringstream); - boost::shared_ptr p_output_1(new std::stringstream); - boost::shared_ptr streams[2] = { p_output_0, p_output_1 }; + std::shared_ptr p_output_0(new std::stringstream); + std::shared_ptr p_output_1(new std::stringstream); + std::shared_ptr streams[2] = { p_output_0, p_output_1 }; std::size_t number_of_partitions = 2; std::size_t number_of_colors = 1;