diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake index 19654fcf899028dc1f2e9b4f3e027c16e28d5082..a7a614f5cad3ab3c3253a0a6a5a0bc04433708fe 100755 --- a/applications/utilities/mesh/conversion/Optional/Allwmake +++ b/applications/utilities/mesh/conversion/Optional/Allwmake @@ -6,6 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Parse arguments for compilation (at least for error catching) . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments + # Get version info and arch-path . $WM_PROJECT_DIR/etc/config.sh/functions _foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/ccmio) diff --git a/applications/utilities/mesh/conversion/ccm/Allwmake b/applications/utilities/mesh/conversion/ccm/Allwmake new file mode 100755 index 0000000000000000000000000000000000000000..7f59349f938d1226dedd2f21374253faba698a27 --- /dev/null +++ b/applications/utilities/mesh/conversion/ccm/Allwmake @@ -0,0 +1,17 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory + +# Parse arguments for compilation (at least for error catching) +. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments + +# Only build if libraries already exist +if [ -e $FOAM_LIBBIN/libccm.so ] +then + echo "Building optional ccm conversion components." + wmake $targetType ccmToFoam + wmake $targetType foamToCcm +else + echo "Skipping optional ccm conversion components (no libccm.so)." +fi + +#------------------------------------------------------------------------------ diff --git a/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/files b/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..f23232f5e96fec5b699265e74e94cd2d964ea87b --- /dev/null +++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/files @@ -0,0 +1,3 @@ +ccmToFoam.C + +EXE = $(FOAM_APPBIN)/ccmToFoam diff --git a/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options b/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options new file mode 100644 index 0000000000000000000000000000000000000000..8b1f005a7833c6c646d3983fc9d54014120a747e --- /dev/null +++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options @@ -0,0 +1,12 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude \ + -I$(LIB_SRC)/conversion/ccm/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude + +EXE_LIBS = \ + -lfiniteVolume \ + -lgenericPatchFields \ + -lmeshTools \ + -lconversion -lccm diff --git a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C new file mode 100644 index 0000000000000000000000000000000000000000..5b0a4cf660521e2a28e9449e7c0954331e83d244 --- /dev/null +++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C @@ -0,0 +1,314 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Application + ccmToFoam + +Group + grpMeshConversionUtilities + +Description + Reads CCM files as written by PROSTAR/STARCCM and writes an + OPENFOAM polyMesh. + +Usage + \b ccmToFoam [OPTION] ccmMesh + + Options: + - \par -ascii + Write in ASCII format instead of binary + + - \par -export + re-export mesh in CCM format for post-processing + + - \par -list + List some information about the geometry + + - \par -name \ + Provide alternative base name for export. Default is meshExport. + + - \par -combine + Combine identically named patches + + - \par -noBaffles + Remove any baffles by merging the faces. + + - \par -merge + Merge in-place interfaces + + - \par -numbered + Use numbered patch/zone (not names) directly from ccm ids. + + - \par -remap \ + use specified remapping dictionary instead of constant/remapping + + - \par -scale \ + Specify an alternative geometry scaling factor. + The default is \b 1 (no scaling). + + - \par -solids + Treat any solid cells present just like fluid cells. + The default is to remove them. + +Note + - sub-domains (fluid | solid | porosity) are stored as separate domains + within the CCM file. These are merged together to form a single mesh. + - baffles are written as interfaces for later use + +See also + Foam::ccm::reader for more information about the File Locations + +\*---------------------------------------------------------------------------*/ + +#include "argList.H" +#include "Time.H" +#include "ccm.H" +#include "regionSplit.H" + +using namespace Foam; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +int main(int argc, char *argv[]) +{ + argList::addNote + ( + "Reads CCM files as written by PROSTAR/STARCCM and writes an" + " OPENFOAM polyMesh." + ); + + argList::noParallel(); + argList::validArgs.append("ccmMesh"); + argList::addBoolOption + ( + "ascii", + "write in ASCII format instead of binary" + ); + argList::addBoolOption + ( + "export", + "re-export mesh in CCM format for post-processing" + ); + argList::addBoolOption + ( + "list", + "list some information about the geometry" + ); + argList::addOption + ( + "remap", + "name", + "use specified remapping dictionary instead of " + ); + argList::addOption + ( + "name", + "name", + "provide alternative base name when re-exporting (implies -export). " + "Default is ." + ); + argList::addBoolOption + ( + "combine", + "combine identically named patches" + ); + argList::addBoolOption + ( + "noBaffles", + "remove any baffles by merging the faces" + ); + argList::addBoolOption + ( + "merge", + "merge in-place interfaces" + ); + argList::addBoolOption + ( + "numbered", + "use numbered names (eg, patch_0, zone_0) only" + ); + argList::addOption + ( + "scale", + "scale", + "geometry scaling factor - default is 1 (ie, no scaling)" + ); + argList::addBoolOption + ( + "withSolid", + "treat any solid cells present just like fluid cells. " + "the default is to remove them." + ); + + argList args(argc, argv); + Time runTime(args.rootPath(), args.caseName()); + runTime.functionObjects().off(); + + const bool optList = args.optionFound("list"); + + // exportName only has a size when export is in effect + fileName exportName; + if (args.optionReadIfPresent("name", exportName)) + { + const word ext = exportName.ext(); + // strip erroneous extension (.ccm, .ccmg, .ccmp) + if (ext == "ccm" || ext == "ccmg" || ext == "ccmp") + { + exportName = exportName.lessExt(); + } + } + else if (args.optionFound("export")) + { + exportName = ccm::writer::defaultMeshName; + if (args.optionFound("case")) + { + exportName += '-' + args.globalCaseName(); + } + } + + // By default, no scaling + const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0); + + // Default to binary output, unless otherwise specified + const IOstream::streamFormat format = + ( + args.optionFound("ascii") + ? IOstream::ASCII + : IOstream::BINARY + ); + + // Increase the precision of the points data + IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision())); + + + // Read control options + // ~~~~~~~~~~~~~~~~~~~~ + + ccm::reader::options rOpts; + rOpts.removeBaffles(args.optionFound("noBaffles")); + rOpts.mergeInterfaces(args.optionFound("merge")); + + if (args.optionFound("numbered")) + { + rOpts.useNumberedNames(true); + } + else if (args.optionFound("combine")) + { + rOpts.combineBoundaries(true); + } + + if (args.optionFound("solids")) + { + Info<< "treating solids like fluids" << endl; + rOpts.keepSolid(true); + } + else + { + rOpts.keepSolid(false); + } + + // CCM reader for reading geometry/solution + ccm::reader reader(args[1], rOpts); + + // list the geometry information + if (optList) + { + Info<< "mesh geometry information:" << endl; + if (reader.hasGeometry()) + { + Info<< nl << "cellTable:" << reader.cellTableInfo() + << nl << "boundaryRegion:" << reader.boundaryTableInfo() + << nl << "interfaces:" << reader.interfaceDefinitionsInfo() + << endl; + + if + ( + args.optionFound("remap") + ? reader.remapMeshInfo(runTime, args["remap"]) + : reader.remapMeshInfo(runTime) + ) + { + Info<< nl + << "Remapped cellTable:" << reader.cellTableInfo() << nl + << "Remapped boundaryRegion:" << reader.boundaryTableInfo() + << endl; + } + } + else + { + Info<< "NONE" << endl; + } + + return 0; + } + else if (reader.readGeometry(scaleFactor)) + { + autoPtr mesh = + ( + args.optionFound("remap") + ? reader.mesh(runTime, args["remap"]) + : reader.mesh(runTime) + ); + + // report mesh bounding box information + Info<< nl << "Bounding box size: " << mesh().bounds().span() << nl; + + // check number of regions + regionSplit rs(mesh); + + Info<< "Number of regions: " << rs.nRegions(); + if (rs.nRegions() == 1) + { + Info<< " (OK)." << nl; + } + else + { + Info<< nl << nl + << "**************************************************" << nl + << "** WARNING: the mesh has disconnected regions **" << nl + << "**************************************************" << nl; + } + Info<< endl; + reader.writeMesh(mesh, format); + + // exportName only has a size when export is in effect + if (exportName.size()) + { + const fileName geomName = exportName + ".ccmg"; + Info<< nl << "Re-exporting geometry as " << geomName << nl; + ccm::writer(geomName, mesh).writeGeometry(); + } + } + else + { + FatalErrorIn("ccmToFoam") + << "could not read geometry" + << exit(FatalError); + } + + Info<< "\nEnd\n" << endl; + + return 0; +} + +// ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/files b/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..dd5d32f698998c0c1b955605c15096a6deb47c1b --- /dev/null +++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/files @@ -0,0 +1,3 @@ +foamToCcm.C + +EXE = $(FOAM_APPBIN)/foamToCcm diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options b/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options new file mode 100644 index 0000000000000000000000000000000000000000..df1a41bde0ac5a0fa70a0ee9372ab01cdd4c9b9d --- /dev/null +++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options @@ -0,0 +1,10 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude \ + -I$(LIB_SRC)/conversion/ccm/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude + +EXE_LIBS = \ + -lfiniteVolume \ + -lgenericPatchFields \ + -lconversion -lccm diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C b/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C new file mode 100644 index 0000000000000000000000000000000000000000..9d64cc09b063abf3e6fb862e797fff8d021402a6 --- /dev/null +++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C @@ -0,0 +1,272 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Application + foamToCcm + +Group + grpMeshConversionUtilities + +Description + Translates OPENFOAM mesh and/or results to CCM format + +Usage + \b foamToCcm [OPTION] + + Options: + - \par -mesh + convert mesh only to CCM format + + - \par -name \ + Provide alternative base name. Default is meshExport. + + - \par -overwrite + No backup of existing output files. + + - \par -remap \ + use specified remapping dictionary instead of constant/remapping + + - \par -results + convert results only to CCM format + +Note + - No parallel data + - No Lagrangian elements + - the -noZero time option can be useful to avoid the often incomplete + initial conditions (missing useful calculated values) + +See also + Foam::ccm::writer for information about the + constant/remapping file. + +\*---------------------------------------------------------------------------*/ + +#include "argList.H" +#include "timeSelector.H" + +#include "volFields.H" +#include "OFstream.H" +#include "IOobjectList.H" +#include "scalarIOField.H" +#include "tensorIOField.H" + +#include "ccm.H" + +using namespace Foam; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// Main program: + +int main(int argc, char *argv[]) +{ + argList::addNote + ( + "Translate OPENFOAM data to CCM format" + ); + + Foam::timeSelector::addOptions(); + argList::noParallel(); + argList::addBoolOption + ( + "mesh", + "convert mesh only" + ); + argList::addOption + ( + "name", + "name", + "provide alternative base name. Default is ." + ); + argList::addBoolOption + ( + "overwrite", + "no backup of existing output files" + ); + argList::addOption + ( + "remap", + "name", + "use specified remapping dictionary instead of " + ); + argList::addBoolOption + ( + "results", + "convert results only" + ); + + #include "setRootCase.H" + #include "createTime.H" + runTime.functionObjects().off(); + + // get times list + instantList timeDirs = Foam::timeSelector::select0(runTime, args); + + const bool optMesh = args.optionFound("mesh"); + const bool optResults = args.optionFound("results"); + const bool optOverwrite = args.optionFound("overwrite"); + + fileName exportName = ccm::writer::defaultMeshName; + if (args.optionReadIfPresent("name", exportName)) + { + const word ext = exportName.ext(); + // strip erroneous extension (.ccm, .ccmg, .ccmp) + if (ext == "ccm" || ext == "ccmg" || ext == "ccmp") + { + exportName = exportName.lessExt(); + } + } + else if (args.optionFound("case")) + { + exportName += '-' + args.globalCaseName(); + } + + if (optMesh && optResults) + { + Warning + << "\n-mesh and -results options are mutually exclusive\n" + << endl; + args.printUsage(); + FatalError.exit(); + } + +// // skip over time=0, unless some other time option has been specified +// if +// ( +// !args.optionFound("zeroTime") +// && !args.optionFound("time") +// && !args.optionFound("latestTime") +// && Times.size() > 2 +// ) +// { +// startTime = 2; +// } +// +// runTime.setTime(Times[startTime], startTime); + + runTime.setTime(timeDirs[0], 0); + if (optMesh) + { + // convert mesh only + #include "createPolyMesh.H" + + forAll(timeDirs, timeI) + { + runTime.setTime(timeDirs[timeI], timeI); + + #include "getTimeIndex.H" + + if (timeI == 0) + { + ccm::writer writer + ( + exportName + ".ccmg", + mesh, + !optOverwrite + ); + writer.writeGeometry(); + } + else if (mesh.moving()) + { + ccm::writer writer + ( + exportName + ".ccmg_" + timeName, + mesh, + !optOverwrite + ); + writer.writeGeometry(); + } + } + } + else + { + // convert fields with or without converting mesh + #include "createMesh.H" + + // #include "checkHasMovingMesh.H" + // #include "checkHasLagrangian.H" + + IOobjectList objects(mesh, timeDirs[timeDirs.size()-1].name()); + // IOobjectList sprayObjects(mesh, Times[Times.size()-1].name(), "lagrangian"); + + forAll(timeDirs, timeI) + { + runTime.setTime(timeDirs[timeI], timeI); + + #include "getTimeIndex.H" + + Info<< "has " + << mesh.nCells() << " cells, " + << mesh.nPoints() << " points, " + << mesh.boundaryMesh().size() << " patches" + << endl; + + if (!optResults) + { + if (timeI == 0) + { + ccm::writer writer + ( + exportName + ".ccmg", + mesh, + !optOverwrite + ); + writer.writeGeometry(); + } + else if (mesh.moving()) + { + ccm::writer writer + ( + exportName + ".ccmg_" + timeName, + mesh, + !optOverwrite + ); + writer.writeGeometry(); + } + } + + ccm::writer writer + ( + exportName + ".ccmp_" + timeName, + mesh, + !optOverwrite + ); + // writer.setTopologyFile(exportName + ".ccmg"); + Info<< "writing solution:"; + if (args.optionFound("remap")) + { + writer.writeSolution(objects, args["remap"]); + } + else + { + writer.writeSolution(objects); + } + } + } + + Info<< "\nEnd\n" << endl; + return 0; +} + + +// ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/getTimeIndex.H b/applications/utilities/mesh/conversion/ccm/foamToCcm/getTimeIndex.H new file mode 100644 index 0000000000000000000000000000000000000000..4547e06457e9faf3f96bc5c0fc35bc28cdd7d1dc --- /dev/null +++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/getTimeIndex.H @@ -0,0 +1,49 @@ +// Read time index from */uniform/time, but treat 0 and constant specially + + word timeName = "0"; + + if + ( + runTime.timeName() != runTime.constant() + && runTime.timeName() != "0" + ) + { + IOobject io + ( + "time", + runTime.timeName(), + "uniform", + runTime, + IOobject::READ_IF_PRESENT, + IOobject::NO_WRITE, + false + ); + + if (io.typeHeaderOk(true)) + { + IOdictionary timeObject + ( + IOobject + ( + "time", + runTime.timeName(), + "uniform", + runTime, + IOobject::MUST_READ, + IOobject::NO_WRITE, + false + ) + ); + + label index; + timeObject.lookup("index") >> index; + timeName = Foam::name(index); + } + else + { + timeName = runTime.timeName(); + } + } + + Info<< "\nTime [" << timeName << "] = " << runTime.timeName() << nl; + diff --git a/applications/utilities/mesh/conversion/fireToFoam/Make/files b/applications/utilities/mesh/conversion/fireToFoam/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..a8734855d05090b2b37c953497224a46ac205a5e --- /dev/null +++ b/applications/utilities/mesh/conversion/fireToFoam/Make/files @@ -0,0 +1,3 @@ +fireToFoam.C + +EXE = $(FOAM_APPBIN)/fireToFoam diff --git a/applications/utilities/mesh/conversion/fireToFoam/Make/options b/applications/utilities/mesh/conversion/fireToFoam/Make/options new file mode 100644 index 0000000000000000000000000000000000000000..e3af2fe661b0e1a9cc1f77fbe4b08a9923d2bd35 --- /dev/null +++ b/applications/utilities/mesh/conversion/fireToFoam/Make/options @@ -0,0 +1,7 @@ +EXE_INC = \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude + +EXE_LIBS = \ + -lconversion diff --git a/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C b/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C new file mode 100644 index 0000000000000000000000000000000000000000..0f7c32c701dea259c602298d4dc933c4c0eef449 --- /dev/null +++ b/applications/utilities/mesh/conversion/fireToFoam/fireToFoam.C @@ -0,0 +1,123 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Application + fireToFoam + +Group + grpMeshConversionUtilities + +Description + Converts an AVL/FIRE polyhedral mesh to OPENFOAM + +Usage + \b fireToFoam [OPTION] firePolyMesh + + Options: + + - \param -ascii + Write in ASCII format instead of binary + + - \par -check + Perform edge checking + + - \par -scale \ + Specify an alternative geometry scaling factor. + The default is \b 1 (no scaling). + +\*---------------------------------------------------------------------------*/ + +#include "argList.H" +#include "Time.H" +#include "FIREMeshReader.H" +#include "checkFireEdges.H" + +using namespace Foam; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +int main(int argc, char *argv[]) +{ + argList::addNote + ( + "Convert AVL/FIRE polyhedral mesh to OPENFOAM format" + ); + + argList::noParallel(); + argList::validArgs.append("firePolyMesh"); + argList::addBoolOption + ( + "ascii", + "write in ASCII format instead of binary" + ); + argList::addBoolOption + ( + "check", + "perform edge checking as well" + ); + argList::addOption + ( + "scale", + "scale", + "geometry scaling factor - default is 1 (no scaling)" + ); + + + argList args(argc, argv); + Time runTime(args.rootPath(), args.caseName()); + + + // Binary output, unless otherwise specified + const IOstream::streamFormat format = + ( + args.optionFound("ascii") + ? IOstream::ASCII + : IOstream::BINARY + ); + + // increase the precision of the points data + IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision())); + + + fileFormats::FIREMeshReader reader + ( + args[1], + // Default no scaling + args.optionLookupOrDefault("scale", 1.0) + ); + + + autoPtr mesh = reader.mesh(runTime); + reader.writeMesh(mesh(), format); + + + if (args.optionFound("check")) + { + checkFireEdges(mesh()); + } + + Info<< "\nEnd\n" << endl; + return 0; +} + +// ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/foamToFireMesh/Make/files b/applications/utilities/mesh/conversion/foamToFireMesh/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..0cc67f4f557a5542705ef177178f54e44518a35e --- /dev/null +++ b/applications/utilities/mesh/conversion/foamToFireMesh/Make/files @@ -0,0 +1,3 @@ +foamToFireMesh.C + +EXE = $(FOAM_APPBIN)/foamToFireMesh diff --git a/applications/utilities/mesh/conversion/foamToFireMesh/Make/options b/applications/utilities/mesh/conversion/foamToFireMesh/Make/options new file mode 100644 index 0000000000000000000000000000000000000000..e3af2fe661b0e1a9cc1f77fbe4b08a9923d2bd35 --- /dev/null +++ b/applications/utilities/mesh/conversion/foamToFireMesh/Make/options @@ -0,0 +1,7 @@ +EXE_INC = \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude + +EXE_LIBS = \ + -lconversion diff --git a/applications/utilities/mesh/conversion/foamToFireMesh/foamToFireMesh.C b/applications/utilities/mesh/conversion/foamToFireMesh/foamToFireMesh.C new file mode 100644 index 0000000000000000000000000000000000000000..87ddd4dff938fdef1f9d626dbd180d92978db89d --- /dev/null +++ b/applications/utilities/mesh/conversion/foamToFireMesh/foamToFireMesh.C @@ -0,0 +1,136 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Application + foamToFireMesh + +Description + Reads an OpenFOAM mesh and writes an AVL/FIRE fpma format + +Usage + \b foamToFireMesh [OPTION] + + Options: + - \par -ascii + Write in ASCII format instead of binary + + - \par -scale \ + Specify an alternative geometry scaling factor. + The default is \b 1 (ie, no scaling). + +See also + Foam::cellTable, Foam::meshWriter and Foam::fileFormats::FIREMeshWriter + +\*---------------------------------------------------------------------------*/ + +#include "argList.H" +#include "timeSelector.H" +#include "Time.H" +#include "polyMesh.H" +#include "FIREMeshWriter.H" + +using namespace Foam; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Main program: + +int main(int argc, char *argv[]) +{ + argList::addNote + ( + "read OpenFOAM mesh and write an AVL/FIRE fpma format" + ); + argList::noParallel(); + timeSelector::addOptions(); + + argList::addBoolOption + ( + "ascii", + "write in ASCII format instead of binary" + ); + argList::addOption + ( + "scale", + "factor", + "geometry scaling factor - default is 1 (none)" + ); + + #include "setRootCase.H" + #include "createTime.H" + + instantList timeDirs = timeSelector::select0(runTime, args); + + fileName exportName = meshWriter::defaultMeshName; + if (args.optionFound("case")) + { + exportName += '-' + args.globalCaseName(); + } + + + // write control options + // ~~~~~~~~~~~~~~~~~~~~~ + fileFormats::FIREMeshWriter::binary = !args.optionFound("ascii"); + + // default: rescale from [m] to [mm] + scalar scaleFactor = 1; + if (args.optionReadIfPresent("scale", scaleFactor)) + { + if (scaleFactor <= 0) + { + scaleFactor = 1; + } + } + + #include "createPolyMesh.H" + + forAll(timeDirs, timeI) + { + runTime.setTime(timeDirs[timeI], timeI); + + #include "getTimeIndex.H" + + polyMesh::readUpdateState state = mesh.readUpdate(); + + if (!timeI || state != polyMesh::UNCHANGED) + { + fileFormats::FIREMeshWriter writer(mesh, scaleFactor); + + fileName meshName(exportName); + if (state != polyMesh::UNCHANGED) + { + meshName += '_' + runTime.timeName(); + } + + writer.write(meshName); + } + + Info<< nl << endl; + } + + Info<< "End\n" << endl; + + return 0; +} + + +// ************************************************************************* // diff --git a/applications/utilities/mesh/conversion/foamToFireMesh/getTimeIndex.H b/applications/utilities/mesh/conversion/foamToFireMesh/getTimeIndex.H new file mode 100644 index 0000000000000000000000000000000000000000..11b8993f28bd3efd8f8efd44d2880271d3a0419e --- /dev/null +++ b/applications/utilities/mesh/conversion/foamToFireMesh/getTimeIndex.H @@ -0,0 +1,51 @@ +// Read time index from */uniform/time, but treat 0 and constant specially + + word timeName = "0"; + + if + ( + runTime.timeName() != runTime.constant() + && runTime.timeName() != "0" + ) + { + IOobject io + ( + "time", + runTime.timeName(), + "uniform", + runTime, + IOobject::READ_IF_PRESENT, + IOobject::NO_WRITE, + false + ); + + if (io.typeHeaderOk(true)) + { + IOdictionary timeObject + ( + IOobject + ( + "time", + runTime.timeName(), + "uniform", + runTime, + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false + ) + ); + + label index; + timeObject.lookup("index") >> index; + timeName = Foam::name(index); + } + else + { + timeName = runTime.timeName(); + // Info<< "skip ... missing entry " << io.objectPath() << endl; + // continue; + } + } + + Info<< "\nTime [" << timeName << "] = " << runTime.timeName() << nl; + diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C index b4692d201ac15c2d2329fe8867de35766d1b7771..f8fe44f19fc05c81ff81eaa76bf2032e73a89d76 100644 --- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C +++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C @@ -94,15 +94,9 @@ int main(int argc, char *argv[]) exportName += '-' + args.globalCaseName(); } - // default: rescale from [m] to [mm] - scalar scaleFactor = 1000; - if (args.optionReadIfPresent("scale", scaleFactor)) - { - if (scaleFactor <= 0) - { - scaleFactor = 1; - } - } + // Default rescale from [m] to [mm] + const scalar scaleFactor = args.optionLookupOrDefault("scale", 1000.0); + const bool writeBndFile = !args.optionFound("noBnd"); #include "createPolyMesh.H" @@ -116,12 +110,12 @@ int main(int argc, char *argv[]) if (!timeI || state != polyMesh::UNCHANGED) { - fileFormats::STARCDMeshWriter writer(mesh, scaleFactor); - - if (args.optionFound("noBnd")) - { - writer.noBoundary(); - } + fileFormats::STARCDMeshWriter writer + ( + mesh, + scaleFactor, + writeBndFile + ); fileName meshName(exportName); if (state != polyMesh::UNCHANGED) diff --git a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C index af57977d788beb9b155e978a82be2f61d8cb11c0..65261399d076de189a31b6c7fbb206ac1a6f36ca 100644 --- a/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C +++ b/applications/utilities/mesh/conversion/star4ToFoam/star4ToFoam.C @@ -48,7 +48,7 @@ Usage Note Baffles are written as interfaces for later use -See Also +See also Foam::cellTable, Foam::meshReader and Foam::fileFormats::STARCDMeshReader \*---------------------------------------------------------------------------*/ @@ -88,32 +88,35 @@ int main(int argc, char *argv[]) "retain solid cells and treat them like fluid cells" ); + argList args(argc, argv); Time runTime(args.rootPath(), args.caseName()); - // default rescale from [mm] to [m] - scalar scaleFactor = args.optionLookupOrDefault("scale", 0.001); - if (scaleFactor <= 0) - { - scaleFactor = 1; - } - - fileFormats::STARCDMeshReader::keepSolids = args.optionFound("solids"); - - // default to binary output, unless otherwise specified - IOstream::streamFormat format = IOstream::BINARY; - if (args.optionFound("ascii")) - { - format = IOstream::ASCII; - } + // Binary output, unless otherwise specified + const IOstream::streamFormat format = + ( + args.optionFound("ascii") + ? IOstream::ASCII + : IOstream::BINARY + ); - // increase the precision of the points data + // Increase the precision of the points data IOstream::defaultPrecision(max(10u, IOstream::defaultPrecision())); - // remove extensions and/or trailing '.' + + // Remove extensions and/or trailing '.' const fileName prefix = fileName(args[1]).lessExt(); - fileFormats::STARCDMeshReader reader(prefix, runTime, scaleFactor); + + fileFormats::STARCDMeshReader reader + ( + prefix, + runTime, + // Default rescale from [mm] to [m] + args.optionLookupOrDefault("scale", 0.001), + args.optionFound("solids") + ); + autoPtr mesh = reader.mesh(runTime); reader.writeMesh(mesh, format); diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/files b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/files index 044aa6ae43a0911e12dbc805adeeb202ad3ad864..a474a8fcfc5ca8a0593a612b2f5aceb2246ead9b 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/files +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/files @@ -1,6 +1,4 @@ ensightOutputCloud.C -meshSubsetHelper.C - foamToEnsight.C EXE = $(FOAM_APPBIN)/foamToEnsight diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C index 1d0f6c3beb3d0e08ec4318c1af86605ad96ee29b..5080d840ebc1e3da0ab29f58a411f2c9a43da133 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C @@ -291,7 +291,7 @@ int main(int argc, char *argv[]) << mesh.boundaryMesh()[0].name() << ")" << endl; } - meshSubsetHelper myMesh(mesh, cellZoneName); + meshSubsetHelper myMesh(mesh, meshSubsetHelper::ZONE, cellZoneName); // // Open new ensight case file, initialize header etc. diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/files b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/files index 270e84931b599af46bf3a9db82024e3202dd5006..3eb58f17730826790e60e9c50a6ecc12f9c81c13 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/files +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/files @@ -1,5 +1,4 @@ tecplotWriter.C -vtkMesh.C foamToTecplot360.C EXE = $(FOAM_APPBIN)/foamToTecplot360 diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C index 6ec9aff2772060d06ea92c5c07e8859aa08428d1..5dbe1581cad2d7edc6860575c82858169bfbf7c6 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -68,9 +68,6 @@ Usage information as a single argument. The double quotes denote a regular expression. - - \par -useTimeName - use the time index in the VTK file name instead of the time index - \*---------------------------------------------------------------------------*/ #include "pointMesh.H" @@ -86,7 +83,7 @@ Usage #include "stringListOps.H" #include "wordRe.H" -#include "vtkMesh.H" +#include "meshSubsetHelper.H" #include "readFields.H" #include "tecplotWriter.H" @@ -99,7 +96,7 @@ Usage // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template -void print(const char* msg, Ostream& os, const PtrList& flds) +void print(const char* msg, Ostream& os, const PtrList& flds) { if (flds.size()) { @@ -140,7 +137,7 @@ labelList getSelectedPatches if ( isType(pp) - || (Pstream::parRun() && isType(pp)) + || (Pstream::parRun() && isType(pp)) ) { Info<< " discarding empty/processor patch " << patchi @@ -161,8 +158,7 @@ labelList getSelectedPatches } - - +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // int main(int argc, char *argv[]) { @@ -170,10 +166,8 @@ int main(int argc, char *argv[]) ( "Tecplot binary file format writer" ); - timeSelector::addOptions(); #include "addRegionOption.H" - argList::addOption ( "fields", @@ -190,7 +184,7 @@ int main(int argc, char *argv[]) ( "faceSet", "name", - "restrict conversion to the specified cellSet" + "restrict conversion to the specified faceSet" ); argList::addBoolOption ( @@ -248,7 +242,8 @@ int main(int argc, char *argv[]) } word cellSetName; - string vtkName; + word faceSetName; + string vtkName = runTime.caseName(); if (args.optionReadIfPresent("cellSet", cellSetName)) { @@ -266,11 +261,7 @@ int main(int argc, char *argv[]) vtkName = vtkName.substr(i); } } - else - { - vtkName = runTime.caseName(); - } - + args.optionReadIfPresent("faceSet", faceSetName); instantList timeDirs = timeSelector::select0(runTime, args); @@ -294,10 +285,11 @@ int main(int argc, char *argv[]) args.optionFound("time") || args.optionFound("latestTime") || cellSetName.size() + || faceSetName.size() || regionName != polyMesh::defaultRegion ) { - Info<< "Keeping old files in " << fvPath << nl << endl; + Info<< "Keeping old tecplot files in " << fvPath << nl << endl; } else { @@ -309,9 +301,8 @@ int main(int argc, char *argv[]) mkDir(fvPath); - - // mesh wrapper; does subsetting and decomposition - vtkMesh vMesh(mesh, cellSetName); + // Mesh wrapper: does subsetting + meshSubsetHelper myMesh(mesh, meshSubsetHelper::SET, cellSetName); forAll(timeDirs, timeI) { @@ -319,13 +310,12 @@ int main(int argc, char *argv[]) Info<< "Time: " << runTime.timeName() << endl; - const word timeDesc = name(timeI); //name(runTime.timeIndex()); + const word timeDesc = name(timeI); // Foam::name(runTime.timeIndex()); // Check for new polyMesh/ and update mesh, fvMeshSubset and cell // decomposition. - polyMesh::readUpdateState meshState = vMesh.readUpdate(); - - const fvMesh& mesh = vMesh.mesh(); + polyMesh::readUpdateState meshState = myMesh.readUpdate(); + const fvMesh& mesh = myMesh.mesh(); INTEGER4 nFaceNodes = 0; forAll(mesh.faces(), facei) @@ -348,24 +338,24 @@ int main(int argc, char *argv[]) // Construct the vol fields (on the original mesh if subsetted) - PtrList vsf; - readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vsf); + PtrList vsf; + readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vsf); print(" volScalarFields :", Info, vsf); - PtrList vvf; - readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vvf); + PtrList vvf; + readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vvf); print(" volVectorFields :", Info, vvf); - PtrList vSpheretf; - readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vSpheretf); + PtrList vSpheretf; + readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vSpheretf); print(" volSphericalTensorFields :", Info, vSpheretf); - PtrList vSymmtf; - readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vSymmtf); + PtrList vSymmtf; + readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vSymmtf); print(" volSymmTensorFields :", Info, vSymmtf); - PtrList vtf; - readFields(vMesh, vMesh.baseMesh(), objects, selectedFields, vtf); + PtrList vtf; + readFields(myMesh, myMesh.baseMesh(), objects, selectedFields, vtf); print(" volTensorFields :", Info, vtf); @@ -379,11 +369,11 @@ int main(int argc, char *argv[]) << " (\"-noPointValues\" (at your option)\n"; } - PtrList psf; - PtrList pvf; - //PtrList pSpheretf; - //PtrList pSymmtf; - //PtrList ptf; + PtrList psf; + PtrList pvf; + //PtrList pSpheretf; + //PtrList pSymmtf; + //PtrList ptf; if (!noPointValues) @@ -418,8 +408,8 @@ int main(int argc, char *argv[]) readFields ( - vMesh, - pointMesh::New(vMesh.baseMesh()), + myMesh, + pointMesh::New(myMesh.baseMesh()), objects, selectedFields, psf @@ -428,8 +418,8 @@ int main(int argc, char *argv[]) readFields ( - vMesh, - pointMesh::New(vMesh.baseMesh()), + myMesh, + pointMesh::New(myMesh.baseMesh()), objects, selectedFields, pvf @@ -438,8 +428,8 @@ int main(int argc, char *argv[]) //readFields //( - // vMesh, - // pointMesh::New(vMesh.baseMesh()), + // myMesh, + // pointMesh::New(myMesh.baseMesh()), // objects, // selectedFields, // pSpheretf @@ -448,8 +438,8 @@ int main(int argc, char *argv[]) // //readFields //( - // vMesh, - // pointMesh::New(vMesh.baseMesh()), + // myMesh, + // pointMesh::New(myMesh.baseMesh()), // objects, // selectedFields, // pSymmtf @@ -458,8 +448,8 @@ int main(int argc, char *argv[]) // //readFields //( - // vMesh, - // pointMesh::New(vMesh.baseMesh()), + // myMesh, + // pointMesh::New(myMesh.baseMesh()), // objects, // selectedFields, // ptf @@ -769,11 +759,10 @@ int main(int argc, char *argv[]) // //--------------------------------------------------------------------- - if (args.optionFound("faceSet")) + if (faceSetName.size()) { // Load the faceSet - const word setName = args["faceSet"]; - labelList faceLabels(faceSet(mesh, setName).toc()); + labelList faceLabels(faceSet(mesh, faceSetName).toc()); // Filename as if patch with same name. mkDir(fvPath/setName); @@ -886,7 +875,6 @@ int main(int argc, char *argv[]) } - //--------------------------------------------------------------------- // // Write patches as multi-zone file @@ -901,7 +889,7 @@ int main(int argc, char *argv[]) fileName patchFileName; - if (vMesh.useSubMesh()) + if (myMesh.useSubMesh()) { patchFileName = fvPath/"boundaryMesh"/cellSetName @@ -1072,7 +1060,7 @@ int main(int argc, char *argv[]) fileName patchFileName; - if (vMesh.useSubMesh()) + if (myMesh.useSubMesh()) { patchFileName = fvPath/"faceZoneMesh"/cellSetName diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C index c677fe439c7ef0a75b6beb96352a0c67ea42bb15..172a83cf2399cd5f8d4b8678d6e1531fcc16929a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C @@ -2,8 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation - \\/ M anipulation | + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -36,37 +36,32 @@ namespace Foam template void readFields ( - const vtkMesh& vMesh, + const meshSubsetHelper& helper, const typename GeoField::Mesh& mesh, const IOobjectList& objects, const HashSet& selectedFields, - PtrList& fields + PtrList& fields ) { - // Search list of objects for volScalarFields + // Search list of objects for fields of type GeomField IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName)); - // Construct the vol scalar fields - label nFields = fields.size(); - fields.setSize(nFields + fieldObjects.size()); + // Construct the fields + fields.setSize(fieldObjects.size()); + label nFields = 0; - forAllIter(IOobjectList, fieldObjects, iter) + forAllConstIter(IOobjectList, fieldObjects, iter) { if (selectedFields.empty() || selectedFields.found(iter()->name())) { fields.set ( - nFields, - vMesh.interpolate + nFields++, + helper.interpolate ( - GeoField - ( - *iter(), - mesh - ) - ) + GeoField(*iter(), mesh) + ).ptr() ); - nFields++; } } diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.H index b25c56755c2f2559bf4076ce57057268cad5b131..510bd11d2536419dea3c29bfce016e2dbd5ddd8e 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.H @@ -2,8 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation - \\/ M anipulation | + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -34,7 +34,7 @@ SourceFiles #ifndef readFields_H #define readFields_H -#include "fvMesh.H" +#include "meshSubsetHelper.H" #include "PtrList.H" #include "IOobjectList.H" #include "HashSet.H" @@ -48,11 +48,11 @@ namespace Foam template void readFields ( - const vtkMesh& vMesh, + const meshSubsetHelper&, const typename GeoField::Mesh& mesh, const IOobjectList& objects, const HashSet& selectedFields, - PtrList& fields + PtrList& fields ); } // End namespace Foam diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.H deleted file mode 100644 index ec6045b5341b0516fd7742ec5f7a84f215d60f19..0000000000000000000000000000000000000000 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.H +++ /dev/null @@ -1,178 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::vtkMesh - -Description - Encapsulation of VTK mesh data. Holds mesh or meshsubset and - polyhedral-cell decomposition on it. - -SourceFiles - vtkMesh.C - -\*---------------------------------------------------------------------------*/ - -#ifndef vtkMesh_H -#define vtkMesh_H - -#include "fvMeshSubset.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Forward declaration of classes -class Time; - -/*---------------------------------------------------------------------------*\ - Class vtkMesh Declaration -\*---------------------------------------------------------------------------*/ - -class vtkMesh -{ - // Private data - - //- Reference to mesh - fvMesh& baseMesh_; - - //- Subsetting engine + sub-fvMesh - fvMeshSubset subsetter_; - - //- Current cellSet (or empty) - const word setName_; - -// //- Current decomposition of topology -// mutable autoPtr topoPtr_; - - - - // Private Member Functions - - //- Disallow default bitwise copy construct - vtkMesh(const vtkMesh&); - - //- Disallow default bitwise assignment - void operator=(const vtkMesh&); - - -public: - - // Constructors - - //- Construct from components - vtkMesh(fvMesh& baseMesh, const word& setName = ""); - - - // Member Functions - - // Access - - //- Whole mesh - const fvMesh& baseMesh() const - { - return baseMesh_; - } - - const fvMeshSubset& subsetter() const - { - return subsetter_; - } - - //- Check if running subMesh - bool useSubMesh() const - { - return setName_.size(); - } - -// //- topology -// const vtkTopo& topo() const -// { -// if (topoPtr_.empty()) -// { -// topoPtr_.reset(new vtkTopo(mesh())); -// } -// return topoPtr_(); -// } - - //- Access either mesh or submesh - const fvMesh& mesh() const - { - if (useSubMesh()) - { - return subsetter_.subMesh(); - } - else - { - return baseMesh_; - } - } - -// //- Number of field cells -// label nFieldCells() const -// { -// return topo().vertLabels().size(); -// } -// -// //- Number of field points -// label nFieldPoints() const -// { -// return mesh().nPoints() + topo().addPointCellLabels().size(); -// } - - - // Edit - - //- Read mesh - polyMesh::readUpdateState readUpdate(); - - - //- Map volume field (does in fact do very little interpolation; - // just copied from fvMeshSubset) - template - tmp interpolate(const GeoField& fld) const - { - if (useSubMesh()) - { - tmp subFld = subsetter_.interpolate(fld); - subFld.ref().rename(fld.name()); - return subFld; - } - else - { - return fld; - } - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C index 4e42b5afbfaa25c7e4275541de7c96e959aad0f7..c2a6f3b29810977ee869310d9c56f5feb2463420 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C @@ -410,7 +410,6 @@ int main(int argc, char *argv[]) args.optionReadIfPresent("pointSet", pointSetName); - instantList timeDirs = timeSelector::select0(runTime, args); #include "createNamedMesh.H" @@ -450,7 +449,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); Info<< "VTK mesh topology: " @@ -503,7 +502,7 @@ int main(int argc, char *argv[]) Info<< " FaceSet : " << patchFileName << endl; - writeFaceSet(binary, vMesh, set, patchFileName); + writeFaceSet(binary, vMesh.mesh(), set, patchFileName); continue; } @@ -526,7 +525,7 @@ int main(int argc, char *argv[]) Info<< " pointSet : " << patchFileName << endl; - writePointSet(binary, vMesh, set, patchFileName); + writePointSet(binary, vMesh.mesh(), set, patchFileName); continue; } @@ -849,7 +848,7 @@ int main(int argc, char *argv[]) writeSurfFields ( binary, - vMesh, + vMesh.mesh(), surfFileName, svf ); @@ -892,7 +891,7 @@ int main(int argc, char *argv[]) patchWriter writer ( - vMesh, + vMesh.mesh(), binary, nearCellValue, patchFileName, @@ -970,7 +969,7 @@ int main(int argc, char *argv[]) patchWriter writer ( - vMesh, + vMesh.mesh(), binary, nearCellValue, patchFileName, @@ -1188,7 +1187,7 @@ int main(int argc, char *argv[]) lagrangianWriter writer ( - vMesh, + vMesh.mesh(), binary, lagrFileName, cloudName, @@ -1218,7 +1217,7 @@ int main(int argc, char *argv[]) { lagrangianWriter writer ( - vMesh, + vMesh.mesh(), binary, lagrFileName, cloudName, diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files index 4deaaa68f07c4ac1117eb8673149c90d195bc8f2..02de5b47e6254aab58ae3557c2f7e2342b7df753 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/Make/files @@ -6,7 +6,6 @@ writeFuns.C writeFaceSet.C writePointSet.C writeSurfFields.C -vtkMesh.C vtkTopo.C writeVTK/writeVTK.C diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H index b61cfd6377aed05e7d85fe681a648c6ef1c63deb..b1836afb60e16c05542594272367a3ea69fdea25 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H @@ -41,8 +41,6 @@ SourceFiles #include "pointFields.H" #include "vtkMesh.H" -using namespace Foam; - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C index 6c168a22805b4218ecf89f1366cb15ffb77d3815..6eab8f164666e4767559491354f705df14cc4418 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,23 +32,21 @@ License Foam::lagrangianWriter::lagrangianWriter ( - const vtkMesh& vMesh, + const fvMesh& mesh, const bool binary, const fileName& fName, const word& cloudName, const bool dummyCloud ) : - vMesh_(vMesh), + mesh_(mesh), binary_(binary), fName_(fName), cloudName_(cloudName), os_(fName.c_str()) { - const fvMesh& mesh = vMesh_.mesh(); - // Write header - writeFuns::writeHeader(os_, binary_, mesh.time().caseName()); + writeFuns::writeHeader(os_, binary_, mesh_.time().caseName()); os_ << "DATASET POLYDATA" << std::endl; if (dummyCloud) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H index 113bfe43b0a399554f61dd0d1614491554d91d0a..24dd4a322872c92eb6f2dfa32474c7c676e728d3 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriter.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -40,9 +40,6 @@ SourceFiles #include "Cloud.H" #include "volFields.H" #include "pointFields.H" -#include "vtkMesh.H" - -using namespace Foam; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,7 +54,7 @@ class volPointInterpolation; class lagrangianWriter { - const vtkMesh& vMesh_; + const fvMesh& mesh_; const bool binary_; @@ -77,7 +74,7 @@ public: //- Construct from components lagrangianWriter ( - const vtkMesh&, + const fvMesh&, const bool binary, const fileName&, const word&, diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C index 8d34517dca577652c338114abe8c990fab4816c8..86cec10dc3ee015598988d5ee2b71c5ed036fc0c 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/lagrangianWriterTemplates.C @@ -39,9 +39,9 @@ void Foam::lagrangianWriter::writeIOField(const wordList& objects) IOobject header ( object, - vMesh_.mesh().time().timeName(), + mesh_.time().timeName(), cloud::prefix/cloudName_, - vMesh_.mesh(), + mesh_, IOobject::MUST_READ, IOobject::NO_WRITE, false diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C index 4a9840c1e271d18aa0314b75bf6463cdc388abae..d099745aa259b8f59f9029a52af2b1725a8859c3 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -30,21 +30,20 @@ License Foam::patchWriter::patchWriter ( - const vtkMesh& vMesh, + const fvMesh& mesh, const bool binary, const bool nearCellValue, const fileName& fName, const labelList& patchIDs ) : - vMesh_(vMesh), + mesh_(mesh), binary_(binary), nearCellValue_(nearCellValue), fName_(fName), patchIDs_(patchIDs), os_(fName.c_str()) { - const fvMesh& mesh = vMesh_.mesh(); const polyBoundaryMesh& patches = mesh.boundaryMesh(); // Write header @@ -115,8 +114,6 @@ Foam::patchWriter::patchWriter void Foam::patchWriter::writePatchIDs() { - const fvMesh& mesh = vMesh_.mesh(); - DynamicList fField(nFaces_); os_ << "patchID 1 " << nFaces_ << " float" << std::endl; @@ -125,7 +122,7 @@ void Foam::patchWriter::writePatchIDs() { label patchi = patchIDs_[i]; - const polyPatch& pp = mesh.boundaryMesh()[patchi]; + const polyPatch& pp = mesh_.boundaryMesh()[patchi]; if (!isA(pp)) { diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H index e25bbb1122414163f440f685bc5a6688c92b3cef..aab8075da87052a6ebc22fdc00cbf041e8aede05 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/patchWriter.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -40,12 +40,9 @@ SourceFiles #include "OFstream.H" #include "volFields.H" #include "pointFields.H" -#include "vtkMesh.H" #include "indirectPrimitivePatch.H" #include "PrimitivePatchInterpolation.H" -using namespace Foam; - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -59,7 +56,8 @@ class volPointInterpolation; class patchWriter { - const vtkMesh& vMesh_; + //- Reference to the OpenFOAM mesh (or subset) + const fvMesh& mesh_; const bool binary_; @@ -82,7 +80,7 @@ public: //- Construct from components patchWriter ( - const vtkMesh&, + const fvMesh&, const bool binary, const bool nearCellValue, const fileName&, diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C index 8d515ab056391eef21df4e8177d942e254eb98a7..172a83cf2399cd5f8d4b8678d6e1531fcc16929a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -36,37 +36,32 @@ namespace Foam template void readFields ( - const vtkMesh& vMesh, + const meshSubsetHelper& helper, const typename GeoField::Mesh& mesh, const IOobjectList& objects, const HashSet& selectedFields, PtrList& fields ) { - // Search list of objects for volScalarFields + // Search list of objects for fields of type GeomField IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName)); - // Construct the vol scalar fields + // Construct the fields fields.setSize(fieldObjects.size()); label nFields = 0; - forAllIter(IOobjectList, fieldObjects, iter) + forAllConstIter(IOobjectList, fieldObjects, iter) { if (selectedFields.empty() || selectedFields.found(iter()->name())) { fields.set ( - nFields, - vMesh.interpolate + nFields++, + helper.interpolate ( - GeoField - ( - *iter(), - mesh - ) + GeoField(*iter(), mesh) ).ptr() ); - nFields++; } } diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H index 31b7e2632c84a7e493e0f4cd5defd3cf5b0e4c56..510bd11d2536419dea3c29bfce016e2dbd5ddd8e 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/readFields.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -34,7 +34,7 @@ SourceFiles #ifndef readFields_H #define readFields_H -#include "fvMesh.H" +#include "meshSubsetHelper.H" #include "PtrList.H" #include "IOobjectList.H" #include "HashSet.H" @@ -48,7 +48,7 @@ namespace Foam template void readFields ( - const vtkMesh& vMesh, + const meshSubsetHelper&, const typename GeoField::Mesh& mesh, const IOobjectList& objects, const HashSet& selectedFields, diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H index f06da45c3f7f94576fb397e326d3596d60d0b65d..0a5589c26e7edbe6866388d9bb55936b45d02d37 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H @@ -40,11 +40,8 @@ SourceFiles #include "OFstream.H" #include "volFields.H" #include "surfaceFields.H" -#include "vtkMesh.H" #include "indirectPrimitivePatch.H" -using namespace Foam; - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C index 68fd29d257b538d3b36a789daba2bba931c55d08..92d878f2292b534fe915f2c5e8bae4ed2056fff2 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C @@ -29,7 +29,8 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // template -Foam::tmp> Foam::surfaceMeshWriter::getFaceField +Foam::tmp> +Foam::surfaceMeshWriter::getFaceField ( const GeometricField& sfld ) const diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H index f536ae04fa2f7e27faa7baf121366ba63e988fc4..f0a80db4ead04f7e4e1c13d77c488225d5acb809 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/vtkMesh.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -36,46 +36,35 @@ SourceFiles #ifndef vtkMesh_H #define vtkMesh_H +#include "meshSubsetHelper.H" #include "vtkTopo.H" -#include "fvMeshSubset.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -// Forward declaration of classes -class Time; - /*---------------------------------------------------------------------------*\ Class vtkMesh Declaration \*---------------------------------------------------------------------------*/ class vtkMesh +: + public meshSubsetHelper { // Private data - //- Reference to mesh - fvMesh& baseMesh_; - - //- Subsetting engine + sub-fvMesh - fvMeshSubset subsetter_; - - //- Current cellSet (or empty) - const word setName_; - //- Current decomposition of topology mutable autoPtr topoPtr_; - // Private Member Functions //- Disallow default bitwise copy construct - vtkMesh(const vtkMesh&); + vtkMesh(const vtkMesh&) = delete; //- Disallow default bitwise assignment - void operator=(const vtkMesh&); + void operator=(const vtkMesh&) = delete; public: @@ -83,31 +72,17 @@ public: // Constructors //- Construct from components - vtkMesh(fvMesh& baseMesh, const word& setName = ""); + vtkMesh(fvMesh& baseMesh, const word& setName = word::null) + : + meshSubsetHelper(baseMesh, meshSubsetHelper::SET, setName) + {} // Member Functions // Access - //- Whole mesh - const fvMesh& baseMesh() const - { - return baseMesh_; - } - - const fvMeshSubset& subsetter() const - { - return subsetter_; - } - - //- Check if running subMesh - bool useSubMesh() const - { - return setName_.size(); - } - - //- topology + //- Topology const vtkTopo& topo() const { if (topoPtr_.empty()) @@ -117,18 +92,6 @@ public: return topoPtr_(); } - //- Access either mesh or submesh - const fvMesh& mesh() const - { - if (useSubMesh()) - { - return subsetter_.subMesh(); - } - else - { - return baseMesh_; - } - } //- Number of field cells label nFieldCells() const @@ -136,6 +99,7 @@ public: return topo().cellTypes().size(); } + //- Number of field points label nFieldPoints() const { @@ -145,26 +109,20 @@ public: // Edit - //- Read mesh - polyMesh::readUpdateState readUpdate(); - - - //- Map volume field (does in fact do very little interpolation; - // just copied from fvMeshSubset) - template - tmp interpolate(const GeoField& fld) const + //- Read mesh, forcing topo update if necessary + polyMesh::readUpdateState readUpdate() { - if (useSubMesh()) - { - tmp subFld = subsetter_.interpolate(fld); - subFld.ref().rename(fld.name()); - return subFld; - } - else + polyMesh::readUpdateState meshState + = meshSubsetHelper::readUpdate(); + + if (meshState != polyMesh::UNCHANGED) { - return fld; + topoPtr_.clear(); } + + return meshState; } + }; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C index 4ad78d96a0d7075f16dc73444283fd98729ed4bc..0556b7aaf27e0022b82cbb587dea9f818f9409e3 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,12 +32,12 @@ License void Foam::writeFaceSet ( const bool binary, - const vtkMesh& vMesh, + const fvMesh& mesh, const faceSet& set, const fileName& fileName ) { - const faceList& faces = vMesh.mesh().faces(); + const faceList& faces = mesh.faces(); std::ofstream ostr(fileName.c_str()); @@ -69,7 +69,7 @@ void Foam::writeFaceSet setFaces[setFacei] = faces[iter.key()]; setFacei++; } - primitiveFacePatch fp(setFaces, vMesh.mesh().points()); + primitiveFacePatch fp(setFaces, mesh.points()); // Write points and faces as polygons diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H index eb7c45203169a0a46c43fcd713c5e0cb4609effe..73ca4f07416e6fc9fdfff79350a6ddefdd876160 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFaceSet.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -36,7 +36,7 @@ SourceFiles #ifndef writeFaceSet_H #define writeFaceSet_H -#include "vtkMesh.H" +#include "fvMesh.H" #include "faceSet.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,7 +48,7 @@ namespace Foam void writeFaceSet ( const bool binary, - const vtkMesh& vMesh, + const fvMesh&, const faceSet& set, const fileName& fileName ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C index 4cafa01f0a0879ad1e40b5d3039042b18bc37f7d..e5fffb536671144a864004b16ee89eac11416612 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.C @@ -37,7 +37,7 @@ namespace Foam void writePointSet ( const bool binary, - const vtkMesh& vMesh, + const fvMesh& mesh, const pointSet& set, const fileName& fileName ) @@ -68,7 +68,7 @@ void writePointSet writeFuns::insert ( - UIndirectList(vMesh.mesh().points(), set.toc())(), + UIndirectList(mesh.points(), set.toc())(), ptField ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H index 32ffd981f6bedc4a3c5b14a92d1986528249a664..d1ad15efe6d7b7b95946f479e695765eebb3aea8 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writePointSet.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -36,7 +36,7 @@ SourceFiles #ifndef writePointSet_H #define writePointSet_H -#include "vtkMesh.H" +#include "fvMesh.H" #include "pointSet.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,7 +48,7 @@ namespace Foam void writePointSet ( const bool binary, - const vtkMesh& vMesh, + const fvMesh& mesh, const pointSet& set, const fileName& fileName ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C index 4144a579a5497701b36afd23752a98fca3d65e99..9dc889adf4be77423e75cb965625c3cc7b52c590 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,13 +35,11 @@ License void Foam::writeSurfFields ( const bool binary, - const vtkMesh& vMesh, + const fvMesh& mesh, const fileName& fileName, const UPtrList& surfVectorFields ) { - const fvMesh& mesh = vMesh.mesh(); - std::ofstream str(fileName.c_str()); writeFuns::writeHeader diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H index 798e335fd343cf180e7f579919cf44fa58630718..7740e15f78f48c3817ebfca37e8ab65b17eb3f44 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeSurfFields.H @@ -35,7 +35,7 @@ SourceFiles #ifndef writeSurfFields_H #define writeSurfFields_H -#include "vtkMesh.H" +#include "fvMesh.H" #include "surfaceMesh.H" #include "surfaceFieldsFwd.H" @@ -48,7 +48,7 @@ namespace Foam void writeSurfFields ( const bool binary, - const vtkMesh& vMesh, + const fvMesh&, const fileName& fileName, const UPtrList& surfVectorFields ); diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options index d0cdd781d764d8d978df42aa7bd999d0ce185106..9f63402d646402607cc5a547da62abbdbfabfd68 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/Make/options @@ -3,6 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude \ -I$(ParaView_INCLUDE_DIR) \ -I$(ParaView_INCLUDE_DIR)/vtkkwiml \ -I../../vtkPVReaders/lnInclude \ @@ -10,7 +12,7 @@ EXE_INC = \ LIB_LIBS = \ -ldynamicMesh \ - -ldynamicMesh \ + -lconversion \ -lgenericPatchFields \ -llagrangian \ -L$(FOAM_LIBBIN) -lvtkPVReaders \ diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake index 4b81d4b8c1ae4055194d3a4cc096607f750683a1..3187320a6796462cce366fa3845a669791b2042c 100755 --- a/src/conversion/Allwmake +++ b/src/conversion/Allwmake @@ -3,8 +3,15 @@ cd ${0%/*} || exit 1 # Run from this directory # Parse arguments for library compilation . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments + set -x wmake $targetType +ccm/Allwmake || { + echo + echo "WARNING: skipped optional conversion component (build issues detected)" + echo +} + #------------------------------------------------------------------------------ diff --git a/src/conversion/Make/files b/src/conversion/Make/files index 19af831aeb5a682c329d131f838512a8654cbedf..3f2c0a0c98c7e6ccb2679829519124f5f4fadf6b 100644 --- a/src/conversion/Make/files +++ b/src/conversion/Make/files @@ -15,9 +15,16 @@ ensight/part/ensightPartCells.C ensight/part/ensightPartFaces.C ensight/part/ensightParts.C +fire/FIREMeshReader.C +fire/FIREMeshWriter.C +fire/checkFireEdges.C + starcd/STARCDMeshReader.C starcd/STARCDMeshWriter.C polyDualMesh/polyDualMesh.C +vtk/part/foamVtkCells.C +vtk/output/foamVtkOutput.C + LIB = $(FOAM_LIBBIN)/libconversion diff --git a/src/conversion/ccm/Allwmake b/src/conversion/ccm/Allwmake new file mode 100755 index 0000000000000000000000000000000000000000..a3e067e1dc0b9cdef6e24986923e5cdcd85a866a --- /dev/null +++ b/src/conversion/ccm/Allwmake @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Build optional components (eg, may depend on third-party libraries) +#------------------------------------------------------------------------------ +cd ${0%/*} || exit 1 # Run from this directory + +# Parse arguments for compilation (at least for error catching) +. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments + +. $WM_PROJECT_DIR/etc/config.sh/functions +_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/ccmio) + +# Link with static libccmio only (possibly fewer issues) +if [ "$WM_LABEL_SIZE" = 64 ] +then + # The libccmio uses int32_t. + # The OpenFOAM adapter thus requires additional work for 64-bit labels. + echo "Skipping optional component libccm" + echo " does not support 64-bit labels" +elif [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \ + -a -e $CCMIO_ARCH_PATH/lib/libccmio.a ] +then + wmake libso +else + echo "Skipping optional component libccm" +fi + +#------------------------------------------------------------------------------ diff --git a/src/conversion/ccm/Make/files b/src/conversion/ccm/Make/files new file mode 100644 index 0000000000000000000000000000000000000000..89ec20a1db35f1404009aea7b0e367eff3d00a9a --- /dev/null +++ b/src/conversion/ccm/Make/files @@ -0,0 +1,16 @@ +common/ccmBase.C +common/ccmInternal.C + +reader/ccmReader.C +reader/ccmReaderAux.C +reader/ccmReaderMesh.C +reader/ccmReaderSolution.C +reader/ccmReaderOptions.C + +writer/ccmWriter.C +writer/ccmWriterMesh.C +writer/ccmWriterSolution.C + +/* misc/mergePoints1.C */ + +LIB = $(FOAM_LIBBIN)/libccm diff --git a/src/conversion/ccm/Make/options b/src/conversion/ccm/Make/options new file mode 100644 index 0000000000000000000000000000000000000000..ef4b6bb2798726d4b87bff3808ec8807b560a1c0 --- /dev/null +++ b/src/conversion/ccm/Make/options @@ -0,0 +1,14 @@ +EXE_INC = \ + /* -DWITH_MONITORING -DDEBUG_MONITORING */ \ + /* -DDEBUG_BAFFLES */ \ + /* -DDEBUG_CCMIOREAD */ \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(CCMIO_ARCH_PATH)/include + +LIB_LIBS = \ + -lfiniteVolume \ + -lconversion \ + -L$(CCMIO_ARCH_PATH)/lib -lccmio diff --git a/src/conversion/ccm/common/ccm.H b/src/conversion/ccm/common/ccm.H new file mode 100644 index 0000000000000000000000000000000000000000..639b6127cb87086bc4d522f37acce276739f7b71 --- /dev/null +++ b/src/conversion/ccm/common/ccm.H @@ -0,0 +1,37 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Description + Reader/writer for handling ccm files. + +\*---------------------------------------------------------------------------*/ + +#ifndef ccm_H +#define ccm_H + +#include "ccmReader.H" +#include "ccmWriter.H" + +#endif + +// ************************************************************************* // diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.C b/src/conversion/ccm/common/ccmBase.C similarity index 52% rename from applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.C rename to src/conversion/ccm/common/ccmBase.C index 0a58e5d523c41724e0c4ca743a5daef9aab2fa4e..14efe10a5e22fb30a3becd0df48ba238eb16eb52 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/vtkMesh.C +++ b/src/conversion/ccm/common/ccmBase.C @@ -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) 2016 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,62 +21,81 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -\*---------------------------------------------------------------------------*/ +\*----------------------------------------------------------------------------*/ -#include "vtkMesh.H" -#include "fvMeshSubset.H" -#include "Time.H" -#include "cellSet.H" +#include "ccmBase.H" +#include "ccmInternal.H" // include last to avoid any strange interactions -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from components -Foam::vtkMesh::vtkMesh +// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // + +bool Foam::ccm::base::assertNoError ( - fvMesh& baseMesh, - const word& setName + int err, + const char* msg ) -: - baseMesh_(baseMesh), - subsetter_(baseMesh), - setName_(setName) { - if (setName.size()) - { - // Read cellSet using whole mesh - cellSet currentSet(baseMesh_, setName_); + return ccmGlobalState::assertNoError(static_cast(err), msg); +} - // Set current subset - subsetter_.setLargeCellSubset(currentSet); - } + +bool Foam::ccm::base::assertNoError +( + int err, + const std::string& msg +) +{ + return ccmGlobalState::assertNoError(static_cast(err), msg); } -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +bool Foam::ccm::base::assertNoError(const char* msg) const +{ + return globalState_->assertNoError(msg); +} -Foam::polyMesh::readUpdateState Foam::vtkMesh::readUpdate() + +bool Foam::ccm::base::assertNoError(const std::string& msg) const { - polyMesh::readUpdateState meshState = baseMesh_.readUpdate(); + return globalState_->assertNoError(msg); +} - if (meshState != polyMesh::UNCHANGED) - { - // Note: since fvMeshSubset has no movePoints() functionality - // reconstruct the subset even if only movement. -// topoPtr_.clear(); +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::ccm::base::base() +: + globalState_(new ccmGlobalState) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::ccm::base::~base() +{ + close(); +} - if (setName_.size()) - { - Info<< "Subsetting mesh based on cellSet " << setName_ << endl; - // Read cellSet using whole mesh - cellSet currentSet(baseMesh_, setName_); +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - subsetter_.setLargeCellSubset(currentSet); +bool Foam::ccm::base::close() +{ + if (globalState_) + { + if (CCMIOIsValidEntity(globalState_->root)) + { + CCMIOCloseFile(NULL, globalState_->root); } - } + delete globalState_; + globalState_ = 0; - return meshState; + return true; + } + else + { + return false; + } } diff --git a/src/conversion/ccm/common/ccmBase.H b/src/conversion/ccm/common/ccmBase.H new file mode 100644 index 0000000000000000000000000000000000000000..5f789eadd0aaa100ae07ad4952d7ecc19b627aad --- /dev/null +++ b/src/conversion/ccm/common/ccmBase.H @@ -0,0 +1,131 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::ccm::base + +Description + Base functionality common to reader and writer classes + +Note + this class is in development + - any/all of the class names and members may change + +SourceFiles + ccmBase.C + +\*---------------------------------------------------------------------------*/ + +#ifndef ccmBase_H +#define ccmBase_H + +#include + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace ccm +{ + +// * * * * * * * * * * * * * Forward Declarations * * * * * * * * * * * * * // + +class ccmGlobalState; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +/*---------------------------------------------------------------------------*\ + Class ccm::base Declaration +\*---------------------------------------------------------------------------*/ + +class base +{ + // Private Member Functions + + //- Disallow default bitwise copy construct + base(const base&) = delete; + + //- Disallow default bitwise assignment + void operator=(const base&) = delete; + + +protected: + + // Protected Data + + //- Maintain overall global states (error, root-node) + ccmGlobalState* globalState_; + + + // Protected Member Functions + + //- Die with msg if there is an error + // Return true if there is no error + static bool assertNoError(int err, const char *msg); + + //- Die with msg if there is an error + // Return true if there is no error + static bool assertNoError(int err, const std::string& msg); + + + //- check global state for errors and die as required + // Return true if there is no error + bool assertNoError(const char* msg) const; + + //- check global state for errors and die as required + // Return true if there is no error + bool assertNoError(const std::string& msg) const; + + +public: + + // Constructors + + //- Construct null + base(); + + + //- Destructor: close file + ~base(); + + + // Member Functions + + // Access + + //- Explicity close the file and terminate ccmio access. + // Return false if it was already closed. + bool close(); + +}; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace ccm +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/conversion/ccm/common/ccmInternal.C b/src/conversion/ccm/common/ccmInternal.C new file mode 100644 index 0000000000000000000000000000000000000000..47dd0c393397577c56db7e2702c663f1b27fcb54 --- /dev/null +++ b/src/conversion/ccm/common/ccmInternal.C @@ -0,0 +1,171 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*----------------------------------------------------------------------------*/ + +#include "Pstream.H" +#include "ccmInternal.H" // include last to avoid any strange interactions + + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ +defineTypeNameAndDebug(ccm, 0); +} + + +// * * * * * * * * * * * * * * Static Functions * * * * * * * * * * * * * * // + +// \cond file-scope +// Return the string corresponding to the error +static const char* errorMsg(CCMIOError err) +{ + switch (err) + { + case kCCMIONoErr: + return ""; + break; + case kCCMIONoFileErr: + return "No File Error"; + break; + case kCCMIOPermissionErr: + return "Permission Error"; + break; + case kCCMIOCorruptFileErr: + return "Corrupt File Error"; + break; + case kCCMIOBadLinkErr: + return "Bad Link Error"; + break; + case kCCMIONoNodeErr: + return "No Node Error"; + break; + case kCCMIODuplicateNodeErr: + return "Duplicate Node Error"; + break; + case kCCMIOWrongDataTypeErr: + return "Wrong Data Type Error"; + break; + case kCCMIONoDataErr: + return "NoData Error"; + break; + case kCCMIOWrongParentErr: + return "Wrong Parent Error"; + break; + case kCCMIOBadParameterErr: + return "Bad Parameter Error"; + break; + case kCCMIONoMemoryErr: + return "No Memory Error"; + break; + case kCCMIOIOErr: + return "IO Error"; + break; + case kCCMIOTooManyFacesErr: + return "Too Many Faces Error"; + break; + case kCCMIOVersionErr: + return "Version Error"; + break; + case kCCMIOArrayDimensionToLargeErr: + return "Array Dimension To Large Error"; + break; + case kCCMIOInternalErr: + return "Internal Error"; + break; + default: + return "unclassified error"; + break; + } +} +//! \endcond + + +// * * * * * * * * * * * * * * Public Member Functions * * * * * * * * * * * // + +bool Foam::ccm::ccmGlobalState::assertNoError +( + CCMIOError err, + const char* msg +) +{ + if (err != kCCMIONoErr) + { + Perr<< endl + << "--> FATAL ERROR:" + << "\n " << msg + << "\n libccmio reports -> " << errorMsg(err) << " <-\n" + << endl; + + ::exit(1); + } + + return (err == kCCMIONoErr); +} + + +bool Foam::ccm::ccmGlobalState::assertNoError +( + CCMIOError err, + const std::string& msg +) +{ + if (err != kCCMIONoErr) + { + assertNoError(err, msg.c_str()); + } + + return (err == kCCMIONoErr); +} + + +bool Foam::ccm::ccmGlobalState::assertNoError +( + const char* msg +) const +{ + return assertNoError(error, msg); +} + + +bool Foam::ccm::ccmGlobalState::assertNoError +( + const std::string& msg +) const +{ + return assertNoError(error, msg); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::ccm::ccmGlobalState::ccmGlobalState() +: + error(kCCMIONoErr) +{ + CCMIOInvalidateEntity(&root); +} + + +// ************************************************************************* // diff --git a/src/conversion/ccm/common/ccmInternal.H b/src/conversion/ccm/common/ccmInternal.H new file mode 100644 index 0000000000000000000000000000000000000000..f528438dbea01c9f52e950dbba3774ad4b66ccab --- /dev/null +++ b/src/conversion/ccm/common/ccmInternal.H @@ -0,0 +1,170 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Description + Internal bits for wrapping libccmio - do not use directly + +\*---------------------------------------------------------------------------*/ +#ifndef ccmInternal_H +#define ccmInternal_H + +#include "className.H" +#include "List.H" + +// headers and definitions for using libccmio +#include "libccmio/ccmio.h" + +// low-level routines are also needed +#include "libccmio/ccmiocore.h" +#include "libccmio/ccmioutility.h" + +// don't want these defines to leak through +#undef TRUE +#undef FALSE + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +// @cond +// internal use only - skip doxygen documentation +namespace Foam +{ +namespace ccm +{ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//- Declare namespace and debug information. +NamespaceName("ccm"); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + +//- A C++ wrapper for the C struct +class ccmID +: + public CCMIOID +{}; + +//- A C++ wrapper for the C struct +class ccmNODE +: + public CCMIONode +{ +public: + + //- Recast constructor + ccmNODE(CCMIONode node) + : + CCMIONode(node) + {} +}; + + +//- A C++ wrapper for the enum +class ccmDimension +{ + CCMIODimensionality dims_; + +public: + + //- Construct from components + ccmDimension(CCMIODimensionality dims) + : + dims_(dims) + {} + + //- Return underlying enum + CCMIODimensionality operator()() const + { + return dims_; + } +}; + + +//- Maintain overall global states (error, rootNode) +class ccmGlobalState +{ +public: + + //- Maintain error state between calls + CCMIOError error; + + //- Root node in the CCM file + ccmID root; + + //- Null constructor. Start with no error, but root in invalid state. + ccmGlobalState(); + + //- True if there is an error + bool hasError() const + { + return (error != kCCMIONoErr); + } + + //- Die with msg if there is an error + // Return true if there is no error + static bool assertNoError(CCMIOError err, const char *msg); + + //- Die with msg if there is an error + // Return true if there is no error + static bool assertNoError(CCMIOError err, const std::string& msg); + + //- Die with msg if there is an error + // Return true if there is no error + bool assertNoError(const char *msg) const; + + //- Die with msg if there is an error + // Return true if there is no error + bool assertNoError(const std::string& msg) const; + +}; + + +//- MapIds for various parts +class ccmMaps +{ +public: + //- The cell map + ccmID cells; + + //- The internalFaces map + ccmID internalFaces; + + //- Boundary region maps + List boundary; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace ccm +} // End namespace Foam + +// @endcond +// internal use only - skip doxygen documentation + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/conversion/ccm/misc/ListOps1.H b/src/conversion/ccm/misc/ListOps1.H new file mode 100644 index 0000000000000000000000000000000000000000..7e8490240c748b82493c871ad3b625225c118f32 --- /dev/null +++ b/src/conversion/ccm/misc/ListOps1.H @@ -0,0 +1,84 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +InNamspace + Foam + +Description + Various functions to operate on Lists. + +SourceFiles + ListOps.C + ListOpsTemplates.C + +\*---------------------------------------------------------------------------*/ + +#ifndef ListOps1_H +#define ListOps1_H + +#include "ListOps.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +//- Reorder the elements (indices, not values) of a list. +// Negative ListType elements are untouched, unless pruning has been selected. +// With pruning, these elements are skipped and the list shrinks accordingly. +template +ListType reorder +( + const labelUList& oldToNew, + const ListType&, + const bool prune +); + +//- Inplace reorder the elements of a list. +// Negative ListType elements are untouched, unless pruning has been selected. +// With pruning, these elements are skipped and the list shrinks accordingly. +template +void inplaceReorder +( + const labelUList& oldToNew, + ListType&, + const bool prune +); + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository + #include "ListOps1Templates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // + diff --git a/src/conversion/ccm/misc/ListOps1Templates.C b/src/conversion/ccm/misc/ListOps1Templates.C new file mode 100644 index 0000000000000000000000000000000000000000..14a9ac38c9284f3e017187a76b188c73d8391d72 --- /dev/null +++ b/src/conversion/ccm/misc/ListOps1Templates.C @@ -0,0 +1,117 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "ListOps1.H" + +// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // + +template +ListType Foam::reorder +( + const labelUList& oldToNew, + const ListType& lst, + const bool prune +) +{ + const label sz = lst.size(); + + // Create copy + ListType newLst(sz); + + // Ensure consistent addressable size (eg, DynamicList) + newLst.setSize(sz); + + + label maxIdx = 0; + forAll(lst, elemI) + { + const label newIdx = oldToNew[elemI]; + if (newIdx >= 0) // could also require newIdx < sz + { + newLst[newIdx] = lst[elemI]; + if (prune && maxIdx < newIdx) + { + maxIdx = newIdx; + } + } + else if (!prune) + { + newLst[elemI] = lst[elemI]; + } + } + + if (prune && maxIdx < sz) + { + newLst.setSize(maxIdx); + } + + return newLst; +} + + +template +void Foam::inplaceReorder +( + const labelUList& oldToNew, + ListType& lst, + const bool prune +) +{ + const label sz = lst.size(); + + // Create copy + ListType newLst(sz); + + // Ensure consistent addressable size (eg, DynamicList) + newLst.setSize(sz); + + label maxIdx = 0; + forAll(lst, elemI) + { + const label newIdx = oldToNew[elemI]; + if (newIdx >= 0) // could also require newIdx < sz + { + newLst[newIdx] = lst[elemI]; + if (prune && maxIdx < newIdx) + { + maxIdx = newIdx; + } + } + else if (!prune) + { + newLst[elemI] = lst[elemI]; + } + } + + if (prune && maxIdx < sz) + { + newLst.setSize(maxIdx); + } + + lst.transfer(newLst); +} + + +// ************************************************************************* // diff --git a/src/conversion/ccm/misc/mergePoints1.C b/src/conversion/ccm/misc/mergePoints1.C new file mode 100644 index 0000000000000000000000000000000000000000..c1114df3ca0b6850af134dc77df5358e9bca9359 --- /dev/null +++ b/src/conversion/ccm/misc/mergePoints1.C @@ -0,0 +1,177 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "ListOps.H" +#include "point.H" +#include "Field.H" + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + + +// template class ListType=UList> +template +Foam::label Foam::mergePoints +( + const bool dummy, + const UIndirectList& points, + const scalar mergeTol, + const bool verbose, + labelList& pointMap, + const Type& origin +) +{ + // Create a old to new point mapping array + pointMap.setSize(points.size()); + pointMap = -1; + + if (points.empty()) + { + return 0; + } + + // No normal field operations on UIndirectList. + // Use a tmp pointField instead. + tmp> tPoints(new pointField(points)); + + Type compareOrigin = origin; + if (origin == Type::max) + { + compareOrigin = sum(tPoints())/points.size(); + } + + // We're comparing distance squared to origin first. + // Say if starting from two close points: + // x, y, z + // x+mergeTol, y+mergeTol, z+mergeTol + // Then the magSqr of both will be + // x^2+y^2+z^2 + // x^2+y^2+z^2 + 2*mergeTol*(x+z+y) + mergeTol^2*... + // so the difference will be 2*mergeTol*(x+y+z) + + const scalar mergeTolSqr = Foam::sqr(scalar(mergeTol)); + + // Sort points by magSqr + const Field d(tPoints - compareOrigin); + + List magSqrD(d.size()); + forAll(d, pointI) + { + magSqrD[pointI] = magSqr(d[pointI]); + } + labelList order; + sortedOrder(magSqrD, order); + + + Field sortedTol(points.size()); + forAll(order, sortI) + { + label pointI = order[sortI]; + + // Convert to scalar precision + const point pt + ( + scalar(d[pointI].x()), + scalar(d[pointI].y()), + scalar(d[pointI].z()) + ); + sortedTol[sortI] = 2*mergeTol*(mag(pt.x())+mag(pt.y())+mag(pt.z())); + } + + label newPointI = 0; + + // Handle 0th point separately (is always unique) + label pointI = order[0]; + pointMap[pointI] = newPointI++; + + + for (label sortI = 1; sortI < order.size(); sortI++) + { + // Get original point index + label pointI = order[sortI]; + const scalar mag2 = magSqrD[order[sortI]]; + // Convert to scalar precision + const point pt + ( + scalar(points[pointI].x()), + scalar(points[pointI].y()), + scalar(points[pointI].z()) + ); + + + // Compare to previous points to find equal one. + label equalPointI = -1; + + for + ( + label prevSortI = sortI - 1; + prevSortI >= 0 + && (mag(magSqrD[order[prevSortI]] - mag2) <= sortedTol[sortI]); + prevSortI-- + ) + { + label prevPointI = order[prevSortI]; + const point prevPt + ( + scalar(points[prevPointI].x()), + scalar(points[prevPointI].y()), + scalar(points[prevPointI].z()) + ); + + if (magSqr(pt - prevPt) <= mergeTolSqr) + { + // Found match. + equalPointI = prevPointI; + + break; + } + } + + + if (equalPointI != -1) + { + // Same coordinate as equalPointI. Map to same new point. + pointMap[pointI] = pointMap[equalPointI]; + + if (verbose) + { + Pout<< "Foam::mergePoints : Merging points " + << pointI << " and " << equalPointI + << " with coordinates:" << points[pointI] + << " and " << points[equalPointI] + << endl; + } + } + else + { + // Differs. Store new point. + pointMap[pointI] = newPointI++; + } + } + + return newPointI; +} + + +// ************************************************************************* // diff --git a/src/conversion/ccm/misc/mergePoints1.H b/src/conversion/ccm/misc/mergePoints1.H new file mode 100644 index 0000000000000000000000000000000000000000..85fc56210a289be0d488e89985d0edaab10e13dc --- /dev/null +++ b/src/conversion/ccm/misc/mergePoints1.H @@ -0,0 +1,73 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Description + Merge points. See below. + +SourceFiles + mergePoints.C + +\*---------------------------------------------------------------------------*/ + +#ifndef mergePoints1_H +#define mergePoints1_H + +#include "scalar.H" +#include "labelList.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Function mergePoints Declaration +\*---------------------------------------------------------------------------*/ + +//- Sorts and merges points. All points closer than/equal mergeTol get merged. +// Returns the number of unique points and a map from old to new. +//template class ListType=UList> +template +label mergePoints +( + const bool dummy, + const UIndirectList& points, + const scalar mergeTol, + const bool verbose, + labelList& pointMap, + const Type& origin = Type::zero +); + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository + #include "mergePoints1.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/conversion/ccm/reader/ccmBoundaryInfo.H b/src/conversion/ccm/reader/ccmBoundaryInfo.H new file mode 100644 index 0000000000000000000000000000000000000000..967c6f51e1071f28df17294daa011fb78d22bc59 --- /dev/null +++ b/src/conversion/ccm/reader/ccmBoundaryInfo.H @@ -0,0 +1,126 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Description + Containers for holding STARCCM boundary information + +\*---------------------------------------------------------------------------*/ +#ifndef ccmBoundaryInfo_H +#define ccmBoundaryInfo_H + +#include "word.H" +#include "Ostream.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//! \cond internal-use +// internal use only - skip doxygen documentation +namespace Foam +{ +namespace ccm +{ + +/*---------------------------------------------------------------------------*\ + Class ccm::ccmBoundaryInfo Declaration +\*---------------------------------------------------------------------------*/ + +//- Helper when reading raw boundary information +class ccmBoundaryInfo +{ +public: + //- The ccm region + int ccmIndex; + + //- Number of faces + label size; + + //- The openfoam patch id to map to + label patchId; + + //- The patch name, as per the BoundaryRegion "Label" entry + std::string patchName; + + //- The patch type, as per the BoundaryRegion "BoundaryType" entry + std::string patchType; + + + //- Construct null + ccmBoundaryInfo() + : + ccmIndex(0), + size(0), + patchId(-1), + patchName(), + patchType("patch") + {} + + + //- Set patch name, default to "patch_CCMID" for an empty string + void setPatchName(const std::string& str) + { + if (str.empty()) + { + patchName = "patch_" + ::Foam::name(ccmIndex); + } + else + { + patchName = str; + } + } + + + //- Info doesn't match if the ccm boundaries are different + bool operator!=(const ccmBoundaryInfo& rhs) const + { + return ccmIndex != rhs.ccmIndex; + } + + // IOstream Operators + + friend Ostream& operator<<(Ostream& os, const ccmBoundaryInfo& entry) + { + os << "BoundaryFaces-" << entry.ccmIndex; + os << " size=" << entry.size; + os << " name=" << entry.patchName; + os << " type=" << entry.patchType; + os << " foam-patch=" << entry.patchId; + + return os; + } + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace ccm +} // End namespace Foam + +//! \endcond +// internal use only - skip doxygen documentation + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/conversion/ccm/reader/ccmInterfaceDefinitions.H b/src/conversion/ccm/reader/ccmInterfaceDefinitions.H new file mode 100644 index 0000000000000000000000000000000000000000..1c9ea2c8e55da3b5ee3642f1afc118a0f339a984 --- /dev/null +++ b/src/conversion/ccm/reader/ccmInterfaceDefinitions.H @@ -0,0 +1,252 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Description + Containers for holding STARCCM interface definitions + +\*---------------------------------------------------------------------------*/ +#ifndef ccmInterfaceDefinitions_H +#define ccmInterfaceDefinitions_H + +#include "Map.H" +#include "Ostream.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace ccm +{ + +/*---------------------------------------------------------------------------*\ + Class ccm::interfaceEntry Declaration +\*---------------------------------------------------------------------------*/ + +//- A STARCCM interface definition is a pair of boundary ids +class interfaceEntry +{ +public: + // Public Data + + //- The internal interface id + label id; + + //- The first boundary + label bnd0; + + //- The second boundary + label bnd1; + + // Constructors + + //- Construct null + interfaceEntry() + : + id(-1), + bnd0(-1), + bnd1(-1) + {} + + + //- Construct empty interface definition + interfaceEntry(const label index) + : + id(index), + bnd0(-1), + bnd1(-1) + {} + + + //- Construct from components + interfaceEntry + ( + const label index, + const label boundary0, + const label boundary1 + ) + : + id(index), + bnd0(boundary0), + bnd1(boundary1) + {} + + + // Access + + //- Check for in-place interfaces + static bool isInPlace(const std::string& configurationType) + { + return configurationType == "IN_PLACE"; + } + + + //- True if the boundary id is in this interface + bool inInterface(label bndId) const + { + return bndId == bnd0 || bndId == bnd1; + } + + + //- Canonical name for boundary 0 + word canonicalName0() const + { + return "Interface" + ::Foam::name(id) + "_0"; + } + + //- Canonical name for boundary 1 + word canonicalName1() const + { + return "Interface" + ::Foam::name(id) + "_1"; + } + + //- Canonical name for boundary + word canonicalName(label bndId) const + { + if (bndId == bnd0) + { + return canonicalName0(); + } + else if (bndId == bnd1) + { + return canonicalName1(); + } + else + { + return word::null; + } + } + + + // IOstream Operators + + friend Ostream& operator<< + ( + Ostream& os, + const interfaceEntry& entry + ) + { + os << "(" << entry.bnd0 << " " << entry.bnd1 << ")"; + return os; + } + +}; + + +/*---------------------------------------------------------------------------*\ + Class ccm::interfaceDefinitions Declaration +\*---------------------------------------------------------------------------*/ + +//- A list of available interface definitions +class interfaceDefinitions +: + public Map +{ +public: + // Constructor + + //- Null construct + interfaceDefinitions() + : + Map() + {} + + + //- Scan available interface entries for one matching this boundary id + bool add(interfaceEntry entry) + { + if + ( + entry.id >= 0 + && entry.bnd0 >= 0 && entry.bnd1 >= 0 + && entry.bnd0 != entry.bnd1 + ) + { + this->set(entry.id, entry); + return true; + } + else + { + return false; + } + } + + + //- Scan available interface entries for one matching this boundary id + bool isInterface(label bndId) + { + forAllConstIter(Map, *this, iter) + { + if (iter().inInterface(bndId)) + { + return true; + } + } + return false; + } + + + //- Scan interface entries for one matching this boundary id + // return the canonical name + word interfaceName(label bndId) + { + word ifname; + forAllConstIter(Map, *this, iter) + { + ifname = iter().canonicalName(bndId); + if (!ifname.empty()) + { + break; + } + } + + return ifname; + } + + + // IOstream Operators + + friend Ostream& operator<< + ( + Ostream& os, + const interfaceDefinitions& defs + ) + { + os << static_cast& >(defs) + << nl; + + return os; + } + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace ccm +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/conversion/ccm/reader/ccmReader.C b/src/conversion/ccm/reader/ccmReader.C new file mode 100644 index 0000000000000000000000000000000000000000..5d0c6f11579837bdaf874a34af474e6949a316c8 --- /dev/null +++ b/src/conversion/ccm/reader/ccmReader.C @@ -0,0 +1,801 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*----------------------------------------------------------------------------*/ + +#include "ccmReader.H" +#include "IFstream.H" +#include "IOdictionary.H" +#include "demandDrivenData.H" + +#include "ccmInternal.H" // include last to avoid any strange interactions + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +// The cellTable integer options +const char* Foam::ccm::reader::cellTableOpti[] = +{ + "MaterialId", "PorosityId", "SpinId", "GroupId", "ColorIdx", nullptr +}; + +// The cellTable string options - "Label" handled separately +const char* Foam::ccm::reader::cellTableOptstr[] = +{ + "MaterialType", nullptr +}; + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +// Simulate GetEntityIndex +// CCMIOGetEntityIndex(nullptr, nodeId, &internalId); +int Foam::ccm::reader::ccmGetEntityIndex(ccmNODE node) +{ + int intval = 0; + char name[kCCMIOMaxStringLength + 1]; + + if + ( + CCMIOGetName + ( + nullptr, + node, + name + ) + == kCCMIONoErr + ) + { + char const *pos = strrchr(name, '-'); + + if (!pos) + { + intval = 0; + } + else + { + // Negative ID number + if (pos != name && (*(pos - 1) == '-')) + --pos; + + intval = atoi(++pos); + } + } + + return intval; +} + + +std::string Foam::ccm::reader::ccmReadNodestr +( + const char* opt, + ccmNODE node +) +{ + char *strval = 0; + std::string str; + + if + ( + CCMIOReadNodestr + ( + nullptr, + node, + opt, + &strval + ) + == kCCMIONoErr + && strval + ) + { + str = strval; + } + + // allocated by CCMIOReadNodestr + if (strval) + { + free(strval); + } + + return str; +} + + +std::string Foam::ccm::reader::ccmReadOptstr +( + const char* opt, + ccmID node +) +{ + std::string str; + int len = 0; + + if + ( + CCMIOReadOptstr + ( + nullptr, + node, + opt, + &len, + nullptr + ) + == kCCMIONoErr + && len + ) + { + char* strval = new char[len + 1]; + if + ( + CCMIOReadOptstr + ( + nullptr, + node, + opt, + &len, + strval + ) + == kCCMIONoErr + ) + { + strval[len] = '\0'; + str = strval; + } + delete[] strval; + } + + return str; +} + + +Foam::word Foam::ccm::reader::validateWord +( + const std::string& str +) +{ + std::string::size_type ngood = 0; + bool prefix = false; + bool first = true; + + for + ( + std::string::const_iterator iter = str.begin(); + iter != str.end(); + ++iter + ) + { + if (word::valid(*iter)) + { + ++ngood; + if (first) + { + first = false; + + // start with a digit? need to prefix with '_' + if (isdigit(*iter)) + { + prefix = true; + ++ngood; + } + } + } + } + + if (ngood == str.size() && !prefix) + { + return str; + } + + Foam::word out; + out.resize(ngood); + ngood = 0; + + Foam::word::iterator iter2 = out.begin(); + for + ( + std::string::const_iterator iter1 = str.begin(); + iter1 != str.end(); + ++iter1 + ) + { + register char c = *iter1; + + if (Foam::word::valid(c)) + { + if (prefix) + { + prefix = false; + *(iter2++) = '_'; + ++ngood; + } + *(iter2++) = c; + ++ngood; + } + } + + out.resize(ngood); + + return out; +} + + +// read map data and check error +void Foam::ccm::reader::readMap +( + const ccmID& mapId, + labelList& data +) +{ + if (globalState_->hasError()) + { + return; + } + + CCMIOReadMap + ( + &(globalState_->error), + mapId, + data.begin(), + kCCMIOStart, + kCCMIOEnd + ); + assertNoError("error reading map"); +} + + +// readProblemDescription: +// - get cellTable and boundaryRegion information +// - some regions defined here may be unused by our mesh +void Foam::ccm::reader::readProblemDescription +( + const ccmID& probNode +) +{ + readInterfaceDefinitions(); + readProblemDescription_boundaryRegion(probNode); + readProblemDescription_cellTable(probNode); + +#ifdef DEBUG_CCMIOREAD + Info<< "InterfaceDefinitions: " << interfaceDefinitions_ << nl + << "cellTable" << cellTable_ << nl + << "boundaryRegion" << boundaryRegion_ << endl; +#endif +} + + +// readInterfaceDefinitions: +// - get /InterfaceDefinitions. used by STARCCM to define in-place interfaces, etc +// - only handle in-place one here +void Foam::ccm::reader::readInterfaceDefinitions() +{ + interfaceDefinitions_.clear(); + + // /InterfaceDefinitions + // --------------------- + + CCMIONode rootNode; + CCMIONode interfaceDefNode; + + // CCMIOID -> CCMIONODE + if + ( + CCMIOGetEntityNode + ( + nullptr, + (globalState_->root), + &rootNode + ) + == kCCMIONoErr + + // get "/InterfaceDefinitions" + && + CCMIOGetNode + ( + nullptr, + rootNode, + "InterfaceDefinitions", + &interfaceDefNode + ) + == kCCMIONoErr + ) + { + CCMIONode interfaceNode; + + // simulate CCMIONextEntity + for + ( + int index = 0; + CCMIOGetNextChildWithLabel + ( + nullptr, + interfaceDefNode, + "Interface", + &index, + &interfaceNode + ) == kCCMIONoErr; + /* nop */ + ) + { + interfaceEntry ifentry(ccmGetEntityIndex(interfaceNode)); + + if + ( + CCMIOReadNodei + ( + nullptr, + interfaceNode, + "Boundary0", + &(ifentry.bnd0) + ) + == kCCMIONoErr + + && CCMIOReadNodei + ( + nullptr, + interfaceNode, + "Boundary1", + &(ifentry.bnd1) + ) + == kCCMIONoErr + + // only handle 'IN_PLACE' interfaces + && interfaceEntry::isInPlace + ( + ccmReadNodestr("Configuration", interfaceNode) + ) + ) + { + interfaceDefinitions_.add(ifentry); + } + } + } +} + + +// readProblemDescription - get boundaryRegion information +// +// CCM Node: /ProblemDescriptions/ProblemDescription-N/BoundaryRegion-N +// +// Requires InterfaceDefinitions first +void Foam::ccm::reader::readProblemDescription_boundaryRegion +( + const ccmID& probNode +) +{ + if (option().useNumberedNames()) + { + Info<< "using numbered patch/zone names" << endl; + } + + boundaryRegion_.clear(); + + ccmID node; + + // boundaryRegion information + // -------------------------- + for + ( + int nodeI = 0; + CCMIONextEntity + ( + nullptr, + probNode, + kCCMIOBoundaryRegion, + &nodeI, + &node + ) == kCCMIONoErr; + /* nop */ + ) + { + // read boundaryRegionId + int Id = 0; + CCMIOGetEntityIndex + ( + &(globalState_->error), + node, + &Id + ); + assertNoError("error reading boundaryRegion index"); + + dictionary dict; + + // Read boundary type + // (inlet|outlet|symmetry|wall| + // cyclic|stagnation|pressure|baffle|freestream) + { + const char* opt = "BoundaryType"; + std::string str = ccmReadOptstr(opt, node); + + if (str.empty()) + { + dict.add(opt, "empty"); + } + else if (str == "internal") + { + // old PROSTAR bug: "monitoring" mislabeled as "internal" + dict.add(opt, "monitoring"); + } + else + { + dict.add(opt, validateWord(str)); + } + } + + + // Read boundary name: + // - from 'Label' field (STARCCM+) + // - from 'BoundaryName' field (PROSTAR and/or STARCCM+) + // - fallback: generate one from boundary type and boundaryRegionId + { + const char* opt = "Label"; + std::string str; + + if (option().useNumberedNames()) + { + str = "patch_" + ::Foam::name(Id); + } + else if + ( + option().renameInterfaces() + && interfaceDefinitions_.isInterface(Id) + ) + { +#ifdef DEBUG_CCMIOREAD + Info<< "boundary is on an interface: remap name for " << Id << endl; +#endif + // substitute immediately with interface name + str = interfaceDefinitions_.interfaceName(Id); + } + else if + ( + (str = ccmReadOptstr(opt, node)).empty() + && (str = ccmReadOptstr("BoundaryName", node)).empty() + ) + { + // fallback + str = word(dict["BoundaryType"]) + "_" + ::Foam::name(Id); + } + + if (!str.empty()) + { + dict.add(opt, validateWord(str)); + } + } + + boundaryRegion_.insert(Id, dict); + } +} + + +// readProblemDescription - get cellTable information +// +// CCM Node: /ProblemDescriptions/ProblemDescription-N/CellType-N +// +void Foam::ccm::reader::readProblemDescription_cellTable +( + const ccmID& probNode +) +{ + cellTable_.clear(); + + ccmID node; + + // cellTable information + // --------------------- + for + ( + int nodeI = 0; + CCMIONextEntity + ( + nullptr, + probNode, + kCCMIOCellType, + &nodeI, + &node + ) == kCCMIONoErr; + /* nop */ + ) + { + // Read cellTableId (CellType) + int Id = 0; + CCMIOGetEntityIndex + ( + &(globalState_->error), + node, + &Id + ); + assertNoError("error reading cellTable index"); + + dictionary dict; + + // Special treatment for "Label" + { + const char* opt = "Label"; + std::string str; + + if (!option().useNumberedNames()) + { + str = ccmReadOptstr(opt, node); + } + + if (str.empty()) + { + str = "zone_" + ::Foam::name(Id); + } + + dict.add(opt, validateWord(str)); + } + + + // Other string options + for (int i=0; cellTableOptstr[i]; ++i) + { + const char* opt = cellTableOptstr[i]; + std::string str = ccmReadOptstr(opt, node); + + if (!str.empty()) + { + dict.add(opt, validateWord(str)); + } + } + + // Add non-zero integer options + for (int i=0; cellTableOpti[i]; ++i) + { + const char* opt = cellTableOpti[i]; + int intval; + + if + ( + CCMIOReadOpti + ( + nullptr, + node, + opt, + &intval + ) + == kCCMIONoErr + && intval != 0 + ) + { + dict.add(opt, intval); + } + } + + cellTable_.insert(Id, dict); + } +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::ccm::reader::printInfo() const +{ + Info<< "Mesh Information" << nl + << "----------------" << nl + << "boundingBox: " << boundBox(points_) << nl + << "nPoints: " << nPoints_ << nl + << "nCells: " << nCells_ << nl + << "nFaces: " << nFaces_ << nl + << "nInternalFaces: " << nInternalFaces_ << nl + << "nBaffles: " << bafInterfaces_.size() << endl; +} + + +bool Foam::ccm::reader::readGeometry +( + const scalar scaleFactor +) +{ + detectGeometry(); + + if (geometryStatus_ == OKAY) + { + // Sanity on the scaling factor + + readMeshTopology(scaleFactor <= VSMALL ? 1 : scaleFactor); + reorderMesh(); + + // assume success if we have points and cells + if (nCells_ && points_.size()) + { + geometryStatus_ = READ; + } + else + { + geometryStatus_ = BAD; + } + } + + return (geometryStatus_ == OKAY || geometryStatus_ == READ); +} + + +bool Foam::ccm::reader::hasGeometry() +{ + detectGeometry(); + return (geometryStatus_ == OKAY || geometryStatus_ == READ); +} + + +bool Foam::ccm::reader::hasSolution() +{ + detectSolution(); + return (solutionStatus_ == OKAY || solutionStatus_ == READ); +} + + +void Foam::ccm::reader::writeMesh +( + const polyMesh& mesh, + IOstream::streamFormat fmt +) const +{ + mesh.removeFiles(); + + Info<< "Writing polyMesh" << endl; + mesh.writeObject + ( + fmt, + IOstream::currentVersion, + IOstream::UNCOMPRESSED + ); + writeAux(mesh); +} + + +bool Foam::ccm::reader::remapMeshInfo +( + const objectRegistry& registry, + const fileName& remappingDictName +) +{ + dictionary remapDict; + + if (remappingDictName.empty()) + { + remapDict = IOdictionary + ( + IOobject + ( + "remapping", + "constant", + registry, + IOobject::READ_IF_PRESENT, + IOobject::NO_WRITE, + false + ) + ); + } + else + { + // specified (absolute) name: treat like MUST_READ + remapDict = dictionary(IFstream(remappingDictName)()); + } + + bool ok = false; + + if (remapDict.empty()) + { + return false; + } + + + // merge specified cellTable entries together + if (remapDict.isDict("cellTable")) + { + cellTable_.combine(remapDict.subDict("cellTable"), cellTableId_); + ok = true; + } + + // rename boundaries + if (remapDict.isDict("boundaryRegion")) + { + boundaryRegion_.rename(remapDict.subDict("boundaryRegion")); + ok = true; + } + + return ok; +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +// Construct from reading a file +Foam::ccm::reader::reader +( + const fileName& file, + const reader::options& opts +) +: + base(), + options_(new options(opts)), + geometryStatus_(UNKNOWN), + solutionStatus_(UNKNOWN), + interfaceDefinitions_(), + boundaryRegion_(), + cellTable_(), + nPoints_(0), + nInternalFaces_(0), + nFaces_(0), + nCells_(0), + points_(), + faces_(), + faceOwner_(), + faceNeighbour_(), + bafInterfaces_(), + domInterfaces_(), + origFaceId_(), + origCellId_(), + cellTableId_(), + origBndId_(), + patchSizes_(), + solutionTable_(), + fieldTable_(), + lagrangianTable_() +{ + if (!option().keptSomeRegion()) + { + FatalErrorIn("ccm::reader(const fileName&)") + << "must retain at least one region type: fluid | porous | solid" + << exit(FatalError); + } + + if (!isFile(file, false)) + { + FatalErrorIn("ccm::reader(const fileName&)") + << "Cannot read file " << file + << exit(FatalError); + } + + // Reinitialize error state from the return value + globalState_->error = CCMIOOpenFile + ( + nullptr, + file.c_str(), + kCCMIORead, + &(globalState_->root) + ); + assertNoError("Error opening file for reading"); + + detectGeometry(); + detectSolution(); +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::ccm::reader::~reader() +{ + close(); + deleteDemandDrivenData(options_); +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +const Foam::ccm::reader::options& Foam::ccm::reader::option() const +{ + return *options_; +} + + +// ************************************************************************* // diff --git a/src/conversion/ccm/reader/ccmReader.H b/src/conversion/ccm/reader/ccmReader.H new file mode 100644 index 0000000000000000000000000000000000000000..aa15978dd35314388bf4de9c407fe4c41c19a710 --- /dev/null +++ b/src/conversion/ccm/reader/ccmReader.H @@ -0,0 +1,710 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::ccm::reader + +Description + Reads CCM files as written by PROSTAR/STARCCM + + - arbitrary polyhedral meshs + - writes interfaces (baffles) to constant/polymesh/interfaces + - experimental handling of monitoring (internal) boundaries + - does not handle cyclics. Use createPatch to recreate these + - does patch names only if they are in the problem description + - reads cell and face solution data + - reads Lagrangian data + + The Default_Boundary_Region (region 0) is a special region that serves + two purposes: + -# it contains all wall and baffle boundaries that have not otherwise + been assigned. + -# it holds the outer bounds of flow domains (fluid/porous/solid) + + The CCM node \c Meshes/FaceBasedTopology/Cells/Interfaces holds the mapping + of the corresponding mesh faces, which can be used to merge these internal + boundaries. + + If solid cells exist, there are three possible courses of action: + -# Remove all solid cells for subsequent flow calculations. + This is the default. + -# Treat solid cells like fluid cells, but convert the corresponding + Default_Boundary_Region to Default_Boundary_Solid for easier + identification. + This treatment is useful for visualization purposes. + -# Move solid cells to a separate mesh region. + This would be useful for conjugate heat transfer, but + is not implemented. + + \par Files + + The constant/remapping file is an \c IOdictionary that is + \c READ_IF_PRESENT and can be used to remap certain information. eg, + + \verbatim + // rename/combine cellTable entries + // newName ( listOldNames ); + cellTable + { + fluid ( inletRegion outletRegion ); + cat1 ( CAT1 "cat1_(Back|Front|Gamma)" ); + } + + // rename boundary regions + // newName oldName; + boundaryRegion + { + inlet_4 inlet_1; + inlet_5 inlet_2; + inlet_6 inlet_3; + } + \endverbatim + + The constant/boundaryRegion file is an \c IOMap + that is written. It contains the boundary type and names. eg, + + \verbatim + ( + 0 + { + BoundaryType wall; + Label Default_Boundary_Region; + } + 1 + { + BoundaryType inlet; + Label inlet_1; + } + ... + + 4 + { + BoundaryType pressure; + Label outlet; + } + ) + \endverbatim + + The constant/cellTable file is an \c IOMap that is + written. It contains the cellTable information. + eg, + + \verbatim + ( + 1 + { + Label inletRegion; + MaterialType fluid; + MaterialId 1; + } + 2 + { + Label cat1; + MaterialType fluid; + MaterialId 1; + PorosityId 1; + } + 3 + { + Label outletRegion; + MaterialType fluid; + MaterialId 1; + } + ) + \endverbatim + +Note + this class is still under development + - any/all of the class names and members may change + +SourceFiles + ccmReader.C + ccmReaderAux.C + ccmReaderMesh.C + ccmReaderSolution.C + +\*---------------------------------------------------------------------------*/ + +#ifndef ccmReader_H +#define ccmReader_H + +#include "ccmBase.H" +#include "STARCDCore.H" + +#include "labelList.H" +#include "ListOps.H" +#include "polyMesh.H" +#include "boundaryRegion.H" +#include "cellTable.H" +#include "ccmInterfaceDefinitions.H" +#include "ccmSolutionTable.H" + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace ccm +{ + +// * * * * * * * * * * * * * Forward Declarations * * * * * * * * * * * * * // + +class ccmID; +class ccmNODE; +class ccmGlobalState; +class reader; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +/*---------------------------------------------------------------------------*\ + Class ccm::reader Declaration +\*---------------------------------------------------------------------------*/ + +class reader +: + public base, + protected fileFormats::STARCDCore +{ +public: + // Forward Declarations + class options; + + +private: + + // Static Data + + //- cellTable integer options + static const char* cellTableOpti[]; + + //- cellTable string options + static const char* cellTableOptstr[]; + + + // Private data + + //- Reader options + const options* options_; + + + //- Enumeration defining the status of a ccmio node + enum nodeStatus + { + UNKNOWN, BAD, OKAY, READ + }; + + + //- status of the geometry (topology) information + nodeStatus geometryStatus_; + + //- status of the solution (field) information + nodeStatus solutionStatus_; + + // Persistent data + + //- ccm node: /InterfaceDefinitions + interfaceDefinitions interfaceDefinitions_; + + //- ccm node: ProblemDescriptions/boundaryRegion + boundaryRegion boundaryRegion_; + + //- ccm node: ProblemDescriptions/cellType + cellTable cellTable_; + + //- Number of points + label nPoints_; + + //- Number of internal faces + label nInternalFaces_; + + //- Number of faces + label nFaces_; + + //- Number of cells + label nCells_; + + //- Minimum mesh data + + //- Points + pointField points_; + + //- Faces + faceList faces_; + + //- Face-owner cells + labelList faceOwner_; + + //- Face-neighbour cells + labelList faceNeighbour_; + + // List of interface pairs (baffles) + List bafInterfaces_; + + //- List of interface pairs between mesh regions (domains) + List domInterfaces_; + + //- Face sets for monitoring + HashTable monitoringSets_; + + + // Mesh Maps + + //- Map to original face id + labelList origFaceId_; + + //- Map to original cell id + labelList origCellId_; + + //- Cell table id for each cell + labelList cellTableId_; + + //- List of the original ccm boundary region number + labelList origBndId_; + + //- Patching and region info + labelList patchSizes_; + + //- Solution information + solutionTable solutionTable_; + + //- Field information + fieldTable fieldTable_; + + //- Field information + fieldTable lagrangianTable_; + + + // Private Member Functions + + //- Disallow default bitwise copy construct + reader(const reader&) = delete; + + //- Disallow default bitwise assignment + void operator=(const reader&) = delete; + + + //- Calculate patch starts from given index with current patch sizes + inline labelList patchStartList(label initial) const; + + //- Report mesh sizes to stdout + void printSizes() const; + + //- Simulate CCMIOGetEntityIndex for Nodes (not ids) + int ccmGetEntityIndex(ccmNODE node); + + //- Read string option from specified ccm node + // return empty string on failure + std::string ccmReadNodestr(const char* opt, ccmNODE node); + + //- Read string option from specified ccm node + // return empty string on failure + std::string ccmReadOptstr(const char* opt, ccmID node); + + //- Strip invalid characters, prefix leading digit with '_' + static word validateWord(const std::string&); + + //- Read map data and check error + void readMap(const ccmID& mapId, labelList& data); + + //- Determine if the geometry looks good + bool detectGeometry(); + + //- Get interfaces, cellTable and boundaryRegion information + void readProblemDescription(const ccmID& probNode); + + //- Get /InterfaceDefinitions, used by STARCCM to define in-place interfaces, etc + // only handle in-place (IN_PLACE) ones at the moment + void readInterfaceDefinitions(); + + //- Get boundaryRegion information + void readProblemDescription_boundaryRegion(const ccmID& probNode); + + //- Get cellTable information + void readProblemDescription_cellTable(const ccmID& probNode); + + //- Read the geometry without any sorting or renumbering + void readMeshTopology(const scalar scaleFactor=1.0); + + //- Read the vertices + labelList readVertices + ( + const ccmID& verticesNode, + const scalar scaleFactor = 1.0 + ); + + //- Read the cells + void readCells(const ccmID& topoNode); + + //- Read the interfaces + void readInterfaces(const ccmID& cellsNode); + + //- Read the monitoring + void readMonitoring(const ccmID& topoId); + + //- Move solid faces from Default_Boundary_Region -> Default_Boundary_Solid + void juggleSolids(); + + //- Remove unwanted fluid/porous/solid regions + void removeUnwanted(); + + //- Remove interfaces with face >= nFace + void validateInterface(List&); + + //- Renumber interface faces + void renumberInterfaces(const List