Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dumux-lecture
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dumux-repositories
dumux-lecture
Commits
445b3630
Commit
445b3630
authored
Dec 11, 2018
by
Katharina Heck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[cleanup][columnxylene] general cleanup
parent
30b277e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
24 deletions
+25
-24
lecture/mm/columnxylene/columnxyleneexercise.input
lecture/mm/columnxylene/columnxyleneexercise.input
+3
-1
lecture/mm/columnxylene/columnxyleneproblem.hh
lecture/mm/columnxylene/columnxyleneproblem.hh
+22
-21
lecture/mm/columnxylene/columnxylenespatialparams.hh
lecture/mm/columnxylene/columnxylenespatialparams.hh
+0
-2
No files found.
lecture/mm/columnxylene/columnxyleneexercise.input
View file @
445b3630
[TimeLoop]
DtInitial = 1 # [s]
TEnd = 1800 # [s]
OutputInterval = 1
MaxTimeStepSize = 1
[Grid]
...
...
@@ -28,3 +27,6 @@ SolidHeatCapacity = 850
SolidDensity = 2650
SolidThermalConductivity = 2.8
SolidHeatCapacity = 84000
[Newton]
MaxRelativeShift = 1e-4
lecture/mm/columnxylene/columnxyleneproblem.hh
View file @
445b3630
...
...
@@ -103,6 +103,7 @@ struct SpatialParams<TypeTag, TTag::ColumnTypeTag>
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
ColumnSpatialParams
<
FVGridGeometry
,
Scalar
>
;
};
}
// end namespace Properties
/*!
...
...
@@ -258,7 +259,7 @@ public:
NumEqVector
values
(
0.0
);
// negative values for injection
if
(
globalPos
[
1
]
>
1.2
-
eps_
)
if
(
globalPos
[
1
]
>
this
->
fvGridGeometry
().
bBoxMax
()[
1
]
-
eps_
)
{
values
[
FluidSystem
::
wCompIdx
]
=
getParam
<
Scalar
>
(
"Problem.steamFlux"
);
values
[
FluidSystem
::
gCompIdx
]
=
-
0.000001
;
...
...
@@ -324,45 +325,45 @@ private:
if
(
y
>
yMax
-
eps_
)
values
[
switch2Idx
]
=
0.112
;
else
if
(
y
>
yMax
-
0.0148
+
eps_
)
else
if
(
y
>
yMax
-
0.0148
-
eps_
)
values
[
switch2Idx
]
=
0
+
((
yMax
-
y
)
/
0.0148
)
*
0.112
;
else
if
(
y
>
yMax
-
0.0296
+
eps_
)
else
if
(
y
>
yMax
-
0.0296
-
eps_
)
values
[
switch2Idx
]
=
0.112
+
(((
yMax
-
y
)
-
0.0148
)
/
0.0148
)
*
(
0.120
-
0.112
);
else
if
(
y
>
yMax
-
0.0444
+
eps_
)
else
if
(
y
>
yMax
-
0.0444
-
eps_
)
values
[
switch2Idx
]
=
0.120
+
(((
yMax
-
y
)
-
0.0296
)
/
0.0148
)
*
(
0.125
-
0.120
);
else
if
(
y
>
yMax
-
0.0592
+
eps_
)
else
if
(
y
>
yMax
-
0.0592
-
eps_
)
values
[
switch2Idx
]
=
0.125
+
(((
yMax
-
y
)
-
0.0444
)
/
0.0148
)
*
(
0.137
-
0.125
);
else
if
(
y
>
yMax
-
0.0740
+
eps_
)
else
if
(
y
>
yMax
-
0.0740
-
eps_
)
values
[
switch2Idx
]
=
0.137
+
(((
yMax
-
y
)
-
0.0592
)
/
0.0148
)
*
(
0.150
-
0.137
);
else
if
(
y
>
yMax
-
0.0888
+
eps_
)
else
if
(
y
>
yMax
-
0.0888
-
eps_
)
values
[
switch2Idx
]
=
0.150
+
(((
yMax
-
y
)
-
0.0740
)
/
0.0148
)
*
(
0.165
-
0.150
);
else
if
(
y
>
yMax
-
0.1036
+
eps_
)
else
if
(
y
>
yMax
-
0.1036
-
eps_
)
values
[
switch2Idx
]
=
0.165
+
(((
yMax
-
y
)
-
0.0888
)
/
0.0148
)
*
(
0.182
-
0.165
);
else
if
(
y
>
yMax
-
0.1184
+
eps_
)
else
if
(
y
>
yMax
-
0.1184
-
eps_
)
values
[
switch2Idx
]
=
0.182
+
(((
yMax
-
y
)
-
0.1036
)
/
0.0148
)
*
(
0.202
-
0.182
);
else
if
(
y
>
yMax
-
0.1332
+
eps_
)
else
if
(
y
>
yMax
-
0.1332
-
eps_
)
values
[
switch2Idx
]
=
0.202
+
(((
yMax
-
y
)
-
0.1184
)
/
0.0148
)
*
(
0.226
-
0.202
);
else
if
(
y
>
yMax
-
0.1480
+
eps_
)
else
if
(
y
>
yMax
-
0.1480
-
eps_
)
values
[
switch2Idx
]
=
0.226
+
(((
yMax
-
y
)
-
0.1332
)
/
0.0148
)
*
(
0.257
-
0.226
);
else
if
(
y
>
yMax
-
0.1628
+
eps_
)
else
if
(
y
>
yMax
-
0.1628
-
eps_
)
values
[
switch2Idx
]
=
0.257
+
(((
yMax
-
y
)
-
0.1480
)
/
0.0148
)
*
(
0.297
-
0.257
);
else
if
(
y
>
yMax
-
0.1776
+
eps_
)
else
if
(
y
>
yMax
-
0.1776
-
eps_
)
values
[
switch2Idx
]
=
0.297
+
(((
yMax
-
y
)
-
0.1628
)
/
0.0148
)
*
(
0.352
-
0.297
);
else
if
(
y
>
yMax
-
0.1924
+
eps_
)
else
if
(
y
>
yMax
-
0.1924
-
eps_
)
values
[
switch2Idx
]
=
0.352
+
(((
yMax
-
y
)
-
0.1776
)
/
0.0148
)
*
(
0.426
-
0.352
);
else
if
(
y
>
yMax
-
0.2072
+
eps_
)
else
if
(
y
>
yMax
-
0.2072
-
eps_
)
values
[
switch2Idx
]
=
0.426
+
(((
yMax
-
y
)
-
0.1924
)
/
0.0148
)
*
(
0.522
-
0.426
);
else
if
(
y
>
yMax
-
0.2220
+
eps_
)
else
if
(
y
>
yMax
-
0.2220
-
eps_
)
values
[
switch2Idx
]
=
0.522
+
(((
yMax
-
y
)
-
0.2072
)
/
0.0148
)
*
(
0.640
-
0.522
);
else
if
(
y
>
yMax
-
0.2368
+
eps_
)
else
if
(
y
>
yMax
-
0.2368
-
eps_
)
values
[
switch2Idx
]
=
0.640
+
(((
yMax
-
y
)
-
0.2220
)
/
0.0148
)
*
(
0.767
-
0.640
);
else
if
(
y
>
yMax
-
0.2516
+
eps_
)
else
if
(
y
>
yMax
-
0.2516
-
eps_
)
values
[
switch2Idx
]
=
0.767
+
(((
yMax
-
y
)
-
0.2368
)
/
0.0148
)
*
(
0.878
-
0.767
);
else
if
(
y
>
yMax
-
0.2664
+
eps_
)
else
if
(
y
>
yMax
-
0.2664
-
eps_
)
values
[
switch2Idx
]
=
0.878
+
(((
yMax
-
y
)
-
0.2516
)
/
0.0148
)
*
(
0.953
-
0.878
);
else
if
(
y
>
yMax
-
0.2812
+
eps_
)
else
if
(
y
>
yMax
-
0.2812
-
eps_
)
values
[
switch2Idx
]
=
0.953
+
(((
yMax
-
y
)
-
0.2664
)
/
0.0148
)
*
(
0.988
-
0.953
);
else
if
(
y
>
yMax
-
0.3000
+
eps_
)
else
if
(
y
>
yMax
-
0.3000
-
eps_
)
values
[
switch2Idx
]
=
0.988
;
else
values
[
switch2Idx
]
=
1.e-4
;
...
...
lecture/mm/columnxylene/columnxylenespatialparams.hh
View file @
445b3630
...
...
@@ -204,8 +204,6 @@ private:
MaterialLawParams
fineMaterialParams_
;
MaterialLawParams
coarseMaterialParams_
;
Scalar
lambdaSolid_
;
static
constexpr
Scalar
eps_
=
1.5e-7
;
};
...
...
Write
Preview
Markdown
is supported
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