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
c70c12a2
Commit
c70c12a2
authored
May 03, 2016
by
Henry Weller
Browse files
functionObjects: Simplified organization and naming
parent
ff6d8914
Changes
119
Hide whitespace changes
Inline
Side-by-side
src/postProcessing/functionObjects/Allwmake
View file @
c70c12a2
...
...
@@ -6,13 +6,9 @@ targetType=libso
.
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
set
-x
wmake
$targetType
cloud
wmake
$targetType
field
wmake
$targetType
forces
wmake
$targetType
fvTools
wmake
$targetType
IO
wmake
$targetType
jobControl
wmake
$targetType
systemCall
wmake
$targetType
lagrangian
wmake
$targetType
utilities
#------------------------------------------------------------------------------
src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H
deleted
100644 → 0
View file @
ff6d8914
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-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/>.
\defgroup grpIOFunctionObjects Input/output function objects
@{
\ingroup grpFunctionObjects
This group contains input/output-based function objects
@}
\*---------------------------------------------------------------------------*/
src/postProcessing/functionObjects/IO/Make/files
deleted
100644 → 0
View file @
ff6d8914
partialWrite/partialWrite.C
partialWrite/partialWriteFunctionObject.C
removeRegisteredObject/removeRegisteredObject.C
removeRegisteredObject/removeRegisteredObjectFunctionObject.C
writeDictionary/writeDictionary.C
writeDictionary/writeDictionaryFunctionObject.C
writeRegisteredObject/writeRegisteredObject.C
writeRegisteredObject/writeRegisteredObjectFunctionObject.C
LIB = $(FOAM_LIBBIN)/libIOFunctionObjects
src/postProcessing/functionObjects/IO/Make/options
deleted
100644 → 0
View file @
ff6d8914
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
-lfiniteVolume \
-lmeshTools
src/postProcessing/functionObjects/field/Make/files
View file @
c70c12a2
...
...
@@ -49,4 +49,13 @@ regionSizeDistribution/regionSizeDistributionFunctionObject.C
histogram/histogram.C
histogram/histogramFunctionObject.C
div/div.C
div/divFunctionObject.C
grad/grad.C
grad/gradFunctionObject.C
mag/mag.C
mag/magFunctionObject.C
LIB = $(FOAM_LIBBIN)/libfieldFunctionObjects
src/postProcessing/functionObjects/f
vTools/calcMag/IOcalcMag
.H
→
src/postProcessing/functionObjects/f
ield/div/IOdiv
.H
View file @
c70c12a2
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012
-2016
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -22,24 +22,24 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
Foam::IO
calcMag
Foam::IO
div
Description
Instance of the generic IOOutputFilter for
calcMag
.
Instance of the generic IOOutputFilter for
div
.
\*---------------------------------------------------------------------------*/
#ifndef IO
calcMag
_H
#define IO
calcMag
_H
#ifndef IO
div
_H
#define IO
div
_H
#include "
calcMag
.H"
#include "
div
.H"
#include "IOOutputFilter.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
typedef
IOOutputFilter
<
calcMag
>
IOcalcMag
;
typedef
IOOutputFilter
<
div
>
IOdiv
;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/postProcessing/functionObjects/f
vTools/calcFvcDiv/calcFvcD
iv.C
→
src/postProcessing/functionObjects/f
ield/div/d
iv.C
View file @
c70c12a2
...
...
@@ -23,10 +23,10 @@ License
\*---------------------------------------------------------------------------*/
#include "
calcFvcD
iv.H"
#include "
d
iv.H"
#include "volFields.H"
#include "dictionary.H"
#include "
calcFvcD
iv.H"
#include "
d
iv.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
...
...
@@ -34,14 +34,14 @@ namespace Foam
{
namespace
functionObjects
{
defineTypeNameAndDebug
(
calcFvcD
iv
,
0
);
defineTypeNameAndDebug
(
d
iv
,
0
);
}
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam
::
volScalarField
&
Foam
::
functionObjects
::
calcFvcD
iv
::
divField
Foam
::
volScalarField
&
Foam
::
functionObjects
::
d
iv
::
divField
(
const
word
&
divName
,
const
dimensionSet
&
dims
...
...
@@ -79,7 +79,7 @@ Foam::volScalarField& Foam::functionObjects::calcFvcDiv::divField
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam
::
functionObjects
::
calcFvcDiv
::
calcFvcD
iv
Foam
::
functionObjects
::
div
::
d
iv
(
const
word
&
name
,
const
objectRegistry
&
obr
,
...
...
@@ -96,7 +96,7 @@ Foam::functionObjects::calcFvcDiv::calcFvcDiv
}
bool
Foam
::
functionObjects
::
calcFvcD
iv
::
viable
bool
Foam
::
functionObjects
::
d
iv
::
viable
(
const
word
&
name
,
const
objectRegistry
&
obr
,
...
...
@@ -111,13 +111,13 @@ bool Foam::functionObjects::calcFvcDiv::viable
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam
::
functionObjects
::
calcFvcDiv
::~
calcFvcD
iv
()
Foam
::
functionObjects
::
div
::~
d
iv
()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void
Foam
::
functionObjects
::
calcFvcD
iv
::
read
(
const
dictionary
&
dict
)
void
Foam
::
functionObjects
::
d
iv
::
read
(
const
dictionary
&
dict
)
{
dict
.
lookup
(
"fieldName"
)
>>
fieldName_
;
dict
.
lookup
(
"resultName"
)
>>
resultName_
;
...
...
@@ -129,7 +129,7 @@ void Foam::functionObjects::calcFvcDiv::read(const dictionary& dict)
}
void
Foam
::
functionObjects
::
calcFvcD
iv
::
execute
()
void
Foam
::
functionObjects
::
d
iv
::
execute
()
{
bool
processed
=
false
;
...
...
@@ -144,17 +144,17 @@ void Foam::functionObjects::calcFvcDiv::execute()
}
void
Foam
::
functionObjects
::
calcFvcD
iv
::
end
()
void
Foam
::
functionObjects
::
d
iv
::
end
()
{
execute
();
}
void
Foam
::
functionObjects
::
calcFvcD
iv
::
timeSet
()
void
Foam
::
functionObjects
::
d
iv
::
timeSet
()
{}
void
Foam
::
functionObjects
::
calcFvcD
iv
::
write
()
void
Foam
::
functionObjects
::
d
iv
::
write
()
{
if
(
obr_
.
foundObject
<
regIOobject
>
(
resultName_
))
{
...
...
src/postProcessing/functionObjects/f
vTools/calcFvcDiv/calcFvcD
iv.H
→
src/postProcessing/functionObjects/f
ield/div/d
iv.H
View file @
c70c12a2
...
...
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::functionObjects::
calcFvcD
iv
Foam::functionObjects::
d
iv
Group
grpFVFunctionObjects
...
...
@@ -33,13 +33,13 @@ Description
volume scalar field.
SourceFiles
calcFvcD
iv.C
IO
calcFvcD
iv.H
d
iv.C
IO
d
iv.H
\*---------------------------------------------------------------------------*/
#ifndef
calcFvcD
iv_H
#define
calcFvcD
iv_H
#ifndef
functionObjects_d
iv_H
#define
functionObjects_d
iv_H
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
...
...
@@ -63,14 +63,14 @@ namespace functionObjects
{
/*---------------------------------------------------------------------------*\
Class
calcFvcD
iv Declaration
Class
d
iv Declaration
\*---------------------------------------------------------------------------*/
class
calcFvcD
iv
class
d
iv
{
// Private data
//- Name of this
calcFvcD
iv object
//- Name of this
d
iv object
word
name_
;
//- Reference to the database
...
...
@@ -102,23 +102,23 @@ class calcFvcDiv
);
//- Disallow default bitwise copy construct
calcFvcD
iv
(
const
calcFvcD
iv
&
);
d
iv
(
const
d
iv
&
);
//- Disallow default bitwise assignment
void
operator
=
(
const
calcFvcD
iv
&
);
void
operator
=
(
const
d
iv
&
);
public:
//- Runtime type information
TypeName
(
"
calcFvcD
iv"
);
TypeName
(
"
d
iv"
);
// Constructors
//- Construct for given objectRegistry and dictionary.
// Allow the possibility to load fields from files
calcFvcD
iv
d
iv
(
const
word
&
name
,
const
objectRegistry
&
,
...
...
@@ -138,18 +138,18 @@ public:
//- Destructor
virtual
~
calcFvcD
iv
();
virtual
~
d
iv
();
// Member Functions
//- Return name of the set of
calcFvcD
iv
//- Return name of the set of
d
iv
virtual
const
word
&
name
()
const
{
return
name_
;
}
//- Read the
calcFvcD
iv data
//- Read the
d
iv data
virtual
void
read
(
const
dictionary
&
);
//- Execute, currently does nothing
...
...
@@ -161,7 +161,7 @@ public:
//- Called when time was set at the end of the Time::operator++
virtual
void
timeSet
();
//- Calculate the
calcFvcD
iv and write
//- Calculate the
d
iv and write
virtual
void
write
();
//- Update for changes of mesh
...
...
@@ -182,7 +182,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "
calcFvcD
ivTemplates.C"
#include "
d
ivTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/postProcessing/functionObjects/f
vTools/calcMag/calcMag
FunctionObject.C
→
src/postProcessing/functionObjects/f
ield/div/div
FunctionObject.C
View file @
c70c12a2
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012
-2016
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -23,18 +23,18 @@ License
\*---------------------------------------------------------------------------*/
#include "
calcMag
FunctionObject.H"
#include "
div
FunctionObject.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace
Foam
{
defineNamedTemplateTypeNameAndDebug
(
calcMag
FunctionObject
,
0
);
defineNamedTemplateTypeNameAndDebug
(
div
FunctionObject
,
0
);
addToRunTimeSelectionTable
(
functionObject
,
calcMag
FunctionObject
,
div
FunctionObject
,
dictionary
);
}
...
...
src/postProcessing/functionObjects/f
vTools/calcFvcDiv/calcFvcD
ivFunctionObject.H
→
src/postProcessing/functionObjects/f
ield/div/d
ivFunctionObject.H
View file @
c70c12a2
...
...
@@ -22,29 +22,29 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
Foam::
calcFvcD
ivFunctionObject
Foam::
d
ivFunctionObject
Description
FunctionObject wrapper around
calcFvcD
iv to allow it to be created
FunctionObject wrapper around
d
iv to allow it to be created
via the functions entry within controlDict.
SourceFiles
calcFvcD
ivFunctionObject.C
d
ivFunctionObject.C
\*---------------------------------------------------------------------------*/
#ifndef
calcFvcD
ivFunctionObject_H
#define
calcFvcD
ivFunctionObject_H
#ifndef
d
ivFunctionObject_H
#define
d
ivFunctionObject_H
#include "
calcFvcD
iv.H"
#include "
d
iv.H"
#include "OutputFilterFunctionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
typedef
OutputFilterFunctionObject
<
functionObjects
::
calcFvcD
iv
>
calcFvcD
ivFunctionObject
;
typedef
OutputFilterFunctionObject
<
functionObjects
::
d
iv
>
d
ivFunctionObject
;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
src/postProcessing/functionObjects/f
vTools/calcFvcDiv/calcFvcD
ivTemplates.C
→
src/postProcessing/functionObjects/f
ield/div/d
ivTemplates.C
View file @
c70c12a2
...
...
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template
<
class
FieldType
>
void
Foam
::
functionObjects
::
calcFvcD
iv
::
calcDiv
void
Foam
::
functionObjects
::
d
iv
::
calcDiv
(
const
word
&
fieldName
,
const
word
&
resultName
,
...
...
src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H
→
src/postProcessing/functionObjects/field/
doc/
fieldFunctionObjectsDoc.H
View file @
c70c12a2
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012
-2016
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
View file @
c70c12a2
...
...
@@ -119,8 +119,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef fieldAverage_H
#define fieldAverage_H
#ifndef
functionObjects_
fieldAverage_H
#define
functionObjects_
fieldAverage_H
#include "volFieldsFwd.H"
#include "Switch.H"
...
...
src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
View file @
c70c12a2
...
...
@@ -74,8 +74,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef fieldCoordinateSystemTransform_H
#define fieldCoordinateSystemTransform_H
#ifndef
functionObjects_
fieldCoordinateSystemTransform_H
#define
functionObjects_
fieldCoordinateSystemTransform_H
#include "OFstream.H"
#include "volFields.H"
...
...
src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
View file @
c70c12a2
...
...
@@ -75,8 +75,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef fieldMinMax_H
#define fieldMinMax_H
#ifndef
functionObjects_
fieldMinMax_H
#define
functionObjects_
fieldMinMax_H
#include "functionObjectFiles.H"
#include "Switch.H"
...
...
src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
View file @
c70c12a2
...
...
@@ -102,8 +102,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef cellSource_H
#define cellSource_H
#ifndef
functionObjects_
cellSource_H
#define
functionObjects_
cellSource_H
#include "NamedEnum.H"
#include "fieldValue.H"
...
...
src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
View file @
c70c12a2
...
...
@@ -136,8 +136,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef faceSource_H
#define faceSource_H
#ifndef
functionObjects_
faceSource_H
#define
functionObjects_
faceSource_H
#include "NamedEnum.H"
#include "fieldValue.H"
...
...
src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
View file @
c70c12a2
...
...
@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef fieldValue_H
#define fieldValue_H
#ifndef
functionObjects_
fieldValue_H
#define
functionObjects_
fieldValue_H
#include "functionObjectFiles.H"
#include "Switch.H"
...
...
src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
View file @
c70c12a2
...
...
@@ -73,8 +73,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
#ifndef fieldValueDelta_H
#define fieldValueDelta_H
#ifndef
functionObjects_
fieldValueDelta_H
#define
functionObjects_
fieldValueDelta_H
#include "functionObjectFiles.H"
#include "fieldValue.H"
...
...
src/postProcessing/functionObjects/f
vTools/calcFvcDiv/IOcalcFvcDiv
.H
→
src/postProcessing/functionObjects/f
ield/grad/IOgrad
.H
View file @
c70c12a2
...
...
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2012
-2016
OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
...
...
@@ -22,24 +22,24 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
Foam::IO
calcFvcDiv
Foam::IO
grad
Description
Instance of the generic IOOutputFilter for
calcFvcDiv
.
Instance of the generic IOOutputFilter for
grad
.
\*---------------------------------------------------------------------------*/
#ifndef IO
calcFvcDiv
_H
#define IO
calcFvcDiv
_H
#ifndef IO
grad
_H
#define IO
grad
_H
#include "
calcFvcDiv
.H"
#include "
grad
.H"
#include "IOOutputFilter.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace
Foam
{
typedef
IOOutputFilter
<
calcFvcDiv
>
IOcalcFvcDiv
;
typedef
IOOutputFilter
<
grad
>
IOgrad
;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...
...
Prev
1
2
3
4
5
6
Next
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