zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'olesenm'

Browse Source
This commit is contained in:
andy
2010-02-17 16:48:44 +00:00
parent f4f23178e0 a3fec987a8
commit e49e95a53b
158 changed files with 804 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
View File

@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Translates FOAM data to Fluent format.
Translates OpenFOAM data to Fluent format.
\*---------------------------------------------------------------------------*/

7
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -80,7 +80,10 @@ Foam::ensightMesh::ensightMesh
if (args.optionFound("patches"))
{
wordList patchNameList(args.optionLookup("patches")());
wordList patchNameList
(
args.optionLookup("patches")()
);
if (patchNameList.empty())
{

2
applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
View File

@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Translates FOAM data to EnSight format.
Translates OpenFOAM data to EnSight format.
An Ensight part is created for the internalMesh and for each patch.

7
applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -215,9 +215,8 @@ int main(int argc, char *argv[])
word cellSetName;
string vtkName;
if (args.optionFound("cellSet"))
if (args.optionReadIfPresent("cellSet", cellSetName))
{
cellSetName = args.option("cellSet");
vtkName = cellSetName;
}
else if (Pstream::parRun())
@ -738,7 +737,7 @@ int main(int argc, char *argv[])
if (args.optionFound("faceSet"))
{
// Load the faceSet
word setName(args.option("faceSet"));
const word setName = args["faceSet"];
labelList faceLabels(faceSet(mesh, setName).toc());
// Filename as if patch with same name.

9
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -329,9 +329,8 @@ int main(int argc, char *argv[])
word cellSetName;
string vtkName = runTime.caseName();
if (args.optionFound("cellSet"))
if (args.optionReadIfPresent("cellSet", cellSetName))
{
cellSetName = args.option("cellSet");
vtkName = cellSetName;
}
else if (Pstream::parRun())
@ -423,7 +422,7 @@ int main(int argc, char *argv[])
if (args.optionFound("faceSet"))
{
// Load the faceSet
faceSet set(mesh, args.option("faceSet"));
faceSet set(mesh, args["faceSet"]);
// Filename as if patch with same name.
mkDir(fvPath/set.name());
@ -446,7 +445,7 @@ int main(int argc, char *argv[])
if (args.optionFound("pointSet"))
{
// Load the pointSet
pointSet set(mesh, args.option("pointSet"));
pointSet set(mesh, args["pointSet"]);
// Filename as if patch with same name.
mkDir(fvPath/set.name());

6
applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
Translates a STAR-CD SMAP data file into FOAM field format.
Translates a STAR-CD SMAP data file into OpenFOAM field format.
\*---------------------------------------------------------------------------*/
@ -65,7 +65,7 @@ int main(int argc, char *argv[])
# include "createMesh.H"
IFstream smapFile(args.additionalArgs()[0]);
IFstream smapFile(args[1]);
if (!smapFile.good())
{

4
applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -59,7 +59,7 @@ namespace Foam
(
IOobject
(
args.option("dict"),
args["dict"],
runTime.system(),
runTime,
IOobject::MUST_READ

6
applications/utilities/postProcessing/patch/patchAverage/patchAverage.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,8 +45,8 @@ int main(int argc, char *argv[])
instantList timeDirs = timeSelector::select0(runTime, args);
# include "createMesh.H"
word fieldName(args.additionalArgs()[0]);
word patchName(args.additionalArgs()[1]);
const word fieldName = args[1];
const word patchName = args[2];
forAll(timeDirs, timeI)
{

6
applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
\\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -47,8 +47,8 @@ int main(int argc, char *argv[])
instantList timeDirs = timeSelector::select0(runTime, args);
# include "createNamedMesh.H"
word fieldName(args.additionalArgs()[0]);
word patchName(args.additionalArgs()[1]);
const word fieldName = args[1];
const word patchName = args[2];
forAll(timeDirs, timeI)
{