From cb429d340a427d95cf8be5347ccd8c6036f6ed7f Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 15 Dec 2017 15:15:58 +0100
Subject: [PATCH] [nonisothermal] Remove implicit folder level

---
 dumux/porousmediumflow/1p/implicit/model.hh               | 2 +-
 dumux/porousmediumflow/1pnc/implicit/model.hh             | 2 +-
 .../porousmediumflow/1pncmin/implicit/propertydefaults.hh | 2 +-
 dumux/porousmediumflow/2p/model.hh                        | 2 +-
 dumux/porousmediumflow/2p1c/model.hh                      | 2 +-
 dumux/porousmediumflow/2p2c/implicit/model.hh             | 2 +-
 dumux/porousmediumflow/2pnc/model.hh                      | 2 +-
 dumux/porousmediumflow/3p/model.hh                        | 2 +-
 dumux/porousmediumflow/3p3c/model.hh                      | 2 +-
 dumux/porousmediumflow/3pwateroil/properties.hh           | 2 +-
 dumux/porousmediumflow/3pwateroil/propertydefaults.hh     | 2 +-
 dumux/porousmediumflow/nonisothermal/CMakeLists.txt       | 8 +++++++-
 .../nonisothermal/implicit/CMakeLists.txt                 | 7 -------
 .../nonisothermal/{implicit => }/indices.hh               | 0
 .../nonisothermal/{implicit => }/localresidual.hh         | 0
 .../nonisothermal/{implicit => }/model.hh                 | 0
 .../nonisothermal/{implicit => }/vtkoutputfields.hh       | 0
 dumux/porousmediumflow/properties.hh                      | 2 +-
 dumux/porousmediumflow/richards/implicit/model.hh         | 2 +-
 dumux/porousmediumflow/richardsnc/implicit/model.hh       | 2 +-
 20 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 dumux/porousmediumflow/nonisothermal/implicit/CMakeLists.txt
 rename dumux/porousmediumflow/nonisothermal/{implicit => }/indices.hh (100%)
 rename dumux/porousmediumflow/nonisothermal/{implicit => }/localresidual.hh (100%)
 rename dumux/porousmediumflow/nonisothermal/{implicit => }/model.hh (100%)
 rename dumux/porousmediumflow/nonisothermal/{implicit => }/vtkoutputfields.hh (100%)

diff --git a/dumux/porousmediumflow/1p/implicit/model.hh b/dumux/porousmediumflow/1p/implicit/model.hh
index 1086336259..36034a04bb 100644
--- a/dumux/porousmediumflow/1p/implicit/model.hh
+++ b/dumux/porousmediumflow/1p/implicit/model.hh
@@ -50,7 +50,7 @@
 
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/1pnc/implicit/model.hh b/dumux/porousmediumflow/1pnc/implicit/model.hh
index 2fe92c3a2a..b270389cfc 100644
--- a/dumux/porousmediumflow/1pnc/implicit/model.hh
+++ b/dumux/porousmediumflow/1pnc/implicit/model.hh
@@ -72,7 +72,7 @@
 
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/compositional/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
 
 #include "indices.hh"
diff --git a/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh b/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
index 09768c13c1..d46e37cdd8 100644
--- a/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/1pncmin/implicit/propertydefaults.hh
@@ -33,7 +33,7 @@
 #include "volumevariables.hh"
 #include "properties.hh"
 
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 #include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
 #include <dumux/material/spatialparams/implicit1p.hh>
 #include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
diff --git a/dumux/porousmediumflow/2p/model.hh b/dumux/porousmediumflow/2p/model.hh
index f33a34df80..23a9bc3719 100644
--- a/dumux/porousmediumflow/2p/model.hh
+++ b/dumux/porousmediumflow/2p/model.hh
@@ -66,7 +66,7 @@
 
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/2p1c/model.hh b/dumux/porousmediumflow/2p1c/model.hh
index 7e0178d9c3..7d2dda7b5f 100644
--- a/dumux/porousmediumflow/2p1c/model.hh
+++ b/dumux/porousmediumflow/2p1c/model.hh
@@ -37,7 +37,7 @@
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
 #include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include <dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh>
 
diff --git a/dumux/porousmediumflow/2p2c/implicit/model.hh b/dumux/porousmediumflow/2p2c/implicit/model.hh
index 6cbac8d576..7ddbb7e605 100644
--- a/dumux/porousmediumflow/2p2c/implicit/model.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/model.hh
@@ -80,7 +80,7 @@
 // property forward declarations
 #include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
diff --git a/dumux/porousmediumflow/2pnc/model.hh b/dumux/porousmediumflow/2pnc/model.hh
index 5bfcde8a4e..348d08964f 100644
--- a/dumux/porousmediumflow/2pnc/model.hh
+++ b/dumux/porousmediumflow/2pnc/model.hh
@@ -95,7 +95,7 @@
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/compositional/localresidual.hh>
 #include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/3p/model.hh b/dumux/porousmediumflow/3p/model.hh
