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
6697fb50
Commit
6697fb50
authored
Apr 27, 2022
by
Timo Koch
Browse files
[material][pnm] Fix position of deprecated attribute
parent
3c75a53a
Pipeline
#15533
waiting for manual action with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
dumux/material/spatialparams/porenetwork/porenetwork1p.hh
View file @
6697fb50
...
...
@@ -36,8 +36,9 @@ namespace Dumux::PoreNetwork {
* \brief The default class for spatial parameters for single-phase pore-network models.
*/
template
<
class
GridGeometry
,
class
Scalar
>
class
[[
deprecated
(
"Use PoreNetwork::OnePDefaultSpatialParams from dumux/porenetwork/1p/spatialparams.hh instead. This class will be removed after 3.5."
)]]
class
OnePDefaultSpatialParams
:
public
BaseSpatialParams
<
GridGeometry
,
Scalar
,
OnePDefaultSpatialParams
:
public
BaseSpatialParams
<
GridGeometry
,
Scalar
,
OnePDefaultSpatialParams
<
GridGeometry
,
Scalar
>>
{
using
ParentType
=
BaseSpatialParams
<
GridGeometry
,
Scalar
,
...
...
dumux/material/spatialparams/porenetwork/porenetwork2p.hh
View file @
6697fb50
...
...
@@ -46,8 +46,9 @@ namespace Dumux::PoreNetwork {
* \brief The base class for spatial parameters for pore-network models.
*/
template
<
class
GridGeometry
,
class
Scalar
,
class
LocalRules
,
class
Implementation
>
class
[[
deprecated
(
"Use PoreNetwork::TwoPSpatialParams from dumux/porenetwork/2p/spatialparams.hh instead. This class will be removed after 3.5."
)]]
class
TwoPBaseSpatialParams
TwoPBaseSpatialParams
:
public
BaseSpatialParams
<
GridGeometry
,
Scalar
,
TwoPBaseSpatialParams
<
GridGeometry
,
Scalar
,
LocalRules
,
Implementation
>>
{
using
ParentType
=
BaseSpatialParams
<
GridGeometry
,
Scalar
,
TwoPBaseSpatialParams
<
GridGeometry
,
Scalar
,
LocalRules
,
Implementation
>>
;
...
...
@@ -209,8 +210,9 @@ private:
// TODO docme
template
<
class
GridGeometry
,
class
Scalar
,
class
MaterialLawT
>
class
[[
deprecated
(
"Use PoreNetwork::TwoPDefaultSpatialParams from dumux/porenetwork/2p/spatialparams.hh instead. This class will be removed after 3.5."
)]]
class
TwoPDefaultSpatialParams
:
public
TwoPBaseSpatialParams
<
GridGeometry
,
Scalar
,
MaterialLawT
,
TwoPDefaultSpatialParams
:
public
TwoPBaseSpatialParams
<
GridGeometry
,
Scalar
,
MaterialLawT
,
TwoPDefaultSpatialParams
<
GridGeometry
,
Scalar
,
MaterialLawT
>>
{
using
ParentType
=
TwoPBaseSpatialParams
<
GridGeometry
,
Scalar
,
MaterialLawT
,
...
...
dumux/material/spatialparams/porenetwork/porenetworkbase.hh
View file @
6697fb50
...
...
@@ -88,8 +88,9 @@ struct hasPorosityAtPos
* \brief The base class for spatial parameters for pore-network models.
*/
template
<
class
GridGeometry
,
class
Scalar
,
class
Implementation
>
class
[[
deprecated
(
"Use PoreNetwork::SpatialParams from dumux/porenetwork/common/spatialparams.hh instead. This class will be removed after 3.5."
)]]
class
BaseSpatialParams
BaseSpatialParams
{
using
GridView
=
typename
GridGeometry
::
GridView
;
using
SubControlVolume
=
typename
GridGeometry
::
SubControlVolume
;
...
...
Timo Koch
@timok
mentioned in commit
79996c40
·
Apr 27, 2022
mentioned in commit
79996c40
mentioned in commit 79996c40b36cf72f75692b9bcec874f59c80fcc2
Toggle commit list
Timo Koch
@timok
mentioned in merge request
!3072 (merged)
·
Apr 27, 2022
mentioned in merge request
!3072 (merged)
mentioned in merge request !3072
Toggle commit list
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