Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
openfpm_pdata
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
Model registry
Operate
Environments
Monitor
Incidents
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
Sbalzarini Lab
Software
Parallel Computing
OpenFPM
openfpm_pdata
Commits
cedf328e
Commit
cedf328e
authored
8 years ago
by
Yaroslav
Browse files
Options
Downloads
Patches
Plain Diff
CellList_hilb renamed to CellList_gen
parent
844f8a32
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
openfpm_data
+1
-1
1 addition, 1 deletion
openfpm_data
src/Vector/vector_dist.hpp
+4
-4
4 additions, 4 deletions
src/Vector/vector_dist.hpp
with
5 additions
and
5 deletions
openfpm_data
@
2978eb68
Subproject commit
dbfc39c70904fa40ac52d71e784cd6f54283f578
Subproject commit
2978eb687487ec6f704dee1d5ce180a2250f88f2
This diff is collapsed.
Click to expand it.
src/Vector/vector_dist.hpp
+
4
−
4
View file @
cedf328e
...
...
@@ -8,6 +8,8 @@
#ifndef VECTOR_HPP_
#define VECTOR_HPP_
#include
"../../openfpm_data/src/NN/CellList/CellListFast_gen.hpp"
#include
"../../openfpm_data/src/NN/CellList/CellListFast_gen.hpp"
#include
"HDF5_XdmfWriter/HDF5_XdmfWriter.hpp"
#include
"VCluster.hpp"
#include
"Space/Shape/Point.hpp"
...
...
@@ -17,7 +19,6 @@
#include
"memory/PreAllocHeapMemory.hpp"
#include
"memory/PtrMemory.hpp"
#include
"NN/CellList/CellList.hpp"
#include
"NN/CellList/CellListFast_hilb.hpp"
#include
"util/common.hpp"
#include
"util/object_util.hpp"
#include
"memory/ExtPreAlloc.hpp"
...
...
@@ -31,7 +32,6 @@
#include
"data_type/aggregate.hpp"
#include
"NN/VerletList/VerletList.hpp"
#include
"vector_dist_comm.hpp"
#include
"NN/CellList/CellListFast_hilb.hpp"
#define NO_ID false
#define ID true
...
...
@@ -375,7 +375,7 @@ public:
* \return the Cell list
*
*/
template
<
typename
CellL
=
CellList_
hilb
<
dim
,
St
,
Process_keys_hilb
<
dim
>,
FAST
,
shift
<
dim
,
St
>
>
>
CellL
getCellList_hilb
(
St
r_cut
)
template
<
typename
CellL
=
CellList_
gen
<
dim
,
St
,
Process_keys_hilb
<
dim
>,
FAST
,
shift
<
dim
,
St
>
>
>
CellL
getCellList_hilb
(
St
r_cut
)
{
// Get ghost and anlarge by 1%
Ghost
<
dim
,
St
>
g
=
getDecomposition
().
getGhost
();
...
...
@@ -462,7 +462,7 @@ public:
* \return The Cell-list
*
*/
template
<
typename
CellL
=
CellList_
hilb
<
dim
,
St
,
Process_keys_hilb
<
dim
>,
FAST
,
shift
<
dim
,
St
>
>
>
CellL
getCellList_hilb
(
St
r_cut
,
const
Ghost
<
dim
,
St
>
&
enlarge
)
template
<
typename
CellL
=
CellList_
gen
<
dim
,
St
,
Process_keys_hilb
<
dim
>,
FAST
,
shift
<
dim
,
St
>
>
>
CellL
getCellList_hilb
(
St
r_cut
,
const
Ghost
<
dim
,
St
>
&
enlarge
)
{
CellL
cell_list
;
...
...
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