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

STYLE: use foamVersion::api instead of OPENFOAM define for string output

Browse Source
This commit is contained in:
Mark Olesen
2019-08-14 20:39:14 +02:00
committed by Andrew Heather
parent 7a75b9c0d4
commit edbb6a122b
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fileFormats/ensight/file/ensightGeoFile.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. \\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011 OpenFOAM Foundation | Copyright (C) 2011 OpenFOAM Foundation
@ -26,7 +26,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "ensightGeoFile.H" #include "ensightGeoFile.H"
#include "macros.H" #include "foamVersion.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -39,11 +39,7 @@ void Foam::ensightGeoFile::initialize()
newline(); newline();
// Description line 2 // Description line 2
#if OPENFOAM write(string("Written by OpenFOAM " + std::to_string(foamVersion::api)));
write("Written by OpenFOAM " STRING_QUOTE(OPENFOAM));
#else
write("Written by OpenFOAM");
#endif
newline(); newline();
write("node id assign"); write("node id assign");

8
src/fileFormats/vtk/output/foamVtkOutput.C
View File

@ -32,6 +32,7 @@ License
#include "foamVtkAppendRawFormatter.H" #include "foamVtkAppendRawFormatter.H"
#include "foamVtkLegacyAsciiFormatter.H" #include "foamVtkLegacyAsciiFormatter.H"
#include "foamVtkLegacyRawFormatter.H" #include "foamVtkLegacyRawFormatter.H"
#include "foamVersion.H"
#include "typeInfo.H" #include "typeInfo.H"
#include "globalIndex.H" #include "globalIndex.H"
#include "instant.H" #include "instant.H"
@ -234,12 +235,7 @@ void Foam::vtk::legacy::fileHeader
if (title.empty() || 0 == truncate) if (title.empty() || 0 == truncate)
{ {
// Avoid an empty title // Avoid an empty title
os << "File generated by OpenFOAM " << foamVersion::api << nl;
os << "File generated by OpenFOAM";
#if OPENFOAM
os << ' ' << OPENFOAM;
#endif
os << nl;
} }
else if (std::string::npos == truncate) else if (std::string::npos == truncate)
{ {