From 7594faf8065c5906f8c6f8c84f0f05138d56c331 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Wed, 24 Feb 2016 08:22:48 +0100
Subject: [PATCH] [test_fluidsystems] Make test fail, because it fails
---
.../material/fluidsystems/checkfluidsystem.hh | 9 ++-
.../fluidsystems/test_fluidsystems.cc | 72 ++++++++++---------
2 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 312428a2a0..25e149e126 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -149,8 +149,8 @@ public:
{
if (!allowPressure_)
{
- DUNE_THROW(Dune::InvalidStateException,
- "pressure called but not allowed\n\n");
+ std::cout << "Dune::InvalidStateException: pressure called but not allowed\n\n";
+ exit(2);
}
assert(restrictPhaseIdx_ < 0 || restrictPhaseIdx_ == phaseIdx);
return BaseFluidState::pressure(phaseIdx);
@@ -373,8 +373,9 @@ std::string checkFluidState(const BaseFluidState &fs)
}
template<class Scalar, class FluidSystem>
-void checkFluidSystem()
+int checkFluidSystem()
{
+ int success = 0;
std::cout << "Testing fluid system '" << Dune::className<FluidSystem>() << "'\n";
// make sure the fluid system provides the number of phases and
@@ -487,6 +488,7 @@ void checkFluidSystem()
} catch (Dune::Exception e)
{
std::cout << "\ndensity calculation throws exception:\n" << e.what();
+ success++;
}
fs.allowPressure(true);
@@ -563,6 +565,7 @@ void checkFluidSystem()
}
std::cout << "----------------------------------\n";
+ return success;
}
} // end namespace Dumux
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index 5c9acc6b09..60fdef393c 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -70,6 +70,7 @@ int main()
typedef Dumux::LiquidPhase<Scalar, H2O> Liquid;
typedef Dumux::GasPhase<Scalar, N2> Gas;
+ int success = 0;
std::string collectedExceptions;
/////////////////////////
@@ -87,24 +88,25 @@ int main()
if (!collectedExceptions.empty())
{
std::cout<<"Dumux::CompositionalFluidState: \n"<<collectedExceptions<<"\n";
+ success++;
}
-
// ImmiscibleFluidState
Dumux::ImmiscibleFluidState<Scalar, FluidSystem> immiscibleFluidState;
collectedExceptions = Dumux::checkFluidState<Scalar>(immiscibleFluidState);
if (!collectedExceptions.empty())
{
std::cout<<"Dumux::ImmiscibleFluidState: \n"<<collectedExceptions<<"\n";
+ success++;
}
-
// IsothermalImmiscibleFluidState
Dumux::IsothermalImmiscibleFluidState<Scalar, FluidSystem> isothermalImmiscibleFluidState;
collectedExceptions = Dumux::checkFluidState<Scalar>(isothermalImmiscibleFluidState);
if (!collectedExceptions.empty())
{
- std::cout<<"Dumux::IsothermalImmiscibleFluidState: \n"<<collectedExceptions<<"\n";
+ std::cout<<"Dumux::IsothermalImmiscibleFluidState: \n"<<collectedExceptions<<"\n";
+ success++;
}
// NonEquilibriumFluidState
@@ -113,6 +115,7 @@ int main()
if (!collectedExceptions.empty())
{
std::cout<<"Dumux::NonEquilibriumFluidState: \n"<<collectedExceptions<<"\n";
+ success++;
}
// NonEquilibriumEnergyFluidState uses TypeTag
@@ -125,6 +128,7 @@ int main()
if (!collectedExceptions.empty())
{
std::cout<<"Dumux::PressureOverlayFluidState: \n"<<collectedExceptions<<"\n";
+ success++;
}
// SaturationOverlayFluidState
@@ -133,6 +137,7 @@ int main()
if (!collectedExceptions.empty())
{
std::cout<<"Dumux::SaturationOverlayFluidState: \n"<<collectedExceptions<<"\n";
+ success++;
}
// TemperatureOverlayFluidState
@@ -141,6 +146,7 @@ int main()
if (!collectedExceptions.empty())
{
std::cout<<"Dumux::TemperatureOverlayFluidState: \n"<<collectedExceptions<<"\n";
+ success++;
}
}
@@ -150,17 +156,17 @@ int main()
// 1p
{ typedef Dumux::FluidSystems::OneP<Scalar, Liquid> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::OneP<Scalar, Gas> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// 2p-immiscible
{ typedef Dumux::FluidSystems::TwoPImmiscible<Scalar, Liquid, Liquid> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::TwoPImmiscible<Scalar, Liquid, Gas> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
- { typedef Dumux::FluidSystems::TwoPImmiscible<Scalar, Gas, Liquid> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ { typedef Dumux::FluidSystems::TwoPImmiscible<Scalar, Gas, Liquid> FluidSystem;
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// base
@@ -168,11 +174,11 @@ int main()
{ typedef Dumux::Brine<Scalar> Brine;
const bool enableComplexRelations=false;
typedef Dumux::FluidSystems::BrineAir<Scalar, H2O, enableComplexRelations> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::Brine<Scalar> Brine;
const bool enableComplexRelations=true;
typedef Dumux::FluidSystems::BrineAir<Scalar, H2O, enableComplexRelations> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// Brine -- CO2
@@ -180,73 +186,73 @@ int main()
{ typedef Dumux::SimpleH2O<Scalar> H2O;
const bool enableComplexRelations=false;
typedef Dumux::FluidSystems::H2OAir<Scalar, H2O, enableComplexRelations> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::SimpleH2O<Scalar> H2O;
const bool enableComplexRelations=true;
typedef Dumux::FluidSystems::H2OAir<Scalar, H2O, enableComplexRelations> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::H2O<Scalar> H2O;
const bool enableComplexRelations=false;
typedef Dumux::FluidSystems::H2OAir<Scalar, H2O, enableComplexRelations> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::H2O<Scalar> H2O;
const bool enableComplexRelations=true;
typedef Dumux::FluidSystems::H2OAir<Scalar, H2O, enableComplexRelations> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// gas phase
{ typedef Dumux::GasPhase<Scalar, H2O> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::GasPhase<Scalar, H2O> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// H2O -- Air -- Mesitylene
{ typedef Dumux::FluidSystems::H2OAirMesitylene<Scalar> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// H2O -- Air -- Xylene
{ typedef Dumux::FluidSystems::H2OAirXylene<Scalar> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// H2O -- N2
{ typedef Dumux::FluidSystems::H2ON2<Scalar, /*enableComplexRelations=*/false> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::H2ON2<Scalar, /*enableComplexRelations=*/true> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// H2O -- N2 -- kinetic
{ typedef Dumux::FluidSystems::H2ON2Kinetic<Scalar, /*enableComplexRelations=*/false> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::H2ON2Kinetic<Scalar, /*enableComplexRelations=*/true> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// H2O -- N2 -- liquid phase
{ typedef Dumux::FluidSystems::H2ON2LiquidPhase<Scalar, /*enableComplexRelations=*/false> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::H2ON2LiquidPhase<Scalar, /*enableComplexRelations=*/true> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// H2O -- N2 -- o2
{ typedef Dumux::FluidSystems::H2ON2O2<Scalar, /*enableComplexRelations=*/false> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::H2ON2O2<Scalar, /*enableComplexRelations=*/true> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// liquid phase
{ typedef Dumux::LiquidPhase<Scalar, H2O> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::LiquidPhase<Scalar, H2O> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// pure water simple
{ typedef Dumux::FluidSystems::PureWaterSimpleFluidSystem<Scalar, /*enableComplexRelations=*/false> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
{ typedef Dumux::FluidSystems::PureWaterSimpleFluidSystem<Scalar, /*enableComplexRelations=*/true> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
// spe5
{ typedef Dumux::FluidSystems::Spe5<Scalar> FluidSystem;
- Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
+ success += Dumux::checkFluidSystem<Scalar, FluidSystem>(); }
- return 0;
+ return success;
}
--
GitLab