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

GIT: resolved merge conflict

Browse Source
This commit is contained in:
Andrew Heather
2018-06-13 14:20:18 +01:00
parent 9258b558f4 616b91c06e
commit c909a5df25
148 changed files with 835 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fileFormats/vtk/output/foamVtkOutput.H
View File

@ -59,9 +59,7 @@ namespace vtk
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Constants
// General Functions
// General Functions
//- Return a default asciiFormatter
autoPtr<vtk::formatter> newFormatter(std::ostream& os);
@ -94,7 +92,7 @@ namespace vtk
void writeList
(
vtk::formatter& fmt,
const UList<Type>& lst
const UList<Type>& list
);
//- Write a list of values.
@ -103,7 +101,7 @@ namespace vtk
void writeList
(
vtk::formatter& fmt,
const FixedList<Type, Size>& lst
const FixedList<Type, Size>& list
);
@ -113,7 +111,7 @@ namespace vtk
void writeList
(
vtk::formatter& fmt,
const UList<Type>& lst,
const UList<Type>& list,
const labelUList& addressing
);
@ -126,7 +124,7 @@ namespace vtk
namespace legacy
{
// Constants
// Constants
//- Strings corresponding to the (POLYDATA, UNSTRUCTURED_GRID) elements
extern const Foam::Enum<vtk::fileTag> contentNames;
@ -135,7 +133,7 @@ namespace legacy
extern const Foam::Enum<vtk::fileTag> dataTypeNames;
// Functions
// Functions
//- Emit header for legacy file.
// Writes "ASCII" or "BINARY" depending on specified type.

20
src/fileFormats/vtk/output/foamVtkOutputTemplates.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2107 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,12 +44,12 @@ template<class Type>
void Foam::vtk::writeList
(
vtk::formatter& fmt,
const UList<Type>& lst
const UList<Type>& list
)
{
forAll(lst, i)
for (const Type& val : list)
{
write(fmt, lst[i]);
write(fmt, val);
}
}
@ -58,12 +58,12 @@ template<class Type, unsigned Size>
void Foam::vtk::writeList
(
vtk::formatter& fmt,
const FixedList<Type, Size>& lst
const FixedList<Type, Size>& list
)
{
for (unsigned i=0; i<Size; ++i)
for (const Type& val : list)
{
write(fmt, lst[i]);
write(fmt, val);
}
}
@ -72,13 +72,13 @@ template<class Type>
void Foam::vtk::writeList
(
vtk::formatter& fmt,
const UList<Type>& lst,
const UList<Type>& list,
const labelUList& addressing
)
{
forAll(addressing, i)
for (const label idx : addressing)
{
write(fmt, lst[addressing[i]]);
write(fmt, list[idx]);
}
}