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 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry
2012-06-07 14:46:35 +01:00
parent 711cf48e5d 74d014f103
commit d3ec8c9067
3 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Pstream/mpi/UPstream.C
View File

@ -581,7 +581,6 @@ void Foam::UPstream::waitRequest(const label i)
<< Foam::abort(FatalError);
}
int flag;
if
(
MPI_Wait

43
src/fileFormats/vtk/vtkUnstructuredReader.C
View File

@ -34,10 +34,12 @@ License
defineTypeNameAndDebug(Foam::vtkUnstructuredReader, 0);
template<>
const char*
Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>::names[] =
namespace Foam
{
template<>
const char*
NamedEnum<vtkUnstructuredReader::vtkDataType, 8>::names[] =
{
"int",
"unsigned_int",
"long",
@ -46,35 +48,36 @@ Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>::names[] =
"double",
"string",
"vtkIdType"
};
const Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataType, 8>
Foam::vtkUnstructuredReader::vtkDataTypeNames;
};
const NamedEnum<vtkUnstructuredReader::vtkDataType, 8>
vtkUnstructuredReader::vtkDataTypeNames;
template<>
const char*
Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataSetType, 3>::names[] =
{
template<>
const char*
NamedEnum<vtkUnstructuredReader::vtkDataSetType, 3>::names[] =
{
"FIELD",
"SCALARS",
"VECTORS"
};
const Foam::NamedEnum<Foam::vtkUnstructuredReader::vtkDataSetType, 3>
Foam::vtkUnstructuredReader::vtkDataSetTypeNames;
};
const NamedEnum<vtkUnstructuredReader::vtkDataSetType, 3>
vtkUnstructuredReader::vtkDataSetTypeNames;
template<>
const char*
Foam::NamedEnum<Foam::vtkUnstructuredReader::parseMode, 5>::names[] =
{
template<>
const char*
NamedEnum<vtkUnstructuredReader::parseMode, 5>::names[] =
{
"NOMODE",
"UNSTRUCTURED_GRID",
"POLYDATA",
"CELL_DATA",
"POINT_DATA"
};
const Foam::NamedEnum<Foam::vtkUnstructuredReader::parseMode, 5>
Foam::vtkUnstructuredReader::parseModeNames;
};
const NamedEnum<vtkUnstructuredReader::parseMode, 5>
vtkUnstructuredReader::parseModeNames;
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //

10
src/triSurface/triSurface/interfaces/AC3D/readAC.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -174,7 +174,13 @@ bool triSurface::readAC(const fileName& ACfileName)
for (label patchI = 0; patchI < nPatches; patchI++)
{
readUpto("OBJECT", ACfile, args, " while reading patch " + patchI);
readUpto
(
"OBJECT",
ACfile,
args,
" while reading patch " + Foam::name(patchI)
);
// Object global values
string patchName = string("patch") + name(patchI);