index f8797c3d81..e5f85a106f 100644
--- a/dumux/porousmediumflow/3p/model.hh
+++ b/dumux/porousmediumflow/3p/model.hh
@@ -62,7 +62,7 @@
 
 #include <dumux/porousmediumflow/properties.hh>
 #include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/3p3c/model.hh b/dumux/porousmediumflow/3p3c/model.hh
index 14c5b6f790..1d819b7c13 100644
--- a/dumux/porousmediumflow/3p3c/model.hh
+++ b/dumux/porousmediumflow/3p3c/model.hh
@@ -80,7 +80,7 @@
 
 #include <dumux/common/properties.hh>
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidstates/compositional.hh>
diff --git a/dumux/porousmediumflow/3pwateroil/properties.hh b/dumux/porousmediumflow/3pwateroil/properties.hh
index 192081d440..2f235ed929 100644
--- a/dumux/porousmediumflow/3pwateroil/properties.hh
+++ b/dumux/porousmediumflow/3pwateroil/properties.hh
@@ -31,7 +31,7 @@
 
 #include <dumux/implicit/box/properties.hh>
 #include <dumux/implicit/cellcentered/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 namespace Dumux
 {
diff --git a/dumux/porousmediumflow/3pwateroil/propertydefaults.hh b/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
index fbd7da54bc..035d618115 100644
--- a/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
+++ b/dumux/porousmediumflow/3pwateroil/propertydefaults.hh
@@ -31,7 +31,7 @@
 #include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
 #include <dumux/material/spatialparams/implicit.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 #include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
 
 #include "indices.hh"
diff --git a/dumux/porousmediumflow/nonisothermal/CMakeLists.txt b/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
index ba8341c614..9a0b200fe7 100644
--- a/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
+++ b/dumux/porousmediumflow/nonisothermal/CMakeLists.txt
@@ -1 +1,7 @@
-add_subdirectory("implicit")
+#install headers
+install(FILES
+indices.hh
+localresidual.hh
+model.hh
+vtkoutputfields.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonisothermal/implicit)
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/CMakeLists.txt b/dumux/porousmediumflow/nonisothermal/implicit/CMakeLists.txt
deleted file mode 100644
index 9a0b200fe7..0000000000
--- a/dumux/porousmediumflow/nonisothermal/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#install headers
-install(FILES
-indices.hh
-localresidual.hh
-model.hh
-vtkoutputfields.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/nonisothermal/implicit)
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/indices.hh b/dumux/porousmediumflow/nonisothermal/indices.hh
similarity index 100%
rename from dumux/porousmediumflow/nonisothermal/implicit/indices.hh
rename to dumux/porousmediumflow/nonisothermal/indices.hh
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh b/dumux/porousmediumflow/nonisothermal/localresidual.hh
similarity index 100%
rename from dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh
rename to dumux/porousmediumflow/nonisothermal/localresidual.hh
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/model.hh b/dumux/porousmediumflow/nonisothermal/model.hh
similarity index 100%
rename from dumux/porousmediumflow/nonisothermal/implicit/model.hh
rename to dumux/porousmediumflow/nonisothermal/model.hh
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh
similarity index 100%
rename from dumux/porousmediumflow/nonisothermal/implicit/vtkoutputfields.hh
rename to dumux/porousmediumflow/nonisothermal/vtkoutputfields.hh
diff --git a/dumux/porousmediumflow/properties.hh b/dumux/porousmediumflow/properties.hh
index 005f69413d..b9b9ccae2a 100644
--- a/dumux/porousmediumflow/properties.hh
+++ b/dumux/porousmediumflow/properties.hh
@@ -32,7 +32,7 @@
 
 #include <dumux/porousmediumflow/fluxvariables.hh>
 #include <dumux/porousmediumflow/fluxvariablescache.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh>
+#include <dumux/porousmediumflow/nonisothermal/localresidual.hh>
 #include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
 #include <dumux/porousmediumflow/velocityoutput.hh>
 
diff --git a/dumux/porousmediumflow/richards/implicit/model.hh b/dumux/porousmediumflow/richards/implicit/model.hh
index 2225c4eaff..693b08f70c 100644
--- a/dumux/porousmediumflow/richards/implicit/model.hh
+++ b/dumux/porousmediumflow/richards/implicit/model.hh
@@ -104,7 +104,7 @@
 #include <dumux/material/fluidstates/immiscible.hh>
 
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "indices.hh"
 #include "volumevariables.hh"
diff --git a/dumux/porousmediumflow/richardsnc/implicit/model.hh b/dumux/porousmediumflow/richardsnc/implicit/model.hh
index de67e4db95..a3eeb808f4 100644
--- a/dumux/porousmediumflow/richardsnc/implicit/model.hh
+++ b/dumux/porousmediumflow/richardsnc/implicit/model.hh
@@ -40,7 +40,7 @@
 #include <dumux/material/fluidstates/compositional.hh>
 
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
+#include <dumux/porousmediumflow/nonisothermal/model.hh>
 
 #include "volumevariables.hh"
 #include "indices.hh"
-- 
GitLab