From 4fc9569754c9504e127447c565e2b818aecf14e2 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 11 Oct 2013 12:12:50 +0100
Subject: [PATCH] ENH: Surface film - removed shearForce - deprecated by film
turbulence models
---
src/regionModels/surfaceFilmModels/Make/files | 1 -
.../surfaceShearForce/surfaceShearForce.C | 101 ----------------
.../surfaceShearForce/surfaceShearForce.H | 114 ------------------
3 files changed, 216 deletions(-)
delete mode 100644 src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
delete mode 100644 src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.H
diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/regionModels/surfaceFilmModels/Make/files
index 5d28eb443b3..80ccb5554df 100644
--- a/src/regionModels/surfaceFilmModels/Make/files
+++ b/src/regionModels/surfaceFilmModels/Make/files
@@ -14,7 +14,6 @@ $(KINEMATICMODELS)/force/force/force.C
$(KINEMATICMODELS)/force/force/forceNew.C
$(KINEMATICMODELS)/force/forceList/forceList.C
$(KINEMATICMODELS)/force/contactAngleForce/contactAngleForce.C
-$(KINEMATICMODELS)/force/surfaceShearForce/surfaceShearForce.C
$(KINEMATICMODELS)/force/thermocapillaryForce/thermocapillaryForce.C
$(KINEMATICMODELS)/injectionModel/injectionModel/injectionModel.C
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
deleted file mode 100644
index 8089d1fba84..00000000000
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.C
+++ /dev/null
@@ -1,101 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "surfaceShearForce.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvmSup.H"
-#include "kinematicSingleLayer.H"
-#include "turbulenceModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace regionModels
-{
-namespace surfaceFilmModels
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(surfaceShearForce, 0);
-addToRunTimeSelectionTable(force, surfaceShearForce, dictionary);
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-surfaceShearForce::surfaceShearForce
-(
- const surfaceFilmModel& owner,
- const dictionary& dict
-)
-:
- force(typeName, owner, dict),
- Cf_(readScalar(coeffs_.lookup("Cf")))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-surfaceShearForce::~surfaceShearForce()
-{}
-
-
-// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-
-tmp<fvVectorMatrix> surfaceShearForce::correct(volVectorField& U)
-{
- // local reference to film model
- const kinematicSingleLayer& film =
- static_cast<const kinematicSingleLayer&>(owner_);
-
- // local references to film fields
- const volScalarField& mu = film.mu();
- const volVectorField& Uw = film.Uw();
- const volScalarField& delta = film.delta();
- const volVectorField& Up = film.UPrimary();
-
- // laminar case - employ simple coeff-based model
- const volScalarField& rhop = film.rhoPrimary();
- volScalarField Cs("Cs", Cf_*rhop*mag(Up - U));
-
- dimensionedScalar d0("SMALL", delta.dimensions(), SMALL);
- volScalarField Cw("Cw", mu/(0.3333*(delta + d0)));
- Cw.min(5000.0);
-
- return
- (
- - fvm::Sp(Cs, U) + Cs*Up // surface contribution
- - fvm::Sp(Cw, U) + Cw*Uw // wall contribution
- );
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace surfaceFilmModels
-} // End namespace regionModels
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.H
deleted file mode 100644
index 5c7d4b7767f..00000000000
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/surfaceShearForce/surfaceShearForce.H
+++ /dev/null
@@ -1,114 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Class
- Foam::surfaceShearForce
-
-Description
- Film surface shear force
-
-SourceFiles
- surfaceShearForce.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef surfaceShearForce_H
-#define surfaceShearForce_H
-
-#include "force.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace regionModels
-{
-namespace surfaceFilmModels
-{
-
-/*---------------------------------------------------------------------------*\
- Class surfaceShearForce Declaration
-\*---------------------------------------------------------------------------*/
-
-class surfaceShearForce
-:
- public force
-{
-private:
-
- // Private Data
-
- //- Surface roughness coefficient
- scalar Cf_;
-
-
-
- // Private member functions
-
- //- Disallow default bitwise copy construct
- surfaceShearForce(const surfaceShearForce&);
-
- //- Disallow default bitwise assignment
- void operator=(const surfaceShearForce&);
-
-
-public:
-
- //- Runtime type information
- TypeName("surfaceShear");
-
-
- // Constructors
-
- //- Construct from surface film model
- surfaceShearForce
- (
- const surfaceFilmModel& owner,
- const dictionary& dict
- );
-
-
- //- Destructor
- virtual ~surfaceShearForce();
-
-
- // Member Functions
-
- // Evolution
-
- //- Correct
- virtual tmp<fvVectorMatrix> correct(volVectorField& U);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace surfaceFilmModels
-} // End namespace regionModels
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
--
GitLab