Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
d8801cd5
Commit
d8801cd5
authored
6 years ago
by
Timo Koch
Browse files
Options
Downloads
Patches
Plain Diff
[mpnc] Remove unused 2poft adapter
parent
a881dff7
No related branches found
No related tags found
1 merge request
!1376
[mp] Streamline interface for MP material laws
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dumux/material/fluidmatrixinteractions/mp/2poftadapter.hh
+0
-103
0 additions, 103 deletions
dumux/material/fluidmatrixinteractions/mp/2poftadapter.hh
dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
+0
-1
0 additions, 1 deletion
dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
with
0 additions
and
104 deletions
dumux/material/fluidmatrixinteractions/mp/2poftadapter.hh
deleted
100644 → 0
+
0
−
103
View file @
a881dff7
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* See the file COPYING for full copying permissions. *
* *
* 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 <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
* \file
* \ingroup Fluidmatrixinteractions
* \brief Makes the twophase capillary pressure-saturation relations
* available under the M-phase API for material laws.
* Also use the temperature dependent version of the material laws.
*/
#ifndef DUMUX_MP_OFT_ADAPTER_HH
#define DUMUX_MP_OFT_ADAPTER_HH
#include
<algorithm>
#include
<cassert>
#include
<dumux/common/typetraits/typetraits.hh>
namespace
Dumux
{
/*!
* \ingroup Fluidmatrixinteractions
* \brief Adapts the interface of the MpNc material law to the standard-Dumux material law.
* Also use the temperature dependent version of the material laws.
*/
template
<
class
MaterialLaw
,
int
numPhases
>
class
MPOfTAdapter
{
static_assert
(
AlwaysFalse
<
MaterialLaw
>::
value
,
"Adapter not implemented for the specified number of phases"
);
};
/*!
* \ingroup Fluidmatrixinteractions
* \brief Adapts the interface of the MpNc material law to the standard-Dumux material law.
* Also use the temperature dependent version of the material laws.
*/
template
<
class
MaterialLaw
>
class
MPOfTAdapter
<
MaterialLaw
,
2
>
{
public:
using
Params
=
typename
MaterialLaw
::
Params
;
/*!
* \brief The capillary pressure-saturation curve.
* \param pc Container for capillary pressure in \f$\mathrm{[Pa]}\f$
* \param params Array of parameters
* \param fluidState Fluidstate
* \param wPhaseIdx the phase index of the wetting phase
*/
template
<
class
pcContainerT
,
class
FluidState
>
static
void
capillaryPressures
(
pcContainerT
&
pc
,
const
Params
&
params
,
const
FluidState
&
fluidState
,
int
wPhaseIdx
)
{
assert
(
pc
.
size
()
==
2
);
const
int
nPhaseIdx
=
1
-
wPhaseIdx
;
// non-wetting phase gets the capillary pressure added
pc
[
nPhaseIdx
]
=
0
;
// wetting phase does not get anything added
pc
[
wPhaseIdx
]
=
-
MaterialLaw
::
pc
(
params
,
fluidState
.
saturation
(
wPhaseIdx
),
fluidState
.
temperature
(
wPhaseIdx
));
}
/*!
* \brief The relative permeability of all phases.
* \param kr Container for relative permeability
* \param params Array of parameters
* \param fluidState Fluidstate
* \param wPhaseIdx the phase index of the wetting phase
*/
template
<
class
krContainerT
,
class
FluidState
>
static
void
relativePermeabilities
(
krContainerT
&
kr
,
const
Params
&
params
,
const
FluidState
&
fluidState
,
int
wPhaseIdx
)
{
assert
(
kr
.
size
()
==
2
);
const
int
nPhaseIdx
=
1
-
wPhaseIdx
;
kr
[
wPhaseIdx
]
=
MaterialLaw
::
krw
(
params
,
fluidState
.
saturation
(
wPhaseIdx
));
kr
[
nPhaseIdx
]
=
MaterialLaw
::
krn
(
params
,
fluidState
.
saturation
(
wPhaseIdx
));
}
};
}
#endif
This diff is collapsed.
Click to expand it.
dumux/material/fluidmatrixinteractions/mp/CMakeLists.txt
+
0
−
1
View file @
d8801cd5
install
(
FILES
2poftadapter.hh
mpadapter.hh
mplinearmaterial.hh
mplinearmaterialparams.hh
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment