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
a2c0c771
Commit
a2c0c771
authored
Dec 06, 2018
by
incardon
Browse files
Latest particle mesh code
parent
cc09fc21
Changes
4
Hide whitespace changes
Inline
Side-by-side
configure
View file @
a2c0c771
...
...
@@ -532,9 +532,9 @@ fi
cd
build
## remove enerything
echo
"Calling
CXX=mpic++ CC=mpicc
cmake ../.
$conf_options
"
echo
"Calling cmake ../.
$conf_options
"
rm
../error_code
CXX
=
mpic++
CC
=
mpicc
cmake ../.
$conf_options
cmake ../.
$conf_options
if
[
$?
!=
0
]
;
then
#ok something went wrong the install script analyze the return code to potentially fix the problem automatically
# Read the error code and exit with that
...
...
script/detect_gcc
View file @
a2c0c771
...
...
@@ -66,9 +66,9 @@ function detect_compiler()
# we check if the detection is garbage
echo
"
$major
"
| egrep
-q
'^[0-9]+$'
if
[
$?
==
0
]
;
then
dgc_major
=
$(
g++
--version
|
grep
LLVM |
sed
's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g'
)
dgc_middle
=
$(
g++
--version
|
grep
LLVM |
sed
's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\2/g'
)
dgc_minor
=
$(
g++
--version
|
grep
LLVM |
sed
's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\3/g'
)
dgc_major
=
$(
g++
--version
|
grep
LLVM |
sed
's/.*
\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g'
)
dgc_middle
=
$(
g++
--version
|
grep
LLVM |
sed
's/.*
\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\2/g'
)
dgc_minor
=
$(
g++
--version
|
grep
LLVM |
sed
's/.*
\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\3/g'
)
if
[
$dgc_major
-gt
6
]
;
then
echo
-e
"clang++
$dgc_major
.
$dgc_middle
.
$dgc_minor
\0
33[92;1m SUCCESS
\0
33[0m"
...
...
src/CMakeLists.txt
View file @
a2c0c771
...
...
@@ -23,7 +23,7 @@ add_test(NAME pdata_4_proc COMMAND mpirun -np 4 ./pdata)
###########################
if
(
CUDA_FOUND
)
target_compile_options
(
pdata PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe
"--display_error_number --diag_suppress=611 --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111"
--expt-extended-lambda>
)
target_compile_options
(
pdata PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:
-Xcudafe
"--display_error_number --diag_suppress=611 --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111"
--expt-extended-lambda>
)
target_include_directories
(
pdata PUBLIC
${
MPI_C_INCLUDE_DIRS
}
)
endif
()
...
...
src/Decomposition/Domain_NN_calculator_cart.hpp
View file @
a2c0c771
...
...
@@ -218,13 +218,15 @@ class domain_nn_calculator_cart
for
(
size_t
i
=
0
;
i
<
anom
.
size
()
;
i
++
)
{
anom_lin
.
add
();
anom_lin
.
last
().
subsub
=
gs
.
LinId
(
anom
.
get
(
i
).
subsub
+
shift
);
grid_key_dx
<
dim
>
tmp
=
anom
.
get
(
i
).
subsub
+
shift
;
anom_lin
.
last
().
subsub
=
gs
.
LinId
(
tmp
);
long
int
self_cell
=
-
1
;
for
(
size_t
j
=
0
;
j
<
anom
.
get
(
i
).
NN_subsub
.
size
()
;
j
++
)
{
anom_lin
.
get
(
i
).
NN_subsub
.
add
((
long
int
)
gs
.
LinId
(
anom
.
get
(
i
).
NN_subsub
.
get
(
j
)
+
shift
)
-
anom_lin
.
get
(
i
).
subsub
);
grid_key_dx
<
dim
>
tmp
=
anom
.
get
(
i
).
NN_subsub
.
get
(
j
)
+
shift
;
anom_lin
.
get
(
i
).
NN_subsub
.
add
((
long
int
)
gs
.
LinId
(
tmp
)
-
anom_lin
.
get
(
i
).
subsub
);
// This indicate that for example in the neighborhood of one cell it-self is included in the list
// For example the cell 100 is in the neighborhood of the cell 100
...
...
@@ -278,12 +280,18 @@ public:
dom_cells_lin
.
clear
();
for
(
size_t
i
=
0
;
i
<
dom_cells
.
size
()
;
i
++
)
dom_cells_lin
.
add
(
gs
.
LinId
(
dom_cells
.
get
(
i
)
+
shift
));
{
grid_key_dx
<
dim
>
tmp
=
dom_cells
.
get
(
i
)
+
shift
;
dom_cells_lin
.
add
(
gs
.
LinId
(
tmp
));
}
dom_lin
.
clear
();
for
(
size_t
i
=
0
;
i
<
dom
.
size
()
;
i
++
)
dom_lin
.
add
(
gs
.
LinId
(
dom
.
get
(
i
)
+
shift
));
{
grid_key_dx
<
dim
>
tmp
=
dom
.
get
(
i
)
+
shift
;
dom_lin
.
add
(
gs
.
LinId
(
tmp
));
}
linearize_subsub
(
anom
,
anom_lin
,
shift
,
gs
);
}
...
...
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