Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
4256da32
Commit
4256da32
authored
Jan 22, 2019
by
Mark OLESEN
Browse files
GIT: fix merge/rebase artifact
parent
fafe1e56
Changes
2
Hide whitespace changes
Inline
Side-by-side
etc/config.sh/setup
View file @
4256da32
...
...
@@ -51,7 +51,7 @@ _foamEcho "Locating ThirdParty directory"
for
WM_THIRD_PARTY_DIR
in
\
"
$WM_PROJECT_DIR
/ThirdParty"
\
"
$prefixDir
/ThirdParty-
$
FOAM_API
"
\
"
$prefixDir
/ThirdParty-
$
WM_PROJECT_VERSION
"
\
"
$prefixDir
/ThirdParty-v
$FOAM_API
"
\
"
$prefixDir
/ThirdParty-
$FOAM_API
"
\
"
$prefixDir
/ThirdParty-common"
\
...
...
src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
View file @
4256da32
...
...
@@ -878,8 +878,6 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
if
(
newStart
>=
0
&&
newEnd
>=
0
)
{
const
labelList
&
addedPoints
=
iter
.
object
();
labelList
newAddedPoints
(
addedPoints
.
size
());
label
newI
=
0
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment