applications/solvers/modules: Reorganised to match the structure of tutorials/modules

Given that the number of solid solver modules is currently 1 and unlikely to
exceed 3 it is not very useful to maintain solid and fluid sub-directories and
easier to see the correspondence between the solver modules and tutorial cases
without.

applications/solvers/modules/Allwmake

@@ -11,5 +11,6 @@ wmake $targetType fluid
 wmake $targetType multicomponentFluid
 compressibleVoF/Allwmake $targetType $*
 multiphaseEuler/Allwmake $targetType $*
+wmake $targetType solid
 
 #------------------------------------------------------------------------------

applications/solvers/modules/compressibleVoF/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \
+    -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \
     -IcompressibleInterPhaseTransportModel/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \

applications/solvers/modules/fluid/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
-    -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \
+    -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \
-    -I$(FOAM_SOLVERS)/modules/fluid/isothermalFluid/lnInclude \
+    -I$(FOAM_SOLVERS)/modules/isothermalFluid/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \

applications/solvers/modules/incompressibleFluid/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \
+    -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \

applications/solvers/modules/isothermalFluid/Make/options

@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \
+    -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \

applications/solvers/modules/multicomponentFluid/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
-    -I$(FOAM_SOLVERS)/modules/fluid/fluidSolver/lnInclude \
+    -I$(FOAM_SOLVERS)/modules/fluidSolver/lnInclude \
-    -I$(FOAM_SOLVERS)/modules/fluid/isothermalFluid/lnInclude \
+    -I$(FOAM_SOLVERS)/modules/isothermalFluid/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
     -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \

applications/solvers/modules/multiphaseEuler/functionObjects/phaseMap/phaseMap.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License