From 2dc43880a7f4c4900397ddaf1c820e0633041a68 Mon Sep 17 00:00:00 2001
From: Edward 'Ned' Coltman <nedc@wilde02.iws.uni-stuttgart.de>
Date: Thu, 5 Apr 2018 15:52:24 +0200
Subject: [PATCH] move and rename purewatersimple.hh to the test folder. The
new name is "combustionfluidsystem.hh" Update files related to
test_mpncthermalnonequil_box
---
dumux/material/fluidsystems/CMakeLists.txt | 1 -
test/material/fluidsystems/checkfluidsystem.hh | 1 -
test/material/fluidsystems/test_fluidsystems.cc | 7 -------
test/porousmediumflow/mpnc/implicit/CMakeLists.txt | 1 +
.../mpnc/implicit/combustionfluidsystem.hh | 0
test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh | 3 ++-
6 files changed, 3 insertions(+), 10 deletions(-)
rename dumux/material/fluidsystems/purewatersimple.hh => test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh (100%)
diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 258e51b4e6..ec102c893c 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -16,7 +16,6 @@ install(FILES
liquidphase2c.hh
nullparametercache.hh
parametercachebase.hh
- purewatersimple.hh
spe5.hh
spe5parametercache.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/fluidsystems)
diff --git a/test/material/fluidsystems/checkfluidsystem.hh b/test/material/fluidsystems/checkfluidsystem.hh
index 4801dd149d..96f214112c 100644
--- a/test/material/fluidsystems/checkfluidsystem.hh
+++ b/test/material/fluidsystems/checkfluidsystem.hh
@@ -43,7 +43,6 @@
#include <dumux/material/fluidsystems/h2on2kinetic.hh>
#include <dumux/material/fluidsystems/h2on2o2.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/fluidsystems/purewatersimple.hh>
#include <dumux/material/fluidsystems/spe5.hh>
// include all fluid states
diff --git a/test/material/fluidsystems/test_fluidsystems.cc b/test/material/fluidsystems/test_fluidsystems.cc
index f4944e895b..26a1ac90ef 100644
--- a/test/material/fluidsystems/test_fluidsystems.cc
+++ b/test/material/fluidsystems/test_fluidsystems.cc
@@ -39,7 +39,6 @@
#include <dumux/material/fluidsystems/h2on2kinetic.hh>
#include <dumux/material/fluidsystems/h2on2o2.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/fluidsystems/purewatersimple.hh>
#include <dumux/material/fluidsystems/spe5.hh>
// include all fluid states
@@ -203,12 +202,6 @@ int main()
{ using FluidSystem = FluidSystems::LiquidPhase<Scalar, H2O>;
success += checkFluidSystem<Scalar, FluidSystem>(); }
- // pure water simple
- { using FluidSystem = FluidSystems::PureWaterSimpleFluidSystem<Scalar, /*enableComplexRelations=*/false>;
- success += checkFluidSystem<Scalar, FluidSystem>(); }
- { using FluidSystem = FluidSystems::PureWaterSimpleFluidSystem<Scalar, /*enableComplexRelations=*/true>;
- success += checkFluidSystem<Scalar, FluidSystem>(); }
-
// spe5
{ using FluidSystem = FluidSystems::Spe5<Scalar>;
success += checkFluidSystem<Scalar, FluidSystem>(); }
diff --git a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
index 0c400f8bdf..020599efeb 100644
--- a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
@@ -44,6 +44,7 @@ dune_add_test(COMPILE_ONLY # since it currently fails miserably with very differ
#install sources
install(FILES
combustionproblem1c.hh
+combustionfluidsystem.hh
combustionspatialparams.hh
evaporationatmosphereproblem.hh
evaporationatmospherespatialparams.hh
diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
similarity index 100%
rename from dumux/material/fluidsystems/purewatersimple.hh
rename to test/porousmediumflow/mpnc/implicit/combustionfluidsystem.hh
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index ba88ad0b9f..0e6e4c7dd4 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -32,11 +32,12 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/mpnc/model.hh>
-#include <dumux/material/fluidsystems/purewatersimple.hh>
+
#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
#include "combustionspatialparams.hh"
+#include "combustionfluidsystem.hh"
namespace Dumux
{
--
GitLab