Commit e63e1ec3 authored by Lincoln Sherpa's avatar Lincoln Sherpa Committed by Kilian Weishaupt
Browse files

[test][freeflow] Account for runtime inertia in all test

parent c94878fa
......@@ -63,7 +63,6 @@ SET_BOOL_PROP(AngeliTestTypeTag, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(AngeliTestTypeTag, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(AngeliTestTypeTag, EnableGridVolumeVariablesCache, true);
SET_BOOL_PROP(AngeliTestTypeTag, EnableInertiaTerms, true);
}
/*!
......
......@@ -65,12 +65,6 @@ SET_BOOL_PROP(DoneaTestTypeTag, EnableFVGridGeometryCache, ENABLECACHING);
SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFluxVariablesCache, ENABLECACHING);
SET_BOOL_PROP(DoneaTestTypeTag, EnableGridVolumeVariablesCache, ENABLECACHING);
SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFaceVariablesCache, ENABLECACHING);
#if ENABLE_NAVIERSTOKES
SET_BOOL_PROP(DoneaTestTypeTag, EnableInertiaTerms, true);
#else
SET_BOOL_PROP(DoneaTestTypeTag, EnableInertiaTerms, false);
#endif
}
/*!
......
......@@ -60,8 +60,6 @@ SET_BOOL_PROP(KovasznayTestTypeTag, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(KovasznayTestTypeTag, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(KovasznayTestTypeTag, EnableGridVolumeVariablesCache, true);
SET_BOOL_PROP(KovasznayTestTypeTag, EnableInertiaTerms, true);
}
/*!
......
......@@ -64,7 +64,6 @@ SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableGridVolumeVariablesCache, true);
SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableInertiaTerms, true);
SET_BOOL_PROP(NavierStokesAnalyticTypeTag, NormalizePressure, false);
}
......@@ -162,7 +161,7 @@ public:
for (unsigned int dimIdx = 0; dimIdx < dimWorld; ++dimIdx)
{
// inertia term
if (GET_PROP_VALUE(TypeTag, EnableInertiaTerms))
if (this->enableInertiaTerms())
source[Indices::velocity(velIdx)] += density_ * dv2dx(globalPos)[velIdx][dimIdx];
// viscous term (molecular)
......
......@@ -10,6 +10,7 @@ Cells = 100 50
Name = test_channel_stokesni_convection # name passed to the output routines
InletVelocity = 1e-2
EnableGravity = false
EnableInertiaTerms = false
[ Newton ]
MaxSteps = 10
......
......@@ -5,6 +5,7 @@ Cells = 32
[Problem]
Name = test_navierstokes_1d
EnableGravity = false
EnableInertiaTerms = true
PrintL2Error = true
[Component]
......
......@@ -11,6 +11,7 @@ Cells = 50 50
Name = test_angeli # name passed to the output routines
EnableGravity = false
PrintL2Error = false
EnableInertiaTerms = true
[Component]
LiquidDensity = 1
......
......@@ -7,6 +7,7 @@ Cells = 50 50
Name = test_kovasznay # name passed to the output routines
EnableGravity = false
PrintL2Error = false
EnableInertiaTerms = true
[Component]
LiquidDensity = 1
......
......@@ -6,6 +6,7 @@ Cells = 40 40
Name = test_donea # name passed to the output routines
EnableGravity = false
PrintL2Error = false
EnableInertiaTerms = false
[ Newton ]
MaxSteps = 10
......
......@@ -80,7 +80,6 @@ SET_BOOL_PROP(ChannelNCTestTypeTag, UseMoles, false);
SET_BOOL_PROP(ChannelNCTestTypeTag, UseMoles, true);
#endif
SET_BOOL_PROP(ChannelNCTestTypeTag, EnableInertiaTerms, true);
}
/*!
......
......@@ -66,12 +66,6 @@ SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableGridVolumeVariablesCache, true);
SET_BOOL_PROP(DensityDrivenFlowTypeTag, UseMoles, true);
#if ENABLE_NAVIERSTOKES
SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableInertiaTerms, true);
#else
SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableInertiaTerms, false);
#endif
}
/*!
......
......@@ -61,8 +61,6 @@ SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableGridVolumeVariablesCache, true);
SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, UseMoles, true);
// #if ENABLE_NAVIERSTOKES
SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableInertiaTerms, false);
//! Here we set FicksLaw or MaxwellStefansLaw
SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, MolecularDiffusionType, MaxwellStefansLaw<TypeTag>);
......
......@@ -10,6 +10,7 @@ Cells = 30 30
[Problem]
Name = test_msfreeflow # name passed to the output routines
EnableGravity = false
EnableInertiaTerms = false
[Assembly]
NumericDifference.BaseEpsilon = 1e-8
......
......@@ -10,6 +10,7 @@ Cells = 40 40
[Problem]
Name = test_densitydrivenflow # name passed to the output routines
EnableGravity = true
EnableInertiaTerms = false
UseWholeLength = false
[Assembly]
......
......@@ -10,6 +10,7 @@ Cells = 50 10
Name = test_purediffusion # name passed to the output routines
InletVelocity = 0
EnableGravity = false
EnableInertiaTerms = false
[ Newton ]
MaxSteps = 10
......
......@@ -60,9 +60,6 @@ SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridVolumeVariablesCache, true);
// Do consider intertia terms
SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableInertiaTerms, true);
// Use moles
SET_BOOL_PROP(StokesOnePTwoCTypeTag, UseMoles, true);
......
......@@ -33,6 +33,7 @@ Tortuosity = 0.5
[Problem]
Name = test_stokes1p2cdarcy1p2chorizontal
EnableGravity = false
EnableInertiaTerms = true
[Vtk]
AddVelocity = 1
......
......@@ -61,9 +61,6 @@ SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridFluxVariablesCache, true);
SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableGridVolumeVariablesCache, true);
// Do not consider intertia terms
SET_BOOL_PROP(StokesOnePTwoCTypeTag, EnableInertiaTerms, false);
// Use moles
SET_BOOL_PROP(StokesOnePTwoCTypeTag, UseMoles, true);
......
......@@ -29,6 +29,7 @@ Tortuosity = 0.5
[Problem]
Name = test_stokes1p2cdarcy1p2cvertical
EnableGravity = false
EnableInertiaTerms = false
[Vtk]
AddVelocity = 1
......
......@@ -29,6 +29,7 @@ Tortuosity = 1.0
Name = test_stokes1p2cdarcy1p2cvertical_diffusion
EnableGravity = false
OnlyDiffusion = true
EnableInertiaTerms = false
[Vtk]
AddVelocity = 1
Supports Markdown
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