From acdbf45534ffa625ed3a75071277e065533ab3b7 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 29 Jan 2020 17:17:36 +0000 Subject: [PATCH] Moved OBJstream into src/fileFormats/obj --- .../mesh/generation/extrude/extrudeToRegionMesh/Make/options | 4 ++-- applications/utilities/surface/surfaceCheck/Make/options | 4 ++-- src/fileFormats/Make/files | 1 + src/{surfMesh/surfaceFormats => fileFormats}/obj/OBJstream.C | 5 ++--- src/{surfMesh/surfaceFormats => fileFormats}/obj/OBJstream.H | 2 +- src/surfMesh/Make/files | 1 - 6 files changed, 8 insertions(+), 9 deletions(-) rename src/{surfMesh/surfaceFormats => fileFormats}/obj/OBJstream.C (98%) rename src/{surfMesh/surfaceFormats => fileFormats}/obj/OBJstream.H (98%) diff --git a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options index 49cad25f21..29ab9dca6f 100644 --- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options +++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options @@ -1,12 +1,12 @@ EXE_INC = \ - -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude EXE_LIBS = \ - -lsurfMesh \ + -lfileFormats \ -lfiniteVolume \ -lmeshTools \ -ldynamicMesh \ diff --git a/applications/utilities/surface/surfaceCheck/Make/options b/applications/utilities/surface/surfaceCheck/Make/options index ef204ab685..338a56a339 100644 --- a/applications/utilities/surface/surfaceCheck/Make/options +++ b/applications/utilities/surface/surfaceCheck/Make/options @@ -1,11 +1,11 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lsampling \ -ltriSurface \ - -lsurfMesh \ + -lfileFormats \ -lmeshTools diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files index 18b38df684..f477a0ed6c 100644 --- a/src/fileFormats/Make/files +++ b/src/fileFormats/Make/files @@ -2,6 +2,7 @@ vtk/vtkWriteOps.C vtk/vtkUnstructuredReader.C nas/NASCore.C starcd/STARCDCore.C +obj/OBJstream.C coordSet/coordSet.C diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.C b/src/fileFormats/obj/OBJstream.C similarity index 98% rename from src/surfMesh/surfaceFormats/obj/OBJstream.C rename to src/fileFormats/obj/OBJstream.C index 9491a63223..47989f315c 100644 --- a/src/surfMesh/surfaceFormats/obj/OBJstream.C +++ b/src/fileFormats/obj/OBJstream.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,14 +24,13 @@ License \*---------------------------------------------------------------------------*/ #include "OBJstream.H" -//#include "token.H" #include "primitivePatch.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { -defineTypeNameAndDebug(OBJstream, 0); + defineTypeNameAndDebug(OBJstream, 0); } diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.H b/src/fileFormats/obj/OBJstream.H similarity index 98% rename from src/surfMesh/surfaceFormats/obj/OBJstream.H rename to src/fileFormats/obj/OBJstream.H index 63328f0c3e..971d9603a4 100644 --- a/src/surfMesh/surfaceFormats/obj/OBJstream.H +++ b/src/fileFormats/obj/OBJstream.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/surfMesh/Make/files b/src/surfMesh/Make/files index f860243104..3e4918ecaa 100644 --- a/src/surfMesh/Make/files +++ b/src/surfMesh/Make/files @@ -25,7 +25,6 @@ $(surfaceFormats)/ac3d/AC3DsurfaceFormatRunTime.C $(surfaceFormats)/gts/GTSsurfaceFormatRunTime.C $(surfaceFormats)/nas/NASsurfaceFormatRunTime.C $(surfaceFormats)/obj/OBJsurfaceFormatRunTime.C -$(surfaceFormats)/obj/OBJstream.C $(surfaceFormats)/off/OFFsurfaceFormatRunTime.C $(surfaceFormats)/ofs/OFSsurfaceFormatCore.C $(surfaceFormats)/ofs/OFSsurfaceFormatRunTime.C