Skip to content
GitLab
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
5f88d923
Commit
5f88d923
authored
Dec 17, 2015
by
Thomas Fetzer
Browse files
[multidomain,deprecation] Fix and update deprecations.
parent
b894623d
Changes
6
Hide whitespace changes
Inline
Side-by-side
dumux/common/boundarytypes.hh
View file @
5f88d923
...
...
@@ -64,9 +64,6 @@ public:
boundaryInfo_
[
eqIdx
].
isDirichlet
=
0
;
boundaryInfo_
[
eqIdx
].
isNeumann
=
0
;
boundaryInfo_
[
eqIdx
].
isOutflow
=
0
;
boundaryInfo_
[
eqIdx
].
isCouplingInflow
=
0
;
boundaryInfo_
[
eqIdx
].
isCouplingOutflow
=
0
;
boundaryInfo_
[
eqIdx
].
isMortarCoupling
=
0
;
boundaryInfo_
[
eqIdx
].
isCouplingDirichlet
=
0
;
boundaryInfo_
[
eqIdx
].
isCouplingNeumann
=
0
;
boundaryInfo_
[
eqIdx
].
isCouplingMortar
=
0
;
...
...
@@ -167,31 +164,31 @@ public:
/*!
* \brief Set all boundary conditions to coupling inflow.
*/
DUNE_DEPRECATED_MSG
(
"setAllCouplingInflow() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"setAllCouplingInflow() is deprecated
. Use setAllCouplingNeumann() instead.
"
)
void
setAllCouplingInflow
()
{
for
(
int
eqIdx
=
0
;
eqIdx
<
numEq
;
++
eqIdx
)
{
setCoupling
Inflow
(
eqIdx
);
setCoupling
Neumann
(
eqIdx
);
}
}
/*!
* \brief Set all boundary conditions to coupling outflow.
*/
DUNE_DEPRECATED_MSG
(
"setAllCouplingOutflow() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"setAllCouplingOutflow() is deprecated
. Use setAllCouplingDirichlet() instead.
"
)
void
setAllCouplingOutflow
()
{
for
(
int
eqIdx
=
0
;
eqIdx
<
numEq
;
++
eqIdx
)
{
setCoupling
Outflow
(
eqIdx
);
setCoupling
Dirichlet
(
eqIdx
);
}
}
/*!
* \brief Set all boundary conditions to mortar coupling.
*/
DUNE_DEPRECATED_MSG
(
"setAllMortarCoupling() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"setAllMortarCoupling() is deprecated
. Use setAllCouplingMortar() instead.
"
)
void
setAllMortarCoupling
()
{
for
(
int
eqIdx
=
0
;
eqIdx
<
numEq
;
++
eqIdx
)
...
...
@@ -295,40 +292,28 @@ public:
/*!
* \brief Set a boundary condition for a single equation to coupling inflow.
*/
DUNE_DEPRECATED_MSG
(
"setCouplingInflow() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"setCouplingInflow() is deprecated
. Use setCouplingNeumann() instead.
"
)
void
setCouplingInflow
(
int
eqIdx
)
{
resetEq
(
eqIdx
);
boundaryInfo_
[
eqIdx
].
visited
=
1
;
boundaryInfo_
[
eqIdx
].
isCouplingInflow
=
1
;
Valgrind
::
SetDefined
(
boundaryInfo_
[
eqIdx
]);
setCouplingNeumann
(
eqIdx
);
}
/*!
* \brief Set a boundary condition for a single equation to coupling outflow.
*/
DUNE_DEPRECATED_MSG
(
"setCouplingOutflow() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"setCouplingOutflow() is deprecated
. Use setCouplingDirichlet() instead.
"
)
void
setCouplingOutflow
(
int
eqIdx
)
{
resetEq
(
eqIdx
);
boundaryInfo_
[
eqIdx
].
visited
=
1
;
boundaryInfo_
[
eqIdx
].
isCouplingOutflow
=
1
;
Valgrind
::
SetDefined
(
boundaryInfo_
[
eqIdx
]);
setCouplingDirichlet
(
eqIdx
);
}
/*!
* \brief Set a boundary condition for a single equation to mortar coupling.
*/
DUNE_DEPRECATED_MSG
(
"setMortarCoupling() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"setMortarCoupling() is deprecated
. Use setCouplingMortar() instead.
"
)
void
setMortarCoupling
(
int
eqIdx
)
{
resetEq
(
eqIdx
);
boundaryInfo_
[
eqIdx
].
visited
=
1
;
boundaryInfo_
[
eqIdx
].
isMortarCoupling
=
1
;
Valgrind
::
SetDefined
(
boundaryInfo_
[
eqIdx
]);
setCouplingMortar
(
eqIdx
);
}
/*!
...
...
@@ -415,19 +400,19 @@ public:
*
* \param eqIdx The index of the equation
*/
DUNE_DEPRECATED_MSG
(
"isCouplingInflow() is deprecated"
)
bool
isCouplingIn
flow
(
unsigned
eqIdx
)
const
{
return
boundaryInfo_
[
eqIdx
].
isCoupling
Inflow
;
}
DUNE_DEPRECATED_MSG
(
"isCouplingInflow() is deprecated
. Use isCouplingNeumann() instead.
"
)
bool
flow
(
unsigned
eqIdx
)
const
{
return
boundaryInfo_
[
eqIdx
].
isCoupling
Neumann
;
}
/*!
* \brief Returns true if some equation is used to specify an
* inflow coupling condition.
*/
DUNE_DEPRECATED_MSG
(
"hasCouplingInflow() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"hasCouplingInflow() is deprecated
. Use hasCouplingNeumann() instead.
"
)
bool
hasCouplingInflow
()
const
{
for
(
int
i
=
0
;
i
<
numEq
;
++
i
)
if
(
boundaryInfo_
[
i
].
isCoupling
Inflow
)
if
(
boundaryInfo_
[
i
].
isCoupling
Neumann
)
return
true
;
return
false
;
}
...
...
@@ -438,19 +423,19 @@ public:
*
* \param eqIdx The index of the equation
*/
DUNE_DEPRECATED_MSG
(
"isCouplingOutflow() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"isCouplingOutflow() is deprecated
. Use isCouplingDirichlet() instead.
"
)
bool
isCouplingOutflow
(
unsigned
eqIdx
)
const
{
return
boundaryInfo_
[
eqIdx
].
isCoupling
Outflow
;
}
{
return
boundaryInfo_
[
eqIdx
].
isCoupling
Dirichlet
;
}
/*!
* \brief Returns true if some equation is used to specify an
* outflow coupling condition.
*/
DUNE_DEPRECATED_MSG
(
"hasCouplingOutflow() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"hasCouplingOutflow() is deprecated
. Use hasCouplingDirichlet() instead.
"
)
bool
hasCouplingOutflow
()
const
{
for
(
int
i
=
0
;
i
<
numEq
;
++
i
)
if
(
boundaryInfo_
[
i
].
isCoupling
Outflow
)
if
(
boundaryInfo_
[
i
].
isCoupling
Dirichlet
)
return
true
;
return
false
;
}
...
...
@@ -461,21 +446,21 @@ public:
*
* \param eqIdx The index of the equation
*/
DUNE_DEPRECATED_MSG
(
"isMortarCoupling() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"isMortarCoupling() is deprecated
. Use isCouplingMortar() instead.
"
)
bool
isMortarCoupling
(
unsigned
eqIdx
)
const
{
return
boundaryInfo_
[
eqIdx
].
is
Mortar
Coupling
;
return
boundaryInfo_
[
eqIdx
].
isCoupling
Mortar
;
}
/*!
* \brief Returns true if some equation is used to specify a
* mortar coupling condition.
*/
DUNE_DEPRECATED_MSG
(
"hasMortarCoupling() is deprecated"
)
DUNE_DEPRECATED_MSG
(
"hasMortarCoupling() is deprecated
. Use hasCouplingMortar() instead.
"
)
bool
hasMortarCoupling
()
const
{
for
(
int
i
=
0
;
i
<
numEq
;
++
i
)
if
(
boundaryInfo_
[
i
].
is
Mortar
Coupling
)
if
(
boundaryInfo_
[
i
].
isCoupling
Mortar
)
return
true
;
return
false
;
}
...
...
@@ -599,9 +584,6 @@ protected:
unsigned
char
isDirichlet
:
1
;
unsigned
char
isNeumann
:
1
;
unsigned
char
isOutflow
:
1
;
unsigned
char
isCouplingInflow
:
1
;
unsigned
char
isCouplingOutflow
:
1
;
unsigned
char
isMortarCoupling
:
1
;
unsigned
char
isCouplingDirichlet
:
1
;
unsigned
char
isCouplingNeumann
:
1
;
unsigned
char
isCouplingMortar
:
1
;
...
...
dumux/multidomain/couplinglocalresiduals/2p2ccouplinglocalresidual.hh
View file @
5f88d923
...
...
@@ -2,6 +2,6 @@
#define DUMUX_2P2C_COUPLING_LOCAL_RESIDUAL_OLD_HH
#warning This file is deprecated and will be removed after Dumux 2.9
#include "../2cstokes2p2c/2p2ccouplinglocalresidual.hh
>
#include
"../2cstokes2p2c/2p2ccouplinglocalresidual.hh
"
#endif // DUMUX_2P2C_COUPLING_LOCAL_RESIDUAL_OLD_HH
dumux/multidomain/couplinglocalresiduals/2p2cnicouplinglocalresidual.hh
View file @
5f88d923
...
...
@@ -2,6 +2,6 @@
#define DUMUX_2P2CNI_COUPLING_LOCAL_RESIDUAL_OLD_HH
#warning This file is deprecated and will be removed after Dumux 2.9
#include "../2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
>
#include
"../2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
"
#endif // DUMUX_2P2CNI_COUPLING_LOCAL_RESIDUAL_OLD_HH
dumux/multidomain/couplinglocalresiduals/boxcouplinglocalresidual.hh
View file @
5f88d923
...
...
@@ -2,6 +2,6 @@
#define DUMUX_BOX_COUPLING_LOCAL_RESIDUAL_OLD_HH
#warning This file is deprecated and will be removed after Dumux 2.9
#include "../common/boxcouplinglocalresidual.hh
>
#include
"../common/boxcouplinglocalresidual.hh
"
#endif // DUMUX_BOX_COUPLING_LOCAL_RESIDUAL_OLD_HH
dumux/multidomain/couplinglocalresiduals/stokesnccouplinglocalresidual.hh
View file @
5f88d923
...
...
@@ -2,6 +2,6 @@
#define DUMUX_STOKESNC_COUPLING_LOCAL_RESIDUAL_OLD_HH
#warning This file is deprecated and will be removed after Dumux 2.9
#include "../2cstokes2p2c/stokesnccouplinglocalresidual.hh
>
#include
"../2cstokes2p2c/stokesnccouplinglocalresidual.hh
"
#endif // DUMUX_STOKESNC_COUPLING_LOCAL_RESIDUAL_OLD_HH
dumux/multidomain/couplinglocalresiduals/stokesncnicouplinglocalresidual.hh
View file @
5f88d923
...
...
@@ -2,6 +2,6 @@
#define DUMUX_STOKESNCNI_COUPLING_LOCAL_RESIDUAL_OLD_HH
#warning This file is deprecated and will be removed after Dumux 2.9
#include "../2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
>
#include
"../2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
"
#endif // DUMUX_STOKESNCNI_COUPLING_LOCAL_RESIDUAL_OLD_HH
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment