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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TurTLE
TurTLE
Commits
6f474a6e
There was a problem fetching the pipeline summary.
Commit
6f474a6e
authored
Jun 21, 2018
by
Cristian Lalescu
Browse files
Options
Downloads
Patches
Plain Diff
hardcode type of particles to simple spheres that can rotate.
parent
0db01970
No related branches found
No related tags found
1 merge request
!23
WIP: Feature/use cmake
Pipeline
#
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
bfps/cpp/full_code/NSVEcomplex_particles.cpp
+2
-0
2 additions, 0 deletions
bfps/cpp/full_code/NSVEcomplex_particles.cpp
bfps/cpp/particles/particles_inner_computer.hpp
+6
-6
6 additions, 6 deletions
bfps/cpp/particles/particles_inner_computer.hpp
with
8 additions
and
6 deletions
bfps/cpp/full_code/NSVEcomplex_particles.cpp
+
2
−
0
View file @
6f474a6e
...
@@ -14,10 +14,12 @@ int NSVEcomplex_particles<rnumber>::initialize(void)
...
@@ -14,10 +14,12 @@ int NSVEcomplex_particles<rnumber>::initialize(void)
p2p_computer
<
double
,
long
long
int
>
current_p2p_computer
;
p2p_computer
<
double
,
long
long
int
>
current_p2p_computer
;
// TODO: particle interactions are switched off manually for testing purposes.
// TODO: particle interactions are switched off manually for testing purposes.
// this needs to be fixed once particle interactions can be properly resolved.
// this needs to be fixed once particle interactions can be properly resolved.
this
->
enable_p2p
=
false
;
current_p2p_computer
.
setEnable
(
enable_p2p
);
current_p2p_computer
.
setEnable
(
enable_p2p
);
//current_p2p_computer.setEnable(false);
//current_p2p_computer.setEnable(false);
particles_inner_computer
<
double
,
long
long
int
>
current_particles_inner_computer
(
inner_v0
);
particles_inner_computer
<
double
,
long
long
int
>
current_particles_inner_computer
(
inner_v0
);
this
->
enable_inner
=
false
;
current_particles_inner_computer
.
setEnable
(
enable_inner
);
current_particles_inner_computer
.
setEnable
(
enable_inner
);
this
->
cutoff
=
1.0
;
this
->
cutoff
=
1.0
;
...
...
...
...
This diff is collapsed.
Click to expand it.
bfps/cpp/particles/particles_inner_computer.hpp
+
6
−
6
View file @
6f474a6e
...
@@ -98,11 +98,11 @@ public:
...
@@ -98,11 +98,11 @@ public:
#pragma omp parallel for
#pragma omp parallel for
for
(
partsize_t
idx_part
=
0
;
idx_part
<
nb_particles
;
++
idx_part
){
for
(
partsize_t
idx_part
=
0
;
idx_part
<
nb_particles
;
++
idx_part
){
// Cross product vorticity/orientation
// Cross product vorticity/orientation
rhs_part
[
idx_part
*
size_particle_rhs
+
3
+
IDX_X
]
+=
(
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_Y
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_Z
]
-
rhs_part
[
idx_part
*
size_particle_rhs
+
3
+
IDX_X
]
+=
0.5
*
(
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_Y
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_Z
]
-
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_Z
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_Y
]);
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_Z
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_Y
]);
rhs_part
[
idx_part
*
size_particle_rhs
+
3
+
IDX_Y
]
+=
(
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_Z
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_X
]
-
rhs_part
[
idx_part
*
size_particle_rhs
+
3
+
IDX_Y
]
+=
0.5
*
(
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_Z
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_X
]
-
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_X
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_Z
]);
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_X
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_Z
]);
rhs_part
[
idx_part
*
size_particle_rhs
+
3
+
IDX_Z
]
+=
(
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_X
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_Y
]
-
rhs_part
[
idx_part
*
size_particle_rhs
+
3
+
IDX_Z
]
+=
0.5
*
(
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_X
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_Y
]
-
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_Y
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_X
]);
rhs_part_extra
[
idx_part
*
size_particle_rhs_extra
+
IDX_Y
]
*
pos_part
[
idx_part
*
size_particle_positions
+
3
+
IDX_X
]);
}
}
}
}
...
...
...
...
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
sign in
to comment