Commit 360fbfe7 authored by Holger Class's avatar Holger Class
Browse files

we changed the 3p3cni test in order to test now also the xylene

component and the corresponding fluid system


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9397 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 1bbb32e7
......@@ -384,7 +384,7 @@ file(COPY test/boxmodels/2p2cni/waterair-reference.vtu DESTINATION references)
file(COPY test/boxmodels/2p2cni/test_2p2cni.input DESTINATION test/boxmodels/2p2cni)
file(COPY test/boxmodels/3p3c/infiltration-reference.vtu DESTINATION references)
file(COPY test/boxmodels/3p3c/test_3p3c.input DESTINATION test/boxmodels/3p3c)
file(COPY test/boxmodels/3p3cni/kuevette3p3cni-reference.vtu DESTINATION references)
file(COPY test/boxmodels/3p3cni/column3p3cni-reference.vtu DESTINATION references)
file(COPY test/boxmodels/3p3cni/test_3p3cni.input DESTINATION test/boxmodels/3p3cni)
file(COPY test/boxmodels/co2/co2-reference.vtu DESTINATION references)
file(COPY test/boxmodels/co2/test_co2.input DESTINATION test/boxmodels/co2)
......@@ -457,7 +457,7 @@ add_test(test_2pni bin/runTest.sh references/injection2pni-reference.vtu in
add_test(test_2p2c bin/runTest.sh references/injection-reference.vtu injection-00009.vtu test/boxmodels/2p2c/test_2p2c -Grid.File test/boxmodels/2p2c/grids/test_2p2c.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_2p2cni bin/runTest.sh references/waterair-reference.vtu waterair-00010.vtu test/boxmodels/2p2cni/test_2p2cni -Grid.File test/boxmodels/2p2cni/grids/test_2p2cni.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_3p3c bin/runTest.sh references/infiltration-reference.vtu infiltration-00007.vtu test/boxmodels/3p3c/test_3p3c -Grid.File test/boxmodels/3p3c/grids/test_3p3c_coarse.dgf -TimeManager.TEnd 8.64e5 -TimeManager.DtInitial 8.64e4)
add_test(test_3p3cni bin/runTest.sh references/kuevette3p3cni-reference.vtu kuevette3p3cni-00010.vtu test/boxmodels/3p3cni/test_3p3cni -Grid.File test/boxmodels/3p3cni/grids/kuev_3p3cni_coarse.dgf -TimeManager.MaxTimeStepSize 200 -TimeManager.DtInitial 200)
add_test(test_3p3cni bin/runTest.sh references/column3p3cni-reference.vtu columnxylol-00061.vtu test/boxmodels/3p3cni/test_3p3cni -Grid.File test/boxmodels/3p3cni/grids/column.dgf)
add_test(test_co2 bin/runTest.sh references/co2-reference.vtu heterogeneous-00020.vtu test/boxmodels/co2/test_co2 -Grid.File test/boxmodels/co2/grids/heterogeneousSmall.dgf)
add_test(test_restart bin/runTest.sh references/co2-reference.vtu heterogeneous-00020.vtu test/boxmodels/co2/test_co2 -Grid.File test/boxmodels/co2/grids/heterogeneousSmall.dgf -Restart 42008.6 -TimeManager.DtInitial 23452.1)
add_test(test_co2ni bin/runTest.sh references/co2ni-reference.vtu heterogeneousni-00020.vtu test/boxmodels/co2ni/test_co2ni -Grid.File test/boxmodels/co2ni/grids/heterogeneousSmall.dgf)
......
......@@ -113,7 +113,7 @@ public:
* \param temp temperature of component in \f$\mathrm{[K]}\f$
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static Scalar spHeatCapLiquidPhase(Scalar temp, Scalar pressure)
static Scalar liquidHeatCapacity(Scalar temp, Scalar pressure)
{
Scalar CH3,C6H5,H;
// after Reid et al. : Missenard group contrib. method (s. example 5-8)
......
This diff is collapsed.
......@@ -72,10 +72,10 @@ SET_BOOL_PROP(ColumnProblem, ProblemEnableGravity, true);
SET_INT_PROP(ColumnProblem, ImplicitNumericDifferenceMethod, 0);
// Write newton convergence
SET_BOOL_PROP(ColumnProblem, NewtonWriteConvergence, true);
SET_BOOL_PROP(ColumnProblem, NewtonWriteConvergence, false);
// Set the maximum time step
SET_SCALAR_PROP(ColumnProblem, TimeManagerMaxTimeStepSize, 5.);
SET_SCALAR_PROP(ColumnProblem, TimeManagerMaxTimeStepSize, 4.);
}
......@@ -225,8 +225,8 @@ public:
if (globalPos[1] > 1.2 - eps_)
{
values[Indices::contiWEqIdx] = -0.395710;
values[Indices::contiAEqIdx] = -0.000001;
values[Indices::contiCEqIdx] = -0.00;
values[Indices::contiGEqIdx] = -0.000001;
values[Indices::contiNEqIdx] = -0.00;
values[Indices::energyEqIdx] = -17452.97;
}
}
......
This diff is collapsed.
......@@ -22,8 +22,9 @@
* \brief test for the 3p3cni box model
*/
#include "config.h"
#include "kuevetteproblem.hh"
//#include "columnxylolproblem.hh"
//#include "kuevetteproblem.hh"
#include "columnxylolproblem.hh"
//#include "permdruckproblem.hh"
#include <dumux/common/start.hh>
......@@ -55,7 +56,7 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
typedef TTAG(KuevetteProblem) ProblemTypeTag;
// typedef TTAG(ColumnProblem) ProblemTypeTag;
// typedef TTAG(KuevetteProblem) ProblemTypeTag;
typedef TTAG(ColumnProblem) ProblemTypeTag;
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
}
......@@ -10,10 +10,10 @@
[TimeManager]
DtInitial = 1 # [s]
TEnd = 1800 # [s]
TEnd = 200 # [s]
[Grid]
File = ./grids/kuev_3p3cni.dgf
File = ./grids/column.dgf
###############################################################
# Simulation restart
......
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