mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Further cleanup: includes, copyright, whitespace.
This commit is contained in:
parent
9e28857933
commit
4eb77bebb4
@ -27,33 +27,16 @@
|
|||||||
#include <opm/autodiff/NewtonIterationBlackoilCPR.hpp>
|
#include <opm/autodiff/NewtonIterationBlackoilCPR.hpp>
|
||||||
#include <opm/autodiff/NewtonIterationUtilities.hpp>
|
#include <opm/autodiff/NewtonIterationUtilities.hpp>
|
||||||
#include <opm/autodiff/AutoDiffHelpers.hpp>
|
#include <opm/autodiff/AutoDiffHelpers.hpp>
|
||||||
#include <opm/core/utility/ErrorMacros.hpp>
|
|
||||||
#include <opm/core/utility/Exceptions.hpp>
|
|
||||||
#include <opm/core/utility/Units.hpp>
|
#include <opm/core/utility/Units.hpp>
|
||||||
#include <opm/core/linalg/LinearSolverFactory.hpp>
|
|
||||||
#include <opm/core/linalg/ParallelIstlInformation.hpp>
|
#include <opm/core/linalg/ParallelIstlInformation.hpp>
|
||||||
|
|
||||||
|
|
||||||
#include <opm/core/utility/platform_dependent/disable_warnings.h>
|
|
||||||
|
|
||||||
// #include <dune/istl/bcrsmatrix.hh>
|
|
||||||
#include <dune/istl/io.hh>
|
|
||||||
#include <dune/istl/owneroverlapcopy.hh>
|
|
||||||
#include <dune/istl/preconditioners.hh>
|
|
||||||
#include <dune/istl/schwarz.hh>
|
|
||||||
#include <dune/istl/solvers.hh>
|
|
||||||
#include <dune/istl/paamg/amg.hh>
|
|
||||||
#include <dune/istl/paamg/kamg.hh>
|
|
||||||
#include <dune/istl/paamg/pinfo.hh>
|
|
||||||
|
|
||||||
#include <opm/core/utility/platform_dependent/reenable_warnings.h>
|
|
||||||
|
|
||||||
#if HAVE_UMFPACK
|
#if HAVE_UMFPACK
|
||||||
#include <Eigen/UmfPackSupport>
|
#include <Eigen/UmfPackSupport>
|
||||||
#else
|
#else
|
||||||
#include <Eigen/SparseLU>
|
#include <Eigen/SparseLU>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace Opm
|
namespace Opm
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -61,8 +44,6 @@ namespace Opm
|
|||||||
typedef AutoDiffBlock<double> ADB;
|
typedef AutoDiffBlock<double> ADB;
|
||||||
typedef ADB::V V;
|
typedef ADB::V V;
|
||||||
typedef ADB::M M;
|
typedef ADB::M M;
|
||||||
typedef Dune::FieldMatrix<double, 1, 1> MatrixBlockType;
|
|
||||||
typedef Dune::BCRSMatrix <MatrixBlockType> Mat;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -191,8 +172,7 @@ namespace Opm
|
|||||||
// Copy solver output to dx.
|
// Copy solver output to dx.
|
||||||
std::copy(x.begin(), x.end(), dx.data());
|
std::copy(x.begin(), x.end(), dx.data());
|
||||||
|
|
||||||
if( hasWells )
|
if ( hasWells ) {
|
||||||
{
|
|
||||||
// Compute full solution using the eliminated equations.
|
// Compute full solution using the eliminated equations.
|
||||||
// Recovery in inverse order of elimination.
|
// Recovery in inverse order of elimination.
|
||||||
dx = recoverVariable(elim_eqs[1], dx, np);
|
dx = recoverVariable(elim_eqs[1], dx, np);
|
||||||
|
@ -1,26 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
Copyright 2015 SINTEF ICT, Applied Mathematics.
|
Copyright 2015 SINTEF ICT, Applied Mathematics.
|
||||||
|
|
||||||
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 3 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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright 2014 SINTEF ICT, Applied Mathematics.
|
|
||||||
Copyright 2015 Dr. Blatt - HPC-Simulation-Software & Services
|
|
||||||
Copyright 2015 NTNU
|
|
||||||
Copyright 2015 Statoil AS
|
Copyright 2015 Statoil AS
|
||||||
|
|
||||||
This file is part of the Open Porous Media project (OPM).
|
This file is part of the Open Porous Media project (OPM).
|
||||||
@ -46,24 +25,6 @@
|
|||||||
#include <opm/autodiff/NewtonIterationBlackoilInterleaved.hpp>
|
#include <opm/autodiff/NewtonIterationBlackoilInterleaved.hpp>
|
||||||
#include <opm/autodiff/NewtonIterationUtilities.hpp>
|
#include <opm/autodiff/NewtonIterationUtilities.hpp>
|
||||||
#include <opm/autodiff/AutoDiffHelpers.hpp>
|
#include <opm/autodiff/AutoDiffHelpers.hpp>
|
||||||
#include <opm/core/utility/ErrorMacros.hpp>
|
|
||||||
#include <opm/core/utility/Exceptions.hpp>
|
|
||||||
#include <opm/core/utility/Units.hpp>
|
|
||||||
#include <opm/core/linalg/LinearSolverFactory.hpp>
|
|
||||||
#include <opm/core/linalg/ParallelIstlInformation.hpp>
|
|
||||||
#include <opm/core/utility/platform_dependent/disable_warnings.h>
|
|
||||||
|
|
||||||
// #include <dune/istl/bcrsmatrix.hh>
|
|
||||||
#include <dune/istl/io.hh>
|
|
||||||
#include <dune/istl/owneroverlapcopy.hh>
|
|
||||||
#include <dune/istl/preconditioners.hh>
|
|
||||||
#include <dune/istl/schwarz.hh>
|
|
||||||
#include <dune/istl/solvers.hh>
|
|
||||||
#include <dune/istl/paamg/amg.hh>
|
|
||||||
#include <dune/istl/paamg/kamg.hh>
|
|
||||||
#include <dune/istl/paamg/pinfo.hh>
|
|
||||||
|
|
||||||
#include <opm/core/utility/platform_dependent/reenable_warnings.h>
|
|
||||||
|
|
||||||
#if HAVE_UMFPACK
|
#if HAVE_UMFPACK
|
||||||
#include <Eigen/UmfPackSupport>
|
#include <Eigen/UmfPackSupport>
|
||||||
|
Loading…
Reference in New Issue
Block a user