From 23fb7670597b68378aaf86ae422c7885be1ea0d9 Mon Sep 17 00:00:00 2001 From: henry <Henry Weller h.weller@opencfd.co.uk> Date: Fri, 2 May 2008 13:11:50 +0100 Subject: [PATCH] Correct location of sampling --- .../sampling/{sampling => }/sample/Make/files | 0 .../probeLocations => sample}/Make/options | 0 .../sampling/{sampling => }/sample/sample.C | 0 .../sampling/{sampling => }/sample/sampleDict | 0 .../sampling/probeLocations/Make/files | 3 - .../sampling/probeLocations/probeLocations.C | 87 ------------------- .../sampling/probeLocations/probesDict | 38 -------- .../sampling/sampling/sample/Make/options | 13 --- 8 files changed, 141 deletions(-) rename applications/utilities/postProcessing/sampling/{sampling => }/sample/Make/files (100%) rename applications/utilities/postProcessing/sampling/{sampling/probeLocations => sample}/Make/options (100%) rename applications/utilities/postProcessing/sampling/{sampling => }/sample/sample.C (100%) rename applications/utilities/postProcessing/sampling/{sampling => }/sample/sampleDict (100%) delete mode 100644 applications/utilities/postProcessing/sampling/sampling/probeLocations/Make/files delete mode 100644 applications/utilities/postProcessing/sampling/sampling/probeLocations/probeLocations.C delete mode 100644 applications/utilities/postProcessing/sampling/sampling/probeLocations/probesDict delete mode 100644 applications/utilities/postProcessing/sampling/sampling/sample/Make/options diff --git a/applications/utilities/postProcessing/sampling/sampling/sample/Make/files b/applications/utilities/postProcessing/sampling/sample/Make/files similarity index 100% rename from applications/utilities/postProcessing/sampling/sampling/sample/Make/files rename to applications/utilities/postProcessing/sampling/sample/Make/files diff --git a/applications/utilities/postProcessing/sampling/sampling/probeLocations/Make/options b/applications/utilities/postProcessing/sampling/sample/Make/options similarity index 100% rename from applications/utilities/postProcessing/sampling/sampling/probeLocations/Make/options rename to applications/utilities/postProcessing/sampling/sample/Make/options diff --git a/applications/utilities/postProcessing/sampling/sampling/sample/sample.C b/applications/utilities/postProcessing/sampling/sample/sample.C similarity index 100% rename from applications/utilities/postProcessing/sampling/sampling/sample/sample.C rename to applications/utilities/postProcessing/sampling/sample/sample.C diff --git a/applications/utilities/postProcessing/sampling/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict similarity index 100% rename from applications/utilities/postProcessing/sampling/sampling/sample/sampleDict rename to applications/utilities/postProcessing/sampling/sample/sampleDict diff --git a/applications/utilities/postProcessing/sampling/sampling/probeLocations/Make/files b/applications/utilities/postProcessing/sampling/sampling/probeLocations/Make/files deleted file mode 100644 index 2546931c3f6..00000000000 --- a/applications/utilities/postProcessing/sampling/sampling/probeLocations/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -probeLocations.C - -EXE = $(FOAM_APPBIN)/probeLocations diff --git a/applications/utilities/postProcessing/sampling/sampling/probeLocations/probeLocations.C b/applications/utilities/postProcessing/sampling/sampling/probeLocations/probeLocations.C deleted file mode 100644 index 07e06e8dd6a..00000000000 --- a/applications/utilities/postProcessing/sampling/sampling/probeLocations/probeLocations.C +++ /dev/null @@ -1,87 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2007 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 2 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, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Description - Probe locations. - -\*---------------------------------------------------------------------------*/ - -#include "argList.H" -#include "IOprobes.H" - -using namespace Foam; - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Main program: - -int main(int argc, char *argv[]) -{ - -# include "addTimeOptions.H" -# include "setRootCase.H" - -# include "createTime.H" - - // Get times list - instantList Times = runTime.times(); - - // set startTime and endTime depending on -time and -latestTime options -# include "checkTimeOptions.H" - - runTime.setTime(Times[startTime], startTime); - -# include "createMesh.H" - - IOprobes sniff(mesh, "probesDict", true); - - for (label i=startTime; i<endTime; i++) - { - runTime.setTime(Times[i], i); - Info<< "Time = " << runTime.timeName() << endl; - - // Handle geometry/topology changes - polyMesh::readUpdateState state = mesh.readUpdate(); - - if - ( - state == polyMesh::POINTS_MOVED - || state == polyMesh::TOPO_CHANGE - ) - { - sniff.read(); - } - - sniff.write(); - - Info<< endl; - } - - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/utilities/postProcessing/sampling/sampling/probeLocations/probesDict b/applications/utilities/postProcessing/sampling/sampling/probeLocations/probesDict deleted file mode 100644 index 3f7679f0ded..00000000000 --- a/applications/utilities/postProcessing/sampling/sampling/probeLocations/probesDict +++ /dev/null @@ -1,38 +0,0 @@ -/*-------------------------------*- C++ -*---------------------------------*\ -| ========= | -| \\ / OpenFOAM 1.4.1 | -| \\ / | -| \\ / The Open Source CFD Toolbox | -| \\/ http://www.OpenFOAM.org | -\*-------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location system; - object probesDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - -// Fields to be probed. runTime modifiable! -fields -( - p -); - -// Locations to be probed. runTime modifiable! -probeLocations -( - (0.0254 0.0253 0.0) - (0.0508 0.0253 0.0) - (0.0762 0.0253 0.0) - (0.1016 0.0253 0.0) - (0.1270 0.0253 0.0) - (0.1524 0.0253 0.0) - (0.1778 0.0253 0.0) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/sampling/sampling/sample/Make/options b/applications/utilities/postProcessing/sampling/sampling/sample/Make/options deleted file mode 100644 index 083d04c7a67..00000000000 --- a/applications/utilities/postProcessing/sampling/sampling/sample/Make/options +++ /dev/null @@ -1,13 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -EXE_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling \ - -ltriSurface \ - -llagrangian -- GitLab