diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C index 2d3521328d..180d18669a 100644 --- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C +++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -62,13 +63,13 @@ void Foam::fluentFvMesh::writeFluentMesh() const / time().caseName() + ".msh" ); - Info<< "Writing Header" << endl; + Info<< "Writing Fluent Mesh" << endl; fluentMeshFile - << "(0 \"FOAM to Fluent Mesh File\")" << std::endl << std::endl - << "(0 \"Dimension:\")" << std::endl - << "(2 3)" << std::endl << std::endl - << "(0 \"Grid dimensions:\")" << std::endl; + << "(0 \"OpenFOAM to Fluent Mesh File\")" << nl << nl + << "(0 \"Dimension:\")" << nl + << "(2 3)" << nl << nl + << "(0 \"Grid dimensions:\")" << nl; // Writing number of points fluentMeshFile @@ -217,8 +218,8 @@ void Foam::fluentFvMesh::writeFluentMesh() const // Writing cells fluentMeshFile - << "(12 (1 1 " - << nCells() << " 1 0)(" << std::endl; + << "(12 (1 1 " << nCells() << " 1 0)" << nl + << '('; const cellModel& hex = cellModel::ref(cellModel::HEX); const cellModel& prism = cellModel::ref(cellModel::PRISM); @@ -227,44 +228,59 @@ void Foam::fluentFvMesh::writeFluentMesh() const const cellShapeList& cells = cellShapes(); - bool hasWarned = false; + label nPolys = 0; + + int nElemPerLine = 25; // Start with linebreak and indent forAll(cells, celli) { + if (nElemPerLine == 25) + { + // 25 elements per line with initial indent (readability) + fluentMeshFile << "\n "; + nElemPerLine = 0; + } + else if (!(nElemPerLine % 5)) + { + // Format in blocks of 5 (readability) + fluentMeshFile << token::SPACE; + } + fluentMeshFile << token::SPACE; + ++nElemPerLine; + + if (cells[celli].model() == tet) { - fluentMeshFile << " " << 2; + fluentMeshFile << 2; } else if (cells[celli].model() == hex) { - fluentMeshFile << " " << 4; + fluentMeshFile << 4; } else if (cells[celli].model() == pyr) { - fluentMeshFile << " " << 5; + fluentMeshFile << 5; } else if (cells[celli].model() == prism) { - fluentMeshFile << " " << 6; + fluentMeshFile << 6; } else { - if (!hasWarned) - { - hasWarned = true; - - WarningInFunction - << "foamMeshToFluent: cell shape for cell " - << celli << " only supported by Fluent polyhedral meshes." - << nl - << " Suppressing any further messages for polyhedral" - << " cells." << endl; - } - fluentMeshFile << " " << 7; + fluentMeshFile << 7; + ++nPolys; } } - fluentMeshFile << ")())" << std::endl; + fluentMeshFile + << nl << "))" << nl; + + + if (nPolys) + { + Info<< "Mesh had " << nPolys << " polyhedrals." << endl; + } + // Return to dec fluentMeshFile.setf(ios::dec, ios::basefield); diff --git a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C index ce70fb45af..1ed2d81c87 100644 --- a/src/ODE/ODESolvers/ODESolver/ODESolverNew.C +++ b/src/ODE/ODESolvers/ODESolver/ODESolverNew.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -49,7 +49,7 @@ Foam::autoPtr Foam::ODESolver::New "ODESolver", solverType, *dictionaryConstructorTablePtr_ - ) << exit(FatalError); + ) << exit(FatalIOError); } return autoPtr(cstrIter()(odes, dict)); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C index a1a5676181..ef00d57858 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -68,7 +68,7 @@ Foam::surfaceInterpolationScheme::New "discretisation", schemeName, *MeshConstructorTablePtr_ - ) << exit(FatalError); + ) << exit(FatalIOError); } return cstrIter()(mesh, schemeData); diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C index 60621e2cd9..ceacaf9fcf 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C @@ -453,12 +453,13 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement forAll(surf1, i) { - // Combine selfProx of shell and surfaces. Ignore regions for - // now + // Combine selfProx of shell and surfaces. + // Ignore regions for now const label cellI = cellMap[i]; + const label shelli = ( - cellToCompact[cellI] != -1 + (cellI != -1 && cellToCompact[cellI] != -1) ? gapShell[cellToCompact[cellI]] : -1 ); @@ -482,8 +483,6 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement ) { // Found intersection with surface. Check opposite normal. - label cellI = cellMap[i]; - if ( cellI != -1 diff --git a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C index f4e84e77b2..960e08a2ac 100644 --- a/src/meshTools/sets/faceSources/regionToFace/regionToFace.C +++ b/src/meshTools/sets/faceSources/regionToFace/regionToFace.C @@ -78,7 +78,7 @@ void Foam::regionToFace::markZone const indirectPrimitivePatch& patch, const label proci, const label facei, - const label zoneI, + const label zonei, labelList& faceZone ) const { @@ -100,7 +100,7 @@ void Foam::regionToFace::markZone edgeTopoDistanceData