From 98d2597135225b56c25e26448a7a02c85afc8cac Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 22 Aug 2012 11:48:07 +0000
Subject: [PATCH] tests: use lnapl and dnapl instead of oil and simplednapl
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8949 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
test/boxmodels/2p/lensproblem.hh | 4 ++--
test/decoupled/2p/test_impesadaptiveproblem.hh | 2 +-
test/decoupled/2p/test_impesproblem.hh | 4 ++--
test/decoupled/2p/test_mpfa2pproblem.hh | 4 ++--
tutorial/tutorialproblem_coupled.hh | 4 ++--
tutorial/tutorialproblem_decoupled.hh | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 4f425e1a7c..732ef6a6a3 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -39,7 +39,7 @@
#include <dune/grid/sgrid.hh>
#include <dumux/material/components/simpleh2o.hh>
-#include <dumux/material/components/simplednapl.hh>
+#include <dumux/material/components/dnapl.hh>
#include <dumux/boxmodels/2p/2pmodel.hh>
#include <dumux/boxmodels/common/porousmediaboxproblem.hh>
@@ -87,7 +87,7 @@ SET_PROP(LensProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleDNAPL<Scalar> > type;
+ typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
};
#else
// OR: set the fluid system
diff --git a/test/decoupled/2p/test_impesadaptiveproblem.hh b/test/decoupled/2p/test_impesadaptiveproblem.hh
index 211f250973..8806f9f9c5 100644
--- a/test/decoupled/2p/test_impesadaptiveproblem.hh
+++ b/test/decoupled/2p/test_impesadaptiveproblem.hh
@@ -34,7 +34,7 @@
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/simpleh2o.hh>
-#include <dumux/material/components/oil.hh>
+#include <dumux/material/components/lnapl.hh>
#include <dumux/decoupled/2p/impes/impesproblem2p.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2padaptive.hh>
diff --git a/test/decoupled/2p/test_impesproblem.hh b/test/decoupled/2p/test_impesproblem.hh
index 493b98f37b..275330f0d5 100644
--- a/test/decoupled/2p/test_impesproblem.hh
+++ b/test/decoupled/2p/test_impesproblem.hh
@@ -39,8 +39,8 @@
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/simpleh2o.hh>
-#include <dumux/material/components/simplednapl.hh>
-#include <dumux/material/components/oil.hh>
+#include <dumux/material/components/dnapl.hh>
+#include <dumux/material/components/lnapl.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
#include <dumux/decoupled/2p/transport/fv/fvtransportproperties2p.hh>
diff --git a/test/decoupled/2p/test_mpfa2pproblem.hh b/test/decoupled/2p/test_mpfa2pproblem.hh
index 20c10a54b7..19b620e849 100644
--- a/test/decoupled/2p/test_mpfa2pproblem.hh
+++ b/test/decoupled/2p/test_mpfa2pproblem.hh
@@ -33,7 +33,7 @@
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/simpleh2o.hh>
-#include <dumux/material/components/simplednapl.hh>
+#include <dumux/material/components/dnapl.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2p.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvpressureproperties2padaptive.hh>
@@ -95,7 +95,7 @@ SET_PROP(MPFATwoPTestProblem, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleDNAPL<Scalar> > type;
+ typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
};
// Enable gravity
diff --git a/tutorial/tutorialproblem_coupled.hh b/tutorial/tutorialproblem_coupled.hh
index d048afc4d4..c94bde435e 100644
--- a/tutorial/tutorialproblem_coupled.hh
+++ b/tutorial/tutorialproblem_coupled.hh
@@ -42,7 +42,7 @@
// The components that are used
#include <dumux/material/components/h2o.hh>
-#include <dumux/material/components/oil.hh>
+#include <dumux/material/components/lnapl.hh>
#include <dumux/common/cubegridcreator.hh>
namespace Dumux{
@@ -73,7 +73,7 @@ public: typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{
SET_PROP(TutorialProblemCoupled, NonwettingPhase)
{
private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef Dumux::LiquidPhase<Scalar, Dumux::Oil<Scalar> > type; /*@\label{tutorial-coupled:nonwettingPhase}@*/
+public: typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-coupled:nonwettingPhase}@*/
}; /*@\label{tutorial-coupled:2p-system-end}@*/
SET_TYPE_PROP(TutorialProblemCoupled, FluidSystem, Dumux::TwoPImmiscibleFluidSystem<TypeTag>);
diff --git a/tutorial/tutorialproblem_decoupled.hh b/tutorial/tutorialproblem_decoupled.hh
index a01a96ed36..dea9c03d37 100644
--- a/tutorial/tutorialproblem_decoupled.hh
+++ b/tutorial/tutorialproblem_decoupled.hh
@@ -47,7 +47,7 @@
// the components that are used
#include <dumux/material/components/h2o.hh>
-#include <dumux/material/components/oil.hh>
+#include <dumux/material/components/lnapl.hh>
namespace Dumux
{
@@ -90,7 +90,7 @@ SET_PROP(TutorialProblemDecoupled, NonwettingPhase)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::LiquidPhase<Scalar, Dumux::Oil<Scalar> > type; /*@\label{tutorial-decoupled:nonwettingPhase}@*/
+ typedef Dumux::LiquidPhase<Scalar, Dumux::LNAPL<Scalar> > type; /*@\label{tutorial-decoupled:nonwettingPhase}@*/
}; /*@\label{tutorial-decoupled:2p-system-end}@*/
SET_TYPE_PROP(TutorialProblemDecoupled, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>); /*@\label{tutorial-decoupled:cflflux}@*/
--
GitLab