From 42b271cfd17b4a94747a3b574ef286ebcfbd80de Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 7 Jan 2013 10:01:20 +0100 Subject: [PATCH] changed: certain elements do not like pragma once --- dune/elasticity/applier.hpp | 5 ++++- dune/elasticity/asmhandler.hpp | 5 ++++- dune/elasticity/boundarygrid.hh | 5 ++++- dune/elasticity/elasticity.hpp | 5 ++++- dune/elasticity/elasticity_upscale.hpp | 5 ++++- dune/elasticity/logutils.hpp | 5 ++++- dune/elasticity/material.hh | 5 ++++- dune/elasticity/materials.hh | 5 ++++- dune/elasticity/matrixops.hpp | 5 ++++- dune/elasticity/mortar_evaluator.hpp | 5 ++++- dune/elasticity/mortar_schur.hpp | 5 ++++- dune/elasticity/mortar_schur_precond.hpp | 5 ++++- dune/elasticity/mortar_utils.hpp | 16 +++++++++++++++- dune/elasticity/mpc.hh | 5 ++++- dune/elasticity/seqlu.hpp | 4 +++- dune/elasticity/shapefunctions.hpp | 5 ++++- dune/elasticity/uzawa_solver.hpp | 16 +++++++++++++++- 17 files changed, 89 insertions(+), 17 deletions(-) diff --git a/dune/elasticity/applier.hpp b/dune/elasticity/applier.hpp index 7db2c4c..4442bfe 100644 --- a/dune/elasticity/applier.hpp +++ b/dune/elasticity/applier.hpp @@ -10,7 +10,8 @@ //! and preconditioners in DUNE //! //============================================================================== -#pragma once +#ifndef APPLIER_H_ +#define APPLIER_H_ namespace Opm { namespace Elasticity { @@ -45,3 +46,5 @@ void PreApplier::apply(Vector& v, Vector& d) } } + +#endif diff --git a/dune/elasticity/asmhandler.hpp b/dune/elasticity/asmhandler.hpp index b37842e..f34b095 100644 --- a/dune/elasticity/asmhandler.hpp +++ b/dune/elasticity/asmhandler.hpp @@ -9,7 +9,8 @@ //! \brief Class handling finite element assembly //! //============================================================================== -#pragma once +#ifndef ASMHANDLER_HPP_ +#define ASMHANDLER_HPP_ #include #include @@ -233,3 +234,5 @@ class ASMHandler { } } + +#endif diff --git a/dune/elasticity/boundarygrid.hh b/dune/elasticity/boundarygrid.hh index 2fb054d..75b8fc2 100644 --- a/dune/elasticity/boundarygrid.hh +++ b/dune/elasticity/boundarygrid.hh @@ -9,7 +9,8 @@ //! \brief Class describing 2D quadrilateral grids //! //============================================================================== -#pragma once +#ifndef BOUNDARYGRID_HH_ +#define BOUNDARYGRID_HH_ #include #include @@ -500,3 +501,5 @@ BoundaryGrid::Vertex minXmaxY(std::vector& in); } } + +#endif diff --git a/dune/elasticity/elasticity.hpp b/dune/elasticity/elasticity.hpp index ecc75f7..cd2bd99 100644 --- a/dune/elasticity/elasticity.hpp +++ b/dune/elasticity/elasticity.hpp @@ -9,7 +9,8 @@ //! \brief Elasticity helper class //! //============================================================================== -#pragma once +#ifndef ELASTICITY_HPP_ +#define ELASTICITY_HPP_ namespace Opm { namespace Elasticity { @@ -69,3 +70,5 @@ class Elasticity { } } + +#endif diff --git a/dune/elasticity/elasticity_upscale.hpp b/dune/elasticity/elasticity_upscale.hpp index 7320e5d..98605a1 100644 --- a/dune/elasticity/elasticity_upscale.hpp +++ b/dune/elasticity/elasticity_upscale.hpp @@ -9,7 +9,8 @@ //! \brief Elasticity upscale class //! //============================================================================== -#pragma once +#ifndef ELASTICITY_UPSCALE_HPP_ +#define ELASTICITY_UPSCALE_HPP_ #include #include @@ -444,3 +445,5 @@ class ElasticityUpscale } } + +#endif diff --git a/dune/elasticity/logutils.hpp b/dune/elasticity/logutils.hpp index 2dd2415..2bd92ea 100644 --- a/dune/elasticity/logutils.hpp +++ b/dune/elasticity/logutils.hpp @@ -9,7 +9,8 @@ //! \brief Logging helper utilities //! //============================================================================== -#pragma once +#ifndef LOGUTILS_HPP_ +#define LOGUTILS_HPP_ class LoggerHelper { public: @@ -29,3 +30,5 @@ class LoggerHelper { int per_chunk; //!< Will log for each per_chunk processed int max; //!< Total number of its }; + +#endif diff --git a/dune/elasticity/material.hh b/dune/elasticity/material.hh index 8fe0634..92ee786 100644 --- a/dune/elasticity/material.hh +++ b/dune/elasticity/material.hh @@ -9,7 +9,8 @@ //! \brief Material interface. //! //============================================================================== -#pragma once +#ifndef MATERIAL_HH_ +#define MATERIAL_HH_ #include #include @@ -97,3 +98,5 @@ private: } } + +#endif diff --git a/dune/elasticity/materials.hh b/dune/elasticity/materials.hh index 9fd3d83..2eaca60 100644 --- a/dune/elasticity/materials.hh +++ b/dune/elasticity/materials.hh @@ -9,7 +9,8 @@ //! \brief Material properties. //! //============================================================================== -#pragma once +#ifndef MATERIALS_HH_ +#define MATERIALS_HH_ #include "material.hh" @@ -173,3 +174,5 @@ private: } } + +#endif diff --git a/dune/elasticity/matrixops.hpp b/dune/elasticity/matrixops.hpp index 73f7a82..373d289 100644 --- a/dune/elasticity/matrixops.hpp +++ b/dune/elasticity/matrixops.hpp @@ -9,7 +9,8 @@ //! \brief Helper class with some matrix operations //! //============================================================================== -#pragma once +#ifndef MATRIXOPS_HPP_ +#define MATRIXOPS_HPP_ #include @@ -87,3 +88,5 @@ class MatrixOps { } } + +#endif diff --git a/dune/elasticity/mortar_evaluator.hpp b/dune/elasticity/mortar_evaluator.hpp index c5713de..68c7dd8 100644 --- a/dune/elasticity/mortar_evaluator.hpp +++ b/dune/elasticity/mortar_evaluator.hpp @@ -9,7 +9,8 @@ //! \brief Linear operator for a Mortar block //! //============================================================================== -#pragma once +#ifndef MORTAR_EVALUATOR_HPP_ +#define MORTAR_EVALUATOR_HPP_ #include #include @@ -77,3 +78,5 @@ class MortarEvaluator : public Dune::LinearOperator { } } + +#endif diff --git a/dune/elasticity/mortar_schur.hpp b/dune/elasticity/mortar_schur.hpp index 25b87f7..7093873 100644 --- a/dune/elasticity/mortar_schur.hpp +++ b/dune/elasticity/mortar_schur.hpp @@ -9,7 +9,8 @@ //! \brief Schur based linear operator for a Mortar block //! //============================================================================== -#pragma once +#ifndef MORTAR_SCHUR_HPP_ +#define MORTAR_SCHUR_HPP_ #include #include @@ -71,3 +72,5 @@ class MortarBlockEvaluator : public Dune::LinearOperator { } } + +#endif diff --git a/dune/elasticity/mortar_schur_precond.hpp b/dune/elasticity/mortar_schur_precond.hpp index c3875ce..9dfe7a7 100644 --- a/dune/elasticity/mortar_schur_precond.hpp +++ b/dune/elasticity/mortar_schur_precond.hpp @@ -9,7 +9,8 @@ //! \brief Schur based preconditioner for saddle point systems //! //============================================================================== -#pragma once +#ifndef SCHUR_PRECOND_HPP_ +#define SCHUR_PRECOND_HPP_ #include #include @@ -121,3 +122,5 @@ class MortarSchurPre : public Dune::Preconditioner { } } + +#endif diff --git a/dune/elasticity/mortar_utils.hpp b/dune/elasticity/mortar_utils.hpp index 1e1c552..23c3c78 100644 --- a/dune/elasticity/mortar_utils.hpp +++ b/dune/elasticity/mortar_utils.hpp @@ -1,4 +1,16 @@ -#pragma once +//============================================================================== +//! +//! \file mortar_utils.hpp +//! +//! \date Nov 9 2012 +//! +//! \author Arne Morten Kvarving / SINTEF +//! +//! \brief Mortar helper class +//! +//============================================================================== +#ifndef MORTAR_UTILS_HPP_ +#define MORTAR_UTILS_HPP_ namespace Opm { namespace Elasticity { @@ -29,3 +41,5 @@ class MortarUtils { } } + +#endif diff --git a/dune/elasticity/mpc.hh b/dune/elasticity/mpc.hh index 0108ef6..3986ecf 100644 --- a/dune/elasticity/mpc.hh +++ b/dune/elasticity/mpc.hh @@ -9,7 +9,8 @@ //! \brief Representation of multi-point constraint (MPC) equations. //! //============================================================================== -#pragma once +#ifndef MPC_HH_ +#define MPC_HH_ #include #include @@ -159,3 +160,5 @@ typedef std::map MPCMap; } } + +#endif diff --git a/dune/elasticity/seqlu.hpp b/dune/elasticity/seqlu.hpp index e85c5bf..9c6020a 100644 --- a/dune/elasticity/seqlu.hpp +++ b/dune/elasticity/seqlu.hpp @@ -9,7 +9,8 @@ //! \brief SuperLU preconditioner interface //! //============================================================================== -#pragma once +#ifndef SEQLU_HPP_ +#define SEQLU_HPP_ #if HAVE_SUPERLU #include @@ -75,3 +76,4 @@ class SeqLU : public Dune::Preconditioner { }; #endif +#endif diff --git a/dune/elasticity/shapefunctions.hpp b/dune/elasticity/shapefunctions.hpp index 3047c9d..eef6723 100644 --- a/dune/elasticity/shapefunctions.hpp +++ b/dune/elasticity/shapefunctions.hpp @@ -9,7 +9,8 @@ //! \brief Classes for shape functions. Loosely based on code in dune-grid-howto //! //============================================================================== -#pragma once +#ifndef SHAPEFUNCTIONS_HPP_ +#define SHAPEFUNCTIONS_HPP_ #include #include "dynmatrixev.hh" @@ -410,3 +411,5 @@ protected: } } + +#endif diff --git a/dune/elasticity/uzawa_solver.hpp b/dune/elasticity/uzawa_solver.hpp index 312787b..890c8de 100644 --- a/dune/elasticity/uzawa_solver.hpp +++ b/dune/elasticity/uzawa_solver.hpp @@ -1,4 +1,16 @@ -#pragma once +#ifndef UZAWA_SOLVER_HPP_ +#define UZAWA_SOLVER_HPP_ +//============================================================================== +//! +//! \file uzawa_solver.hpp +//! +//! \date Nov 9 2012 +//! +//! \author Arne Morten Kvarving / SINTEF +//! +//! \brief Uzawa scheme helper class +//! +//============================================================================== namespace Opm { namespace Elasticity { @@ -54,3 +66,5 @@ class UzawaSolver : public Dune::InverseOperator } } + +#endif