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 conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 0e01c44129
2311 changed files with 44974 additions and 26547 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);
}
}

9
applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C
View File

@ -29,7 +29,6 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "fvMesh.H"
#include "volFields.H"
@ -120,7 +119,7 @@ void ReadAndMapFields
}
//else
//{
// FatalErrorIn("ReadAndMapFields(..)")
// FatalErrorInFunction
// << "Face " << faceI << " from index " << index
// << " is not a boundary face." << abort(FatalError);
//}
@ -128,7 +127,7 @@ void ReadAndMapFields
}
//else
//{
// WarningIn("ReadAndMapFields(..)")
// WarningInFunction
// << "Point " << pointI << " at "
// << tetDualMesh.points()[pointI]
// << " has no dual correspondence." << endl;
@ -188,7 +187,7 @@ int main(int argc, char *argv[])
if (pointDualAddressing.size() != tetDualMesh.nPoints())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Size " << pointDualAddressing.size()
<< " of addressing map " << pointDualAddressing.objectPath()
<< " differs from number of points in mesh "
@ -218,7 +217,7 @@ int main(int argc, char *argv[])
label faceI = -index-1;
if (faceI < mesh.nInternalFaces())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Face " << faceI << " from index " << index
<< " is not a boundary face."
<< " nInternalFaces:" << mesh.nInternalFaces()

12
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -332,7 +332,7 @@ int main(int argc, char *argv[])
if (binary && (sizeof(floatScalar) != 4 || sizeof(label) != 4))
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "floatScalar and/or label are not 4 bytes in size" << nl
<< "Hence cannot use binary VTK format. Please use -ascii"
<< exit(FatalError);
@ -342,7 +342,7 @@ int main(int argc, char *argv[])
if (nearCellValue)
{
WarningIn(args.executable())
WarningInFunction
<< "Using neighbouring cell value instead of patch value"
<< nl << endl;
}
@ -351,7 +351,7 @@ int main(int argc, char *argv[])
if (noPointValues)
{
WarningIn(args.executable())
WarningInFunction
<< "Outputting cell values only" << nl << endl;
}
@ -429,7 +429,7 @@ int main(int argc, char *argv[])
mkDir(fvPath);
// mesh wrapper; does subsetting and decomposition
// Mesh wrapper; does subsetting and decomposition
vtkMesh vMesh(mesh, cellSetName);
@ -1295,7 +1295,7 @@ int main(int argc, char *argv[])
);
if (system(cmd.c_str()) == -1)
{
WarningIn(args.executable())
WarningInFunction
<< "Could not execute command " << cmd << endl;
}
}

6
applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
View File

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
if (!smapFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot open SMAP file " << smapFile.name()
<< exit(FatalError);
}
@ -92,7 +92,7 @@ int main(int argc, char *argv[])
&& fieldName.wordToken() != "CELL"
)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Expected first CELL, found "
<< fieldName
<< exit(FatalError);
@ -222,7 +222,7 @@ int main(int argc, char *argv[])
if (cell != 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Expected first SMAP dummy entry to be cell 0, found "
<< cell
<< exit(FatalError);