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

GIT: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 0e01c44129
2311 changed files with 44974 additions and 26547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/autoPatch.H
View File

@ -75,7 +75,7 @@ public:
//- Clone
autoPtr<searchableSurfaceModifier> clone() const
{
notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
NotImplemented;
return autoPtr<searchableSurfaceModifier>(NULL);
}

10
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.C
View File

@ -118,14 +118,8 @@ Foam::triSurface& Foam::searchableSurfaceModifiers::cut::triangulate
}
else
{
FatalErrorIn
(
"searchableSurfaceModifiers::cut::triangulate\n"
"(\n"
" const searchableSurface&,\n"
" triSurface&\n"
")"
) << "Triangulation only supported for triSurfaceMesh, searchableBox"
FatalErrorInFunction
<< "Triangulation only supported for triSurfaceMesh, searchableBox"
<< ", not for surface " << cutter.name()
<< " of type " << cutter.type()
<< exit(FatalError);

2
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/cut.H
View File

@ -99,7 +99,7 @@ public:
//- Clone
autoPtr<searchableSurfaceModifier> clone() const
{
notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
NotImplemented;
return autoPtr<searchableSurfaceModifier>(NULL);
}

7
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.C
View File

@ -69,11 +69,8 @@ Foam::searchableSurfaceModifier::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn
(
"searchableSurfaceModifier::New"
"(const word&, const searchableSurfaces&, const dictionary&)"
) << "Unknown searchableSurfaceModifier type "
FatalErrorInFunction
<< "Unknown searchableSurfaceModifier type "
<< type << nl << nl
<< "Valid searchableSurfaceModifier types : " << endl
<< dictionaryConstructorTablePtr_->sortedToc()

2
applications/utilities/surface/surfacePatch/searchableSurfaceModifier/searchableSurfaceModifier.H
View File

@ -95,7 +95,7 @@ public:
//- Clone
autoPtr<searchableSurfaceModifier> clone() const
{
notImplemented("autoPtr<searchableSurfaceModifier> clone() const");
NotImplemented;
return autoPtr<searchableSurfaceModifier>(NULL);
}