[folder structure] move and rename files from implicit/common, adapt includes

dumux/freeflow/stokes/stokeslocaljacobian.hh

@@ -25,7 +25,7 @@
 
 #include <dune/istl/matrix.hh>
 #include "stokesproperties.hh"
-#include <dumux/implicit/common/implicitlocaljacobian.hh>
+#include <dumux/implicit/localjacobian.hh>
 
 namespace Dumux
 {

dumux/freeflow/stokes/stokeslocalresidual.hh

@@ -29,7 +29,7 @@
 #include <dune/common/float_cmp.hh>
 #include <dune/grid/common/grid.hh>
 
-#include <dumux/implicit/common/implicitmodel.hh>
+#include <dumux/implicit/model.hh>
 #include "stokesproperties.hh"
 #include "stokesvolumevariables.hh"
 #include "stokesfluxvariables.hh"

dumux/freeflow/stokes/stokesmodel.hh

@@ -24,7 +24,7 @@
  * \brief Base class for all models which use the Stokes box model.
  */
 
-#include <dumux/implicit/common/implicitmodel.hh>
+#include <dumux/implicit/model.hh>
 
 #include "stokeslocalresidual.hh"
 #include "stokesnewtoncontroller.hh"

dumux/freeflow/stokes/stokesproblem.hh

@@ -23,7 +23,7 @@
 #ifndef DUMUX_STOKES_PROBLEM_HH
 #define DUMUX_STOKES_PROBLEM_HH
 
-#include <dumux/implicit/common/implicitproblem.hh>
+#include <dumux/implicit/problem.hh>
 
 #include "stokesproperties.hh"
 

dumux/freeflow/stokes/stokesvolumevariables.hh

@@ -27,7 +27,7 @@
 
 #include "stokesproperties.hh"
 
-#include <dumux/implicit/common/implicitvolumevariables.hh>
+#include <dumux/implicit/volumevariables.hh>
 #include <dumux/material/fluidstates/immisciblefluidstate.hh>
 
 namespace Dumux

dumux/geomechanics/el1p2c/el1p2clocaljacobian.hh

@@ -24,7 +24,7 @@
 #ifndef DUMUX_EL1P2C_LOCAL_JACOBIAN_HH
 #define DUMUX_EL1P2C_LOCAL_JACOBIAN_HH
 
-#include <dumux/implicit/common/implicitlocaljacobian.hh>
+#include <dumux/implicit/localjacobian.hh>
 
 namespace Dumux
 {

dumux/geomechanics/el1p2c/el1p2cvolumevariables.hh

@@ -27,7 +27,7 @@
 
 
 #include <dumux/implicit/1p2c/1p2cvolumevariables.hh>
-#include <dumux/implicit/common/implicitvolumevariables.hh>
+#include <dumux/implicit/volumevariables.hh>
 
 #include "el1p2cproperties.hh"
 

dumux/geomechanics/el2p/el2pbasemodel.hh

@@ -26,7 +26,7 @@
 #include <dune/geometry/type.hh>
 #include <dune/istl/bvector.hh>
 
-#include <dumux/implicit/common/implicitmodel.hh>
+#include <dumux/implicit/model.hh>
 #include <dumux/common/valgrind.hh>
 #include <dumux/parallel/vertexhandles.hh>
 

dumux/geomechanics/el2p/el2pfluxvariables.hh

@@ -32,7 +32,7 @@
 #define DUMUX_EL2P_FLUX_VARIABLES_HH
 
 #include <dune/pdelab/gridfunctionspace/localfunctionspace.hh>
-#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
+#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
 #include "el2pproperties.hh"
 
 namespace Dumux

dumux/geomechanics/el2p/el2plocaljacobian.hh

@@ -25,7 +25,7 @@
 #define DUMUX_EL2P_LOCAL_JACOBIAN_HH
 
 #include <dune/pdelab/gridfunctionspace/localfunctionspace.hh>
-#include <dumux/implicit/common/implicitlocaljacobian.hh>
+#include <dumux/implicit/localjacobian.hh>
 #include "el2pproperties.hh"
 
 namespace Dumux

dumux/geomechanics/elastic/elasticvolumevariables.hh

@@ -24,7 +24,7 @@
 #ifndef DUMUX_ELASTIC_VOLUME_VARIABLES_HH
 #define DUMUX_ELASTIC_VOLUME_VARIABLES_HH
 
-#include <dumux/implicit/common/implicitvolumevariables.hh>
+#include <dumux/implicit/volumevariables.hh>
 
 #include "elasticproperties.hh"
 

dumux/implicit/1p/1pmodel.hh

@@ -27,7 +27,7 @@
 #ifndef DUMUX_1P_MODEL_HH
 #define DUMUX_1P_MODEL_HH
 
-#include <dumux/implicit/common/implicitvelocityoutput.hh>
+#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
 #include "1pproperties.hh"
 
 namespace Dumux

dumux/implicit/1p/1ppropertydefaults.hh

@@ -40,7 +40,7 @@
 #include <dumux/material/components/nullcomponent.hh>
 #include <dumux/material/fluidsystems/1pfluidsystem.hh>
 #include <dumux/material/spatialparams/implicitspatialparams1p.hh>
-#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
+#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
 #include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
 
 namespace Dumux

dumux/implicit/1p/1pvolumevariables.hh

@@ -25,7 +25,7 @@
 #define DUMUX_1P_VOLUME_VARIABLES_HH
 
 #include "1pproperties.hh"
-#include <dumux/implicit/common/implicitvolumevariables.hh>
+#include <dumux/implicit/volumevariables.hh>
 
 #include <dumux/material/fluidstates/immisciblefluidstate.hh>
 

dumux/implicit/1p2c/1p2cmodel.hh

@@ -27,7 +27,7 @@
 #ifndef DUMUX_ONEP_TWOC_MODEL_HH
 #define DUMUX_ONEP_TWOC_MODEL_HH
 
-#include <dumux/implicit/common/implicitvelocityoutput.hh>
+#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
 #include "1p2cproperties.hh"
 
 namespace Dumux

dumux/implicit/1p2c/1p2cvolumevariables.hh

@@ -24,7 +24,7 @@
 #ifndef DUMUX_1P2C_VOLUME_VARIABLES_HH
 #define DUMUX_1P2C_VOLUME_VARIABLES_HH
 
-#include <dumux/implicit/common/implicitvolumevariables.hh>
+#include <dumux/implicit/volumevariables.hh>
 
 #include "1p2cproperties.hh"
 

dumux/implicit/2p/2pmodel.hh

@@ -26,7 +26,7 @@
 #ifndef DUMUX_TWOP_MODEL_HH
 #define DUMUX_TWOP_MODEL_HH
 
-#include <dumux/implicit/common/implicitvelocityoutput.hh>
+#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
 #include "2pproperties.hh"
 
 namespace Dumux

dumux/implicit/2p/2ppropertydefaults.hh

@@ -41,7 +41,7 @@
 #include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
 #include <dumux/material/fluidstates/immisciblefluidstate.hh>
 #include <dumux/material/spatialparams/implicitspatialparams.hh>
-#include <dumux/implicit/common/implicitdarcyfluxvariables.hh>
+#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
 
 namespace Dumux

dumux/implicit/2p/2pvolumevariables.hh

@@ -27,7 +27,7 @@
 
 #include "2pproperties.hh"
 
-#include <dumux/implicit/common/implicitvolumevariables.hh>
+#include <dumux/implicit/volumevariables.hh>
 
 #include <dune/common/fvector.hh>
 

dumux/implicit/2p2c/2p2cmodel.hh

@@ -27,7 +27,7 @@
 
 #include "2p2cproperties.hh"
 #include "2p2cindices.hh"
-#include <dumux/implicit/common/implicitvelocityoutput.hh>
+#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
 
 namespace Dumux
 {