mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-07-07 04:53:03 -05:00
move ebos/ecltransmissibility[_impl].[hh|cc] to opm/simulators/flow
This commit is contained in:
Arne Morten Kvarving
parent
6869516230
commit
57905c1069
|
|
@ -24,7 +24,6 @@
|
|||
# find opm -name '*.c*' -printf '\t%p\n' | sort
|
||||
list (APPEND MAIN_SOURCE_FILES
|
||||
ebos/eclgenericproblem.cc
|
||||
ebos/ecltransmissibility.cc
|
||||
opm/core/props/BlackoilPhases.cpp
|
||||
opm/core/props/phaseUsageFromDeck.cpp
|
||||
opm/core/props/satfunc/RelpermDiagnostics.cpp
|
||||
|
|
@ -53,6 +52,7 @@ list (APPEND MAIN_SOURCE_FILES
|
|||
opm/simulators/flow/SimulatorReportBanners.cpp
|
||||
opm/simulators/flow/SimulatorSerializer.cpp
|
||||
opm/simulators/flow/SolutionContainers.cpp
|
||||
opm/simulators/flow/Transmissibility.cpp
|
||||
opm/simulators/flow/ValidationFunctions.cpp
|
||||
opm/simulators/flow/equil/EquilibrationHelpers.cpp
|
||||
opm/simulators/flow/equil/InitStateEquil.cpp
|
||||
|
|
@ -415,8 +415,6 @@ list (APPEND PUBLIC_HEADER_FILES
|
|||
ebos/eclnewtonmethod.hh
|
||||
ebos/eclproblem.hh
|
||||
ebos/eclproblem_properties.hh
|
||||
ebos/ecltransmissibility.hh
|
||||
ebos/ecltransmissibility_impl.hh
|
||||
opm/simulators/flow/ActionHandler.hpp
|
||||
opm/simulators/flow/AluGridCartesianIndexMapper.hpp
|
||||
opm/simulators/flow/AluGridVanguard.hpp
|
||||
|
|
@ -469,6 +467,8 @@ list (APPEND PUBLIC_HEADER_FILES
|
|||
opm/simulators/flow/SolutionContainers.hpp
|
||||
opm/simulators/flow/SubDomain.hpp
|
||||
opm/simulators/flow/TracerModel.hpp
|
||||
opm/simulators/flow/Transmissibility.hpp
|
||||
opm/simulators/flow/Transmissibility_impl.hpp
|
||||
opm/simulators/flow/ValidationFunctions.hpp
|
||||
opm/simulators/flow/VtkTracerModule.hpp
|
||||
opm/simulators/flow/equil/EquilibrationHelpers.hpp
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include <ebos/eclgenericproblem.hh>
|
||||
#include <ebos/eclnewtonmethod.hh>
|
||||
#include <ebos/eclproblem_properties.hh>
|
||||
#include <ebos/ecltransmissibility.hh>
|
||||
|
||||
#include <opm/common/utility/TimeService.hpp>
|
||||
|
||||
|
|
@ -79,6 +78,7 @@
|
|||
#include <opm/simulators/flow/NewTranFluxModule.hpp>
|
||||
#include <opm/simulators/flow/OutputBlackoilModule.hpp>
|
||||
#include <opm/simulators/flow/TracerModel.hpp>
|
||||
#include <opm/simulators/flow/Transmissibility.hpp>
|
||||
#include <opm/simulators/flow/VtkTracerModule.hpp>
|
||||
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
|
||||
#include <opm/simulators/timestepping/SimulatorReport.hpp>
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
// vi: set et ts=4 sw=4 sts=4:
|
||||
/*
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
Consult the COPYING file in the top-level source directory of this
|
||||
module for the precise wording of the license and the list of
|
||||
copyright holders.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <ebos/ecltransmissibility.hh>
|
||||
#include <ebos/ecltransmissibility_impl.hh>
|
||||
|
||||
#include <opm/grid/CpGrid.hpp>
|
||||
|
||||
#if HAVE_DUNE_FEM
|
||||
#include <dune/fem/gridpart/adaptiveleafgridpart.hh>
|
||||
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
|
||||
#include <opm/simulators/flow/FemCpGridCompat.hpp>
|
||||
#endif
|
||||
|
||||
namespace Opm {
|
||||
|
||||
template class EclTransmissibility<Dune::CpGrid,
|
||||
Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
|
||||
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
|
||||
Dune::CartesianIndexMapper<Dune::CpGrid>,
|
||||
double>;
|
||||
|
||||
#ifdef HAVE_DUNE_FEM
|
||||
template class EclTransmissibility<Dune::CpGrid,
|
||||
Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,
|
||||
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>>,
|
||||
Dune::CartesianIndexMapper<Dune::CpGrid>,
|
||||
double>;
|
||||
template class EclTransmissibility<Dune::CpGrid,
|
||||
Dune::Fem::GridPart2GridViewImpl<
|
||||
Dune::Fem::AdaptiveLeafGridPart<
|
||||
Dune::CpGrid,
|
||||
Dune::PartitionIteratorType(4),
|
||||
false> >,
|
||||
Dune::MultipleCodimMultipleGeomTypeMapper<
|
||||
Dune::Fem::GridPart2GridViewImpl<
|
||||
Dune::Fem::AdaptiveLeafGridPart<
|
||||
Dune::CpGrid,
|
||||
Dune::PartitionIteratorType(4),
|
||||
false> > >,
|
||||
Dune::CartesianIndexMapper<Dune::CpGrid>,
|
||||
double>;
|
||||
#endif // HAVE_DUNE_FEM
|
||||
|
||||
} // namespace Opm
|
||||
|
|
@ -28,12 +28,12 @@
|
|||
|
||||
// these are not explicitly instanced in library
|
||||
#include <ebos/eclgenericproblem_impl.hh>
|
||||
#include <ebos/ecltransmissibility_impl.hh>
|
||||
#include <opm/simulators/flow/AluGridVanguard.hpp>
|
||||
#include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
|
||||
#include <opm/simulators/flow/EclGenericWriter_impl.hpp>
|
||||
#include <opm/simulators/flow/GenericThresholdPressure_impl.hpp>
|
||||
#include <opm/simulators/flow/GenericTracerModel_impl.hpp>
|
||||
#include <opm/simulators/flow/Transmissibility_impl.hpp>
|
||||
#include <opm/simulators/flow/equil/InitStateEquil_impl.hpp>
|
||||
#include <opm/simulators/utils/GridDataOutput_impl.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
// these are not explicitly instanced in library
|
||||
#include <ebos/eclgenericproblem_impl.hh>
|
||||
#include <ebos/ecltransmissibility_impl.hh>
|
||||
#include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
|
||||
#include <opm/simulators/flow/EclGenericWriter_impl.hpp>
|
||||
#include <opm/simulators/flow/GenericThresholdPressure_impl.hpp>
|
||||
#include <opm/simulators/flow/GenericTracerModel_impl.hpp>
|
||||
#include <opm/simulators/flow/Transmissibility_impl.hpp>
|
||||
#include <opm/simulators/flow/equil/InitStateEquil_impl.hpp>
|
||||
#include <opm/simulators/utils/GridDataOutput_impl.hpp>
|
||||
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@
|
|||
#include <dune/alugrid/dgf.hh>
|
||||
#include <dune/alugrid/grid.hh>
|
||||
|
||||
#include <ebos/ecltransmissibility.hh>
|
||||
|
||||
#include <opm/common/OpmLog/OpmLog.hpp>
|
||||
|
||||
#include <opm/grid/CpGrid.hpp>
|
||||
|
|
@ -41,6 +39,7 @@
|
|||
|
||||
#include <opm/simulators/flow/AluGridCartesianIndexMapper.hpp>
|
||||
#include <opm/simulators/flow/FlowBaseVanguard.hpp>
|
||||
#include <opm/simulators/flow/Transmissibility.hpp>
|
||||
#include <opm/simulators/utils/ParallelEclipseState.hpp>
|
||||
|
||||
#include <array>
|
||||
|
|
@ -108,7 +107,7 @@ public:
|
|||
using GridView = GetPropType<TypeTag, Properties::GridView>;
|
||||
using CartesianIndexMapper = Dune::CartesianIndexMapper<Grid>;
|
||||
using EquilCartesianIndexMapper = Dune::CartesianIndexMapper<EquilGrid>;
|
||||
using TransmissibilityType = EclTransmissibility<Grid, GridView, ElementMapper, CartesianIndexMapper, Scalar>;
|
||||
using TransmissibilityType = Transmissibility<Grid, GridView, ElementMapper, CartesianIndexMapper, Scalar>;
|
||||
using Factory = Dune::FromToGridFactory<Grid>;
|
||||
|
||||
static constexpr int dimension = Grid::dimension;
|
||||
|
|
|
|||
|
|
@ -27,8 +27,6 @@
|
|||
#ifndef OPM_CPGRID_VANGUARD_HPP
|
||||
#define OPM_CPGRID_VANGUARD_HPP
|
||||
|
||||
#include <ebos/ecltransmissibility.hh>
|
||||
|
||||
#include <opm/common/TimingMacros.hpp>
|
||||
|
||||
#include <opm/models/common/multiphasebaseproperties.hh>
|
||||
|
|
@ -37,6 +35,7 @@
|
|||
#include <opm/simulators/flow/FemCpGridCompat.hpp>
|
||||
#include <opm/simulators/flow/FlowBaseVanguard.hpp>
|
||||
#include <opm/simulators/flow/GenericCpGridVanguard.hpp>
|
||||
#include <opm/simulators/flow/Transmissibility.hpp>
|
||||
|
||||
#include <array>
|
||||
#include <functional>
|
||||
|
|
@ -101,7 +100,7 @@ public:
|
|||
using CartesianIndexMapper = Dune::CartesianIndexMapper<Grid>;
|
||||
using EquilGrid = GetPropType<TypeTag, Properties::EquilGrid>;
|
||||
using GridView = GetPropType<TypeTag, Properties::GridView>;
|
||||
using TransmissibilityType = EclTransmissibility<Grid, GridView, ElementMapper, CartesianIndexMapper, Scalar>;
|
||||
using TransmissibilityType = Transmissibility<Grid, GridView, ElementMapper, CartesianIndexMapper, Scalar>;
|
||||
static constexpr int dimensionworld = Grid::dimensionworld;
|
||||
using Indices = GetPropType<TypeTag, Properties::Indices>;
|
||||
static constexpr bool waterEnabled = Indices::waterEnabled;
|
||||
|
|
|
|||
|
|
@ -28,11 +28,10 @@
|
|||
#ifndef OPM_ECL_GENERIC_WRITER_HPP
|
||||
#define OPM_ECL_GENERIC_WRITER_HPP
|
||||
|
||||
#include <ebos/ecltransmissibility.hh>
|
||||
|
||||
#include <opm/models/parallel/tasklets.hh>
|
||||
|
||||
#include <opm/simulators/flow/CollectDataOnIORank.hpp>
|
||||
#include <opm/simulators/flow/Transmissibility.hpp>
|
||||
#include <opm/simulators/timestepping/SimulatorReport.hpp>
|
||||
|
||||
#include <map>
|
||||
|
|
@ -67,7 +66,7 @@ class EclGenericWriter
|
|||
using CartesianIndexMapper = Dune::CartesianIndexMapper<Grid>;
|
||||
using EquilCartesianIndexMapper = Dune::CartesianIndexMapper<EquilGrid>;
|
||||
using CollectDataOnIORankType = CollectDataOnIORank<Grid,EquilGrid,GridView>;
|
||||
using TransmissibilityType = EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>;
|
||||
using TransmissibilityType = Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>;
|
||||
|
||||
public:
|
||||
// The Simulator object should preferably have been const - the
|
||||
|
|
|
|||
|
|
@ -27,13 +27,12 @@
|
|||
#ifndef OPM_POLYHEDRAL_GRID_VANGUARD_HPP
|
||||
#define OPM_POLYHEDRAL_GRID_VANGUARD_HPP
|
||||
|
||||
#include <ebos/ecltransmissibility.hh>
|
||||
|
||||
#include <opm/grid/polyhedralgrid.hh>
|
||||
|
||||
#include <opm/models/common/multiphasebaseproperties.hh>
|
||||
|
||||
#include <opm/simulators/flow/FlowBaseVanguard.hpp>
|
||||
#include <opm/simulators/flow/Transmissibility.hpp>
|
||||
|
||||
#include <array>
|
||||
#include <functional>
|
||||
|
|
@ -103,8 +102,8 @@ private:
|
|||
using EquilGridPointer = EquilGrid*;
|
||||
|
||||
public:
|
||||
using TransmissibilityType = EclTransmissibility<Grid, GridView, ElementMapper,
|
||||
CartesianIndexMapper, Scalar>;
|
||||
using TransmissibilityType = Transmissibility<Grid, GridView, ElementMapper,
|
||||
CartesianIndexMapper, Scalar>;
|
||||
|
||||
PolyhedralGridVanguard(Simulator& simulator)
|
||||
: FlowBaseVanguard<TypeTag>(simulator)
|
||||
|
|
|
|||
66
opm/simulators/flow/Transmissibility.cpp
Normal file
66
opm/simulators/flow/Transmissibility.cpp
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
// vi: set et ts=4 sw=4 sts=4:
|
||||
/*
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
Consult the COPYING file in the top-level source directory of this
|
||||
module for the precise wording of the license and the list of
|
||||
copyright holders.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <opm/grid/CpGrid.hpp>
|
||||
|
||||
#include <opm/simulators/flow/Transmissibility_impl.hpp>
|
||||
|
||||
#if HAVE_DUNE_FEM
|
||||
#include <dune/fem/gridpart/adaptiveleafgridpart.hh>
|
||||
#include <dune/fem/gridpart/common/gridpart2gridview.hh>
|
||||
#include <opm/simulators/flow/FemCpGridCompat.hpp>
|
||||
#endif
|
||||
|
||||
namespace Opm {
|
||||
|
||||
template class Transmissibility<Dune::CpGrid,
|
||||
Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>,
|
||||
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::DefaultLeafGridViewTraits<Dune::CpGrid>>>,
|
||||
Dune::CartesianIndexMapper<Dune::CpGrid>,
|
||||
double>;
|
||||
|
||||
#ifdef HAVE_DUNE_FEM
|
||||
template class Transmissibility<Dune::CpGrid,
|
||||
Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>,
|
||||
Dune::MultipleCodimMultipleGeomTypeMapper<Dune::GridView<Dune::Fem::GridPart2GridViewTraits<Dune::Fem::AdaptiveLeafGridPart<Dune::CpGrid, Dune::PartitionIteratorType(4), false>>>>,
|
||||
Dune::CartesianIndexMapper<Dune::CpGrid>,
|
||||
double>;
|
||||
template class Transmissibility<Dune::CpGrid,
|
||||
Dune::Fem::GridPart2GridViewImpl<
|
||||
Dune::Fem::AdaptiveLeafGridPart<
|
||||
Dune::CpGrid,
|
||||
Dune::PartitionIteratorType(4),
|
||||
false> >,
|
||||
Dune::MultipleCodimMultipleGeomTypeMapper<
|
||||
Dune::Fem::GridPart2GridViewImpl<
|
||||
Dune::Fem::AdaptiveLeafGridPart<
|
||||
Dune::CpGrid,
|
||||
Dune::PartitionIteratorType(4),
|
||||
false> > >,
|
||||
Dune::CartesianIndexMapper<Dune::CpGrid>,
|
||||
double>;
|
||||
#endif // HAVE_DUNE_FEM
|
||||
|
||||
} // namespace Opm
|
||||
|
|
@ -23,10 +23,10 @@
|
|||
/*!
|
||||
* \file
|
||||
*
|
||||
* \copydoc Opm::EclTransmissibility
|
||||
* \copydoc Opm::Transmissibility
|
||||
*/
|
||||
#ifndef EWOMS_ECL_TRANSMISSIBILITY_HH
|
||||
#define EWOMS_ECL_TRANSMISSIBILITY_HH
|
||||
#ifndef OPM_TRANSMISSIBILITY_HPP
|
||||
#define OPM_TRANSMISSIBILITY_HPP
|
||||
|
||||
#include <dune/common/fvector.hh>
|
||||
#include <dune/common/fmatrix.hh>
|
||||
|
|
@ -39,7 +39,6 @@
|
|||
#include <functional>
|
||||
#include <map>
|
||||
#include <cstdint>
|
||||
#include <tuple>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
|
|
@ -52,7 +51,7 @@ class TransMult;
|
|||
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
class EclTransmissibility {
|
||||
class Transmissibility {
|
||||
// Grid and world dimension
|
||||
enum { dimWorld = GridView::dimensionworld };
|
||||
public:
|
||||
|
|
@ -60,14 +59,14 @@ public:
|
|||
using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
|
||||
using DimVector = Dune::FieldVector<Scalar, dimWorld>;
|
||||
|
||||
EclTransmissibility(const EclipseState& eclState,
|
||||
const GridView& gridView,
|
||||
const CartesianIndexMapper& cartMapper,
|
||||
const Grid& grid,
|
||||
std::function<std::array<double,dimWorld>(int)> centroids,
|
||||
bool enableEnergy,
|
||||
bool enableDiffusivity,
|
||||
bool enableDispersivity);
|
||||
Transmissibility(const EclipseState& eclState,
|
||||
const GridView& gridView,
|
||||
const CartesianIndexMapper& cartMapper,
|
||||
const Grid& grid,
|
||||
std::function<std::array<double,dimWorld>(int)> centroids,
|
||||
bool enableEnergy,
|
||||
bool enableDiffusivity,
|
||||
bool enableDispersivity);
|
||||
|
||||
/*!
|
||||
* \brief Return the permeability for an element.
|
||||
|
|
@ -295,4 +294,4 @@ namespace details {
|
|||
|
||||
} // namespace Opm
|
||||
|
||||
#endif
|
||||
#endif // OPM_TRANSMISSIBILITY_HPP
|
||||
|
|
@ -20,10 +20,8 @@
|
|||
module for the precise wording of the license and the list of
|
||||
copyright holders.
|
||||
*/
|
||||
#ifndef EWOMS_ECL_TRANSMISSIBILITY_IMPL_HH
|
||||
#define EWOMS_ECL_TRANSMISSIBILITY_IMPL_HH
|
||||
|
||||
#include <ebos/ecltransmissibility.hh>
|
||||
#ifndef OPM_TRANSMISSIBILITY_IMPL_HPP
|
||||
#define OPM_TRANSMISSIBILITY_IMPL_HPP
|
||||
|
||||
#include <dune/common/version.hh>
|
||||
#include <dune/grid/common/mcmgmapper.hh>
|
||||
|
|
@ -37,6 +35,8 @@
|
|||
#include <opm/input/eclipse/EclipseState/Grid/TransMult.hpp>
|
||||
#include <opm/input/eclipse/Units/Units.hpp>
|
||||
|
||||
#include <opm/simulators/flow/Transmissibility.hpp>
|
||||
|
||||
#include <fmt/format.h>
|
||||
|
||||
#include <algorithm>
|
||||
|
|
@ -85,15 +85,15 @@ namespace details {
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
EclTransmissibility(const EclipseState& eclState,
|
||||
const GridView& gridView,
|
||||
const CartesianIndexMapper& cartMapper,
|
||||
const Grid& grid,
|
||||
std::function<std::array<double,dimWorld>(int)> centroids,
|
||||
bool enableEnergy,
|
||||
bool enableDiffusivity,
|
||||
bool enableDispersivity)
|
||||
Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Transmissibility(const EclipseState& eclState,
|
||||
const GridView& gridView,
|
||||
const CartesianIndexMapper& cartMapper,
|
||||
const Grid& grid,
|
||||
std::function<std::array<double,dimWorld>(int)> centroids,
|
||||
bool enableEnergy,
|
||||
bool enableDiffusivity,
|
||||
bool enableDispersivity)
|
||||
: eclState_(eclState)
|
||||
, gridView_(gridView)
|
||||
, cartMapper_(cartMapper)
|
||||
|
|
@ -110,57 +110,55 @@ EclTransmissibility(const EclipseState& eclState,
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
Scalar EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Scalar Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
transmissibility(unsigned elemIdx1, unsigned elemIdx2) const
|
||||
{
|
||||
return trans_.at(details::isId(elemIdx1, elemIdx2));
|
||||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
Scalar EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Scalar Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
transmissibilityBoundary(unsigned elemIdx, unsigned boundaryFaceIdx) const
|
||||
{
|
||||
return transBoundary_.at(std::make_pair(elemIdx, boundaryFaceIdx));
|
||||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
Scalar EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Scalar Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
thermalHalfTrans(unsigned insideElemIdx, unsigned outsideElemIdx) const
|
||||
{
|
||||
return thermalHalfTrans_.at(details::directionalIsId(insideElemIdx, outsideElemIdx));
|
||||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
Scalar EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Scalar Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
thermalHalfTransBoundary(unsigned insideElemIdx, unsigned boundaryFaceIdx) const
|
||||
{
|
||||
return thermalHalfTransBoundary_.at(std::make_pair(insideElemIdx, boundaryFaceIdx));
|
||||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
Scalar EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Scalar Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
diffusivity(unsigned elemIdx1, unsigned elemIdx2) const
|
||||
{
|
||||
if (diffusivity_.empty())
|
||||
return 0.0;
|
||||
|
||||
return diffusivity_.at(details::isId(elemIdx1, elemIdx2));
|
||||
|
||||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
Scalar EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Scalar Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
dispersivity(unsigned elemIdx1, unsigned elemIdx2) const
|
||||
{
|
||||
if (dispersivity_.empty())
|
||||
return 0.0;
|
||||
|
||||
return dispersivity_.at(details::isId(elemIdx1, elemIdx2));
|
||||
|
||||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
update(bool global, const std::function<unsigned int(unsigned int)>& map, const bool applyNncMultregT)
|
||||
{
|
||||
const auto& cartDims = cartMapper_.cartesianDimensions();
|
||||
|
|
@ -587,7 +585,7 @@ update(bool global, const std::function<unsigned int(unsigned int)>& map, const
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
extractPermeability_()
|
||||
{
|
||||
unsigned numElem = gridView_.size(/*codim=*/0);
|
||||
|
|
@ -629,7 +627,7 @@ extractPermeability_()
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
extractPermeability_(const std::function<unsigned int(unsigned int)>& map)
|
||||
{
|
||||
unsigned numElem = gridView_.size(/*codim=*/0);
|
||||
|
|
@ -672,7 +670,7 @@ extractPermeability_(const std::function<unsigned int(unsigned int)>& map)
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
extractPorosity_()
|
||||
{
|
||||
// read the intrinsic porosity from the eclState. Note that all arrays
|
||||
|
|
@ -689,7 +687,7 @@ extractPorosity_()
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
extractDispersion_()
|
||||
{
|
||||
if (!enableDispersivity_) {
|
||||
|
|
@ -701,7 +699,7 @@ extractDispersion_()
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
removeNonCartesianTransmissibilities_(bool removeAll)
|
||||
{
|
||||
const auto& cartDims = cartMapper_.cartesianDimensions();
|
||||
|
|
@ -725,7 +723,7 @@ removeNonCartesianTransmissibilities_(bool removeAll)
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper, Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper, Scalar>::
|
||||
applyAllZMultipliers_(Scalar& trans,
|
||||
unsigned insideFaceIdx,
|
||||
unsigned outsideFaceIdx,
|
||||
|
|
@ -776,7 +774,7 @@ applyAllZMultipliers_(Scalar& trans,
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
updateFromEclState_(bool global)
|
||||
{
|
||||
const FieldPropsManager* fp =
|
||||
|
|
@ -813,7 +811,7 @@ updateFromEclState_(bool global)
|
|||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
std::array<std::vector<double>,3>
|
||||
EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
createTransmissibilityArrays_(const std::array<bool,3>& is_tran)
|
||||
{
|
||||
const auto& cartDims = cartMapper_.cartesianDimensions();
|
||||
|
|
@ -880,7 +878,7 @@ createTransmissibilityArrays_(const std::array<bool,3>& is_tran)
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
resetTransmissibilityFromArrays_(const std::array<bool,3>& is_tran,
|
||||
const std::array<std::vector<double>,3>& trans)
|
||||
{
|
||||
|
|
@ -942,7 +940,7 @@ resetTransmissibilityFromArrays_(const std::array<bool,3>& is_tran,
|
|||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
template<class Intersection>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
computeFaceProperties(const Intersection& intersection,
|
||||
const int,
|
||||
const int,
|
||||
|
|
@ -962,10 +960,9 @@ computeFaceProperties(const Intersection& intersection,
|
|||
faceAreaNormal *= geometry.volume();
|
||||
}
|
||||
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
template<class Intersection>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
computeFaceProperties(const Intersection& intersection,
|
||||
const int insideElemIdx,
|
||||
const int insideFaceIdx,
|
||||
|
|
@ -984,7 +981,7 @@ computeFaceProperties(const Intersection& intersection,
|
|||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void
|
||||
EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
applyNncToGridTrans_(const std::unordered_map<std::size_t,int>& cartesianToCompressed)
|
||||
{
|
||||
// First scale NNCs with EDITNNC.
|
||||
|
|
@ -1052,7 +1049,7 @@ applyNncToGridTrans_(const std::unordered_map<std::size_t,int>& cartesianToCompr
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
applyEditNncToGridTrans_(const std::unordered_map<std::size_t,int>& globalToLocal)
|
||||
{
|
||||
const auto& input = eclState_.getInputNNC();
|
||||
|
|
@ -1065,7 +1062,7 @@ applyEditNncToGridTrans_(const std::unordered_map<std::size_t,int>& globalToLoca
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
applyEditNncrToGridTrans_(const std::unordered_map<std::size_t,int>& globalToLocal)
|
||||
{
|
||||
const auto& input = eclState_.getInputNNC();
|
||||
|
|
@ -1078,7 +1075,7 @@ applyEditNncrToGridTrans_(const std::unordered_map<std::size_t,int>& globalToLoc
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
applyEditNncToGridTransHelper_(const std::unordered_map<std::size_t,int>& globalToLocal,
|
||||
const std::string& keyword,
|
||||
const std::vector<NNCdata>& nncs,
|
||||
|
|
@ -1154,7 +1151,7 @@ applyEditNncToGridTransHelper_(const std::unordered_map<std::size_t,int>& global
|
|||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void
|
||||
EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
applyNncMultreg_(const std::unordered_map<std::size_t,int>& cartesianToCompressed)
|
||||
{
|
||||
const auto& inputNNC = this->eclState_.getInputNNC();
|
||||
|
|
@ -1202,7 +1199,7 @@ applyNncMultreg_(const std::unordered_map<std::size_t,int>& cartesianToCompresse
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
computeHalfTrans_(Scalar& halfTrans,
|
||||
const DimVector& areaNormal,
|
||||
int faceIdx, // in the reference element that contains the intersection
|
||||
|
|
@ -1223,7 +1220,7 @@ computeHalfTrans_(Scalar& halfTrans,
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
computeHalfDiffusivity_(Scalar& halfDiff,
|
||||
const DimVector& areaNormal,
|
||||
const DimVector& distance,
|
||||
|
|
@ -1239,8 +1236,8 @@ computeHalfDiffusivity_(Scalar& halfDiff,
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
typename EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::DimVector
|
||||
EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
typename Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::DimVector
|
||||
Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
distanceVector_(const DimVector& center,
|
||||
int faceIdx, // in the reference element that contains the intersection
|
||||
unsigned elemIdx,
|
||||
|
|
@ -1256,7 +1253,7 @@ distanceVector_(const DimVector& center,
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
applyMultipliers_(Scalar& trans,
|
||||
unsigned faceIdx,
|
||||
unsigned cartElemIdx,
|
||||
|
|
@ -1290,7 +1287,7 @@ applyMultipliers_(Scalar& trans,
|
|||
}
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
void EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
void Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
|
||||
applyNtg_(Scalar& trans,
|
||||
unsigned faceIdx,
|
||||
unsigned elemIdx,
|
||||
|
|
@ -1318,6 +1315,6 @@ applyNtg_(Scalar& trans,
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
} // namespace Opm
|
||||
#endif
|
||||
|
||||
#endif // OPM_TRANSMISSIBILITY_IMPL_HPP
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include <opm/grid/CpGrid.hpp>
|
||||
|
||||
#include <ebos/ecltransmissibility.hh>
|
||||
#include <opm/simulators/flow/Transmissibility.hpp>
|
||||
|
||||
using namespace Opm;
|
||||
|
||||
|
|
@ -40,18 +40,20 @@ const int cartDims[3] = {8,15,3};
|
|||
|
||||
// Class extending EclTransmissibility, such that we can access the protected member trans_ to check its contents
|
||||
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
|
||||
class Transmissibility : public EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>
|
||||
class TestTransmissibility : public Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>
|
||||
{
|
||||
using ParentType = EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>;
|
||||
using ParentType = Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>;
|
||||
public:
|
||||
Transmissibility(const EclipseState& eclState,
|
||||
const GridView& gridView,
|
||||
const CartesianIndexMapper& cartMapper,
|
||||
const Grid& grid,
|
||||
std::function<std::array<double,dimWorld>(int)> centroids,
|
||||
bool enableEnergy,
|
||||
bool enableDiffusivity,
|
||||
bool enableDispersivity) : ParentType(eclState,gridView,cartMapper,grid,centroids,enableEnergy,enableDiffusivity,enableDispersivity) {}
|
||||
TestTransmissibility(const EclipseState& eclState,
|
||||
const GridView& gridView,
|
||||
const CartesianIndexMapper& cartMapper,
|
||||
const Grid& grid,
|
||||
std::function<std::array<double,dimWorld>(int)> centroids,
|
||||
bool enableEnergy,
|
||||
bool enableDiffusivity,
|
||||
bool enableDispersivity)
|
||||
: ParentType(eclState,gridView,cartMapper,grid,centroids,
|
||||
enableEnergy,enableDiffusivity,enableDispersivity) {}
|
||||
auto getTransmissibilitymap() {
|
||||
return this->trans_;
|
||||
}
|
||||
|
|
@ -65,7 +67,7 @@ int main(int argc, char** argv )
|
|||
using GridView = Grid::LeafGridView;
|
||||
using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
|
||||
using CartesianIndexMapper = Dune::CartesianIndexMapper<Grid>;
|
||||
using Transmissibility = Transmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,double>;
|
||||
using Transmissibility = TestTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,double>;
|
||||
|
||||
Parser parser;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user