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
19f53505
Commit
19f53505
authored
Jul 18, 2021
by
Hanchuan Wu
Browse files
[cleannup] Remove deprecate warnings from FieldType
parent
074f2c55
Pipeline
#6085
passed with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
dumux/porenetwork/common/iofields.hh
View file @
19f53505
...
...
@@ -36,13 +36,13 @@ public:
template
<
class
OutputModule
>
static
void
initOutputModule
(
OutputModule
&
out
)
{
out
.
addField
(
out
.
problem
().
gridGeometry
().
coordinationNumber
(),
"coordinationNumber"
,
OutputModule
::
FieldType
::
vertex
);
out
.
addField
(
out
.
problem
().
gridGeometry
().
coordinationNumber
(),
"coordinationNumber"
,
Vtk
::
FieldType
::
vertex
);
out
.
addField
(
out
.
problem
().
gridGeometry
().
poreLabel
(),
"poreLabel"
,
OutputModule
::
FieldType
::
vertex
);
out
.
addField
(
out
.
problem
().
gridGeometry
().
poreLabel
(),
"poreLabel"
,
Vtk
::
FieldType
::
vertex
);
out
.
addVolumeVariable
([](
const
auto
&
volVars
){
return
volVars
.
poreInscribedRadius
();
},
"poreInscribedRadius"
);
out
.
addField
(
out
.
problem
().
gridGeometry
().
throatLabel
(),
"throatLabel"
,
OutputModule
::
FieldType
::
element
);
out
.
addField
(
out
.
problem
().
gridGeometry
().
throatLabel
(),
"throatLabel"
,
Vtk
::
FieldType
::
element
);
out
.
addFluxVariable
([](
const
auto
&
fluxVars
,
const
auto
&
fluxVarsCache
)
{
return
fluxVarsCache
.
throatInscribedRadius
();
},
"throatInscribedRadius"
);
...
...
dumux/porenetwork/common/pnmvtkoutputmodule.hh
View file @
19f53505
...
...
@@ -70,7 +70,7 @@ public:
throatFluxDataInfo_
.
push_back
(
ThroatFluxDataInfo
{
f
,
name
});
const
auto
numElems
=
problem
().
gridGeometry
().
gridView
().
size
(
0
);
throatFluxData_
.
push_back
(
std
::
vector
<
Scalar
>
(
numElems
));
ParentType
::
addField
(
throatFluxData_
.
back
(),
throatFluxDataInfo_
.
back
().
name
,
ParentType
::
FieldType
::
element
);
ParentType
::
addField
(
throatFluxData_
.
back
(),
throatFluxDataInfo_
.
back
().
name
,
Vtk
::
FieldType
::
element
);
}
//! Gather and process all required data and write them to a vtk file.
...
...
examples/porenetwork_upscaling/main.cc
View file @
19f53505
...
...
@@ -101,9 +101,9 @@ int main(int argc, char** argv) try
using
VtkWriter
=
PoreNetwork
::
VtkOutputModule
<
GridVariables
,
GetPropType
<
TypeTag
,
Properties
::
FluxVariables
>
,
SolutionVector
>
;
VtkWriter
vtkWriter
(
*
gridVariables
,
x
,
problem
->
name
());
VtkOutputFields
::
initOutputModule
(
vtkWriter
);
vtkWriter
.
addField
(
gridGeometry
->
poreVolume
(),
"poreVolume"
,
Vtk
Writer
::
FieldType
::
vertex
);
vtkWriter
.
addField
(
gridGeometry
->
throatShapeFactor
(),
"throatShapeFactor"
,
Vtk
Writer
::
FieldType
::
element
);
vtkWriter
.
addField
(
gridGeometry
->
throatCrossSectionalArea
(),
"throatCrossSectionalArea"
,
Vtk
Writer
::
FieldType
::
element
);
vtkWriter
.
addField
(
gridGeometry
->
poreVolume
(),
"poreVolume"
,
Vtk
::
FieldType
::
vertex
);
vtkWriter
.
addField
(
gridGeometry
->
throatShapeFactor
(),
"throatShapeFactor"
,
Vtk
::
FieldType
::
element
);
vtkWriter
.
addField
(
gridGeometry
->
throatCrossSectionalArea
(),
"throatCrossSectionalArea"
,
Vtk
::
FieldType
::
element
);
// ### Instantiate the solver
// We use the `LinearPDESolver` class, which is instantiated on the basis
...
...
Hanchuan Wu
@hanchuan
mentioned in commit
d049f08b
·
Jul 18, 2021
mentioned in commit
d049f08b
mentioned in commit d049f08bbd35dc6072b7a44484417dae52714e14
Toggle commit list
Hanchuan Wu
@hanchuan
mentioned in merge request
!2717 (merged)
·
Jul 18, 2021
mentioned in merge request
!2717 (merged)
mentioned in merge request !2717
Toggle commit list
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