diff --git a/opm/material/Constants.hpp b/opm/material/Constants.hpp index 9305f385b..24fdeb151 100644 --- a/opm/material/Constants.hpp +++ b/opm/material/Constants.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::Constants @@ -30,7 +32,7 @@ namespace Opm /*! * \brief A central place for various physical constants occuring in - * some equations. + some equations. */ template class Constants diff --git a/opm/material/DynamicTabulated2dFunction.hpp b/opm/material/DynamicTabulated2dFunction.hpp index 4d652eade..0762b652e 100644 --- a/opm/material/DynamicTabulated2dFunction.hpp +++ b/opm/material/DynamicTabulated2dFunction.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/IdealGas.hpp b/opm/material/IdealGas.hpp index 7e3df8d5b..a6c9eb1f9 100644 --- a/opm/material/IdealGas.hpp +++ b/opm/material/IdealGas.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::IdealGas diff --git a/opm/material/StaticTabulated2dFunction.hpp b/opm/material/StaticTabulated2dFunction.hpp index 5503d5c21..7f39f9001 100644 --- a/opm/material/StaticTabulated2dFunction.hpp +++ b/opm/material/StaticTabulated2dFunction.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/Tabulated2dFunction.hpp b/opm/material/Tabulated2dFunction.hpp index a8ead5e35..ee0b29600 100644 --- a/opm/material/Tabulated2dFunction.hpp +++ b/opm/material/Tabulated2dFunction.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/Valgrind.hpp b/opm/material/Valgrind.hpp index ac3845968..4bac9e1d6 100644 --- a/opm/material/Valgrind.hpp +++ b/opm/material/Valgrind.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \brief Some templates to wrap the valgrind macros @@ -61,7 +63,7 @@ inline bool IsRunning() /*! * \ingroup Valgrind * \brief Make valgrind complain if any of the memory occupied by an object - * is undefined. + is undefined. * * Please note that this does not check whether the destinations of an * object's pointers or references are defined. Also, for performance @@ -80,7 +82,7 @@ inline bool IsRunning() * \param value the object which valgrind should check * * \return true iff there are no undefined bytes in the memory - * occupied by the object. + occupied by the object. */ template inline bool CheckDefined(const T &value) @@ -96,7 +98,7 @@ inline bool CheckDefined(const T &value) * \ingroup Valgrind * * * \brief Make valgrind complain if any of the the memory occupied - * by a C-style array objects is undefined. + by a C-style array objects is undefined. * * Please note that this does not check whether the destinations of an * object's pointers or references are defined. Also, for performance @@ -116,7 +118,7 @@ inline bool CheckDefined(const T &value) * \param size The size of the array in number of objects * * \return true iff there are no undefined bytes in the memory - * occupied by the array. + occupied by the array. */ template inline bool CheckDefined(const T *value, int size) @@ -132,7 +134,7 @@ inline bool CheckDefined(const T *value, int size) /*! * \ingroup Valgrind * \brief Make the memory on which an object resides undefined in - * valgrind runs. + valgrind runs. * * Example: * @@ -157,7 +159,7 @@ inline void SetUndefined(const T &value) /*! * \ingroup Valgrind * \brief Make the memory on which an array of object resides - * undefined in valgrind runs. + undefined in valgrind runs. * * Example: * @@ -207,7 +209,7 @@ inline void SetDefined(const T &value) /*! * \ingroup Valgrind * \brief Make the memory on which a C-style array of objects resides - * defined. + defined. * * Example: * @@ -257,7 +259,7 @@ inline void SetNoAccess(const T &value) /*! * \ingroup Valgrind * \brief Make valgrind complain if the memory of a C-style array of - * objects is accessed. + objects is accessed. * * Example: * diff --git a/opm/material/binarycoefficients/Air_Mesitylene.hpp b/opm/material/binarycoefficients/Air_Mesitylene.hpp index 3bfdf7c7f..be2808c83 100644 --- a/opm/material/binarycoefficients/Air_Mesitylene.hpp +++ b/opm/material/binarycoefficients/Air_Mesitylene.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Bernd Flemisch * - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Bernd Flemisch + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BinaryCoeff::Air_Mesitylene diff --git a/opm/material/binarycoefficients/Air_Xylene.hpp b/opm/material/binarycoefficients/Air_Xylene.hpp index 1d35958cb..420234f5c 100644 --- a/opm/material/binarycoefficients/Air_Xylene.hpp +++ b/opm/material/binarycoefficients/Air_Xylene.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Bernd Flemisch * - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Bernd Flemisch + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BinaryCoeff::Air_Xylene diff --git a/opm/material/binarycoefficients/Brine_CO2.hpp b/opm/material/binarycoefficients/Brine_CO2.hpp index c521bd7f7..58d248169 100644 --- a/opm/material/binarycoefficients/Brine_CO2.hpp +++ b/opm/material/binarycoefficients/Brine_CO2.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/binarycoefficients/FullerMethod.hpp b/opm/material/binarycoefficients/FullerMethod.hpp index 18472100d..b8abebd01 100644 --- a/opm/material/binarycoefficients/FullerMethod.hpp +++ b/opm/material/binarycoefficients/FullerMethod.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BinaryCoeff::fullerMethod @@ -33,7 +35,7 @@ namespace BinaryCoeff { /*! * \ingroup Binarycoefficients * \brief Estimate binary diffusion coefficents \f$\mathrm{[m^2/s]}\f$ in gases according to - * the method by Fuller. + the method by Fuller. * * \param M molar masses \f$\mathrm{[g/mol]}\f$ * \param SigmaNu atomic diffusion volume diff --git a/opm/material/binarycoefficients/H2O_Air.hpp b/opm/material/binarycoefficients/H2O_Air.hpp index e1173246b..9286968ef 100644 --- a/opm/material/binarycoefficients/H2O_Air.hpp +++ b/opm/material/binarycoefficients/H2O_Air.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Klaus Mosthaf * - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Klaus Mosthaf + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BinaryCoeff::H2O_Air diff --git a/opm/material/binarycoefficients/H2O_CO2.hpp b/opm/material/binarycoefficients/H2O_CO2.hpp index 61b76f47b..494e9ab8a 100644 --- a/opm/material/binarycoefficients/H2O_CO2.hpp +++ b/opm/material/binarycoefficients/H2O_CO2.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/binarycoefficients/H2O_Mesitylene.hpp b/opm/material/binarycoefficients/H2O_Mesitylene.hpp index eefadffd0..5180c34fc 100644 --- a/opm/material/binarycoefficients/H2O_Mesitylene.hpp +++ b/opm/material/binarycoefficients/H2O_Mesitylene.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Bernd Flemisch * - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Bernd Flemisch + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BinaryCoeff::H2O_Mesitylene diff --git a/opm/material/binarycoefficients/H2O_N2.hpp b/opm/material/binarycoefficients/H2O_N2.hpp index c5dfd216f..e088e4bc1 100644 --- a/opm/material/binarycoefficients/H2O_N2.hpp +++ b/opm/material/binarycoefficients/H2O_N2.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * Copyright (C) 2010 by Felix Bode * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + Copyright (C) 2010 by Felix Bode + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BinaryCoeff::H2O_N2 diff --git a/opm/material/binarycoefficients/H2O_Xylene.hpp b/opm/material/binarycoefficients/H2O_Xylene.hpp index a26b22e7d..569e8aa48 100644 --- a/opm/material/binarycoefficients/H2O_Xylene.hpp +++ b/opm/material/binarycoefficients/H2O_Xylene.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Bernd Flemisch * - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Bernd Flemisch + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BinaryCoeff::H2O_Xylene diff --git a/opm/material/binarycoefficients/HenryIapws.hpp b/opm/material/binarycoefficients/HenryIapws.hpp index 447e49d64..be35fcc34 100644 --- a/opm/material/binarycoefficients/HenryIapws.hpp +++ b/opm/material/binarycoefficients/HenryIapws.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -31,7 +33,7 @@ namespace Opm /*! * \ingroup Binarycoefficients * \brief The Henry constants in liquid water using the IAPWS 2004 - * formulation. + formulation. * * This function calculates \f$K_D\f$, see: * diff --git a/opm/material/components/Air.hpp b/opm/material/components/Air.hpp index e8adf8799..d0cca2c03 100644 --- a/opm/material/components/Air.hpp +++ b/opm/material/components/Air.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Klaus Mosthaf * - * Copyright (C) 2010-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Klaus Mosthaf + Copyright (C) 2010-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::Air diff --git a/opm/material/components/Brine.hpp b/opm/material/components/Brine.hpp index 09124d43c..65e4745ee 100644 --- a/opm/material/components/Brine.hpp +++ b/opm/material/components/Brine.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/components/CO2.hpp b/opm/material/components/CO2.hpp index c107c9a47..daaa1b68b 100644 --- a/opm/material/components/CO2.hpp +++ b/opm/material/components/CO2.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012-2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012-2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/components/Component.hpp b/opm/material/components/Component.hpp index 9d12ba446..cb93cdbed 100644 --- a/opm/material/components/Component.hpp +++ b/opm/material/components/Component.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * Copyright (C) 2010 by Felix Bode * - * Copyright (C) 2010 by Katherina Baber * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + Copyright (C) 2010 by Felix Bode + Copyright (C) 2010 by Katherina Baber + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::Component diff --git a/opm/material/components/Dnapl.hpp b/opm/material/components/Dnapl.hpp index da06bce8d..527a189eb 100644 --- a/opm/material/components/Dnapl.hpp +++ b/opm/material/components/Dnapl.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * Copyright (C) 2010-2012 by Markus Wolff * - * Copyright (C) 2010 by Felix Bode * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + Copyright (C) 2010-2012 by Markus Wolff + Copyright (C) 2010 by Felix Bode + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::DNAPL diff --git a/opm/material/components/H2O.hpp b/opm/material/components/H2O.hpp index 27700d86d..301ecb30b 100644 --- a/opm/material/components/H2O.hpp +++ b/opm/material/components/H2O.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2013 by Andreas Lauser * - * Copyright (C) 2010 by Jochen Fritz * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2013 by Andreas Lauser + Copyright (C) 2010 by Jochen Fritz + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::H2O @@ -583,7 +585,7 @@ public: Scalar RT = Rs*temperature; Scalar dv_dp = RT/(dp_dpi*pv) - * + (dgamma_dpi + pi*ddgamma_ddpi - v0*dp_dpi/RT); */ @@ -691,7 +693,7 @@ public: Scalar RT = Rs*temperature; Scalar dv_dp = RT/(dp_dpi*pv) - * + (dgamma_dpi + pi*ddgamma_ddpi - v0*dp_dpi/RT); */ diff --git a/opm/material/components/Lnapl.hpp b/opm/material/components/Lnapl.hpp index 7cb93ef29..7d03cdbff 100644 --- a/opm/material/components/Lnapl.hpp +++ b/opm/material/components/Lnapl.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Markus Wolff * - * Copyright (C) 2009-2012 by Andreas Lauser * - * Copyright (C) 2010 by Felix Bode * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Markus Wolff + Copyright (C) 2009-2012 by Andreas Lauser + Copyright (C) 2010 by Felix Bode + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::LNAPL diff --git a/opm/material/components/Mesitylene.hpp b/opm/material/components/Mesitylene.hpp index e3af37bcd..32886c1a7 100644 --- a/opm/material/components/Mesitylene.hpp +++ b/opm/material/components/Mesitylene.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Philipp Nuske * - * Copyright (C) 2012 by Bernd Flemisch * - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Philipp Nuske + Copyright (C) 2012 by Bernd Flemisch + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::Mesitylene diff --git a/opm/material/components/N2.hpp b/opm/material/components/N2.hpp index 13f16046a..14dc2da10 100644 --- a/opm/material/components/N2.hpp +++ b/opm/material/components/N2.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * Copyright (C) 2010 by Felix Bode * - * Copyright (C) 2011-2012 by Philipp Nuske * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + Copyright (C) 2010 by Felix Bode + Copyright (C) 2011-2012 by Philipp Nuske + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::N2 diff --git a/opm/material/components/NullComponent.hpp b/opm/material/components/NullComponent.hpp index 744a6df5a..92946920b 100644 --- a/opm/material/components/NullComponent.hpp +++ b/opm/material/components/NullComponent.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::NullComponent diff --git a/opm/material/components/SimpleCO2.hpp b/opm/material/components/SimpleCO2.hpp index 4c9b79608..e4c246c57 100644 --- a/opm/material/components/SimpleCO2.hpp +++ b/opm/material/components/SimpleCO2.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/components/SimpleH2O.hpp b/opm/material/components/SimpleH2O.hpp index cb6461004..2484399ab 100644 --- a/opm/material/components/SimpleH2O.hpp +++ b/opm/material/components/SimpleH2O.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * Copyright (C) 2010 by Felix Bode * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + Copyright (C) 2010 by Felix Bode + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::SimpleH2O diff --git a/opm/material/components/TabulatedComponent.hpp b/opm/material/components/TabulatedComponent.hpp index 194c4be90..daeb249d9 100644 --- a/opm/material/components/TabulatedComponent.hpp +++ b/opm/material/components/TabulatedComponent.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * Copyright (C) 2010 by Felix Bode * - * Copyright (C) 2012 by Philipp Nuske * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + Copyright (C) 2010 by Felix Bode + Copyright (C) 2012 by Philipp Nuske + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -41,7 +43,7 @@ namespace Opm * \ingroup Components * * \brief A generic class which tabulates all thermodynamic properties - * of a given component. + of a given component. * * At the moment, this class can only handle the sub-critical fluids * since it tabulates along the vapor pressure curve. @@ -49,7 +51,7 @@ namespace Opm * \tparam Scalar The type used for scalar values * \tparam Scalar The component which ought to be tabulated * \tparam useVaporPressure If true, tabulate all quantities along the - * vapor pressure curve, if false use the pressure range [p_min, p_max] + vapor pressure curve, if false use the pressure range [p_min, p_max] */ template class TabulatedComponent diff --git a/opm/material/components/Unit.hpp b/opm/material/components/Unit.hpp index e71289506..da0367e84 100644 --- a/opm/material/components/Unit.hpp +++ b/opm/material/components/Unit.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * Copyright (C) 2009-2010 by Bernd Flemisch * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + Copyright (C) 2009-2010 by Bernd Flemisch + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::Unit diff --git a/opm/material/components/Xylene.hpp b/opm/material/components/Xylene.hpp index 9b0158039..56b76c913 100644 --- a/opm/material/components/Xylene.hpp +++ b/opm/material/components/Xylene.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Bernd Flemisch * - * Copyright (C) 2012 by Philipp Nuske * - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Bernd Flemisch + Copyright (C) 2012 by Philipp Nuske + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::Xylene diff --git a/opm/material/components/iapws/Common.hpp b/opm/material/components/iapws/Common.hpp index 76675e9b5..cfc9c3292 100644 --- a/opm/material/components/iapws/Common.hpp +++ b/opm/material/components/iapws/Common.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2013 by Andreas Lauser * - * Copyright (C) 2012 by Philipp Nuske * - * Copyright (C) 2010 by Felix Bode * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2013 by Andreas Lauser + Copyright (C) 2012 by Philipp Nuske + Copyright (C) 2010 by Felix Bode + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::IAPWS::Common @@ -37,7 +39,7 @@ namespace IAPWS { * \ingroup IAPWS * * \brief Implements relations which are common for all regions of the IAPWS '97 - * formulation. + formulation. * * \tparam Scalar The type used for scalar values * diff --git a/opm/material/components/iapws/Region1.hpp b/opm/material/components/iapws/Region1.hpp index e55b25d54..a7c6f5041 100644 --- a/opm/material/components/iapws/Region1.hpp +++ b/opm/material/components/iapws/Region1.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * Copyright (C) 2010 by Felix Bode * - * Copyright (C) 2010 by Katherina Baber * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + Copyright (C) 2010 by Felix Bode + Copyright (C) 2010 by Katherina Baber + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::IAPWS::Region1 diff --git a/opm/material/components/iapws/Region2.hpp b/opm/material/components/iapws/Region2.hpp index 5cbc199d4..f08a2ea2b 100644 --- a/opm/material/components/iapws/Region2.hpp +++ b/opm/material/components/iapws/Region2.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * Copyright (C) 2010 by Felix Bode * - * Copyright (C) 2010 by Katherina Baber * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + Copyright (C) 2010 by Felix Bode + Copyright (C) 2010 by Katherina Baber + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::IAPWS::Region2 diff --git a/opm/material/components/iapws/Region4.hpp b/opm/material/components/iapws/Region4.hpp index c277d06d9..58c2c0925 100644 --- a/opm/material/components/iapws/Region4.hpp +++ b/opm/material/components/iapws/Region4.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * Copyright (C) 2012 by Benjamin Faigle * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + Copyright (C) 2012 by Benjamin Faigle + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::IAPWS::Region4 diff --git a/opm/material/constraintsolvers/CompositionFromFugacities.hpp b/opm/material/constraintsolvers/CompositionFromFugacities.hpp index fc12083f3..49e72080e 100644 --- a/opm/material/constraintsolvers/CompositionFromFugacities.hpp +++ b/opm/material/constraintsolvers/CompositionFromFugacities.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::CompositionFromFugacities @@ -36,7 +38,7 @@ namespace Opm { /*! * \brief Calculates the chemical equilibrium from the component - * fugacities in a phase. + fugacities in a phase. */ template class CompositionFromFugacities diff --git a/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp b/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp index d5d21797a..e028d95b4 100644 --- a/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp +++ b/opm/material/constraintsolvers/ComputeFromReferencePhase.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ComputeFromReferencePhase @@ -35,7 +37,7 @@ namespace Opm { /*! * \brief Computes all quantities of a generic fluid state if a - * reference phase has been specified. + reference phase has been specified. * * This makes it is possible to specify just one phase and let the * remaining ones be calculated by the constraint solver. This diff --git a/opm/material/constraintsolvers/ImmiscibleFlash.hpp b/opm/material/constraintsolvers/ImmiscibleFlash.hpp index aab3a491b..e95dc86a2 100644 --- a/opm/material/constraintsolvers/ImmiscibleFlash.hpp +++ b/opm/material/constraintsolvers/ImmiscibleFlash.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ImmiscibleFlash @@ -37,7 +39,7 @@ namespace Opm { /*! * \brief Determines the pressures and saturations of all fluid phases - * given the total mass of all components. + given the total mass of all components. * * In a N-phase, N-component context, we have the following * unknowns if assuming immiscibility: diff --git a/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp b/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp index 492ef01c9..7e77b4af2 100644 --- a/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp +++ b/opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::MiscibleMultiPhaseComposition @@ -34,7 +36,7 @@ namespace Opm { /*! * \brief Specifies an auxiliary constraint for the - * MiscibleMultiPhaseComposition constraint solver. + MiscibleMultiPhaseComposition constraint solver. * * For this constraint solver, an auxiliary constraint is defined as a * fixed mole fraction of a component in a fluid phase. @@ -91,8 +93,8 @@ private: /*! * \brief Computes the composition of all phases of a N-phase, - * N-component fluid system assuming that all N phases are - * present + N-component fluid system assuming that all N phases are + present * * The constraint solver assumes the following quantities to be set: * diff --git a/opm/material/constraintsolvers/NcpFlash.hpp b/opm/material/constraintsolvers/NcpFlash.hpp index 557f8d841..f8f598c0a 100644 --- a/opm/material/constraintsolvers/NcpFlash.hpp +++ b/opm/material/constraintsolvers/NcpFlash.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::NcpFlash @@ -38,7 +40,7 @@ namespace Opm { /*! * \brief Determines the phase compositions, pressures and saturations - * given the total mass of all components. + given the total mass of all components. * * In a M-phase, N-component context, we have the following * unknowns: @@ -51,16 +53,16 @@ namespace Opm { * we have: * * - (M - 1)*N equation stemming from the fact that the - * fugacity of any component is the same in all phases + fugacity of any component is the same in all phases * - 1 equation from the closure condition of all saturations - * (they sum up to 1) + (they sum up to 1) * - M - 1 constraints from the capillary pressures - * \f$(-> p_\beta = p_\alpha + p_c\alpha,\beta)\f$ + \f$(-> p_\beta = p_\alpha + p_c\alpha,\beta)\f$ * - N constraints from the fact that the total mass of each - * component is given \f$(-> sum_\alpha rhoMolar_\alpha * - * x_\alpha^\kappa = const)\f$ + component is given \f$(-> sum_\alpha rhoMolar_\alpha * + x_\alpha^\kappa = const)\f$ * - M model constraints. Here we use the NCP constraints - * (-> 0 = min \f$ {S_\alpha, 1 - \sum_\kappa x_\alpha^\kappa}\f$) + (-> 0 = min \f$ {S_\alpha, 1 - \sum_\kappa x_\alpha^\kappa}\f$) * * this also sums up to M*(N + 2). * diff --git a/opm/material/eos/PengRobinson.hpp b/opm/material/eos/PengRobinson.hpp index be0529802..648a7ede9 100644 --- a/opm/material/eos/PengRobinson.hpp +++ b/opm/material/eos/PengRobinson.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -37,7 +39,7 @@ namespace Opm { /*! * \brief Implements the Peng-Robinson equation of state for liquids - * and gases. + and gases. * * See: * diff --git a/opm/material/eos/PengRobinsonMixture.hpp b/opm/material/eos/PengRobinsonMixture.hpp index aaa1d1a50..5baf0d6b5 100644 --- a/opm/material/eos/PengRobinsonMixture.hpp +++ b/opm/material/eos/PengRobinsonMixture.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2013 by Andreas Lauser * - * Copyright (C) 2011-2012 by Bernd Flemisch * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2013 by Andreas Lauser + Copyright (C) 2011-2012 by Bernd Flemisch + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::PengRobinsonMixture @@ -33,7 +35,7 @@ namespace Opm { /*! * \brief Implements the Peng-Robinson equation of state for a - * mixture. + mixture. */ template class PengRobinsonMixture diff --git a/opm/material/eos/PengRobinsonParams.hpp b/opm/material/eos/PengRobinsonParams.hpp index a05c6e3b0..be31d6e6d 100644 --- a/opm/material/eos/PengRobinsonParams.hpp +++ b/opm/material/eos/PengRobinsonParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::PengRobinsonParams diff --git a/opm/material/eos/PengRobinsonparamsMixture.hpp b/opm/material/eos/PengRobinsonparamsMixture.hpp index 0e1db0952..ab282eb0a 100644 --- a/opm/material/eos/PengRobinsonparamsMixture.hpp +++ b/opm/material/eos/PengRobinsonparamsMixture.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::PengRobinsonParamsMixture diff --git a/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchten.hpp b/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchten.hpp index 4350968d2..615394b06 100644 --- a/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchten.hpp +++ b/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchten.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Bernd Flemisch * - * Copyright (C) 2012 by Vishal Jambhekar * - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Bernd Flemisch + Copyright (C) 2012 by Vishal Jambhekar + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ThreePParkerVanGenuchten @@ -34,7 +36,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Implementation of van Genuchten's capillary pressure <-> - * saturation relation. + saturation relation. * * \sa VanGenuchten, VanGenuchtenThreephase */ diff --git a/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchtenParams.hpp b/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchtenParams.hpp index da610fade..6ee08229f 100644 --- a/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchtenParams.hpp +++ b/opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchtenParams.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Bernd Flemisch * - * Copyright (C) 2012 by Andreas Lauser * - * Copyright (C) 2012 by Holger Class * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Bernd Flemisch + Copyright (C) 2012 by Andreas Lauser + Copyright (C) 2012 by Holger Class + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ParkerVanGen3PParams @@ -37,7 +39,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Specification of the material params for the three-phase van - * Genuchten capillary pressure model. + Genuchten capillary pressure model. * * In comparison to the two-phase version, this parameter object also * includes the residual saturations, as their handling is very diff --git a/opm/material/fluidmatrixinteractions/3pAdapter.hpp b/opm/material/fluidmatrixinteractions/3pAdapter.hpp index 2d5f3af7a..4c7ba8ec7 100644 --- a/opm/material/fluidmatrixinteractions/3pAdapter.hpp +++ b/opm/material/fluidmatrixinteractions/3pAdapter.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ThreePAdapter @@ -34,7 +36,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Makes the three-phase capillary pressure-saturation relations - * available under the M-phase API for material laws. + available under the M-phase API for material laws. */ template class ThreePAdapter diff --git a/opm/material/fluidmatrixinteractions/BrooksCorey.hpp b/opm/material/fluidmatrixinteractions/BrooksCorey.hpp index e612fff25..f7e8e1755 100644 --- a/opm/material/fluidmatrixinteractions/BrooksCorey.hpp +++ b/opm/material/fluidmatrixinteractions/BrooksCorey.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2013 by Andreas Lauser * - * Copyright (C) 2010 by Philipp Nuske * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2013 by Andreas Lauser + Copyright (C) 2010 by Philipp Nuske + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BrooksCorey @@ -35,7 +37,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Implementation of the Brooks-Corey capillary pressure <-> - * saturation relation. + saturation relation. * * This class provides the "raw" curves as static members and doesn't * concern itself converting absolute to effective saturations and diff --git a/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp b/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp index 76b6d39bb..7abf1a5d2 100644 --- a/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp +++ b/opm/material/fluidmatrixinteractions/BrooksCoreyParams.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * Copyright (C) 2011 by Holger Class * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + Copyright (C) 2011 by Holger Class + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BrooksCoreyParams @@ -34,7 +36,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Specification of the material parameters for the - * Brooks-Corey constitutive relations. + Brooks-Corey constitutive relations. * *\see BrooksCorey */ diff --git a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp index 5070dd507..6a92fcddb 100644 --- a/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp +++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::EclDefaultMaterial @@ -38,7 +40,7 @@ namespace Opm { * \ingroup material * * \brief Implements the default three phase capillary pressure law - * used by the ECLipse simulator. + used by the ECLipse simulator. * * This material law is valid for three fluid phases and only depends * on the saturations. diff --git a/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp b/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp index c031632c5..5a1d201e7 100644 --- a/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp +++ b/opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::EclDefaultMaterialParams @@ -31,8 +33,8 @@ namespace Opm { /*! * \brief Default implementation for the parameters required by the - * default three-phase capillary pressure model used by - * Eclipse. + default three-phase capillary pressure model used by + Eclipse. * * Essentially, this class just stores the two parameter objects for * the twophase capillary pressure laws. diff --git a/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp b/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp index fe612f23a..74a396ed1 100644 --- a/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp +++ b/opm/material/fluidmatrixinteractions/EffToAbsLaw.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2011 by Philipp Nuske * - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2011 by Philipp Nuske + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::EffToAbsLaw @@ -33,8 +35,8 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief This material law takes a material law defined for effective - * saturations and converts it to a material law defined on absolute - * saturations. + saturations and converts it to a material law defined on absolute + saturations. * * The idea: "material laws" (like VanGenuchten or BrooksCorey) are * defined for effective saturations. The numeric calculations @@ -58,10 +60,10 @@ namespace Opm { * * This boils down to: * - the actual material laws (linear, VanGenuchten...) do not need to - * deal with any kind of conversion + deal with any kind of conversion * - the definition of the material law in the spatial parameters is - * not really intuitive, but using it is: Hand in values, get back - * values, do not deal with conversion. + not really intuitive, but using it is: Hand in values, get back + values, do not deal with conversion. */ template > class EffToAbsLaw : public EffLawT::Traits diff --git a/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp b/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp index 0e15b09aa..42de95ccf 100644 --- a/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp +++ b/opm/material/fluidmatrixinteractions/EffToAbsLawParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::EffToAbsLawParams @@ -28,8 +30,8 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief A default implementation of the parameters for the adapter - * class to convert material laws from effective to absolute - * saturations. + class to convert material laws from effective to absolute + saturations. */ template class EffToAbsLawParams : public EffLawParamsT diff --git a/opm/material/fluidmatrixinteractions/LinearMaterial.hpp b/opm/material/fluidmatrixinteractions/LinearMaterial.hpp index b35170ccd..60ca5be1a 100644 --- a/opm/material/fluidmatrixinteractions/LinearMaterial.hpp +++ b/opm/material/fluidmatrixinteractions/LinearMaterial.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::LinearMaterial diff --git a/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp b/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp index 53a47060a..d4cc5236a 100644 --- a/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp +++ b/opm/material/fluidmatrixinteractions/LinearMaterialParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::LinearMaterialParams @@ -27,7 +29,7 @@ namespace Opm { /*! * \brief Reference implementation of params for the linear M-phase - * material material. + material material. */ template class LinearMaterialParams diff --git a/opm/material/fluidmatrixinteractions/MaterialTraits.hpp b/opm/material/fluidmatrixinteractions/MaterialTraits.hpp index d9fcd842b..64b5be62f 100644 --- a/opm/material/fluidmatrixinteractions/MaterialTraits.hpp +++ b/opm/material/fluidmatrixinteractions/MaterialTraits.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \brief This file contains helper classes for the material laws. diff --git a/opm/material/fluidmatrixinteractions/NullMaterial.hpp b/opm/material/fluidmatrixinteractions/NullMaterial.hpp index c4b553899..83aeceba8 100644 --- a/opm/material/fluidmatrixinteractions/NullMaterial.hpp +++ b/opm/material/fluidmatrixinteractions/NullMaterial.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::NullMaterial @@ -36,7 +38,7 @@ namespace Opm * \ingroup material * * \brief Implements a dummy linear saturation-capillary pressure - * relation which just disables capillary pressure. + relation which just disables capillary pressure. */ template class NullMaterial : public TraitsT diff --git a/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp b/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp index aa99b3a75..5b7816e6c 100644 --- a/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp +++ b/opm/material/fluidmatrixinteractions/NullMaterialParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::NullMaterialParams @@ -26,7 +28,7 @@ namespace Opm { /*! * \brief Reference implementation of params for the linear M-phase - * material material. + material material. */ template class NullMaterialParams diff --git a/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp b/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp index 0f9c3f089..70dc62231 100644 --- a/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp +++ b/opm/material/fluidmatrixinteractions/ParkerLenhard.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ParkerLenhard @@ -228,8 +230,8 @@ private: /*! * \ingroup material * \brief Implements the Parker-Lenhard twophase - * p_c-Sw hysteresis model. This class adheres to the twophase - * capillary pressure API. + p_c-Sw hysteresis model. This class adheres to the twophase + capillary pressure API. */ template > class ParkerLenhard : public TraitsT diff --git a/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp b/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp index bcfaa47b1..23b96b19c 100644 --- a/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp +++ b/opm/material/fluidmatrixinteractions/ParkerLenhardParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ParkerLenhardParams @@ -33,7 +35,7 @@ class PLScanningCurve; /*! * \brief Default parameter class for the Parker-Lenhard hysteresis - * model. + model. */ template class ParkerLenhardParams diff --git a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp index d8a7d19f6..447f04146 100644 --- a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp +++ b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::PiecewiseLinearTwoPhaseMaterial @@ -37,7 +39,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Implementation of a tabulated, piecewise linear capillary - * pressure law. + pressure law. * * It would be equally possible to use cubic splines, but since the * ECLIPSE reservoir simulator uses linear interpolation for capillary diff --git a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp index 9bdf4b493..6703ab0a2 100644 --- a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp +++ b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterialParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::PiecewiseLinearTwoPhaseMaterialParams @@ -30,7 +32,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Specification of the material parameters for the van - * Genuchten constitutive relations. + Genuchten constitutive relations. * * In this implementation setting either the \f$n\f$ or \f$m\f$ shape * parameter automatically calculates the other. I.e. they cannot be diff --git a/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp b/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp index 61533d3b0..96030dbdf 100644 --- a/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp +++ b/opm/material/fluidmatrixinteractions/RegularizedBrooksCorey.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * Copyright (C) 2010 by Philipp Nuske * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + Copyright (C) 2010 by Philipp Nuske + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::RegularizedBrooksCorey @@ -33,7 +35,7 @@ namespace Opm { /*! * \ingroup FluidMatrixInteractions * \brief Implementation of the regularized Brooks-Corey capillary - * pressure / relative permeability <-> saturation relation. + pressure / relative permeability <-> saturation relation. * * This class bundles the "raw" curves as static members and doesn't * concern itself converting absolute to effective saturations and @@ -53,8 +55,8 @@ namespace Opm { * * The implementation is accomplished as follows: * - check whether we are in the range of regularization - * - yes: use the regularization - * - no: forward to the standard material law. + - yes: use the regularization + - no: forward to the standard material law. * * \see BrooksCorey */ diff --git a/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp b/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp index 0aea4a920..13f272ed8 100644 --- a/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp +++ b/opm/material/fluidmatrixinteractions/RegularizedBrooksCoreyParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::RegularizedBrooksCoreyParams @@ -30,7 +32,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Parameters that are necessary for the \em regularization of - * the Brooks-Corey capillary pressure model. + the Brooks-Corey capillary pressure model. */ template class RegularizedBrooksCoreyParams : public Opm::BrooksCoreyParams diff --git a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp index 862c91a76..5b9b596dc 100644 --- a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp +++ b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * Copyright (C) 2010 by Philipp Nuske * - * Copyright (C) 2010 by Bernd Flemisch * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + Copyright (C) 2010 by Philipp Nuske + Copyright (C) 2010 by Bernd Flemisch + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::RegularizedVanGenuchten @@ -37,7 +39,7 @@ namespace Opm { /*! * \ingroup FluidMatrixInteractions * \brief Implementation of the regularized van Genuchten's - * capillary pressure / relative permeability <-> saturation relation. + capillary pressure / relative permeability <-> saturation relation. * * This class bundles the "raw" curves as static members and doesn't * concern itself converting absolute to effective saturations and diff --git a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp index c223a44e9..30419b32e 100644 --- a/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp +++ b/opm/material/fluidmatrixinteractions/RegularizedVanGenuchtenParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::RegularizedVanGenuchtenParams @@ -33,7 +35,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Parameters that are necessary for the \em regularization of - * VanGenuchten "material law". + VanGenuchten "material law". * */ template diff --git a/opm/material/fluidmatrixinteractions/VanGenuchten.hpp b/opm/material/fluidmatrixinteractions/VanGenuchten.hpp index b8ea35cf0..fa67557a4 100644 --- a/opm/material/fluidmatrixinteractions/VanGenuchten.hpp +++ b/opm/material/fluidmatrixinteractions/VanGenuchten.hpp @@ -1,23 +1,25 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * Copyright (C) 2010 by Philipp Nuske * - * Copyright (C) 2010 by Bernd Flemisch * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + Copyright (C) 2010 by Philipp Nuske + Copyright (C) 2010 by Bernd Flemisch + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::VanGenuchten @@ -36,7 +38,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Implementation of the van Genuchten capillary pressure - - * saturation relation. + saturation relation. * * This class only implements the "raw" van-Genuchten curves as static * members and doesn't concern itself converting absolute to effective diff --git a/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp b/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp index 18b87ce4a..58aa70b1b 100644 --- a/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp +++ b/opm/material/fluidmatrixinteractions/VanGenuchtenParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::VanGenuchtenParams @@ -28,7 +30,7 @@ namespace Opm { * \ingroup FluidMatrixInteractions * * \brief Specification of the material parameters for the van - * Genuchten constitutive relations. + Genuchten constitutive relations. * * In this implementation setting either the \f$n\f$ or \f$m\f$ shape * parameter automatically calculates the other. I.e. they cannot be diff --git a/opm/material/fluidstates/CompositionalFluidState.hpp b/opm/material/fluidstates/CompositionalFluidState.hpp index 89bd32e19..98e803394 100644 --- a/opm/material/fluidstates/CompositionalFluidState.hpp +++ b/opm/material/fluidstates/CompositionalFluidState.hpp @@ -1,27 +1,29 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief Represents all relevant thermodynamic quantities of a - * multi-phase, multi-component fluid system assuming - * thermodynamic equilibrium. + multi-phase, multi-component fluid system assuming + thermodynamic equilibrium. */ #ifndef OPM_COMPOSITIONAL_FLUID_STATE_HPP #define OPM_COMPOSITIONAL_FLUID_STATE_HPP @@ -35,8 +37,8 @@ namespace Opm { /*! * \brief Represents all relevant thermodynamic quantities of a - * multi-phase, multi-component fluid system assuming - * thermodynamic equilibrium. + multi-phase, multi-component fluid system assuming + thermodynamic equilibrium. */ template class CompositionalFluidState; diff --git a/opm/material/fluidstates/FluidStateCompositionModules.hpp b/opm/material/fluidstates/FluidStateCompositionModules.hpp index f2fb733c9..f8330b60f 100644 --- a/opm/material/fluidstates/FluidStateCompositionModules.hpp +++ b/opm/material/fluidstates/FluidStateCompositionModules.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -36,7 +38,7 @@ namespace Opm { /*! * \brief Module for the modular fluid state which stores the - * phase compositions explicitly in terms of mole fractions. + phase compositions explicitly in terms of mole fractions. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -35,7 +37,7 @@ namespace Opm { /*! * \brief Module for the modular fluid state which stores the - * densitys explicitly. + densitys explicitly. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -35,7 +37,7 @@ namespace Opm { /*! * \brief Module for the modular fluid state which stores the - * enthalpys explicitly. + enthalpys explicitly. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -36,7 +38,7 @@ namespace Opm { /*! * \brief Module for the modular fluid state which stores the - * phase fugacity coefficients explicitly. + phase fugacity coefficients explicitly. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -35,7 +37,7 @@ namespace Opm { /*! * \brief Module for the modular fluid state which stores the - * pressures explicitly. + pressures explicitly. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -35,7 +37,7 @@ namespace Opm { /*! * \brief Module for the modular fluid state which stores the - * saturations explicitly. + saturations explicitly. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -36,7 +38,7 @@ namespace Opm { /*! * \brief Module for the modular fluid state which stores the - * temperatures explicitly. + temperatures explicitly. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * @@ -35,7 +37,7 @@ namespace Opm { /*! * \brief Module for the modular fluid state which stores the - * viscositys explicitly. + viscositys explicitly. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief Represents all relevant thermodynamic quantities of a - * multi-phase, multi-component fluid system assuming - * thermodynamic equilibrium. + multi-phase, multi-component fluid system assuming + thermodynamic equilibrium. */ #ifndef OPM_IMMISCIBLE_FLUID_STATE_HPP #define OPM_IMMISCIBLE_FLUID_STATE_HPP @@ -38,8 +40,8 @@ namespace Opm { /*! * \brief Represents all relevant thermodynamic quantities of a - * multi-phase, multi-component fluid system assuming - * thermodynamic equilibrium. + multi-phase, multi-component fluid system assuming + thermodynamic equilibrium. */ template class ImmiscibleFluidState; diff --git a/opm/material/fluidstates/ModularFluidState.hpp b/opm/material/fluidstates/ModularFluidState.hpp index b4eed1dc2..9d36bb2d4 100644 --- a/opm/material/fluidstates/ModularFluidState.hpp +++ b/opm/material/fluidstates/ModularFluidState.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ModularFluidState @@ -39,8 +41,8 @@ namespace Opm { /*! * \brief Represents all relevant thermodynamic quantities of a - * multi-phase, multi-component fluid system assuming - * thermodynamic equilibrium. + multi-phase, multi-component fluid system assuming + thermodynamic equilibrium. * * This class uses a modular approach which results in storing only a * set of requested thermodynamic quantities. diff --git a/opm/material/fluidstates/NonEquilibriumFluidState.hpp b/opm/material/fluidstates/NonEquilibriumFluidState.hpp index 38890c63b..f509feb09 100644 --- a/opm/material/fluidstates/NonEquilibriumFluidState.hpp +++ b/opm/material/fluidstates/NonEquilibriumFluidState.hpp @@ -1,27 +1,29 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief Represents all relevant thermodynamic quantities of a - * multi-phase, multi-component fluid system _not_ assuming - * thermodynamic equilibrium. + multi-phase, multi-component fluid system _not_ assuming + thermodynamic equilibrium. */ #ifndef OPM_NON_EQUILIBRIUM_FLUID_STATE_HPP #define OPM_NON_EQUILIBRIUM_FLUID_STATE_HPP @@ -35,8 +37,8 @@ namespace Opm { /*! * \brief Represents all relevant thermodynamic quantities of a - * multi-phase, multi-component fluid system _not_ assuming - * thermodynamic equilibrium. + multi-phase, multi-component fluid system _not_ assuming + thermodynamic equilibrium. */ template class NonEquilibriumFluidState; diff --git a/opm/material/fluidstates/PressureOverlayFluidState.hpp b/opm/material/fluidstates/PressureOverlayFluidState.hpp index d1798c29b..34c5f7e42 100644 --- a/opm/material/fluidstates/PressureOverlayFluidState.hpp +++ b/opm/material/fluidstates/PressureOverlayFluidState.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::PressureOverlayFluidState @@ -31,8 +33,8 @@ namespace Opm { /*! * \brief This is a fluid state which allows to set the fluid - * pressures and takes all other quantities from an other - * fluid state. + pressures and takes all other quantities from an other + fluid state. */ template class PressureOverlayFluidState diff --git a/opm/material/fluidstates/SaturationOverlayFluidState.hpp b/opm/material/fluidstates/SaturationOverlayFluidState.hpp index 979cfdef1..3ed6d01c0 100644 --- a/opm/material/fluidstates/SaturationOverlayFluidState.hpp +++ b/opm/material/fluidstates/SaturationOverlayFluidState.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::SaturationOverlayFluidState @@ -31,8 +33,8 @@ namespace Opm { /*! * \brief This is a fluid state which allows to set the fluid - * saturations and takes all other quantities from an other - * fluid state. + saturations and takes all other quantities from an other + fluid state. */ template class SaturationOverlayFluidState diff --git a/opm/material/fluidstates/TemperatureOverlayFluidState.hpp b/opm/material/fluidstates/TemperatureOverlayFluidState.hpp index b85386578..810532832 100644 --- a/opm/material/fluidstates/TemperatureOverlayFluidState.hpp +++ b/opm/material/fluidstates/TemperatureOverlayFluidState.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::TemperatureOverlayFluidState @@ -29,8 +31,8 @@ namespace Opm { /*! * \brief This is a fluid state which allows to set the fluid - * temperatures and takes all other quantities from an other - * fluid state. + temperatures and takes all other quantities from an other + fluid state. */ template class TemperatureOverlayFluidState diff --git a/opm/material/fluidsystems/1pFluidSystem.hpp b/opm/material/fluidsystems/1pFluidSystem.hpp index f25cfd63c..45ea1a93d 100644 --- a/opm/material/fluidsystems/1pFluidSystem.hpp +++ b/opm/material/fluidsystems/1pFluidSystem.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::OneP diff --git a/opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp b/opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp index 122f27797..d73332ab7 100644 --- a/opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp +++ b/opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * Copyright (C) 2011-2012 by Bernd Flemisch * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + Copyright (C) 2011-2012 by Bernd Flemisch + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::TwoPImmiscible @@ -41,7 +43,7 @@ namespace FluidSystems { * \ingroup Fluidsystems * * \brief A fluid system for two-phase models assuming immiscibility and - * thermodynamic equilibrium + thermodynamic equilibrium * * The wetting and the non-wetting phase can be defined individually * via Opm::LiquidPhase and diff --git a/opm/material/fluidsystems/BaseFluidSystem.hpp b/opm/material/fluidsystems/BaseFluidSystem.hpp index 38f8b97e6..3132384cc 100644 --- a/opm/material/fluidsystems/BaseFluidSystem.hpp +++ b/opm/material/fluidsystems/BaseFluidSystem.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::BaseFluidSystem diff --git a/opm/material/fluidsystems/BlackOilFluidSystem.hpp b/opm/material/fluidsystems/BlackOilFluidSystem.hpp index db86a8a98..016a4e0f9 100644 --- a/opm/material/fluidsystems/BlackOilFluidSystem.hpp +++ b/opm/material/fluidsystems/BlackOilFluidSystem.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::BlackOil @@ -42,7 +44,7 @@ namespace FluidSystems { /*! * \brief A fluid system which uses the black-oil parameters - * to calculate termodynamically meaningful quantities. + to calculate termodynamically meaningful quantities. */ template class BlackOil diff --git a/opm/material/fluidsystems/BrineCO2FluidSystem.hpp b/opm/material/fluidsystems/BrineCO2FluidSystem.hpp index 79fa65909..1af0daa6a 100644 --- a/opm/material/fluidsystems/BrineCO2FluidSystem.hpp +++ b/opm/material/fluidsystems/BrineCO2FluidSystem.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * diff --git a/opm/material/fluidsystems/GasPhase.hpp b/opm/material/fluidsystems/GasPhase.hpp index 949d1eeef..c3a64f688 100644 --- a/opm/material/fluidsystems/GasPhase.hpp +++ b/opm/material/fluidsystems/GasPhase.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * Copyright (C) 2010-2011 by Bernd Flemisch * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + Copyright (C) 2010-2011 by Bernd Flemisch + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::GasPhase diff --git a/opm/material/fluidsystems/H2OAirFluidSystem.hpp b/opm/material/fluidsystems/H2OAirFluidSystem.hpp index 1807405bd..c6725ecd1 100644 --- a/opm/material/fluidsystems/H2OAirFluidSystem.hpp +++ b/opm/material/fluidsystems/H2OAirFluidSystem.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Klaus Mosthaf * - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Klaus Mosthaf + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::H2OAir @@ -47,7 +49,7 @@ namespace FluidSystems { * \ingroup Fluidsystems * * \brief A fluid system with a liquid and a gaseous phase and water and air - * as components. + as components. * * This fluidsystem is applied by default with the tabulated version of * water of the IAPWS-formulation. @@ -342,11 +344,11 @@ public: else //using a complicated version of this fluid system { /* Wilke method. See: - * + * See: R. Reid, et al.: The Properties of Gases and Liquids, * 4th edition, McGraw-Hill, 1987, 407-410 or * 5th edition, McGraw-Hill, 2000, p. 9.21/22 - * + */ Scalar muResult = 0; diff --git a/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp b/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp index e5bc4d701..87e478cef 100644 --- a/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp +++ b/opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::H2OAirMesitylene @@ -46,7 +48,7 @@ namespace FluidSystems { /*! * \ingroup Fluidsystems * \brief A fluid system with water, gas and NAPL as phases and - * water, air and mesitylene (DNAPL) as components. + water, air and mesitylene (DNAPL) as components. */ template class H2OAirMesitylene @@ -260,11 +262,11 @@ public: assert (phaseIdx == gPhaseIdx); /* Wilke method. See: - * + * See: R. Reid, et al.: The Properties of Gases and Liquids, * 4th edition, McGraw-Hill, 1987, 407-410 * 5th edition, McGraw-Hill, 20001, p. 9.21/22 - * + * in this case, we use a simplified version in order to avoid * computationally costly evaluation of sqrt and pow functions and * divisions diff --git a/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp b/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp index 4d79ef5dc..5b2695d14 100644 --- a/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp +++ b/opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Holger Class * - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Holger Class + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::H2OAirXylene @@ -43,7 +45,7 @@ namespace FluidSystems { /*! * \ingroup Fluidsystems * \brief A fluid system with water, gas and NAPL as phases and - * water, air and NAPL (contaminant) as components. + water, air and NAPL (contaminant) as components. */ template class H2OAirXylene @@ -222,11 +224,11 @@ public: assert (phaseIdx == gPhaseIdx); /* Wilke method. See: - * + * See: R. Reid, et al.: The Properties of Gases and Liquids, * 4th edition, McGraw-Hill, 1987, 407-410 * 5th edition, McGraw-Hill, 20001, p. 9.21/22 - * + * in this case, we use a simplified version in order to avoid * computationally costly evaluation of sqrt and pow functions and * divisions diff --git a/opm/material/fluidsystems/H2ON2FluidSystem.hpp b/opm/material/fluidsystems/H2ON2FluidSystem.hpp index fa7ed3940..a879cab9e 100644 --- a/opm/material/fluidsystems/H2ON2FluidSystem.hpp +++ b/opm/material/fluidsystems/H2ON2FluidSystem.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::H2ON2 @@ -340,7 +342,7 @@ public: else { /* Wilke method. See: - * + * See: R. Reid, et al.: The Properties of Gases and Liquids, * 4th edition, McGraw-Hill, 1987, 407-410 * 5th edition, McGraw-Hill, 20001, p. 9.21/22 diff --git a/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp b/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp index a49e9dc62..81a41f698 100644 --- a/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp +++ b/opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Katherina Baber * - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Katherina Baber + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::H2ON2LiquidPhase @@ -48,7 +50,7 @@ namespace FluidSystems { * \ingroup Fluidsystems * * \brief A liquid-phase-only fluid system with water and nitrogen as - * components. + components. */ template class H2ON2LiquidPhase diff --git a/opm/material/fluidsystems/LiquidPhase.hpp b/opm/material/fluidsystems/LiquidPhase.hpp index 24edcac46..9c2ca2e78 100644 --- a/opm/material/fluidsystems/LiquidPhase.hpp +++ b/opm/material/fluidsystems/LiquidPhase.hpp @@ -1,22 +1,24 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * Copyright (C) 2010-2011 by Bernd Flemisch * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + Copyright (C) 2010-2011 by Bernd Flemisch + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::LiquidPhase diff --git a/opm/material/fluidsystems/NullParameterCache.hpp b/opm/material/fluidsystems/NullParameterCache.hpp index c7da4e9f9..c790b689f 100644 --- a/opm/material/fluidsystems/NullParameterCache.hpp +++ b/opm/material/fluidsystems/NullParameterCache.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::NullParameterCache diff --git a/opm/material/fluidsystems/ParameterCacheBase.hpp b/opm/material/fluidsystems/ParameterCacheBase.hpp index c68762124..f85ce762f 100644 --- a/opm/material/fluidsystems/ParameterCacheBase.hpp +++ b/opm/material/fluidsystems/ParameterCacheBase.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::ParameterCacheBase diff --git a/opm/material/fluidsystems/Spe5FluidSystem.hpp b/opm/material/fluidsystems/Spe5FluidSystem.hpp index 0846321fd..f46583db2 100644 --- a/opm/material/fluidsystems/Spe5FluidSystem.hpp +++ b/opm/material/fluidsystems/Spe5FluidSystem.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012-2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012-2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidSystems::Spe5 @@ -36,7 +38,7 @@ namespace FluidSystems { /*! * \ingroup Fluidsystems * \brief The fluid system for the oil, gas and water phases of the - * SPE5 problem. + SPE5 problem. * * This problem comprises \f$H_2O\f$, \f$C_1\f$, \f$C_3\f$, \f$C_6\f$, * \f$C_10\f$, \f$C_15\f$ and \f$C_20\f$ as components. diff --git a/opm/material/fluidsystems/Spe5ParameterCache.hpp b/opm/material/fluidsystems/Spe5ParameterCache.hpp index c8de29ab2..880ed0833 100644 --- a/opm/material/fluidsystems/Spe5ParameterCache.hpp +++ b/opm/material/fluidsystems/Spe5ParameterCache.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::Spe5ParameterCache diff --git a/opm/material/heatconduction/DummyHeatConductionLaw.hpp b/opm/material/heatconduction/DummyHeatConductionLaw.hpp index c074112ed..33a5164cf 100644 --- a/opm/material/heatconduction/DummyHeatConductionLaw.hpp +++ b/opm/material/heatconduction/DummyHeatConductionLaw.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::DummyHeatConductionLaw @@ -32,7 +34,7 @@ namespace Opm * \ingroup material * * \brief Implements a dummy law for heat conduction to which isothermal models - * can fall back to. + can fall back to. * * If any method of this law is called, it throws std::logic_error. */ diff --git a/opm/material/heatconduction/FluidConduction.hpp b/opm/material/heatconduction/FluidConduction.hpp index e5da0e6a9..b95441f39 100644 --- a/opm/material/heatconduction/FluidConduction.hpp +++ b/opm/material/heatconduction/FluidConduction.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2009-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2009-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidHeatConduction diff --git a/opm/material/heatconduction/FluidConductionParams.hpp b/opm/material/heatconduction/FluidConductionParams.hpp index 15e2695fc..0872a7cd3 100644 --- a/opm/material/heatconduction/FluidConductionParams.hpp +++ b/opm/material/heatconduction/FluidConductionParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2008-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2008-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::FluidHeatConductionParams diff --git a/opm/material/heatconduction/Somerton.hpp b/opm/material/heatconduction/Somerton.hpp index 09ab61841..a4f092730 100644 --- a/opm/material/heatconduction/Somerton.hpp +++ b/opm/material/heatconduction/Somerton.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::Somerton diff --git a/opm/material/heatconduction/SomertonParams.hpp b/opm/material/heatconduction/SomertonParams.hpp index 8ac4de49a..2e7ec7108 100644 --- a/opm/material/heatconduction/SomertonParams.hpp +++ b/opm/material/heatconduction/SomertonParams.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc Opm::SomertonParams @@ -29,7 +31,7 @@ namespace Opm { /*! * \brief The default implementation of a parameter object for the - * Somerton heatconduction law. + Somerton heatconduction law. */ template class SomertonParams diff --git a/tests/checkFluidSystem.hpp b/tests/checkFluidSystem.hpp index 66f940b41..d1736fc8f 100644 --- a/tests/checkFluidSystem.hpp +++ b/tests/checkFluidSystem.hpp @@ -1,21 +1,23 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * \copydoc checkFluidSystem @@ -49,7 +51,7 @@ /*! * \brief This is a fluid state which makes sure that only the quantities - * allowed are accessed. + allowed are accessed. */ template . * - *****************************************************************************/ +/* + Copyright (C) 2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief This test makes sure that the API for fluid-matrix - * interactions is observed by all capillary pressure / relperm - * laws. + interactions is observed by all capillary pressure / relperm + laws. */ #include "config.h" diff --git a/tests/test_fluidsystems.cpp b/tests/test_fluidsystems.cpp index c8cee201a..f64bb4420 100644 --- a/tests/test_fluidsystems.cpp +++ b/tests/test_fluidsystems.cpp @@ -1,26 +1,28 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2013 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2013 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief This test makes sure that the programming interface is - * observed by all fluid systems + observed by all fluid systems */ #include "config.h" diff --git a/tests/test_immiscibleflash.cpp b/tests/test_immiscibleflash.cpp index feb046eac..19f18dc03 100644 --- a/tests/test_immiscibleflash.cpp +++ b/tests/test_immiscibleflash.cpp @@ -1,26 +1,28 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief This is a program to test the flash calculation which uses - * non-linear complementarity problems (NCP) + non-linear complementarity problems (NCP) * * A flash calculation determines the pressures, saturations and * composition of all phases given the total mass (or, as in this case diff --git a/tests/test_ncpflash.cpp b/tests/test_ncpflash.cpp index b8925c2ec..f3caadfc6 100644 --- a/tests/test_ncpflash.cpp +++ b/tests/test_ncpflash.cpp @@ -1,26 +1,28 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2011-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2011-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief This is a program to test the flash calculation which uses - * non-linear complementarity problems (NCP) + non-linear complementarity problems (NCP) * * A flash calculation determines the pressures, saturations and * composition of all phases given the total mass (or, as in this case diff --git a/tests/test_pengrobinson.cpp b/tests/test_pengrobinson.cpp index 4842b309f..70454b33f 100644 --- a/tests/test_pengrobinson.cpp +++ b/tests/test_pengrobinson.cpp @@ -1,26 +1,28 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief This is test for the SPE5 fluid system (which uses the - * Peng-Robinson EOS) and the NCP flash solver. + Peng-Robinson EOS) and the NCP flash solver. */ #include "config.h" diff --git a/tests/test_tabulation.cpp b/tests/test_tabulation.cpp index 959a6884d..3cf1fa522 100644 --- a/tests/test_tabulation.cpp +++ b/tests/test_tabulation.cpp @@ -1,26 +1,28 @@ // -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- // vi: set et ts=4 sw=4 sts=4: -/***************************************************************************** - * Copyright (C) 2010-2012 by Andreas Lauser * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation, either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *****************************************************************************/ +/* + Copyright (C) 2010-2012 by Andreas Lauser + + This file is part of the Open Porous Media project (OPM). + + OPM is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + OPM is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with OPM. If not, see . +*/ /*! * \file * * \brief This is a program to test the tabulation class for of - * individual components. + individual components. * * It either prints "success" or "error", it does not do anything * else.