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: Resolve conflict with upstream merge from Foundation

Browse Source
This commit is contained in:
Andrew Heather
2015-12-07 17:07:20 +00:00
parent e35afa35bf 736621b945
commit 3f55f752fc
2154 changed files with 44622 additions and 24766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,14 +224,14 @@ int main(int argc, char *argv[])
if (nearCellValue)
{
WarningIn(args.executable())
WarningInFunction
<< "Using neighbouring cell value instead of patch value"
<< nl << endl;
}
if (noPointValues)
{
WarningIn(args.executable())
WarningInFunction
<< "Outputting cell values only" << nl << endl;
}

16
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -69,7 +69,7 @@ Pout<< endl
)
)
{
// FatalErrorIn("tecplotWriter::writeInit(..) const")
// FatalErrorInFunction
// << "Error in TECINI112." << exit(FatalError);
}
}
@ -148,7 +148,7 @@ Pout<< "zoneName:" << zoneName
)
)
{
// FatalErrorIn("tecplotWriter::writePolyhedralZone(..) const")
// FatalErrorInFunction
// << "Error in TECZNE112." << exit(FatalError);
}
}
@ -228,7 +228,7 @@ Pout<< "zoneName:" << zoneName
)
)
{
// FatalErrorIn("tecplotWriter::writePolygonalZone(..) const")
// FatalErrorInFunction
// << "Error in TECZNE112." << exit(FatalError);
}
}
@ -308,7 +308,7 @@ Pout<< "zoneName:" << zoneName
)
)
{
// FatalErrorIn("tecplotWriter::writePolygonalZone(..) const")
// FatalErrorInFunction
// << "Error in TECZNE112." << exit(FatalError);
}
}
@ -379,7 +379,7 @@ void Foam::tecplotWriter::writeConnectivity(const fvMesh& mesh) const
)
)
{
// FatalErrorIn("tecplotWriter::writeConnectivity(const fvMesh&) const")
// FatalErrorInFunction
// << "Error in TECPOLY112." << exit(FatalError);
}
}
@ -493,7 +493,7 @@ void Foam::tecplotWriter::writeConnectivity
)
)
{
// FatalErrorIn("tecplotWriter::writeConnectivity(..) const")
// FatalErrorInFunction
// << "Error in TECPOLY112." << exit(FatalError);
}
}
@ -505,7 +505,7 @@ Pout<< "writeEnd" << endl;
if (!TECEND112())
{
// FatalErrorIn("tecplotWriter::writeEnd() const")
// FatalErrorInFunction
// << "Error in TECEND112." << exit(FatalError);
}

4
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.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-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,7 +57,7 @@ void Foam::tecplotWriter::writeField(const Field<Type>& fld) const
if (!TECDAT112(&size, floats.begin(), &IsDouble))
{
// FatalErrorIn("tecplotWriter::writeField(..) const")
// FatalErrorInFunction
// << "Error in TECDAT112." << exit(FatalError);
}
}