COMP: use hard-coded values for fieldTypes (issue #1068)

- this seems to be the only reliable means of obtaining the values.

  Using typeName_() yields the wrong value.

  Using the typeName causes initialization issues
  (segfault when executing on some systems).
This commit is contained in:
Mark Olesen
2018-11-12 16:39:55 +01:00
parent 90dd4b30cd
commit 8752120ad5
7 changed files with 109 additions and 32 deletions

View File

@ -0,0 +1,3 @@
Test-fieldTypes.C
EXE = $(FOAM_USER_APPBIN)/Test-fieldTypes

View File

@ -0,0 +1,9 @@
EXE_INC = \
-I$(LIB_SRC)/finiteArea/lnInclude \
-I${LIB_SRC}/finiteVolume/lnInclude \
-I${LIB_SRC}/meshTools/lnInclude \
EXE_LIBS = \
-lfiniteArea \
-lfiniteVolume \
-lmeshTools

View File

@ -0,0 +1,63 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
\\/ 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/>.
Application
Test-fieldTypes
Description
Print fieldTypes
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "argList.H"
#include "IOobject.H"
#include "IOstreams.H"
#include "areaFields.H"
#include "fieldTypes.H"
#include "pointFields.H"
#include "volFields.H"
using namespace Foam;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
int main(int argc, char *argv[])
{
argList::noParallel();
Info<< "basic: " << flatOutput(fieldTypes::basic) << nl
<< "area: " << flatOutput(fieldTypes::area) << nl
<< "volume: " << flatOutput(fieldTypes::volume) << nl
<< "internal: " << flatOutput(fieldTypes::internal) << nl
<< "point: " << flatOutput(fieldTypes::point) << nl
<< endl;
Info<< "\nEnd\n" << endl;
return 0;
}
// ************************************************************************* //

View File

@ -24,23 +24,19 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fieldTypes.H" #include "fieldTypes.H"
#include "labelIOField.H"
#include "scalarIOField.H"
#include "vectorIOField.H"
#include "sphericalTensorIOField.H"
#include "symmTensorIOField.H"
#include "tensorIOField.H"
// * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * //
// Note hard-coded values are more reliable than other alternatives
const Foam::wordList Foam::fieldTypes::basic const Foam::wordList Foam::fieldTypes::basic
({ ({
Foam::labelIOField::typeName_(), "labelField", //< labelIOField
Foam::scalarIOField::typeName_(), "scalarField", //< scalarIOField
Foam::vectorIOField::typeName_(), "vectorField", //< vectorOField
Foam::sphericalTensorIOField::typeName_(), "sphericalTensorField", //< sphericalTensorIOField
Foam::symmTensorIOField::typeName_(), "symmTensorField", //< symmTensorIOField
Foam::tensorIOField::typeName_() "tensorField" //< tensorIOField
}); });

View File

@ -56,13 +56,15 @@ namespace Foam
// * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * //
// Note hard-coded values are more reliable than other alternatives
const Foam::wordList Foam::fieldTypes::point const Foam::wordList Foam::fieldTypes::point
({ ({
Foam::pointScalarField::typeName_(), "pointScalarField",
Foam::pointVectorField::typeName_(), "pointVectorField",
Foam::pointSphericalTensorField::typeName_(), "pointSphericalTensorField",
Foam::pointSymmTensorField::typeName_(), "pointSymmTensorField",
Foam::pointTensorField::typeName_() "pointTensorField"
}); });

View File

@ -79,13 +79,15 @@ void GeometricField<scalar, faPatchField, areaMesh>::replace
// * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * //
// Note hard-coded values are more reliable than other alternatives
const Foam::wordList Foam::fieldTypes::area const Foam::wordList Foam::fieldTypes::area
({ ({
Foam::areaScalarField::typeName_(), "areaScalarField",
Foam::areaVectorField::typeName_(), "areaVectorField",
Foam::areaSphericalTensorField::typeName_(), "areaSphericalTensorField",
Foam::areaSymmTensorField::typeName_(), "areaSymmTensorField",
Foam::areaTensorField::typeName_() "areaTensorField"
}); });

View File

@ -85,23 +85,25 @@ void GeometricField<scalar, fvPatchField, volMesh>::replace
// * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Global Data * * * * * * * * * * * * * * * //
// Note hard-coded values are more reliable than other alternatives
const Foam::wordList Foam::fieldTypes::internal const Foam::wordList Foam::fieldTypes::internal
({ ({
Foam::volScalarField::Internal::typeName_(), "volScalarField::Internal",
Foam::volVectorField::Internal::typeName_(), "volVectorField::Internal",
Foam::volSphericalTensorField::Internal::typeName_(), "volSphericalTensorField::Internal",
Foam::volSymmTensorField::Internal::typeName_(), "volSymmTensorField::Internal",
Foam::volTensorField::Internal::typeName_() "volTensorField::Internal"
}); });
const Foam::wordList Foam::fieldTypes::volume const Foam::wordList Foam::fieldTypes::volume
({ ({
Foam::volScalarField::typeName_(), "volScalarField",
Foam::volVectorField::typeName_(), "volVectorField",
Foam::volSphericalTensorField::typeName_(), "volSphericalTensorField",
Foam::volSymmTensorField::typeName_(), "volSymmTensorField",
Foam::volTensorField::typeName_() "volTensorField"
}); });