STYLE: move deposition into separate directory from entrainment

applications/solvers/implicitSolver/Make/files

 faSavageHutterFoam.C
 
-
 EXE = $(FOAM_USER_APPBIN)/faSavageHutterFoam
-

applications/utilities/slopeMesh/Make/files

 slopeMesh.C
 elevationModels/elevationModel/elevationModel.C
-elevationModels/elevationModel/newElevationModel.C
+elevationModels/elevationModel/elevationModelNew.C
 elevationModels/simpleSlope/SimpleSlope.C
 
 EXE = $(FOAM_USER_APPBIN)/slopeMesh

applications/utilities/slopeMesh/elevationModels/elevationModel/elevationModel.H

@@ -21,7 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-
 Namespace
     Foam::elevationModels
 
@@ -67,12 +66,12 @@ namespace Foam
 
 class elevationModel
 {
-
 protected:
 
     // Protected data
 
         word name_;
+
         dictionary elevationProperties_;
 
 
@@ -135,7 +134,7 @@ public:
     // Member Functions
 
         //- Return the global point X for the local point x
-        virtual vector X(const vector &x) const = 0;
+        virtual vector X(const vector& x) const = 0;
 
         //- Return the elevation properties dictionary
         const dictionary& elevationProperties() const

src/avalanche/Make/files

-entrainment = entrainmentModels
+deposition = deposition
+$(deposition)/depositionModel/depositionModel.C
+$(deposition)/depositionModel/depositionModelNew.C
+$(deposition)/depositionOff/depositionOff.C
+$(deposition)/Stopingprofile/Stopingprofile.C
+
+entrainment = entrainment
 $(entrainment)/entrainmentModel/entrainmentModel.C
-$(entrainment)/entrainmentModel/newEntrainmentModel.C
-$(entrainment)/depositionModel/depositionModel.C
-$(entrainment)/depositionModel/newDepositionModel.C
+$(entrainment)/entrainmentModel/entrainmentModelNew.C
 $(entrainment)/entrainmentOff/entrainmentOff.C
 $(entrainment)/Erosionenergy/Erosionenergy.C
 $(entrainment)/Front/Front.C
 $(entrainment)/IsslerFC/IsslerFC.C
 $(entrainment)/Medina/Medina.C
-$(entrainment)/depositionOff/depositionOff.C
-$(entrainment)/Stopingprofile/Stopingprofile.C
 
-friction = frictionModels
+friction = friction
 $(friction)/frictionModel/frictionModel.C
-$(friction)/frictionModel/newFrictionModel.C
+$(friction)/frictionModel/frictionModelNew.C
 $(friction)/PoliquenForterre/PoliquenForterre.C
 $(friction)/muI/muI.C
 $(friction)/Voellmy/Voellmy.C

src/avalanche/entrainmentModels/Stopingprofile/Stopingprofile.H → src/avalanche/deposition/Stopingprofile/Stopingprofile.H

@@ -50,7 +50,6 @@ Author
 #include "faMatrices.H"
 
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam

src/avalanche/entrainmentModels/depositionModel/depositionModel.H → src/avalanche/deposition/depositionModel/depositionModel.H

@@ -35,7 +35,7 @@ Description
 
 SourceFiles
     depositionModel.C
-    newdepositionModel.C
+    depositionModelNew.C
 
 Author
     Matthias Rauter matthias.rauter@uibk.ac.at
@@ -61,7 +61,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class depositionModel Declaration
+                       Class depositionModel Declaration
 \*---------------------------------------------------------------------------*/
 
 class depositionModel
@@ -78,19 +78,19 @@ protected:
         dimensionedScalar rho_;
 
         //- Reference to the surface velocity field
-        const areaVectorField &Us_;
+        const areaVectorField& Us_;
 
         //- Reference to the flow height field
-        const areaScalarField &h_;
+        const areaScalarField& h_;
 
         //- Reference to the cover height field
-        const areaScalarField &hentrain_;
+        const areaScalarField& hentrain_;
 
         //- Reference to the basal pressure field
-        const areaScalarField &pb_;
+        const areaScalarField& pb_;
 
         //- Reference to the bottom stress field
-        const areaVectorField &tau_;
+        const areaVectorField& tau_;
 
         //- Sink term
         mutable areaScalarField Sd_;
@@ -170,7 +170,7 @@ public:
     // Member Functions
 
         //- Return Sink by deposition
-        virtual const areaScalarField &Sd() const = 0;
+        virtual const areaScalarField& Sd() const = 0;
 
         //- Return the deposition properties dictionary
         const dictionary& depositionProperties() const

src/avalanche/entrainmentModels/entrainmentModel/entrainmentModel.H → src/avalanche/entrainment/entrainmentModel/entrainmentModel.H

@@ -35,7 +35,7 @@ Description
 
 SourceFiles
     entrainmentModel.C
-    newEntrainmentModel.C
+    entrainmentModelNew.C
 
 Author
     Matthias Rauter matthias.rauter@uibk.ac.at

src/avalanche/frictionModels/frictionModel/frictionModel.H → src/avalanche/friction/frictionModel/frictionModel.H

@@ -35,7 +35,7 @@ Description
 
 SourceFiles
     frictionModel.C
-    newFrictionModel.C
+    frictionModelNew.C
 
 Author
     Matthias Rauter matthias.rauter@uibk.ac.at
@@ -66,7 +66,6 @@ namespace Foam
 
 class frictionModel
 {
-
 protected:
 
     // Protected data