Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
a8ef5610
Commit
a8ef5610
authored
Jul 26, 2018
by
Mark OLESEN
Browse files
STYLE: renamed meshSubsetHelper -> fvMeshSubsetProxy
parent
dbe0db1d
Changes
9
Hide whitespace changes
Inline
Side-by-side
applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
View file @
a8ef5610
...
...
@@ -90,7 +90,7 @@ Note
#include
"ensightOutput.H"
// local files
#include
"
m
eshSubset
Helper
.H"
#include
"
fvM
eshSubset
Proxy
.H"
#include
"ensightOutputCloud.H"
#include
"memInfo.H"
...
...
@@ -256,11 +256,12 @@ int main(int argc, char *argv[])
if
(
args
.
readIfPresent
(
"cellZone"
,
cellZoneName
))
{
Info
<<
"Converting cellZone "
<<
cellZoneName
<<
" only (puts outside faces into patch "
<<
mesh
.
boundaryMesh
()[
0
].
name
()
<<
")"
<<
endl
;
<<
" only. Places new outside faces into
\"
oldInternalFaces
\"
."
<<
nl
;
}
meshSubsetHelper
meshRef
(
mesh
,
meshSubsetHelper
::
ZONE
,
cellZoneName
);
// fvMeshSubset is ignored if cellZoneName is empty
fvMeshSubsetProxy
meshRef
(
mesh
,
fvMeshSubsetProxy
::
ZONE
,
cellZoneName
);
//
// Open new ensight case file, initialize header etc.
...
...
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View file @
a8ef5610
...
...
@@ -108,7 +108,7 @@ Usage
use the time index in the VTK file name instead of the time index
Note
mesh subset is handled by
m
eshSubset
Helper
. Slight inconsistency in
The
mesh subset is handled by
fvM
eshSubset
Proxy
. Slight inconsistency in
interpolation: on the internal field it interpolates the whole volField
to the whole-mesh pointField and then selects only those values it
needs for the subMesh (using the fvMeshSubset cellMap(), pointMap()
...
...
@@ -158,7 +158,7 @@ Note
#include
"passiveParticle.H"
#include
"wordRes.H"
#include
"areaFields.H"
#include
"
m
eshSubset
Helper
.H"
#include
"
fvM
eshSubset
Proxy
.H"
#include
"readFields.H"
#include
"faceSet.H"
#include
"pointSet.H"
...
...
@@ -482,17 +482,17 @@ int main(int argc, char *argv[])
string
vtkName
=
runTime
.
caseName
();
m
eshSubset
Helper
::
subsetType
cellSubsetType
=
m
eshSubset
Helper
::
NONE
;
fvM
eshSubset
Proxy
::
subsetType
cellSubsetType
=
fvM
eshSubset
Proxy
::
NONE
;
word
cellSubsetName
;
if
(
args
.
readIfPresent
(
"cellSet"
,
cellSubsetName
))
{
vtkName
=
cellSubsetName
;
cellSubsetType
=
m
eshSubset
Helper
::
SET
;
cellSubsetType
=
fvM
eshSubset
Proxy
::
SET
;
}
else
if
(
args
.
readIfPresent
(
"cellZone"
,
cellSubsetName
))
{
vtkName
=
cellSubsetName
;
cellSubsetType
=
m
eshSubset
Helper
::
ZONE
;
cellSubsetType
=
fvM
eshSubset
Proxy
::
ZONE
;
}
else
if
(
Pstream
::
parRun
())
{
...
...
@@ -554,7 +554,7 @@ int main(int argc, char *argv[])
instantList
timeDirs
=
timeSelector
::
select0
(
runTime
,
args
);
// Mesh wrapper: does subsetting and decomposition
m
eshSubset
Helper
meshRef
(
mesh
,
cellSubsetType
,
cellSubsetName
);
fvM
eshSubset
Proxy
meshRef
(
mesh
,
cellSubsetType
,
cellSubsetName
);
// Collect decomposition information etc.
vtk
::
vtuCells
vtuMeshCells
(
fmtType
,
decomposePoly
);
...
...
applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
View file @
a8ef5610
...
...
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2016
-2018
OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -36,7 +36,7 @@ namespace Foam
template
<
class
GeoField
>
label
readFields
(
const
m
eshSubset
Helper
&
helper
,
const
fvM
eshSubset
Proxy
&
proxy
,
const
typename
GeoField
::
Mesh
&
mesh
,
const
IOobjectList
&
objects
,
const
wordHashSet
&
selectedFields
,
...
...
@@ -58,7 +58,7 @@ label readFields
fields
.
set
(
nFields
++
,
helper
.
interpolate
proxy
.
interpolate
(
GeoField
(
*
(
objects
[
fieldName
]),
mesh
)
).
ptr
()
...
...
applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H
View file @
a8ef5610
...
...
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2016
-2018
OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -34,7 +34,7 @@ SourceFiles
#ifndef readFields_H
#define readFields_H
#include
"
m
eshSubset
Helper
.H"
#include
"
fvM
eshSubset
Proxy
.H"
#include
"PtrList.H"
#include
"IOobjectList.H"
#include
"HashSet.H"
...
...
@@ -48,7 +48,7 @@ namespace Foam
template
<
class
GeoField
>
label
readFields
(
const
m
eshSubset
Helper
&
helper
,
const
fvM
eshSubset
Proxy
&
proxy
,
const
typename
GeoField
::
Mesh
&
mesh
,
const
IOobjectList
&
objects
,
const
wordHashSet
&
selectedFields
,
...
...
src/dynamicMesh/Make/files
View file @
a8ef5610
...
...
@@ -90,7 +90,7 @@ polyMeshAdder/polyMeshAdder.C
fvMeshTools/fvMeshTools.C
fvMeshSubset/fvMeshSubset.C
m
eshSubset
Helper/m
eshSubset
Helper
.C
fvM
eshSubset
Proxy/fvM
eshSubset
Proxy
.C
motionSmoother/motionSmoother.C
motionSmoother/motionSmootherAlgo.C
...
...
src/dynamicMesh/
m
eshSubset
Helper/m
eshSubset
Helper
.C
→
src/dynamicMesh/
fvM
eshSubset
Proxy/fvM
eshSubset
Proxy
.C
View file @
a8ef5610
...
...
@@ -23,14 +23,14 @@ License
\*---------------------------------------------------------------------------*/
#include
"
m
eshSubset
Helper
.H"
#include
"
fvM
eshSubset
Proxy
.H"
#include
"cellSet.H"
#include
"cellZone.H"
#include
"Time.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam
::
m
eshSubset
Helper
::
m
eshSubset
Helper
Foam
::
fvM
eshSubset
Proxy
::
fvM
eshSubset
Proxy
(
fvMesh
&
baseMesh
)
...
...
@@ -45,7 +45,7 @@ Foam::meshSubsetHelper::meshSubsetHelper
}
Foam
::
m
eshSubset
Helper
::
m
eshSubset
Helper
Foam
::
fvM
eshSubset
Proxy
::
fvM
eshSubset
Proxy
(
fvMesh
&
baseMesh
,
const
subsetType
type
,
...
...
@@ -65,7 +65,7 @@ Foam::meshSubsetHelper::meshSubsetHelper
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void
Foam
::
m
eshSubset
Helper
::
correct
(
bool
verbose
)
void
Foam
::
fvM
eshSubset
Proxy
::
correct
(
bool
verbose
)
{
if
(
type_
==
SET
)
{
...
...
@@ -96,7 +96,7 @@ void Foam::meshSubsetHelper::correct(bool verbose)
}
Foam
::
polyMesh
::
readUpdateState
Foam
::
m
eshSubset
Helper
::
readUpdate
()
Foam
::
polyMesh
::
readUpdateState
Foam
::
fvM
eshSubset
Proxy
::
readUpdate
()
{
const
polyMesh
::
readUpdateState
meshState
=
baseMesh_
.
readUpdate
();
...
...
src/dynamicMesh/
m
eshSubset
Helper/m
eshSubset
Helper
.H
→
src/dynamicMesh/
fvM
eshSubset
Proxy/fvM
eshSubset
Proxy
.H
View file @
a8ef5610
...
...
@@ -22,19 +22,20 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::
m
eshSubset
Helper
Foam::
fvM
eshSubset
Proxy
Description
Simple helper to hold a mesh or mesh-subset and provide uniform access.
Simple proxy for holding a mesh, or mesh-subset.
The subMeshes are currently limited to cellSet or cellZone definitions.
SourceFiles
m
eshSubset
Helper
.C
m
eshSubset
Helper
Templates.C
fvM
eshSubset
Proxy
.C
fvM
eshSubset
Proxy
Templates.C
\*---------------------------------------------------------------------------*/
#ifndef
m
eshSubset
Helper
_H
#define
m
eshSubset
Helper
_H
#ifndef
fvM
eshSubset
Proxy
_H
#define
fvM
eshSubset
Proxy
_H
#include
"fvMeshSubset.H"
#include
"zeroGradientFvPatchField.H"
...
...
@@ -48,10 +49,10 @@ namespace Foam
class
Time
;
/*---------------------------------------------------------------------------*\
Class
m
eshSubset
Helper
Declaration
Class
fvM
eshSubset
Proxy
Declaration
\*---------------------------------------------------------------------------*/
class
m
eshSubset
Helper
class
fvM
eshSubset
Proxy
{
public:
...
...
@@ -87,10 +88,10 @@ private:
// Private Member Functions
//- No copy construct
m
eshSubset
Helper
(
const
m
eshSubset
Helper
&
)
=
delete
;
fvM
eshSubset
Proxy
(
const
fvM
eshSubset
Proxy
&
)
=
delete
;
//- No copy assignment
void
operator
=
(
const
m
eshSubset
Helper
&
)
=
delete
;
void
operator
=
(
const
fvM
eshSubset
Proxy
&
)
=
delete
;
public:
...
...
@@ -98,10 +99,10 @@ public:
// Constructors
//- Construct from components
m
eshSubset
Helper
(
fvMesh
&
baseMesh
);
fvM
eshSubset
Proxy
(
fvMesh
&
baseMesh
);
//- Construct from components
m
eshSubset
Helper
fvM
eshSubset
Proxy
(
fvMesh
&
baseMesh
,
const
subsetType
,
...
...
@@ -211,10 +212,9 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include
"
m
eshSubset
Helper
Templates.C"
#include
"
fvM
eshSubset
Proxy
Templates.C"
#endif
#endif
// ************************************************************************* //
src/dynamicMesh/
m
eshSubset
Helper/m
eshSubset
Helper
Templates.C
→
src/dynamicMesh/
fvM
eshSubset
Proxy/fvM
eshSubset
Proxy
Templates.C
View file @
a8ef5610
...
...
@@ -23,14 +23,14 @@ License
\*---------------------------------------------------------------------------*/
#include
"
m
eshSubset
Helper
.H"
#include
"
fvM
eshSubset
Proxy
.H"
#include
"volFields.H"
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
template
<
class
Type
>
Foam
::
tmp
<
Foam
::
GeometricField
<
Type
,
Foam
::
fvPatchField
,
Foam
::
volMesh
>>
Foam
::
m
eshSubset
Helper
::
zeroGradientField
Foam
::
fvM
eshSubset
Proxy
::
zeroGradientField
(
const
typename
GeometricField
<
...
...
@@ -62,7 +62,7 @@ Foam::meshSubsetHelper::zeroGradientField
template
<
class
Type
>
Foam
::
tmp
<
Foam
::
GeometricField
<
Type
,
Foam
::
fvPatchField
,
Foam
::
volMesh
>>
Foam
::
m
eshSubset
Helper
::
interpolate
Foam
::
fvM
eshSubset
Proxy
::
interpolate
(
const
GeometricField
<
Type
,
fvPatchField
,
volMesh
>&
vf
)
const
...
...
@@ -82,7 +82,7 @@ Foam::meshSubsetHelper::interpolate
template
<
class
Type
>
Foam
::
tmp
<
Foam
::
GeometricField
<
Type
,
Foam
::
fvPatchField
,
Foam
::
volMesh
>>
Foam
::
m
eshSubset
Helper
::
interpolate
Foam
::
fvM
eshSubset
Proxy
::
interpolate
(
const
typename
GeometricField
<
...
...
@@ -105,7 +105,7 @@ Foam::meshSubsetHelper::interpolate
template
<
class
GeoField
>
Foam
::
tmp
<
GeoField
>
Foam
::
m
eshSubset
Helper
::
interpolate
Foam
::
fvM
eshSubset
Proxy
::
interpolate
(
const
GeoField
&
fld
)
const
...
...
src/dynamicMesh/fvMeshSubsetProxy/meshSubsetHelper.H
0 → 100644
View file @
a8ef5610
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM, licensed under GNU General Public License
<http://www.gnu.org/licenses/>.
Typedef
Foam::meshSubsetHelper
Description
Compatibility name. Rename (JUL-2018) as Foam::fvMeshSubsetProxy
\*---------------------------------------------------------------------------*/
#ifndef meshSubsetHelper_H
#define meshSubsetHelper_H
#include
"fvMeshSubsetProxy.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
typedef
fvMeshSubsetProxy
meshSubsetHelper
;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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