Commit 310c5d93 authored by Mark Olesen's avatar Mark Olesen Committed by Andrew Heather
Browse files

STYLE: spacing and punctuation

parent 60a8f7b6
......@@ -108,6 +108,13 @@ Foam::label Foam::fileFormats::STARCDMeshReader::readPoints
}
}
if (!nPoints)
{
FatalErrorInFunction
<< "No points in file " << inputName << nl
<< abort(FatalError);
}
Info<< "Number of points = " << nPoints << endl;
// Set sizes and reset to invalid values
......@@ -125,13 +132,6 @@ Foam::label Foam::fileFormats::STARCDMeshReader::readPoints
// Pass 2:
// construct pointList and conversion table
// from Star vertex numbers to Foam point labels
if (!nPoints)
{
FatalErrorInFunction
<< "no points in file " << inputName
<< abort(FatalError);
}
else
{
IFstream is(inputName);
readHeader(is, STARCDCore::HEADER_VRT);
......@@ -274,7 +274,6 @@ void Foam::fileFormats::STARCDMeshReader::readCells(const fileName& inputName)
cellTable_.setName(cellTableId);
cellTable_.setMaterial(cellTableId, "solid");
}
}
else if (typeId == STARCDCore::starcdBaffleType)
{
......@@ -291,31 +290,30 @@ void Foam::fileFormats::STARCDMeshReader::readCells(const fileName& inputName)
cellTable_.setMaterial(cellTableId, "shell");
}
}
}
}
const label nCells = nFluids + (keepSolids_ ? nSolids : 0);
Info<< "Number of fluids = " << nFluids << nl
<< "Number of baffles = " << nBaffles << nl;
if (keepSolids_)
{
Info<< "Number of solids = " << nSolids << nl;
}
else
<< "Number of baffles = " << nBaffles << nl
<< "Number of solids = " << nSolids
<< (keepSolids_ ? " (treat as fluid)" : " (ignored)") << nl
<< "Number of shells = " << nShells << " (ignored)" << nl;
if (!nCells)
{
Info<< "Ignored solids = " << nSolids << nl;
}
Info<< "Ignored shells = " << nShells << endl;
OSstream& err = FatalErrorInFunction;
err << "No cells in file " << inputName << nl;
label nCells;
if (keepSolids_)
{
nCells = nFluids + nSolids;
}
else
{
nCells = nFluids;
if (nShells)
{
err << "Consists of shells only (typeId=4)." << nl;
}
err << nl
<< abort(FatalError);
}
cellFaces_.setSize(nCells);
......@@ -339,19 +337,6 @@ void Foam::fileFormats::STARCDMeshReader::readCells(const fileName& inputName)
// Pass 2:
// construct cellFaces_ and possibly cellShapes_
if (nCells <= 0)
{
if (nShells != 0)
{
WarningInFunction
<< inputName << "consists of only shell entries (typeId=4)."
<< endl;
}
FatalErrorInFunction
<< "no cells in file " << inputName
<< abort(FatalError);
}
else
{
IFstream is(inputName);
readHeader(is, STARCDCore::HEADER_CEL);
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-2011 2019 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2008-2011, 2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation
......@@ -28,7 +28,7 @@ License
inline const Foam::radiation::radiativeIntensityRay&
Foam::radiation::fvDOM::IRay(const label rayI) const
{
return IRay_[rayI];
return IRay_[rayI];
}
......@@ -141,7 +141,7 @@ inline bool Foam::radiation::fvDOM::useExternalBeam() const
}
inline const Foam::scalarList& Foam::radiation::fvDOM::
inline const Foam::scalarList& Foam::radiation::fvDOM::
spectralDistribution() const
{
return spectralDistribution_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment