[2p1c] Rename "2p-liquid-water" to "2p1c"

72f91921 · Kilian Weishaupt · 6c2829fe · 72f91921 · 72f91921 · 72f91921
Commit 72f91921 authored 8 years ago by Kilian Weishaupt
--- a/dumux/porousmediumflow/2pliquidvapor/CMakeLists.txt
+++ b/dumux/porousmediumflow/2pliquidvapor/CMakeLists.txt
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt
+++ b/dumux/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt
@@ -8,4 +8,4 @@ newtoncontroller.hh
 properties.hh
 propertydefaults.hh
 volumevariables.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2pliquidvapour/implicit)
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p1c/implicit)
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/indices.hh
+++ b/dumux/porousmediumflow/2pliquidvapor/implicit/indices.hh
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/2pliquidvapor/implicit/localresidual.hh
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/model.hh
+++ b/dumux/porousmediumflow/2pliquidvapor/implicit/model.hh
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/newtoncontroller.hh
+++ b/dumux/porousmediumflow/2pliquidvapor/implicit/newtoncontroller.hh
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/properties.hh
+++ b/dumux/porousmediumflow/2pliquidvapor/implicit/properties.hh
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2pliquidvapor/implicit/propertydefaults.hh
--- a/dumux/porousmediumflow/2pliquidvapor/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pliquidvapor/implicit/volumevariables.hh
--- a/dumux/porousmediumflow/CMakeLists.txt
+++ b/dumux/porousmediumflow/CMakeLists.txt
 add_subdirectory("1p")
 add_subdirectory("1p2c")
 add_subdirectory("2p")
+add_subdirectory("2p1c")
 add_subdirectory("2p2c")
 add_subdirectory("2pdfm")
 add_subdirectory("2pminc")

--- a/test/porousmediumflow/2pliquidvapor/CMakeLists.txt
+++ b/test/porousmediumflow/2pliquidvapor/CMakeLists.txt
--- a/test/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2pliquidvapor/implicit/CMakeLists.txt
--- a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh
+++ b/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionproblem.hh
@@ -25,7 +25,7 @@
 #ifndef DUMUX_STEAM_INJECTIONPROBLEM_HH
 #define DUMUX_STEAM_INJECTIONPROBLEM_HH

-#include <dumux/porousmediumflow/2pliquidvapor/implicit/model.hh>
+#include <dumux/porousmediumflow/2p1c/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>

 #include "steaminjectionspatialparams.hh"

--- a/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionspatialparams.hh
+++ b/test/porousmediumflow/2pliquidvapor/implicit/steaminjectionspatialparams.hh
--- a/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.cc
+++ b/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.cc
--- a/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.input
+++ b/test/porousmediumflow/2pliquidvapor/implicit/test_boxsteaminjection.input
--- a/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.cc
+++ b/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.cc
--- a/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.input
+++ b/test/porousmediumflow/2pliquidvapor/implicit/test_ccsteaminjection.input
--- a/test/porousmediumflow/CMakeLists.txt
+++ b/test/porousmediumflow/CMakeLists.txt
 add_subdirectory("1p")
 add_subdirectory("1p2c")
 add_subdirectory("2p")
+add_subdirectory("2p1c")
 add_subdirectory("2p2c")
-add_subdirectory("2pliquidvapor")
 add_subdirectory("2pminc")
 add_subdirectory("2pnc")
 add_subdirectory("2pncmin")