Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
INMOST
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Terekhov
INMOST
Commits
fbcd23ff
Commit
fbcd23ff
authored
Oct 19, 2016
by
Kirill Terekhov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More mask options for BridgeAdjacencies function
parent
e78e5647
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
21 deletions
+20
-21
Examples/ADMFD/main.cpp
Examples/ADMFD/main.cpp
+0
-1
Source/Headers/inmost_mesh.h
Source/Headers/inmost_mesh.h
+5
-5
Source/Mesh/element.cpp
Source/Mesh/element.cpp
+15
-15
No files found.
Examples/ADMFD/main.cpp
View file @
fbcd23ff
...
...
@@ -209,7 +209,6 @@ int main(int argc,char ** argv)
double
J_T
[
9
];
double
K_inv
[
9
];
double
K_inv_ref1
[
9
];
double
K_inv_ref
[
9
];
double
W_RT0
[
12
];
double
B_RT0
[
16
];
double
gauss_pt_xyz
[
12
];
...
...
Source/Headers/inmost_mesh.h
View file @
fbcd23ff
...
...
@@ -358,11 +358,11 @@ namespace INMOST
/// @param invert_mask if true then those are selected on wich marker is not set
/// @return array of elements
virtual
ElementArray
<
Element
>
getAdjElements
(
ElementType
etype
,
MarkerType
mask
,
bool
invert_mask
=
false
)
const
;
//unordered
ElementArray
<
Element
>
BridgeAdjacencies
(
ElementType
Bridge
,
ElementType
Dest
,
MarkerType
mask
=
0
,
bool
invert_mask
=
false
)
const
;
ElementArray
<
Node
>
BridgeAdjacencies2Node
(
ElementType
Bridge
,
MarkerType
mask
=
0
,
bool
invert_mask
=
false
)
const
;
ElementArray
<
Edge
>
BridgeAdjacencies2Edge
(
ElementType
Bridge
,
MarkerType
mask
=
0
,
bool
invert_mask
=
false
)
const
;
ElementArray
<
Face
>
BridgeAdjacencies2Face
(
ElementType
Bridge
,
MarkerType
mask
=
0
,
bool
invert_mask
=
false
)
const
;
ElementArray
<
Cell
>
BridgeAdjacencies2Cell
(
ElementType
Bridge
,
MarkerType
mask
=
0
,
bool
invert_mask
=
false
)
const
;
ElementArray
<
Element
>
BridgeAdjacencies
(
ElementType
Bridge
,
ElementType
Dest
,
MarkerType
bridge_mask
=
0
,
bool
bridge_invert
=
false
,
MarkerType
target_mask
=
0
,
bool
target_invert
=
false
)
const
;
ElementArray
<
Node
>
BridgeAdjacencies2Node
(
ElementType
Bridge
,
MarkerType
bridge_mask
=
0
,
bool
bridge_invert
=
false
,
MarkerType
target_mask
=
0
,
bool
target_invert
=
false
)
const
;
ElementArray
<
Edge
>
BridgeAdjacencies2Edge
(
ElementType
Bridge
,
MarkerType
bridge_mask
=
0
,
bool
bridge_invert
=
false
,
MarkerType
target_mask
=
0
,
bool
target_invert
=
false
)
const
;
ElementArray
<
Face
>
BridgeAdjacencies2Face
(
ElementType
Bridge
,
MarkerType
bridge_mask
=
0
,
bool
bridge_invert
=
false
,
MarkerType
target_mask
=
0
,
bool
target_invert
=
false
)
const
;
ElementArray
<
Cell
>
BridgeAdjacencies2Cell
(
ElementType
Bridge
,
MarkerType
bridge_mask
=
0
,
bool
bridge_invert
=
false
,
MarkerType
target_mask
=
0
,
bool
target_invert
=
false
)
const
;
/// Retrieve all the nodes of the element.
///
/// For a node returns itself.
...
...
Source/Mesh/element.cpp
View file @
fbcd23ff
...
...
@@ -1048,7 +1048,7 @@ namespace INMOST
ElementArray
<
Element
>
Element
::
BridgeAdjacencies
(
ElementType
Bridge
,
ElementType
Dest
,
MarkerType
mask
,
bool
invert
)
const
ElementArray
<
Element
>
Element
::
BridgeAdjacencies
(
ElementType
Bridge
,
ElementType
Dest
,
MarkerType
bridge_mask
,
bool
bridge_invert
,
MarkerType
target_mask
,
bool
target_
invert
)
const
{
Mesh
*
m
=
GetMeshLink
();
MarkerType
mrk
=
m
->
CreatePrivateMarker
();
...
...
@@ -1056,11 +1056,11 @@ namespace INMOST
ElementArray
<
Element
>
adjfaces
=
getAdjElements
(
Bridge
);
ElementArray
<
Element
>
my
=
Bridge
&
GetElementType
()
?
ElementArray
<
Element
>
(
m
)
:
getAdjElements
(
Dest
);
for
(
ElementArray
<
Element
>::
iterator
it
=
my
.
begin
();
it
!=
my
.
end
();
it
++
)
it
->
SetPrivateMarker
(
mrk
);
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
if
(
bridge_mask
==
0
||
(
bridge_invert
^
(
isPrivate
(
bridge_mask
)
?
it
->
GetPrivateMarker
(
bridge_mask
)
:
it
->
GetMarker
(
bridge_mask
))))
{
ElementArray
<
Element
>
sub
=
it
->
getAdjElements
(
Dest
);
for
(
ElementArray
<
Element
>::
iterator
jt
=
sub
.
begin
();
jt
!=
sub
.
end
();
jt
++
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
mask
==
0
||
(
invert
^
(
isPrivate
(
mask
)
?
jt
->
GetPrivateMarker
(
mask
)
:
jt
->
GetMarker
(
mask
))))
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
target_mask
==
0
||
(
target_invert
^
(
isPrivate
(
target_mask
)
?
jt
->
GetPrivateMarker
(
target_mask
)
:
jt
->
GetMarker
(
target_
mask
))))
)
{
adjcells
.
push_back
(
*
jt
);
jt
->
SetPrivateMarker
(
mrk
);
...
...
@@ -1073,7 +1073,7 @@ namespace INMOST
}
ElementArray
<
Node
>
Element
::
BridgeAdjacencies2Node
(
ElementType
Bridge
,
MarkerType
mask
,
bool
invert
)
const
ElementArray
<
Node
>
Element
::
BridgeAdjacencies2Node
(
ElementType
Bridge
,
MarkerType
bridge_mask
,
bool
bridge_invert
,
MarkerType
target_mask
,
bool
target_
invert
)
const
{
Mesh
*
m
=
GetMeshLink
();
MarkerType
mrk
=
m
->
CreatePrivateMarker
();
...
...
@@ -1081,11 +1081,11 @@ namespace INMOST
ElementArray
<
Element
>
adjfaces
=
getAdjElements
(
Bridge
);
ElementArray
<
Element
>
my
=
Bridge
&
GetElementType
()
?
ElementArray
<
Element
>
(
m
)
:
getAdjElements
(
NODE
);
for
(
ElementArray
<
Element
>::
iterator
it
=
my
.
begin
();
it
!=
my
.
end
();
it
++
)
it
->
SetPrivateMarker
(
mrk
);
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
if
(
bridge_mask
==
0
||
(
bridge_invert
^
(
isPrivate
(
bridge_mask
)
?
it
->
GetPrivateMarker
(
bridge_mask
)
:
it
->
GetMarker
(
bridge_mask
))))
{
ElementArray
<
Node
>
sub
=
it
->
getNodes
();
for
(
ElementArray
<
Node
>::
iterator
jt
=
sub
.
begin
();
jt
!=
sub
.
end
();
jt
++
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
mask
==
0
||
(
invert
^
(
isPrivate
(
mask
)
?
jt
->
GetPrivateMarker
(
mask
)
:
jt
->
GetMarker
(
mask
))))
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
target_mask
==
0
||
(
target_invert
^
(
isPrivate
(
target_mask
)
?
jt
->
GetPrivateMarker
(
target_mask
)
:
jt
->
GetMarker
(
target_
mask
))))
)
{
adjcells
.
push_back
(
*
jt
);
jt
->
SetPrivateMarker
(
mrk
);
...
...
@@ -1097,7 +1097,7 @@ namespace INMOST
return
adjcells
;
}
ElementArray
<
Edge
>
Element
::
BridgeAdjacencies2Edge
(
ElementType
Bridge
,
MarkerType
mask
,
bool
invert
)
const
ElementArray
<
Edge
>
Element
::
BridgeAdjacencies2Edge
(
ElementType
Bridge
,
MarkerType
bridge_mask
,
bool
bridge_invert
,
MarkerType
target_mask
,
bool
target_
invert
)
const
{
Mesh
*
m
=
GetMeshLink
();
MarkerType
mrk
=
m
->
CreatePrivateMarker
();
...
...
@@ -1105,11 +1105,11 @@ namespace INMOST
ElementArray
<
Element
>
adjfaces
=
getAdjElements
(
Bridge
);
ElementArray
<
Element
>
my
=
Bridge
&
GetElementType
()
?
ElementArray
<
Element
>
(
m
)
:
getAdjElements
(
EDGE
);
for
(
ElementArray
<
Element
>::
iterator
it
=
my
.
begin
();
it
!=
my
.
end
();
it
++
)
it
->
SetPrivateMarker
(
mrk
);
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
if
(
bridge_mask
==
0
||
(
bridge_invert
^
(
isPrivate
(
bridge_mask
)
?
it
->
GetPrivateMarker
(
bridge_mask
)
:
it
->
GetMarker
(
bridge_mask
))))
{
ElementArray
<
Edge
>
sub
=
it
->
getEdges
();
for
(
ElementArray
<
Edge
>::
iterator
jt
=
sub
.
begin
();
jt
!=
sub
.
end
();
jt
++
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
mask
==
0
||
(
invert
^
(
isPrivate
(
mask
)
?
jt
->
GetPrivateMarker
(
mask
)
:
jt
->
GetMarker
(
mask
))))
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
target_mask
==
0
||
(
target_invert
^
(
isPrivate
(
target_mask
)
?
jt
->
GetPrivateMarker
(
target_mask
)
:
jt
->
GetMarker
(
target_
mask
))))
)
{
adjcells
.
push_back
(
*
jt
);
jt
->
SetPrivateMarker
(
mrk
);
...
...
@@ -1121,7 +1121,7 @@ namespace INMOST
return
adjcells
;
}
ElementArray
<
Face
>
Element
::
BridgeAdjacencies2Face
(
ElementType
Bridge
,
MarkerType
mask
,
bool
invert
)
const
ElementArray
<
Face
>
Element
::
BridgeAdjacencies2Face
(
ElementType
Bridge
,
MarkerType
bridge_mask
,
bool
bridge_invert
,
MarkerType
target_mask
,
bool
target_
invert
)
const
{
Mesh
*
m
=
GetMeshLink
();
MarkerType
mrk
=
m
->
CreatePrivateMarker
();
...
...
@@ -1129,11 +1129,11 @@ namespace INMOST
ElementArray
<
Element
>
adjfaces
=
getAdjElements
(
Bridge
);
ElementArray
<
Element
>
my
=
Bridge
&
GetElementType
()
?
ElementArray
<
Element
>
(
m
)
:
getAdjElements
(
FACE
);
for
(
ElementArray
<
Element
>::
iterator
it
=
my
.
begin
();
it
!=
my
.
end
();
it
++
)
it
->
SetPrivateMarker
(
mrk
);
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
if
(
bridge_mask
==
0
||
(
bridge_invert
^
(
isPrivate
(
bridge_mask
)
?
it
->
GetPrivateMarker
(
bridge_mask
)
:
it
->
GetMarker
(
bridge_mask
))))
{
ElementArray
<
Face
>
sub
=
it
->
getFaces
();
for
(
ElementArray
<
Face
>::
iterator
jt
=
sub
.
begin
();
jt
!=
sub
.
end
();
jt
++
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
mask
==
0
||
(
invert
^
(
isPrivate
(
mask
)
?
jt
->
GetPrivateMarker
(
mask
)
:
jt
->
GetMarker
(
mask
))))
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
target_mask
==
0
||
(
target_invert
^
(
isPrivate
(
target_mask
)
?
jt
->
GetPrivateMarker
(
target_mask
)
:
jt
->
GetMarker
(
target_
mask
))))
)
{
adjcells
.
push_back
(
*
jt
);
jt
->
SetPrivateMarker
(
mrk
);
...
...
@@ -1145,7 +1145,7 @@ namespace INMOST
return
adjcells
;
}
ElementArray
<
Cell
>
Element
::
BridgeAdjacencies2Cell
(
ElementType
Bridge
,
MarkerType
mask
,
bool
invert
)
const
ElementArray
<
Cell
>
Element
::
BridgeAdjacencies2Cell
(
ElementType
Bridge
,
MarkerType
bridge_mask
,
bool
bridge_invert
,
MarkerType
target_mask
,
bool
target_
invert
)
const
{
Mesh
*
m
=
GetMeshLink
();
MarkerType
mrk
=
m
->
CreatePrivateMarker
();
...
...
@@ -1153,11 +1153,11 @@ namespace INMOST
ElementArray
<
Element
>
adjfaces
=
getAdjElements
(
Bridge
);
ElementArray
<
Element
>
my
=
Bridge
&
GetElementType
()
?
ElementArray
<
Element
>
(
m
)
:
getAdjElements
(
CELL
);
for
(
ElementArray
<
Element
>::
iterator
it
=
my
.
begin
();
it
!=
my
.
end
();
it
++
)
it
->
SetPrivateMarker
(
mrk
);
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
for
(
ElementArray
<
Element
>::
iterator
it
=
adjfaces
.
begin
();
it
!=
adjfaces
.
end
();
it
++
)
if
(
bridge_mask
==
0
||
(
bridge_invert
^
(
isPrivate
(
bridge_mask
)
?
it
->
GetPrivateMarker
(
bridge_mask
)
:
it
->
GetMarker
(
bridge_mask
))))
{
ElementArray
<
Cell
>
sub
=
it
->
getCells
();
for
(
ElementArray
<
Cell
>::
iterator
jt
=
sub
.
begin
();
jt
!=
sub
.
end
();
jt
++
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
mask
==
0
||
(
invert
^
(
isPrivate
(
mask
)
?
jt
->
GetPrivateMarker
(
mask
)
:
jt
->
GetMarker
(
mask
))))
)
if
(
!
jt
->
GetPrivateMarker
(
mrk
)
&&
(
target_mask
==
0
||
(
target_invert
^
(
isPrivate
(
target_mask
)
?
jt
->
GetPrivateMarker
(
target_mask
)
:
jt
->
GetMarker
(
target_
mask
))))
)
{
adjcells
.
push_back
(
*
jt
);
jt
->
SetPrivateMarker
(
mrk
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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