ENH: Simplify code by using demandDrivenData functions

This commit is contained in:
andy
2013-07-24 12:46:36 +01:00
parent 52a8bde2ab
commit 76fb7f8f71

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -30,7 +30,7 @@ License
#include "triSurfaceSearch.H" #include "triSurfaceSearch.H"
#include "cellClassification.H" #include "cellClassification.H"
#include "cpuTime.H" #include "cpuTime.H"
#include "demandDrivenData.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -443,14 +443,8 @@ Foam::surfaceToCell::~surfaceToCell()
{ {
if (IOwnPtrs_) if (IOwnPtrs_)
{ {
if (surfPtr_) deleteDemandDrivenData(surfPtr_);
{ deleteDemandDrivenData(querySurfPtr_);
delete surfPtr_;
}
if (querySurfPtr_)
{
delete querySurfPtr_;
}
} }
} }
@ -463,7 +457,7 @@ void Foam::surfaceToCell::applyToSet
topoSet& set topoSet& set
) const ) const
{ {
if ( (action == topoSetSource::NEW) || (action == topoSetSource::ADD)) if ((action == topoSetSource::NEW) || (action == topoSetSource::ADD))
{ {
Info<< " Adding cells in relation to surface " << surfName_ Info<< " Adding cells in relation to surface " << surfName_
<< " ..." << endl; << " ..." << endl;