From a3fec987a8ca77872960b4cee3aa007482143f59 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 17 Feb 2010 13:56:56 +0100 Subject: [PATCH] CLEANUP: remove most references to (deprecated) .ftr file format - use .obj files for debugging purposes instead. --- .../autoRefineMesh/autoRefineMeshDict | 2 +- .../mesh/advanced/selectCells/selectCellsDict | 2 +- .../surface/surfaceCheck/surfaceCheck.C | 2 +- .../surfaceMeshTriangulate.C | 2 +- .../surfaceSplitNonManifolds.C | 6 ++--- .../booleanSurface/booleanSurface.C | 27 ++++++++----------- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict index d2d9941d63..9c57e17dbf 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict @@ -17,7 +17,7 @@ FoamFile // Surface to keep to -surface "plexi.ftr"; +surface "plexi.obj"; // What is outside. These points have to be inside a cell (so not on a face!) outsidePoints ((-0.99001 -0.99001 -0.99001)); diff --git a/applications/utilities/mesh/advanced/selectCells/selectCellsDict b/applications/utilities/mesh/advanced/selectCells/selectCellsDict index eb10e23d78..87f91eafb4 100644 --- a/applications/utilities/mesh/advanced/selectCells/selectCellsDict +++ b/applications/utilities/mesh/advanced/selectCells/selectCellsDict @@ -21,7 +21,7 @@ FoamFile useSurface false; // Surface to keep to -surface "plexi.ftr"; +surface "plexi.obj"; // What is outside outsidePoints ((-1 -1 -1)); diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C index 365b982829..647ed18b07 100644 --- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C +++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C @@ -616,7 +616,7 @@ int main(int argc, char *argv[]) surfFileNameBase.lessExt() + "_" + name(zone) - + ".ftr" + + ".obj" ); Info<< "writing part " << zone << " size " << subSurf.size() diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C index ef28d76d34..b87201fdfc 100644 --- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C +++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) else { // Write local surface - fileName localPath = runTime.path()/runTime.caseName() + ".ftr"; + fileName localPath = runTime.path()/runTime.caseName() + ".obj"; Pout<< "Writing local surface to " << localPath << endl; diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C index c7cb02242c..8da72b80c4 100644 --- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C +++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C @@ -545,9 +545,9 @@ void calcPointVecs if (face0I == -1 && face1I == -1) { - Info<< "Writing surface to errorSurf.ftr" << endl; + Info<< "Writing surface to errorSurf.obj" << endl; - surf.write("errorSurf.ftr"); + surf.write("errorSurf.obj"); FatalErrorIn("calcPointVecs(..)") << "Cannot find two faces using border edge " << edgeI @@ -557,7 +557,7 @@ void calcPointVecs << " face1I:" << face1I << nl << "faceToEdge:" << faceToEdge << nl << "faceToPoint:" << faceToPoint - << "Written surface to errorSurf.ftr" + << "Written surface to errorSurf.obj" << abort(FatalError); } diff --git a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C index fdccecf617..8839badd67 100644 --- a/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C +++ b/src/meshTools/triSurface/booleanOps/booleanSurface/booleanSurface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. + \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -411,9 +411,8 @@ Foam::booleanSurface::booleanSurface Pout<< "booleanSurface : Generated cutSurf1: " << endl; cutSurf1.writeStats(Pout); - Pout<< "Writing to file cutSurf1.ftr" << endl; - OFstream cutSurf1Stream("cutSurf1.ftr"); - cutSurf1.write(cutSurf1Stream); + Pout<< "Writing to file cutSurf1.obj" << endl; + cutSurf1.write("cutSurf1.obj"); } if (debug) @@ -430,9 +429,8 @@ Foam::booleanSurface::booleanSurface Pout<< "booleanSurface : Generated cutSurf2: " << endl; cutSurf2.writeStats(Pout); - Pout<< "Writing to file cutSurf2.ftr" << endl; - OFstream cutSurf2Stream("cutSurf2.ftr"); - cutSurf2.write(cutSurf2Stream); + Pout<< "Writing to file cutSurf2.obj" << endl; + cutSurf2.write("cutSurf2.obj"); } @@ -768,9 +766,8 @@ Foam::booleanSurface::booleanSurface Pout<< "booleanSurface : Generated cutSurf1: " << endl; cutSurf1.writeStats(Pout); - Pout<< "Writing to file cutSurf1.ftr" << endl; - OFstream cutSurf1Stream("cutSurf1.ftr"); - cutSurf1.write(cutSurf1Stream); + Pout<< "Writing to file cutSurf1.obj" << endl; + cutSurf1.write("cutSurf1.obj"); } @@ -792,9 +789,8 @@ Foam::booleanSurface::booleanSurface Pout<< "booleanSurface : Generated cutSurf2: " << endl; cutSurf2.writeStats(Pout); - Pout<< "Writing to file cutSurf2.ftr" << endl; - OFstream cutSurf2Stream("cutSurf2.ftr"); - cutSurf2.write(cutSurf2Stream); + Pout<< "Writing to file cutSurf2.obj" << endl; + cutSurf2.write("cutSurf2.obj"); } @@ -920,9 +916,8 @@ Foam::booleanSurface::booleanSurface Pout<< "booleanSurface : Generated combinedSurf: " << endl; combinedSurf.writeStats(Pout); - Pout<< "Writing to file combinedSurf.ftr" << endl; - OFstream combinedSurfStream("combinedSurf.ftr"); - combinedSurf.write(combinedSurfStream); + Pout<< "Writing to file combinedSurf.obj" << endl; + combinedSurf.write("combinedSurf.obj"); }