Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sbalzarini Lab
S
Software
P
Parallel Computing
OpenFPM
openfpm_pdata
Commits
31880470
Commit
31880470
authored
Jan 26, 2016
by
Pietro Incardona
Browse files
Merging with master
parent
6e39b110
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/Decomposition/CartDecomposition.hpp
View file @
31880470
...
@@ -507,7 +507,7 @@ public:
...
@@ -507,7 +507,7 @@ public:
* \param p Point to apply the boundary condition
* \param p Point to apply the boundary condition
*
*
*/
*/
bool
applyPointBC
(
Point
<
dim
,
T
>
&
pt
)
const
void
applyPointBC
(
Point
<
dim
,
T
>
&
pt
)
const
{
{
for
(
size_t
i
=
0
;
i
<
dim
;
i
++
)
for
(
size_t
i
=
0
;
i
<
dim
;
i
++
)
{
{
...
...
src/Grid/grid_dist_id.hpp
View file @
31880470
...
@@ -698,11 +698,6 @@ public:
...
@@ -698,11 +698,6 @@ public:
#endif
#endif
InitializeCellDecomposer
(
g_sz
);
InitializeCellDecomposer
(
g_sz
);
// get the grid spacing
Box
<
dim
,
St
>
sp
=
cd_sm
.
getCellBox
();
InitializeCellDecomposer
(
g_sz
);
ghost
=
convert_ghost
(
g
,
cd_sm
);
ghost
=
convert_ghost
(
g
,
cd_sm
);
InitializeDecomposition
(
g_sz
);
InitializeDecomposition
(
g_sz
);
...
...
src/Grid/grid_dist_id_unit_test.hpp
View file @
31880470
...
@@ -271,8 +271,8 @@ void Test2D(const Box<2,float> & domain, long int k)
...
@@ -271,8 +271,8 @@ void Test2D(const Box<2,float> & domain, long int k)
grid_key_dx
<
2
>
start
=
dom2
.
getStart
();
grid_key_dx
<
2
>
start
=
dom2
.
getStart
();
grid_key_dx
<
2
>
stop
=
dom2
.
getStop
();
grid_key_dx
<
2
>
stop
=
dom2
.
getStop
();
BOOST_REQUIRE_EQUAL
(
stop
.
get
(
0
),
g_dist
.
size
(
0
)
-
1
);
BOOST_REQUIRE_EQUAL
(
(
long
int
)
stop
.
get
(
0
),
(
long
int
)
g_dist
.
size
(
0
)
-
1
);
BOOST_REQUIRE_EQUAL
(
stop
.
get
(
1
),
g_dist
.
size
(
1
)
-
1
);
BOOST_REQUIRE_EQUAL
(
(
long
int
)
stop
.
get
(
1
),
(
long
int
)
g_dist
.
size
(
1
)
-
1
);
BOOST_REQUIRE_EQUAL
(
start
.
get
(
0
),
0
);
BOOST_REQUIRE_EQUAL
(
start
.
get
(
0
),
0
);
BOOST_REQUIRE_EQUAL
(
start
.
get
(
1
),
0
);
BOOST_REQUIRE_EQUAL
(
start
.
get
(
1
),
0
);
...
...
src/Grid/staggered_grid_dist_unit_test.hpp
View file @
31880470
...
@@ -18,8 +18,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
...
@@ -18,8 +18,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
{
{
typedef
Point2D_test
<
float
>
p
;
typedef
Point2D_test
<
float
>
p
;
Vcluster
&
v_cl
=
*
global_v_cluster
;
// Domain
// Domain
Box
<
2
,
float
>
domain
({
0.0
,
0.0
},{
1.0
,
1.0
});
Box
<
2
,
float
>
domain
({
0.0
,
0.0
},{
1.0
,
1.0
});
...
@@ -47,8 +45,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
...
@@ -47,8 +45,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
{
{
auto
key
=
it
.
get
();
auto
key
=
it
.
get
();
grid_key_dx
<
2
>
keyg
=
sg
.
getGKey
(
key
);
sg
.
template
get
<
p
::
s
>(
key
)
=
1
;
sg
.
template
get
<
p
::
s
>(
key
)
=
1
;
sg
.
template
get
<
p
::
v
>(
key
)[
0
]
=
0
;
sg
.
template
get
<
p
::
v
>(
key
)[
0
]
=
0
;
...
@@ -62,7 +58,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
...
@@ -62,7 +58,6 @@ BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
++
it
;
++
it
;
}
}
sg
.
write
(
"stag_test.vtk"
);
/* }*/
/* }*/
}
}
...
...
src/Vector/vector_dist.hpp
View file @
31880470
...
@@ -171,7 +171,7 @@ private:
...
@@ -171,7 +171,7 @@ private:
// Particle to move
// Particle to move
if
(
p_id
!=
v_cl
.
getProcessUnitID
())
if
(
p_id
!=
v_cl
.
getProcessUnitID
())
{
{
if
(
p_id
!=
-
1
)
if
(
(
long
int
)
p_id
!=
-
1
)
{
{
prc_sz
.
get
(
p_id
)
++
;
prc_sz
.
get
(
p_id
)
++
;
lbl_p
.
get
(
p_id
).
add
(
key
);
lbl_p
.
get
(
p_id
).
add
(
key
);
...
...
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