From a3da60154e7c69910296dfd278841b20d88ed4c3 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Tue, 17 Jul 2018 23:35:54 +0200
Subject: [PATCH] [test][fluidsystem] test for 1p adapter
---
test/material/fluidsystems/test_fluidsystems.cc | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index 3c514c2e14..89bcf64790 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -28,18 +28,19 @@
// include all fluid systems in dumux-stable
#include <dumux/material/fluidsystems/2pimmiscible.hh>
+#include <dumux/material/fluidsystems/1padapter.hh>
+#include <dumux/material/fluidsystems/1pgas.hh>
+#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/material/fluidsystems/base.hh>
#include <dumux/material/fluidsystems/brine.hh>
#include <dumux/material/fluidsystems/brineair.hh>
#include <dumux/material/fluidsystems/brineco2.hh>
-#include <dumux/material/fluidsystems/1pgas.hh>
#include <dumux/material/fluidsystems/h2oair.hh>
#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
#include <dumux/material/fluidsystems/h2oairxylene.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
#include <dumux/material/fluidsystems/h2on2kinetic.hh>
#include <dumux/material/fluidsystems/h2on2o2.hh>
-#include <dumux/material/fluidsystems/1pliquid.hh>
#include <dumux/material/fluidsystems/spe5.hh>
// include all fluid states
@@ -204,5 +205,16 @@ int main()
{ using FluidSystem = FluidSystems::Spe5<Scalar>;
success += checkFluidSystem<Scalar, FluidSystem>(); }
+ // 1p adapter
+ { using FluidSystem = FluidSystems::OnePAdapter<FluidSystems::TwoPImmiscible<Scalar, Gas, Liquid>, 0>;
+ success += checkFluidSystem<Scalar, FluidSystem>(); }
+ { using FluidSystem = FluidSystems::OnePAdapter<FluidSystems::TwoPImmiscible<Scalar, Gas, Liquid>, 1>;
+ success += checkFluidSystem<Scalar, FluidSystem>(); }
+ { using H2OType = Components::TabulatedComponent<Components::H2O<Scalar>>;
+ using FluidSystem = FluidSystems::OnePAdapter<FluidSystems::H2OAir<Scalar, H2OType>, 0>;
+ success += checkFluidSystem<Scalar, FluidSystem>(); }
+ { using FluidSystem = FluidSystems::OnePAdapter<FluidSystems::H2ON2O2<Scalar>, 1>;
+ success += checkFluidSystem<Scalar, FluidSystem>(); }
+
return success;
}
--
GitLab