zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2013-03-14 08:59:55 +00:00
parent eaaec5c414 32c3482dc5
commit 1059796d73
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/OpenFOAM/global/debug/debug.C
View File

@ -95,10 +95,18 @@ Foam::dictionary& Foam::debug::controlDict()
controlDictPtr_ = new dictionary();
forAllReverse(controlDictFiles, cdfi)
{
controlDictPtr_->merge
(
dictionary(IFstream(controlDictFiles[cdfi])())
);
IFstream ifs(controlDictFiles[cdfi]);
if (!ifs.good())
{
SafeFatalIOErrorIn
(
"debug::controlDict()",
ifs,
"Cannot open controlDict"
);
}
controlDictPtr_->merge(dictionary(ifs));
}
}

6
src/sampling/sampledSet/sampledSets/sampledSets.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -282,10 +282,6 @@ void Foam::sampledSets::correct()
bool setsFound = dict_.found("sets");
if (setsFound)
{
// reset interpolation
pointMesh::Delete(mesh_);
volPointInterpolation::Delete(mesh_);
searchEngine_.correct();
PtrList<sampledSet> newList