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: fix merge/rebase artifact

Browse Source
This commit is contained in:
Mark Olesen
2019-01-22 19:25:53 +01:00
parent fafe1e564b
commit 4256da3291
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/config.sh/setup
View File

@ -51,7 +51,7 @@ _foamEcho "Locating ThirdParty directory"
for WM_THIRD_PARTY_DIR in \ for WM_THIRD_PARTY_DIR in \
"$WM_PROJECT_DIR/ThirdParty" \ "$WM_PROJECT_DIR/ThirdParty" \
"$prefixDir/ThirdParty-$FOAM_API" \ "$prefixDir/ThirdParty-$WM_PROJECT_VERSION" \
"$prefixDir/ThirdParty-v$FOAM_API" \ "$prefixDir/ThirdParty-v$FOAM_API" \
"$prefixDir/ThirdParty-$FOAM_API" \ "$prefixDir/ThirdParty-$FOAM_API" \
"$prefixDir/ThirdParty-common" \ "$prefixDir/ThirdParty-common" \

2
src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
View File

@ -878,8 +878,6 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
if (newStart >= 0 && newEnd >= 0) if (newStart >= 0 && newEnd >= 0)
{ {
const labelList& addedPoints = iter.object();
labelList newAddedPoints(addedPoints.size()); labelList newAddedPoints(addedPoints.size());
label newI = 0; label newI = 0;