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
4e7ac820
Commit
4e7ac820
authored
Feb 11, 2019
by
Mark OLESEN
Committed by
Andrew Heather
Feb 11, 2019
Browse files
STYLE: derive surface sampling from fvMeshFunctionObject
parent
75a691ec
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
View file @
4e7ac820
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-201
8
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-201
9
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
...
...
@@ -123,9 +123,8 @@ Foam::sampledSurfaces::sampledSurfaces
const
dictionary
&
dict
)
:
functionObjects
::
region
FunctionObject
(
name
,
runTime
,
dict
),
functionObjects
::
fvMesh
FunctionObject
(
name
,
runTime
,
dict
),
PtrList
<
sampledSurface
>
(),
mesh_
(
refCast
<
const
fvMesh
>
(
obr_
)),
loadFromFiles_
(
false
),
outputPath_
(
...
...
@@ -152,9 +151,8 @@ Foam::sampledSurfaces::sampledSurfaces
const
bool
loadFromFiles
)
:
functionObjects
::
region
FunctionObject
(
name
,
obr
,
dict
),
functionObjects
::
fvMesh
FunctionObject
(
name
,
obr
,
dict
),
PtrList
<
sampledSurface
>
(),
mesh_
(
refCast
<
const
fvMesh
>
(
obr
)),
loadFromFiles_
(
loadFromFiles
),
outputPath_
(
...
...
@@ -228,6 +226,8 @@ bool Foam::sampledSurfaces::write()
bool
Foam
::
sampledSurfaces
::
read
(
const
dictionary
&
dict
)
{
fvMeshFunctionObject
::
read
(
dict
);
PtrList
<
sampledSurface
>::
clear
();
mergedList_
.
clear
();
changedGeom_
.
clear
();
...
...
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
View file @
4e7ac820
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015-201
8
OpenCFD Ltd.
\\ / A nd | Copyright (C) 2015-201
9
OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation
...
...
@@ -108,7 +108,7 @@ SourceFiles
#ifndef sampledSurfaces_H
#define sampledSurfaces_H
#include
"
region
FunctionObject.H"
#include
"
fvMesh
FunctionObject.H"
#include
"sampledSurface.H"
#include
"surfaceWriter.H"
#include
"mergedSurf.H"
...
...
@@ -122,21 +122,16 @@ SourceFiles
namespace
Foam
{
// Forward declarations
class
Time
;
class
fvMesh
;
class
dictionary
;
/*---------------------------------------------------------------------------*\
Class sampledSurfaces Declaration
\*---------------------------------------------------------------------------*/
class
sampledSurfaces
:
public
functionObjects
::
region
FunctionObject
,
public
functionObjects
::
fvMesh
FunctionObject
,
public
PtrList
<
sampledSurface
>
{
// Static
d
ata
m
embers
// Static
D
ata
M
embers
//- Output verbosity
static
bool
verbose_
;
...
...
@@ -145,10 +140,7 @@ class sampledSurfaces
static
scalar
mergeTol_
;
// Private data
//- Const reference to fvMesh
const
fvMesh
&
mesh_
;
// Private Data
//- Load fields from files (not from objectRegistry)
const
bool
loadFromFiles_
;
...
...
src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
View file @
4e7ac820
...
...
@@ -174,9 +174,8 @@ Foam::surfMeshSamplers::surfMeshSamplers
const
dictionary
&
dict
)
:
functionObjects
::
region
FunctionObject
(
name
,
runTime
,
dict
),
functionObjects
::
fvMesh
FunctionObject
(
name
,
runTime
,
dict
),
PtrList
<
surfMeshSample
>
(),
mesh_
(
refCast
<
const
fvMesh
>
(
obr_
)),
fieldSelection_
(),
derivedNames_
(),
sampleFaceScheme_
(),
...
...
@@ -193,9 +192,8 @@ Foam::surfMeshSamplers::surfMeshSamplers
const
dictionary
&
dict
)
:
functionObjects
::
region
FunctionObject
(
name
,
obr
,
dict
),
functionObjects
::
fvMesh
FunctionObject
(
name
,
obr
,
dict
),
PtrList
<
surfMeshSample
>
(),
mesh_
(
refCast
<
const
fvMesh
>
(
obr
)),
fieldSelection_
(),
derivedNames_
(),
sampleFaceScheme_
(),
...
...
@@ -323,6 +321,8 @@ bool Foam::surfMeshSamplers::write()
bool
Foam
::
surfMeshSamplers
::
read
(
const
dictionary
&
dict
)
{
fvMeshFunctionObject
::
read
(
dict
);
PtrList
<
surfMeshSample
>::
clear
();
fieldSelection_
.
clear
();
derivedNames_
.
clear
();
...
...
src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.H
View file @
4e7ac820
...
...
@@ -102,7 +102,7 @@ SourceFiles
#ifndef surfMeshSamplers_H
#define surfMeshSamplers_H
#include
"
region
FunctionObject.H"
#include
"
fvMesh
FunctionObject.H"
#include
"surfMeshSample.H"
#include
"volFieldsFwd.H"
#include
"surfaceFieldsFwd.H"
...
...
@@ -114,33 +114,22 @@ SourceFiles
namespace
Foam
{
// Forward declarations
class
Time
;
class
fvMesh
;
class
dictionary
;
/*---------------------------------------------------------------------------*\
Class surfMeshSamplers Declaration
\*---------------------------------------------------------------------------*/
class
surfMeshSamplers
:
public
functionObjects
::
region
FunctionObject
,
public
functionObjects
::
fvMesh
FunctionObject
,
public
PtrList
<
surfMeshSample
>
{
// Static
d
ata
m
embers
// Static
D
ata
M
embers
//- Output verbosity
static
bool
verbose_
;
// Private data
//- Const reference to fvMesh
const
fvMesh
&
mesh_
;
// Read from dictionary
// Private Data
//- Names of fields to sample
wordRes
fieldSelection_
;
...
...
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