Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
c27fbd87
Commit
c27fbd87
authored
Nov 29, 2017
by
Dennis Gläser
Browse files
[mpfa] remove last ocurrences of schmes other than the o-method
parent
6dd1dfcc
Changes
4
Hide whitespace changes
Inline
Side-by-side
dumux/discretization/cellcentered/mpfa/connectivitymap.hh
View file @
c27fbd87
...
...
@@ -45,10 +45,6 @@ class CCMpfaConnectivityMapImplementation : public CCMpfaGeneralConnectivityMap<
//! The o-method can use the simple assembly map
template
<
class
TypeTag
>
class
CCMpfaConnectivityMapImplementation
<
TypeTag
,
MpfaMethods
::
oMethod
>
:
public
CCSimpleConnectivityMap
<
TypeTag
>
{};
//! The o-method with full pressure support can use the simple assembly map
template
<
class
TypeTag
>
class
CCMpfaConnectivityMapImplementation
<
TypeTag
,
MpfaMethods
::
oMethodFps
>
:
public
CCSimpleConnectivityMap
<
TypeTag
>
{};
}
#endif
dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
View file @
c27fbd87
...
...
@@ -285,15 +285,16 @@ private:
//! Get the mpfa method only once per simulation
static
const
MpfaMethods
method
=
GET_PROP_VALUE
(
TypeTag
,
MpfaMethod
);
if
(
method
==
MpfaMethods
::
oMethod
||
method
==
MpfaMethods
::
oMethodFps
)
// TODO: uncomment as soon as methods are re-implemented
if
(
method
==
MpfaMethods
::
oMethod
/*|| method == MpfaMethods::oMethodFps*/
)
return
element
.
subEntities
(
dim
);
else
if
(
method
==
MpfaMethods
::
lMethod
)
/*
else if (method == MpfaMethods::lMethod)
{
std::size_t numInsideScvfs = MpfaHelper::getNumLocalScvfs(element.geometry().type());
std::size_t numOutsideScvf = 0;
for (const auto& dataJ : assemblyMap) numOutsideScvf += dataJ.scvfsJ.size();
return numOutsideScvf - numInsideScvfs;
}
}
*/
else
DUNE_THROW
(
Dune
::
NotImplemented
,
"number of interaction volumes estimate for chosen mpfa scheme"
);
}
...
...
dumux/discretization/cellcentered/mpfa/interactionvolume.hh
View file @
c27fbd87
...
...
@@ -41,8 +41,6 @@ using CCMpfaInteractionVolume = CCMpfaInteractionVolumeImplementation<TypeTag, G
}
// end namespace
// the specializations of this class for the available methods have to be included here
// #include <dumux/discretization/cellcentered/mpfa/lmethod/interactionvolume.hh>
#include
<dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh>
// #include <dumux/discretization/cellcentered/mpfa/omethodfps/interactionvolume.hh>
#endif
dumux/discretization/cellcentered/mpfa/methods.hh
View file @
c27fbd87
...
...
@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
* \file
* \brief
Face types of the sub control volume faces in the mpfa method.
* \brief
Available implemented mpfa schemes
*/
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_METHODS_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_METHODS_HH
...
...
@@ -27,10 +27,8 @@ namespace Dumux
{
enum
class
MpfaMethods
:
unsigned
int
{
lMethod
,
oMethod
,
oMethodFps
oMethod
};
}
// end namespace
#endif
\ No newline at end of file
#endif
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment