Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TurTLE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TurTLE
TurTLE
Commits
750437e5
Commit
750437e5
authored
8 years ago
by
Berenger Bramas
Browse files
Options
Downloads
Patches
Plain Diff
Update after rebase and set long long in the python from 1Billion particles
parent
3e467330
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!21
Bugfix/nansampling
,
!11
Feature/longlong particles
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bfps/_base.py
+2
-2
2 additions, 2 deletions
bfps/_base.py
bfps/cpp/full_code/NSVEp.cpp
+2
-2
2 additions, 2 deletions
bfps/cpp/full_code/NSVEp.cpp
bfps/cpp/full_code/NSVEp.hpp
+2
-2
2 additions, 2 deletions
bfps/cpp/full_code/NSVEp.hpp
with
6 additions
and
6 deletions
bfps/_base.py
+
2
−
2
View file @
750437e5
...
...
@@ -56,7 +56,7 @@ class _base(object):
key
=
sorted
(
list
(
parameters
.
keys
()))
src_txt
=
''
for
i
in
range
(
len
(
key
)):
if
(
type
(
parameters
[
key
[
i
]])
==
int
&&
parameters
[
key
[
i
]]
>=
1
<<
30
)
||
type
(
parameters
[
key
[
i
]])
==
long
:
if
(
type
(
parameters
[
key
[
i
]])
==
int
and
parameters
[
key
[
i
]]
>=
1
<<
30
):
src_txt
+=
'
long long int
'
+
key
[
i
]
+
'
;
\n
'
elif
type
(
parameters
[
key
[
i
]])
==
int
:
src_txt
+=
'
int
'
+
key
[
i
]
+
'
;
\n
'
...
...
@@ -101,7 +101,7 @@ class _base(object):
for
i
in
range
(
len
(
key
)):
src_txt
+=
'
dset = H5Dopen(parameter_file,
"
/{0}/{1}
"
, H5P_DEFAULT);
\n
'
.
format
(
file_group
,
key
[
i
])
if
(
type
(
parameters
[
key
[
i
]])
==
int
&&
parameters
[
key
[
i
]]
>=
1
<<
30
)
||
type
(
parameters
[
key
[
i
]])
==
long
:
if
(
type
(
parameters
[
key
[
i
]])
==
int
and
parameters
[
key
[
i
]]
>=
1
<<
30
):
src_txt
+=
'
H5Dread(dset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, &{0});
\n
'
.
format
(
key
[
i
])
elif
type
(
parameters
[
key
[
i
]])
==
int
:
src_txt
+=
'
H5Dread(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &{0});
\n
'
.
format
(
key
[
i
])
...
...
This diff is collapsed.
Click to expand it.
bfps/cpp/full_code/NSVEp.cpp
+
2
−
2
View file @
750437e5
...
...
@@ -63,7 +63,7 @@ int NSVEp<rnumber>::initialize(void)
fs
->
cvelocity
,
// (field object)
fs
->
kk
,
// (kspace object, contains dkx, dky, dkz)
tracers0_integration_steps
,
// to check coherency between parameters and hdf input file (nb rhs)
nparticles
,
// to check coherency between parameters and hdf input file
(
long
long
int
)
nparticles
,
// to check coherency between parameters and hdf input file
fs
->
get_current_fname
(),
// particles input filename
std
::
string
(
"/tracers0/state/"
)
+
std
::
to_string
(
fs
->
iteration
),
// dataset name for initial input
std
::
string
(
"/tracers0/rhs/"
)
+
std
::
to_string
(
fs
->
iteration
),
// dataset name for initial input
...
...
@@ -71,7 +71,7 @@ int NSVEp<rnumber>::initialize(void)
tracers0_smoothness
,
// parameter
this
->
comm
,
fs
->
iteration
+
1
);
this
->
particles_output_writer_mpi
=
new
particles_output_hdf5
<
double
,
3
,
3
>
(
this
->
particles_output_writer_mpi
=
new
particles_output_hdf5
<
long
long
int
,
double
,
3
,
3
>
(
MPI_COMM_WORLD
,
"tracers0"
,
nparticles
,
...
...
This diff is collapsed.
Click to expand it.
bfps/cpp/full_code/NSVEp.hpp
+
2
−
2
View file @
750437e5
...
...
@@ -63,8 +63,8 @@ class NSVEp: public direct_numerical_simulation
vorticity_equation
<
rnumber
,
FFTW
>
*
fs
;
field
<
rnumber
,
FFTW
,
THREE
>
*
tmp_vec_field
;
field
<
rnumber
,
FFTW
,
ONE
>
*
tmp_scal_field
;
std
::
unique_ptr
<
abstract_particles_system
<
double
>>
ps
;
particles_output_hdf5
<
double
,
3
,
3
>
*
particles_output_writer_mpi
;
std
::
unique_ptr
<
abstract_particles_system
<
long
long
int
,
double
>>
ps
;
particles_output_hdf5
<
long
long
int
,
double
,
3
,
3
>
*
particles_output_writer_mpi
;
NSVEp
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment