Commit 445b3630 authored by Katharina Heck's avatar Katharina Heck

[cleanup][columnxylene] general cleanup

parent 30b277e1
[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
......@@ -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;
......
......@@ -204,8 +204,6 @@ private:
MaterialLawParams fineMaterialParams_;
MaterialLawParams coarseMaterialParams_;
Scalar lambdaSolid_;
static constexpr Scalar eps_ = 1.5e-7;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment