From 155c0780bffcf860802959a3087526394732d9dd Mon Sep 17 00:00:00 2001 From: Andreas Lauser <and@poware.org> Date: Fri, 16 Dec 2011 13:24:52 +0000 Subject: [PATCH] decoupled: make test_dec2p2cproblem compile, fix include of "defaultcomponents.hh" in old_fluidsystems/h2o_n2_system.hh git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7107 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/material/old_fluidsystems/h2o_n2_system.hh | 2 +- test/decoupled/2p2c/test_dec2p2cproblem.hh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dumux/material/old_fluidsystems/h2o_n2_system.hh b/dumux/material/old_fluidsystems/h2o_n2_system.hh index 3a0d4354a0..4fa3ff222d 100644 --- a/dumux/material/old_fluidsystems/h2o_n2_system.hh +++ b/dumux/material/old_fluidsystems/h2o_n2_system.hh @@ -34,7 +34,7 @@ #include <dumux/material/binarycoefficients/h2o_n2.hh> -#include "defaultcomponents.hh" +#include <dumux/material/fluidsystems/defaultcomponents.hh> #include <dumux/common/propertysystem.hh> diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh index 0b4c0ab155..824cd40d12 100644 --- a/test/decoupled/2p2c/test_dec2p2cproblem.hh +++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh @@ -36,14 +36,14 @@ #include <dune/grid/yaspgrid.hh> #include <dune/grid/sgrid.hh> -// fluid properties -//#include <dumux/material/old_fluidsystems/simple_h2o_n2_system.hh> -#include <dumux/material/fluidsystems/h2on2fluidsystem.hh> - #include <dumux/decoupled/2p2c/2p2cproblem.hh> #include <dumux/decoupled/2p2c/fvpressure2p2c.hh> #include <dumux/decoupled/2p2c/fvtransport2p2c.hh> +// fluid properties +//#include <dumux/material/old_fluidsystems/simple_h2o_n2_system.hh> +#include <dumux/material/fluidsystems/h2on2fluidsystem.hh> + #include "test_dec2p2c_spatialparams.hh" #include <dumux/linear/impetbicgstabilu0solver.hh> namespace Dumux -- GitLab