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
Christian Butz
VTK
Commits
ca94d84b
Commit
ca94d84b
authored
Jun 17, 2011
by
George Zagaris
Browse files
COMP: Updated to reflect API changes
Made changes to reflect API changes in vtkAMRGridIndexEncoder.
parent
a729c3d6
Changes
3
Hide whitespace changes
Inline
Side-by-side
AMR/vtkAMRGhostExchange.cxx
View file @
ca94d84b
...
...
@@ -180,7 +180,7 @@ void vtkAMRGhostExchange::WriteReceivers( )
{
int
level
=
-
1
;
int
idx
=
-
1
;
vtkAMRGridIndexEncoder
::
d
ecode
(
it
->
first
,
level
,
idx
);
vtkAMRGridIndexEncoder
::
D
ecode
(
it
->
first
,
level
,
idx
);
oss
.
str
(
""
);
oss
.
clear
();
oss
<<
"Receivers_"
<<
level
<<
"_"
<<
idx
<<
".vtk"
;
...
...
@@ -256,7 +256,7 @@ void vtkAMRGhostExchange::GetReceivers( )
vtkUniformGrid
*
gridPtr
=
this
->
ExtrudedData
->
GetDataSet
(
level
,
idx
);
if
(
gridPtr
!=
NULL
)
{
unsigned
int
gridIdx
=
vtkAMRGridIndexEncoder
::
e
ncode
(
level
,
idx
);
unsigned
int
gridIdx
=
vtkAMRGridIndexEncoder
::
E
ncode
(
level
,
idx
);
if
(
this
->
ReceiverList
.
find
(
gridIdx
)
!=
this
->
ReceiverList
.
end
())
{
this
->
ReceiverList
[
gridIdx
]
->
Delete
();
...
...
@@ -353,7 +353,7 @@ void vtkAMRGhostExchange::FindDonors(
return
;
unsigned
int
encodedDonorGridIdx
=
vtkAMRGridIndexEncoder
::
e
ncode
(
donorGridLevel
,
donorBlockIdx
);
vtkAMRGridIndexEncoder
::
E
ncode
(
donorGridLevel
,
donorBlockIdx
);
vtkUniformGrid
*
ug
=
this
->
AMRDataSet
->
GetDataSet
(
donorGridLevel
,
donorBlockIdx
);
...
...
@@ -431,7 +431,7 @@ void vtkAMRGhostExchange::LocalDonorSearch()
unsigned
int
idx
=
cons
->
GetValue
(
con
);
int
level
=
-
1
;
int
blockIdx
=
-
1
;
vtkAMRGridIndexEncoder
::
d
ecode
(
idx
,
level
,
blockIdx
);
vtkAMRGridIndexEncoder
::
D
ecode
(
idx
,
level
,
blockIdx
);
int
nCons
=
this
->
LocalConnectivity
->
GetNumberOfConnections
(
blockIdx
,
level
);
for
(
int
i
=
0
;
i
<
nCons
;
++
i
)
...
...
@@ -461,7 +461,7 @@ void vtkAMRGhostExchange::LocalDataTransfer()
int
receiverLevel
=
-
1
;
int
receiverBlockIdx
=
-
1
;
vtkAMRGridIndexEncoder
::
d
ecode
(
rIdx
,
receiverLevel
,
receiverBlockIdx
);
vtkAMRGridIndexEncoder
::
D
ecode
(
rIdx
,
receiverLevel
,
receiverBlockIdx
);
vtkUniformGrid
*
receiverGrid
=
this
->
ExtrudedData
->
GetDataSet
(
receiverLevel
,
receiverBlockIdx
);
...
...
@@ -524,7 +524,7 @@ void vtkAMRGhostExchange::LocalDataTransfer()
int
donorGridLevel
=
-
1
;
int
donorGridBlockIdx
=
-
1
;
vtkAMRGridIndexEncoder
::
d
ecode
(
vtkAMRGridIndexEncoder
::
D
ecode
(
donorGridIdx
,
donorGridLevel
,
donorGridBlockIdx
);
assert
(
"post: donor grid level mismatch!"
&&
...
...
@@ -625,7 +625,7 @@ void vtkAMRGhostExchange::CheckOwnershipAtSameLevel(
int
donorGridBlock
=
-
1
;
int
donorLevel
=
-
1
;
vtkAMRGridIndexEncoder
::
d
ecode
(
vtkAMRGridIndexEncoder
::
D
ecode
(
donorGridInfo
->
GetValue
(
cellIdx
),
donorLevel
,
donorGridBlock
);
assert
(
"post: level mismatch"
&&
(
donorLevel
==
level
)
);
...
...
AMR/vtkAMRInterBlockConnectivity.cxx
View file @
ca94d84b
...
...
@@ -49,7 +49,7 @@ void vtkAMRInterBlockConnectivity::PrintSelf(
unsigned
int
idx
=
iter
->
first
;
int
level
=
-
1
;
int
block
=
-
1
;
vtkAMRGridIndexEncoder
::
d
ecode
(
idx
,
level
,
block
);
vtkAMRGridIndexEncoder
::
D
ecode
(
idx
,
level
,
block
);
vtkAssertUtils
::
assertTrue
(
(
level
>=
0
),
__FILE__
,
__LINE__
);
vtkAssertUtils
::
assertTrue
(
(
block
>=
0
),
__FILE__
,
__LINE__
);
...
...
@@ -75,7 +75,7 @@ void vtkAMRInterBlockConnectivity::InsertConnection(
const
int
connectingBlockIdx
,
const
int
connectingBlockLevel
,
const
int
connectingBlockProcess
)
{
unsigned
int
idx
=
vtkAMRGridIndexEncoder
::
e
ncode
(
myLevelId
,
myBlockId
);
unsigned
int
idx
=
vtkAMRGridIndexEncoder
::
E
ncode
(
myLevelId
,
myBlockId
);
if
(
this
->
HasBlockConnections
(
idx
)
)
{
this
->
connectivity
[
idx
].
push_back
(
...
...
@@ -99,7 +99,7 @@ void vtkAMRInterBlockConnectivity::InsertConnection(
int
vtkAMRInterBlockConnectivity
::
GetNumberOfConnections
(
const
int
myBlockId
,
const
int
myLevelId
)
{
unsigned
int
idx
=
vtkAMRGridIndexEncoder
::
e
ncode
(
myLevelId
,
myBlockId
);
unsigned
int
idx
=
vtkAMRGridIndexEncoder
::
E
ncode
(
myLevelId
,
myBlockId
);
return
(
this
->
GetNumberOfConnections
(
idx
)
);
}
...
...
@@ -115,7 +115,7 @@ int vtkAMRInterBlockConnectivity::GetNumberOfConnections(const unsigned int idx)
bool
vtkAMRInterBlockConnectivity
::
HasBlockConnections
(
const
int
myBlockId
,
const
int
myLevelId
)
{
unsigned
int
idx
=
vtkAMRGridIndexEncoder
::
e
ncode
(
myLevelId
,
myBlockId
);
unsigned
int
idx
=
vtkAMRGridIndexEncoder
::
E
ncode
(
myLevelId
,
myBlockId
);
if
(
this
->
HasBlockConnections
(
idx
)
)
return
true
;
return
false
;
...
...
@@ -155,7 +155,7 @@ vtkUnsignedIntArray* vtkAMRInterBlockConnectivity::GetEncodedGridKeys()
vtkAMRLink
vtkAMRInterBlockConnectivity
::
GetConnection
(
const
int
myBlockId
,
const
int
myLevelId
,
const
int
idx
)
{
unsigned
int
blockidx
=
vtkAMRGridIndexEncoder
::
e
ncode
(
myLevelId
,
myBlockId
);
unsigned
int
blockidx
=
vtkAMRGridIndexEncoder
::
E
ncode
(
myLevelId
,
myBlockId
);
return
(
this
->
GetConnection
(
blockidx
,
idx
));
}
...
...
AMR/vtkAMRProbeFilter.cxx
View file @
ca94d84b
...
...
@@ -128,7 +128,7 @@ void vtkAMRProbeFilter::ExtractAMRBlocks(
unsigned
int
gridIdx
=
*
iter
;
int
blockId
=
-
1
;
int
levelId
=
-
1
;
vtkAMRGridIndexEncoder
::
d
ecode
(
gridIdx
,
levelId
,
blockId
);
vtkAMRGridIndexEncoder
::
D
ecode
(
gridIdx
,
levelId
,
blockId
);
assert
(
"level index out-of-bounds"
&&
(
(
levelId
>=
0
)
&&
(
levelId
<
amrds
->
GetNumberOfLevels
())));
assert
(
"block index out-of-bounds"
&&
...
...
@@ -198,7 +198,7 @@ void vtkAMRProbeFilter::ProbeAMR(
int
level
=
static_cast
<
int
>
(
currentLevel
);
unsigned
int
grididx
=
vtkAMRGridIndexEncoder
::
e
ncode
(
level
,
blockId
);
vtkAMRGridIndexEncoder
::
E
ncode
(
level
,
blockId
);
blocksToExtract
.
insert
(
grididx
);
isBlockFound
=
true
;
break
;
...
...
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