zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG velocityDamping: correct for new framework

Browse Source 
Fixes #27.
This commit is contained in:
mattijs
2015-12-14 15:00:31 +00:00
parent 2c6558ec20
commit 3f567c2c99
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -93,7 +93,7 @@ Foam::fv::velocityDampingConstraint::velocityDampingConstraint
const fvMesh& mesh const fvMesh& mesh
) )
: :
option(name, modelType, dict, mesh) cellSetOption(name, modelType, dict, mesh)
{ {
read(dict); read(dict);
} }
@ -101,13 +101,7 @@ Foam::fv::velocityDampingConstraint::velocityDampingConstraint
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::fv::velocityDampingConstraint::alwaysApply() const void Foam::fv::velocityDampingConstraint::constrain
{
return true;
}
void Foam::fv::velocityDampingConstraint::setValue
( (
fvMatrix<vector>& eqn, fvMatrix<vector>& eqn,
const label fieldI const label fieldI
@ -126,7 +120,7 @@ void Foam::fv::velocityDampingConstraint::writeData(Ostream& os) const
bool Foam::fv::velocityDampingConstraint::read(const dictionary& dict) bool Foam::fv::velocityDampingConstraint::read(const dictionary& dict)
{ {
if (option::read(dict)) if (cellSetOption::read(dict))
{ {
UMax_ = readScalar(coeffs_.lookup("UMax")); UMax_ = readScalar(coeffs_.lookup("UMax"));

15
src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -55,7 +55,7 @@ SourceFiles
#ifndef velocityDampingConstraint_H #ifndef velocityDampingConstraint_H
#define velocityDampingConstraint_H #define velocityDampingConstraint_H
#include "fvOption.H" #include "cellSetOption.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -70,7 +70,7 @@ namespace fv
class velocityDampingConstraint class velocityDampingConstraint
: :
public option public cellSetOption
{ {
protected: protected:
@ -122,17 +122,10 @@ public:
// Member Functions // Member Functions
virtual bool alwaysApply() const;
// Set values directly // Set values directly
//- Constrain vector matrix //- Constrain vector matrix
virtual void setValue virtual void constrain(fvMatrix<vector>& eqn, const label fieldI);
(
fvMatrix<vector>& eqn,
const label fieldI
);
// I-O // I-O