Skip to content
GitLab
Menu
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
54457c68
Commit
54457c68
authored
Sep 21, 2018
by
Andrew Heather
Browse files
Merge remote-tracking branch 'origin/master' into develop
parents
39c1fbed
c4ffd320
Changes
30
Hide whitespace changes
Inline
Side-by-side
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H
View file @
54457c68
...
...
@@ -22,11 +22,11 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::phasePair description for mass transfer between a pair of
phases. The direction of the mass transfer is from the phase
'from' to the phasse 'to'.
Foam::phasePair
Description
Description for mass transfer between a pair of phases. The direction of
the mass transfer is from the phase 'from' to the phasse 'to'.
SourceFiles
phasePair.C
...
...
bin/foamLog
View file @
54457c68
...
...
@@ -241,7 +241,7 @@ getAllQueries()
#-- Add ones from database, present in log file
# Note: just like awk, line selected with regular expression,
# column with string.
local
dbQueries
=
$(
getDbQueryList
$db
)
local
dbQueries
=
"
$(
getDbQueryList
$db
)
"
for
var
in
$dbQueries
do
...
...
src/OpenFOAM/containers/Bits/PackedList/PackedList.H
View file @
54457c68
...
...
@@ -157,7 +157,7 @@ public:
// \code
// (numElem / elem_per_block)
// + (numElem % elem_per_block) ? 1 : 0
// \code
// \
end
code
// But avoiding the modulus operation
static
constexpr
label
num_blocks
(
label
numElem
)
{
...
...
@@ -498,7 +498,6 @@ public:
Ostream
&
os
,
const
PackedList
<
Width
>&
list
);
};
...
...
src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
View file @
54457c68
...
...
@@ -32,7 +32,7 @@ Description
field and derived quantities. Alternatively, the same actions can be
executed after the simulation using the \c -postProcess command-line option.
\
sub
section secFunctionObjects Using function objects
\section secFunctionObjects Using function objects
FunctionObjects are selected by additional entries in the
$FOAM_CASE/system/controlDict dictionary. Each object is listed in the \c
...
...
src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H
View file @
54457c68
...
...
@@ -29,9 +29,9 @@ Description
In parallel it will assume ranks are sorted according to hostname
and the lowest rank per hostname will be the IO rank. The output directories
will get a unique name processors<N>_<low>-<high> where N is the
overall
number of processors and low and high is the range of ranks
contained
in the files. Each of these subsets uses its own communicator.
will get a unique name processors
\
<N
\
>_
\
<low
\
>-
\
<high
\
> where N is the
overall
number of processors and low and high is the range of ranks
contained
in the files. Each of these subsets uses its own communicator.
Instead of using the hostnames the IO ranks can be assigned using the
FOAM_IORANKS environment variable (also when running non-parallel), e.g.
...
...
src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H
View file @
54457c68
...
...
@@ -28,8 +28,9 @@ Description
fileOperations that performs all file operations on the master processor.
Requires the calls to be parallel synchronised!
Limitations: - no /processor in filename
- no /uniform/ in the filename
Limitations
- no /processor in filename
- no /uniform/ in the filename
The main logic is in ::filePath which returns a
- same path on all processors. This can either be a global file
...
...
@@ -40,12 +41,12 @@ Description
- different path on all processors (processor0/0/p)
system/controlDict:
filePath worldmaster: <globalRoot>/system/controlDict
filePath worldmaster:
\
<globalRoot
\
>/system/controlDict
localmaster: ,,
slave : ,,
processor0/uniform/time
filePath worldmaster: <globalRoot>/processorXXX/uniform/time
filePath worldmaster:
\
<globalRoot
\
>/processorXXX/uniform/time
localmaster: ,,
slave : ,,
...
...
src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H
View file @
54457c68
...
...
@@ -279,6 +279,7 @@ public:
//
// if (nOrig == zones.size()) { existing... } else { new... }
// \endcode
// \param zoneName the name of the zone
// \param verbose report if an existing zone was selected or
// a new zone was created.
// \return non-const reference to the existing or new zone
...
...
src/OpenFOAM/primitives/functions/Function1/Table/Table.H
View file @
54457c68
...
...
@@ -86,6 +86,12 @@ public:
//- Copy constructor
explicit
Table
(
const
Table
<
Type
>&
tbl
);
//- Construct and return a clone
virtual
tmp
<
Function1
<
Type
>>
clone
()
const
{
return
tmp
<
Function1
<
Type
>>
(
new
Table
<
Type
>
(
*
this
));
}
//- Destructor
virtual
~
Table
();
...
...
src/OpenFOAM/primitives/strings/stringOps/stringOps.H
View file @
54457c68
...
...
@@ -218,10 +218,10 @@ namespace stringOps
// -# current directory
// - leading "./" : the current directory
// -# leading tag expansion for commonly used directories
// - <etc>/ : user/group/other OpenFOAM directory
// - <case>/ : FOAM_CASE directory
// - <constant>/ : FOAM_CASE/constant directory
// - <system>/ : FOAM_CASE/system directory
// -
\
<etc
\
>/ : user/group/other OpenFOAM directory
// -
\
<case
\
>/ : FOAM_CASE directory
// -
\
<constant
\
>/ : FOAM_CASE/constant directory
// -
\
<system
\
>/ : FOAM_CASE/system directory
// -# tilde expansion
// - leading "~/" : home directory
// - leading "~user" : home directory for specified user
...
...
@@ -258,10 +258,10 @@ namespace stringOps
// -# current directory
// - leading "./" : the current directory
// -# leading tag expansion for commonly used directories
// - <etc>/ : user/group/other OpenFOAM directory
// - <case>/ : FOAM_CASE directory
// - <constant>/ : FOAM_CASE/constant directory
// - <system>/ : FOAM_CASE/system directory
// -
\
<etc
\
>/ : user/group/other OpenFOAM directory
// -
\
<case
\
>/ : FOAM_CASE directory
// -
\
<constant
\
>/ : FOAM_CASE/constant directory
// -
\
<system
\
>/ : FOAM_CASE/system directory
// -# tilde expansion
// - leading "~/" : home directory
// - leading "~user" : home directory for specified user
...
...
src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
View file @
54457c68
...
...
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation |
Copyright (C) 2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -50,14 +50,12 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::setPorosityCoefficient
const
scalar
Cpm
=
readScalar
(
pm
.
dict
().
lookup
(
C
.
name
()));
for
All
(
cellZoneIDs
,
zonei
)
for
(
const
label
zonei
:
cellZoneIDs
)
{
const
labelList
&
cells
=
this
->
mesh_
.
cellZones
()[
cellZoneIDs
[
zonei
]];
const
labelList
&
cells
=
this
->
mesh_
.
cellZones
()[
zonei
];
for
All
(
cells
,
i
)
for
(
const
label
celli
:
cells
)
{
const
label
celli
=
cells
[
i
];
C
[
celli
]
=
Cpm
;
}
}
...
...
@@ -79,15 +77,14 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::setCdSigma
const
scalar
Cpm
=
readScalar
(
pm
.
dict
().
lookup
(
C
.
name
()));
for
All
(
cellZoneIDs
,
zonei
)
for
(
const
label
zonei
:
cellZoneIDs
)
{
const
labelList
&
cells
=
this
->
mesh_
.
cellZones
()[
cellZoneIDs
[
zonei
]];
const
labelList
&
cells
=
this
->
mesh_
.
cellZones
()[
zonei
];
forAll
(
cells
,
i
)
{
const
label
celli
=
cells
[
i
];
C
[
celli
]
=
Cpm
*
Sigma
[
cell
i
];
C
[
celli
]
=
Cpm
*
Sigma
[
i
];
}
}
}
...
...
@@ -115,10 +112,13 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::setPorosityCoefficients()
);
setPorosityCoefficient
(
Cmu_
,
pm
);
Cmu_
.
correctBoundaryConditions
();
setPorosityCoefficient
(
C1_
,
pm
);
setPorosityCoefficient
(
C2_
,
pm
);
setPorosityCoefficient
(
sigmak_
,
pm
);
setPorosityCoefficient
(
sigmaEps_
,
pm
);
sigmak_
.
correctBoundaryConditions
();
sigmaEps_
.
correctBoundaryConditions
();
setCdSigma
(
CdSigma_
,
pm
);
setPorosityCoefficient
(
betap_
,
pm
);
...
...
src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H
View file @
54457c68
...
...
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::powerLawLopesdaCosta
Foam::
porosityModels::
powerLawLopesdaCosta
Description
Variant of the power law porosity model with spatially varying
...
...
@@ -105,7 +105,7 @@ public:
/*---------------------------------------------------------------------------*\
Class powerLawLopesdaCosta Declaration
Class powerLawLopesdaCosta Declaration
\*---------------------------------------------------------------------------*/
class
powerLawLopesdaCosta
...
...
src/combustionModels/EDC/EDC.H
View file @
54457c68
...
...
@@ -35,7 +35,7 @@ Description
There are many versions and developments of the EDC model, 4 of which are
currently supported in this implementation: v1981, v1996, v2005 and
v2016. The model variant is selected using the optional \c version entry in
the \c EDCCoeffs dictionary,
\eg
the \c EDCCoeffs dictionary,
e.g.
\verbatim
EDCCoeffs
...
...
src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C
View file @
54457c68
...
...
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation |
Copyright (C) 2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
...
...
@@ -117,8 +117,9 @@ Foam::multiSolidBodyMotionSolver::multiSolidBodyMotionSolver
pointIDs_
[
zonei
].
transfer
(
ptIDs
);
Info
<<
"Applying solid body motion "
<<
SBMFs_
[
zonei
].
type
()
<<
" to "
<<
pointIDs_
[
zonei
].
size
()
<<
" points of cellZone "
<<
iter
().
keyword
()
<<
endl
;
<<
" to "
<<
returnReduce
(
pointIDs_
[
zonei
].
size
(),
sumOp
<
label
>
())
<<
" points of cellZone "
<<
iter
().
keyword
()
<<
endl
;
zonei
++
;
}
...
...
src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.H
View file @
54457c68
...
...
@@ -45,6 +45,7 @@ Usage
}
}
}
\endverbatim
Where the loop entries comprise:
\table
...
...
src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
View file @
54457c68
...
...
@@ -45,8 +45,8 @@ Description
except that no interpolation in time is supported. These should be
located in the directory:
\$FOAM_CASE/constant/boundaryData/<patchName>/points
\$FOAM_CASE/constant/boundaryData/<patchName>/0/\{R|U|L\}
\$FOAM_CASE/constant/boundaryData/
\
<patchName
\
>/points
\$FOAM_CASE/constant/boundaryData/
\
<patchName
\
>/0/\{R|U|L\}
Usage
...
...
src/functionObjects/field/CourantNo/CourantNo.H
View file @
54457c68
...
...
@@ -49,7 +49,7 @@ Usage
type | Type name: CourantNo | yes |
rho | Name of density field | no | rho
field | Name of flux field | no | phi
result | Name of Courant number field | no | <function name>
result | Name of Courant number field | no |
\
<function name
\
>
log | Log to standard output | no | yes
\endtable
...
...
src/functionObjects/field/DESModelRegions/DESModelRegions.H
View file @
54457c68
...
...
@@ -51,7 +51,7 @@ Usage
\table
Property | Description | Required | Default value
type | type name: DESModelRegions| yes |
resultName | Name of DES indicator field | no | <function name>
resultName | Name of DES indicator field | no |
\
<function name
\
>
log | log to standard output | no | yes
\endtable
...
...
src/functionObjects/field/PecletNo/PecletNo.H
View file @
54457c68
...
...
@@ -47,7 +47,7 @@ Usage
type | type name: Peclet | yes |
phi | Name of flux field | no | phi
rho | Name of density field | no | rho
result | Name of Peclet field | no | <function name>
result | Name of Peclet field | no |
\
<function name
\
>
log | Log to standard output | no | yes
\endtable
...
...
src/functionObjects/field/Q/Q.H
View file @
54457c68
...
...
@@ -56,7 +56,7 @@ Usage
Property | Description | Required | Default value
type | type name: Q | yes |
U | Name of velocity field | no | U
result | Name of Q field | no | <function name>
result | Name of Q field | no |
\
<function name
\
>
log | Log to standard output | no | yes
\endtable
...
...
src/functionObjects/field/blendingFactor/blendingFactor.H
View file @
54457c68
...
...
@@ -42,7 +42,7 @@ Description
The factor is a face-based quantity, which is converted to a cell-based
quantity by assigning the minimum blending factor for any cell face.
An indicator (volume) field, named <functionObjectName>:<fieldName>, is
An indicator (volume) field, named
\
<functionObjectName
\
>:
\
<fieldName
\
>, is
generated that is set to (1 - f), i.e. values of:
- 0 represent scheme1 as active, and
- 1 represent scheme2 as active.
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
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