From 40985d291b1260037aca696f73fdfe06197b3846 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 17 Jan 2018 14:47:38 +0100 Subject: [PATCH] ENH: use main constant/triSurface directory for sampling surfaces (closes #704) - these were previously taken from region-local directories (eg, constant/region/triSurface), but this becomes difficult to manage when there are many files and regions. --- .../sampledTriSurfaceMesh/sampledTriSurfaceMesh.C | 8 ++++---- src/sampling/surface/triSurfaceMesh/discreteSurface.C | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C index 9732f9b70d..7da363f275 100644 --- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C +++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.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 | Copyright (C) 2016-2017 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -647,7 +647,7 @@ Foam::sampledTriSurfaceMesh::sampledTriSurfaceMesh surfaceName, mesh.time().constant(), // instance "triSurface", // local - mesh, // registry + mesh.time(), // registry IOobject::MUST_READ, IOobject::NO_WRITE, false @@ -679,7 +679,7 @@ Foam::sampledTriSurfaceMesh::sampledTriSurfaceMesh dict.lookup("surface"), mesh.time().constant(), // instance "triSurface", // local - mesh, // registry + mesh.time(), // registry IOobject::MUST_READ, IOobject::NO_WRITE, false @@ -713,7 +713,7 @@ Foam::sampledTriSurfaceMesh::sampledTriSurfaceMesh name, mesh.time().constant(), // instance "triSurface", // local - mesh, // registry + mesh.time(), // registry IOobject::NO_READ, IOobject::NO_WRITE, false diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurface.C b/src/sampling/surface/triSurfaceMesh/discreteSurface.C index 9ea6923748..d9165dd031 100644 --- a/src/sampling/surface/triSurfaceMesh/discreteSurface.C +++ b/src/sampling/surface/triSurfaceMesh/discreteSurface.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 | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -642,7 +642,7 @@ Foam::discreteSurface::discreteSurface surfaceName, mesh.time().constant(), // instance "triSurface", // local - mesh, // registry + mesh.time(), // registry IOobject::MUST_READ, IOobject::NO_WRITE, false @@ -680,7 +680,7 @@ Foam::discreteSurface::discreteSurface dict.lookup("surface"), mesh.time().constant(), // instance "triSurface", // local - mesh, // registry + mesh.time(), // registry IOobject::MUST_READ, IOobject::NO_WRITE, false @@ -716,7 +716,7 @@ Foam::discreteSurface::discreteSurface name, mesh.time().constant(), // instance "triSurface", // local - mesh, // registry + mesh.time(), // registry IOobject::NO_READ, IOobject::NO_WRITE, false