From 9a2a744c37641411cf8c44f2e69f4e79b109491d Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Sun, 1 May 2011 19:39:16 +0200 Subject: [PATCH 1/3] Throw fatal error if face zones do not exist --- .../mesh/generation/makeFaMesh/makeFaMesh.C | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/applications/utilities/mesh/generation/makeFaMesh/makeFaMesh.C b/applications/utilities/mesh/generation/makeFaMesh/makeFaMesh.C index 758703af9..f9e27150a 100644 --- a/applications/utilities/mesh/generation/makeFaMesh/makeFaMesh.C +++ b/applications/utilities/mesh/generation/makeFaMesh/makeFaMesh.C @@ -102,19 +102,30 @@ int main(int argc, char *argv[]) faPatches[patchI].type_ = word(curPatchDict.lookup("type")); + word ownName = curPatchDict.lookup("ownerPolyPatch"); + faPatches[patchI].ownPolyPatchID_ = - mesh.boundaryMesh().findPatchID - ( - word(curPatchDict.lookup("ownerPolyPatch")) - ); + mesh.boundaryMesh().findPatchID(ownName); + + if ( faPatches[patchI].ownPolyPatchID_ < 0 ) + { + FatalErrorIn("makeFaMesh:") + << "neighbourPolyPatch " << ownName << " does not exist" + << exit(FatalError); + } + + word neiName = curPatchDict.lookup("neighbourPolyPatch"); faPatches[patchI].ngbPolyPatchID_ = - mesh.boundaryMesh().findPatchID - ( - word(curPatchDict.lookup("neighbourPolyPatch")) - ); - } + mesh.boundaryMesh().findPatchID(neiName); + if ( faPatches[patchI].ngbPolyPatchID_ < 0 ) + { + FatalErrorIn("makeFaMesh:") + << "neighbourPolyPatch " << neiName << " does not exist" + << exit(FatalError); + } + } // Setting faceLabels list size label size = 0; @@ -126,6 +137,13 @@ int main(int argc, char *argv[]) patchIDs[patchI] = mesh.boundaryMesh().findPatchID(polyMeshPatches[patchI]); + if ( patchIDs[patchI] < 0 ) + { + FatalErrorIn("makeFaMesh:") + << "Patch " << polyMeshPatches[patchI] << " does not exist" + << exit(FatalError); + } + size += mesh.boundaryMesh()[patchIDs[patchI]].size(); } From 2f29de38bfbb4ff12197cca425789b4e777cde6d Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Fri, 31 May 2013 00:31:18 -0400 Subject: [PATCH 2/3] .gitignore: blacklisting files subject to a DMCA complaint by ANSYS --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index b6d81a490..013e5460d 100644 --- a/.gitignore +++ b/.gitignore @@ -86,4 +86,12 @@ etc/settings.csh etc/setteings.sh +# The following files are blacklisted because of a DMCA complaint by ANSYS. +src/lduSolvers/tools/PriorityArray.C +src/lduSolvers/tools/PriorityArray.H +src/lduSolvers/amg/amgPolicy/samgPolicy.C +src/lduSolvers/amg/amgPolicy/samgPolicy.H +src/lduSolvers/amg/amgPolicy/aamgPolicy.C +src/lduSolvers/amg/amgPolicy/aamgPolicy.H + # end-of-file From a70a1e3b394b11f254a78e314538c03ae809bad0 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sun, 2 Jun 2013 09:11:26 -0400 Subject: [PATCH 3/3] Fixing compilation of lduSolvers following removal of files --- src/lduSolvers/Make/files | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lduSolvers/Make/files b/src/lduSolvers/Make/files index ab36ce6b1..7d891ced3 100644 --- a/src/lduSolvers/Make/files +++ b/src/lduSolvers/Make/files @@ -30,7 +30,5 @@ $(amg)/coarseAmgLevel.C amgPolicy = $(amg)/amgPolicy $(amgPolicy)/amgPolicy.C $(amgPolicy)/pamgPolicy.C -$(amgPolicy)/aamgPolicy.C -$(amgPolicy)/samgPolicy.C LIB = $(FOAM_LIBBIN)/liblduSolvers