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

Merge commit 'origin/master' into splitCyclic

Browse Source
This commit is contained in:
mattijs
2010-04-30 15:10:10 +01:00
parent caf974fcfb 08916e83a2
commit 7f6740a9eb
1069 changed files with 14455 additions and 8251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/utilities/postProcessing/dataConversion/foamToFieldview9/calcFaceAddressing.C
View File

@ -72,14 +72,17 @@ labelList calcFaceAddressing
<< " face labels:" << faces << endl
<< " cellI:" << cellI << endl;
FatalError << "Faces consist of vertices:" << endl;
FatalError
<< "Faces consist of vertices:" << endl;
forAll(faces, faceI)
{
FatalError
<< " face:" << faces[faceI]
<< allFaces[faces[faceI]] << endl;
}
FatalError << exit(FatalError);
FatalError
<< exit(FatalError);
}
}
return shapeToMesh;

6
applications/utilities/postProcessing/dataConversion/foamToFieldview9/writeFunctions.C
View File

@ -85,12 +85,12 @@ void writeBytes(char* start, int nBytes)
// Debug: write wall flags data
void writeWallFlags(Ostream& os, label cellI, const labelList& wallFlags)
{
os << "cell " << cellI << " wallsFlags:";
os << "cell " << cellI << " wallsFlags:";
forAll(wallFlags, wallFaceI)
{
os << wallFlags[wallFaceI] << " ";
os << wallFlags[wallFaceI] << ' ';
}
os << endl;
os << endl;
}

6
applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
View File

@ -28,7 +28,8 @@ word format
if ((format != "ascii") && (format != "ieeei4r8"))
{
FatalError << "format type: " << format << " unknown."
FatalError
<< "format type: " << format << " unknown."
<< " Valid options are: ascii ieeei4r8"
<< abort(FatalError);
@ -44,6 +45,7 @@ if
(cells != "hex")
)
{
FatalError << "cells type: " << cells << " unknown."
FatalError
<< "cells type: " << cells << " unknown."
<< abort(FatalError);
}

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

@ -99,12 +99,12 @@ void print(const char* msg, Ostream& os, const PtrList<GeoField>& flds)
{
if (flds.size())
{
os << msg;
os << msg;
forAll(flds, i)
{
os<< ' ' << flds[i].name();
os << ' ' << flds[i].name();
}
os << endl;
os << endl;
}
}
@ -113,9 +113,9 @@ void print(Ostream& os, const wordList& flds)
{
forAll(flds, i)
{
os<< ' ' << flds[i];
os << ' ' << flds[i];
}
os << endl;
os << endl;
}

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

@ -163,12 +163,12 @@ void print(const char* msg, Ostream& os, const PtrList<GeoField>& flds)
{
if (flds.size())
{
os << msg;
os << msg;
forAll(flds, i)
{
os<< ' ' << flds[i].name();
os << ' ' << flds[i].name();
}
os << endl;
os << endl;
}
}
@ -177,9 +177,9 @@ void print(Ostream& os, const wordList& flds)
{
forAll(flds, i)
{
os<< ' ' << flds[i];
os << ' ' << flds[i];
}
os << endl;
os << endl;
}

20
applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
View File

@ -94,20 +94,20 @@ void Foam::writeFuns::write
fField.size()*sizeof(float)
);
os << std::endl;
os << std::endl;
}
else
{
forAll(fField, i)
{
os << fField[i] << ' ';
os << fField[i] << ' ';
if (i > 0 && (i % 10) == 0)
{
os << std::endl;
os << std::endl;
}
}
os << std::endl;
os << std::endl;
}
}
@ -143,20 +143,20 @@ void Foam::writeFuns::write
elems.size()*sizeof(label)
);
os << std::endl;
os << std::endl;
}
else
{
forAll(elems, i)
{
os << elems[i] << ' ';
os << elems[i] << ' ';
if (i > 0 && (i % 10) == 0)
{
os << std::endl;
os << std::endl;
}
}
os << std::endl;
os << std::endl;
}
}
@ -186,11 +186,11 @@ void Foam::writeFuns::writeHeader
if (binary)
{
os << "BINARY" << std::endl;
os << "BINARY" << std::endl;
}
else
{
os << "ASCII" << std::endl;
os << "ASCII" << std::endl;
}
}

11
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
View File

@ -502,15 +502,14 @@ void vtkPV3FoamReader::PrintSelf(ostream& os, vtkIndent indent)
vtkDebugMacro(<<"PrintSelf");
this->Superclass::PrintSelf(os,indent);
os<< indent << "File name: "
<< (this->FileName ? this->FileName : "(none)") << "\n";
os << indent << "File name: "
<< (this->FileName ? this->FileName : "(none)") << "\n";
foamData_->PrintSelf(os, indent);
os<< indent << "Time step range: "
<< this->TimeStepRange[0] << " - " << this->TimeStepRange[1]
<< "\n";
os<< indent << "Time step: " << this->GetTimeStep() << endl;
os << indent << "Time step range: "
<< this->TimeStepRange[0] << " - " << this->TimeStepRange[1] << "\n"
<< indent << "Time step: " << this->GetTimeStep() << endl;
}

4
applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/vtkPV3blockMeshReader.cxx
View File

@ -283,8 +283,8 @@ void vtkPV3blockMeshReader::PrintSelf(ostream& os, vtkIndent indent)
vtkDebugMacro(<<"PrintSelf");
this->Superclass::PrintSelf(os,indent);
os<< indent << "File name: "
<< (this->FileName ? this->FileName : "(none)") << "\n";
os << indent << "File name: "
<< (this->FileName ? this->FileName : "(none)") << "\n";
foamData_->PrintSelf(os, indent);
}

2
applications/utilities/postProcessing/miscellaneous/postChannel/sumData.C
View File

@ -41,7 +41,7 @@ Foam::Ostream& Foam::operator<<
Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::sumData& wDist)
{
return is >> wDist.oldFace_ >> wDist.sum_ >> wDist.count_;
return is >> wDist.oldFace_ >> wDist.sum_ >> wDist.count_;
}