Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
907e195c
Commit
907e195c
authored
Sep 12, 2008
by
mattijs
Browse files
Merge branch 'master' of /home/hunt2/OpenFOAM/OpenFOAM-dev
parents
9c58b626
fc4de936
Changes
15
Hide whitespace changes
Inline
Side-by-side
applications/solvers/incompressible/channelOodles/createGradP.H
View file @
907e195c
...
...
@@ -8,7 +8,7 @@
IFstream
gradPFile
(
runTime
.
path
()
/
runTime
.
timeName
()
/
"gradP.raw"
runTime
.
path
()
/
runTime
.
timeName
()
/
"
uniform"
/
"
gradP.raw"
);
if
(
gradPFile
.
good
())
...
...
applications/solvers/incompressible/channelOodles/writeGradP.H
View file @
907e195c
...
...
@@ -2,7 +2,7 @@
{
OFstream
gradPFile
(
runTime
.
path
()
/
runTime
.
timeName
()
/
"gradP.raw"
runTime
.
path
()
/
runTime
.
timeName
()
/
"
uniform"
/
"
gradP.raw"
);
if
(
gradPFile
.
good
())
...
...
@@ -13,7 +13,7 @@
{
FatalErrorIn
(
args
.
executable
())
<<
"Cannot open file "
<<
runTime
.
path
()
/
runTime
.
timeName
()
/
"gradP.raw"
<<
runTime
.
path
()
/
runTime
.
timeName
()
/
"
uniform"
/
"
gradP.raw"
<<
exit
(
FatalError
);
};
};
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
View file @
907e195c
...
...
@@ -405,9 +405,9 @@ void writePatchField
{
const
Time
&
runTime
=
eMesh
.
mesh
().
time
();
const
List
<
faceSets
>&
boundaryFaceSets
=
eMesh
.
boundaryFaceSets
;
const
HashTable
<
labelList
>&
allPatchNames
=
eMesh
.
allPatchNames
;
const
HashTable
<
label
>&
patchIndices
=
eMesh
.
patchIndices
;
const
List
<
faceSets
>&
boundaryFaceSets
=
eMesh
.
boundaryFaceSets
()
;
const
HashTable
<
labelList
>&
allPatchNames
=
eMesh
.
allPatchNames
()
;
const
HashTable
<
label
>&
patchIndices
=
eMesh
.
patchIndices
()
;
const
HashTable
<
ensightMesh
::
nFacePrimitives
>&
nPatchPrims
=
eMesh
.
nPatchPrims
();
...
...
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.H
View file @
907e195c
...
...
@@ -88,9 +88,6 @@ class ensightMesh
List
<
faceSets
>
boundaryFaceSets_
;
HashTable
<
labelList
>
allPatchNames_
;
HashTable
<
label
>
patchIndices_
;
...
...
@@ -246,9 +243,8 @@ public:
ensightMesh
(
const
fvMesh
&
,
const
argList
&
args
,
const
bool
binary
);
// Destructor
~
ensightMesh
();
//- Destructor
~
ensightMesh
();
// Member Functions
...
...
src/finiteVolume/Make/files
View file @
907e195c
...
...
@@ -186,6 +186,7 @@ $(limitedSchemes)/MC/MC.C
$(limitedSchemes)/Phi/Phi.C
$(limitedSchemes)/filteredLinear/filteredLinear.C
$(limitedSchemes)/filteredLinear2/filteredLinear2.C
$(limitedSchemes)/filteredLinear3/filteredLinear3.C
multivariateSchemes = $(surfaceInterpolation)/multivariateSchemes
$(multivariateSchemes)/multivariateSurfaceInterpolationScheme/multivariateSurfaceInterpolationSchemes.C
...
...
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.C
0 → 100644
View file @
907e195c
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd.
\\/ 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 2 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, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
\*---------------------------------------------------------------------------*/
#include "LimitedScheme.H"
#include "filteredLinear3.H"
#include "filteredLinear3V.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
makeLimitedSurfaceInterpolationScheme
(
filteredLinear3
,
filteredLinear3Limiter
)
makeLimitedVSurfaceInterpolationScheme
(
filteredLinear3V
,
filteredLinear3VLimiter
)
}
// ************************************************************************* //
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3.H
0 → 100644
View file @
907e195c
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd.
\\/ 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 2 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, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::filteredLinear3Limiter
Description
Class to generate weighting factors for the filtered-linear-3
differencing scheme.
The aim is to remove high-frequency modes with "staggering"
characteristics by comparing the face gradient with both neighbouring
cell gradients and introduce small amounts of upwind in order to damp
these modes.
Used in conjunction with the template class LimitedScheme.
SourceFiles
filteredLinear3.C
\*---------------------------------------------------------------------------*/
#ifndef filteredLinear3_H
#define filteredLinear3_H
#include "vector.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
/*---------------------------------------------------------------------------*\
Class filteredLinear3Limiter Declaration
\*---------------------------------------------------------------------------*/
template
<
class
LimiterFunc
>
class
filteredLinear3Limiter
:
public
LimiterFunc
{
// Private data
// Scaling corefficient for the gradient ratio,
// 0 = linear
// 1 = fully limited
scalar
k_
;
public:
filteredLinear3Limiter
(
Istream
&
is
)
:
k_
(
readScalar
(
is
))
{
if
(
k_
<
0
||
k_
>
1
)
{
FatalIOErrorIn
(
"filteredLinear3Limiter(Istream& is)"
,
is
)
<<
"coefficient = "
<<
k_
<<
" should be >= 0 and <= 1"
<<
exit
(
FatalIOError
);
}
}
scalar
limiter
(
const
scalar
cdWeight
,
const
scalar
faceFlux
,
const
typename
LimiterFunc
::
phiType
&
phiP
,
const
typename
LimiterFunc
::
phiType
&
phiN
,
const
typename
LimiterFunc
::
gradPhiType
&
gradcP
,
const
typename
LimiterFunc
::
gradPhiType
&
gradcN
,
const
vector
&
d
)
const
{
// Difference across face
scalar
df
=
phiN
-
phiP
;
// Twice the differences across face-neighbour cells
scalar
dP
=
2
*
(
d
&
gradcP
);
scalar
dN
=
2
*
(
d
&
gradcN
);
// Calculate the limiter
scalar
limiter
=
1
-
k_
*
(
dN
-
df
)
*
(
dP
-
df
)
/
max
(
sqr
(
dN
+
dP
),
SMALL
);
// Limit the limiter between linear and upwind
return
max
(
min
(
limiter
,
1
),
0
);
}
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
}
// End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //
src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/filteredLinear3/filteredLinear3V.H
0 → 100644
View file @
907e195c
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd.
\\/ 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 2 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, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class
Foam::filteredLinear3VLimiter
Description
Class to generate weighting factors for the filteredLinear3V differencing
scheme. The aim is to remove high-frequency modes with "staggering"
characteristics from vector fields by comparing the face gradient in the
direction of maximum gradient with both neighbouring cell gradients and
introduce small amounts of upwind in order to damp these modes.
Used in conjunction with the template class LimitedScheme.
SourceFiles
filteredLinear3V.C
\*---------------------------------------------------------------------------*/
#ifndef filteredLinear3V_H
#define filteredLinear3V_H
#include "vector.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
/*---------------------------------------------------------------------------*\
Class filteredLinear3VLimiter Declaration
\*---------------------------------------------------------------------------*/
template
<
class
LimiterFunc
>
class
filteredLinear3VLimiter
:
public
LimiterFunc
{
// Private data
// Scaling corefficient for the gradient ratio,
// 0 = linear
// 1 = fully limited
scalar
k_
;
public:
filteredLinear3VLimiter
(
Istream
&
is
)
:
k_
(
readScalar
(
is
))
{
if
(
k_
<
0
||
k_
>
1
)
{
FatalIOErrorIn
(
"filteredLinear3VLimiter(Istream& is)"
,
is
)
<<
"coefficient = "
<<
k_
<<
" should be >= 0 and <= 1"
<<
exit
(
FatalIOError
);
}
}
scalar
limiter
(
const
scalar
cdWeight
,
const
scalar
faceFlux
,
const
typename
LimiterFunc
::
phiType
&
phiP
,
const
typename
LimiterFunc
::
phiType
&
phiN
,
const
typename
LimiterFunc
::
gradPhiType
&
gradcP
,
const
typename
LimiterFunc
::
gradPhiType
&
gradcN
,
const
vector
&
d
)
const
{
// Difference across face
vector
dfV
=
phiN
-
phiP
;
// Scalar difference across the face
// in the direction in which the difference is largest
scalar
df
=
dfV
&
dfV
;
// Twice differences across face-neighbour cells
// in the direction in which the face-difference is largest
scalar
dP
=
2
*
(
dfV
&
(
d
&
gradcP
));
scalar
dN
=
2
*
(
dfV
&
(
d
&
gradcN
));
// Calculate the limiter
scalar
limiter
=
1
-
k_
*
(
dN
-
df
)
*
(
dP
-
df
)
/
max
(
sqr
(
dN
+
dP
),
SMALL
);
// Limit the limiter between linear and upwind
return
max
(
min
(
limiter
,
1
),
0
);
}
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
}
// End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //
tutorials/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict.m4
View file @
907e195c
...
...
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format ascii;
`
format
'
ascii;
class dictionary;
object blockMeshDict;
}
...
...
@@ -420,7 +420,7 @@ vertices
vert(4, 7, Zt) vlabel(R7st)
);
blocks
blocks
(
// block0
hex2D(r0, r1, rb1, rb0)
...
...
@@ -692,7 +692,7 @@ edges
arc R7t R0t evert(4, 7, Zt)
);
patches
patches
(
wall rotor
(
...
...
tutorials/interDyMFoam/sloshingTank2D3DoF/constant/polyMesh/blockMeshDict.m4
View file @
907e195c
...
...
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format ascii;
`
format
'
ascii;
class dictionary;
object blockMeshDict;
}
...
...
tutorials/interDyMFoam/sloshingTank3D/constant/polyMesh/blockMeshDict.m4
View file @
907e195c
...
...
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format ascii;
`
format
'
ascii;
class dictionary;
object blockMeshDict;
}
...
...
tutorials/interDyMFoam/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict.m4
View file @
907e195c
...
...
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format ascii;
`
format
'
ascii;
class dictionary;
object blockMeshDict;
}
...
...
tutorials/interDyMFoam/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict.m4
View file @
907e195c
...
...
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format ascii;
`
format
'
ascii;
class dictionary;
object blockMeshDict;
}
...
...
tutorials/rhoPimpleFoam/angledDuct/constant/polyMesh/blockMeshDict.m4
View file @
907e195c
...
...
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format ascii;
`
format
'
ascii;
class dictionary;
object blockMeshDict;
}
...
...
tutorials/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4
View file @
907e195c
...
...
@@ -8,7 +8,7 @@
FoamFile
{
version 2.0;
format ascii;
`
format
'
ascii;
class dictionary;
object blockMeshDict;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment