Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
iRMB
VirtualFluids
Commits
3b21b811
Commit
3b21b811
authored
2 years ago
by
Martin Schönherr
Browse files
Options
Downloads
Patches
Plain Diff
bugfix grid generator
parent
d824fe1a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!101
Open source
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/gpu/GridGenerator/grid/GridImp.cpp
+11
-0
11 additions, 0 deletions
src/gpu/GridGenerator/grid/GridImp.cpp
src/gpu/GridGenerator/grid/GridImp.h
+9
-8
9 additions, 8 deletions
src/gpu/GridGenerator/grid/GridImp.h
with
20 additions
and
8 deletions
src/gpu/GridGenerator/grid/GridImp.cpp
+
11
−
0
View file @
3b21b811
...
...
@@ -868,6 +868,7 @@ void GridImp::findSparseIndices(SPtr<Grid> finerGrid)
if
(
fineGrid
)
{
fineGrid
->
updateSparseIndices
();
this
->
findForGridInterfaceNewIndices
(
fineGrid
);
}
const
uint
newGridSize
=
this
->
getSparseSize
();
...
...
@@ -875,6 +876,16 @@ void GridImp::findSparseIndices(SPtr<Grid> finerGrid)
<<
", delete nodes:"
<<
this
->
getSize
()
-
newGridSize
<<
"
\n
"
;
}
void
GridImp
::
findForGridInterfaceNewIndices
(
SPtr
<
GridImp
>
fineGrid
)
{
#pragma omp parallel for
for
(
int
index
=
0
;
index
<
(
int
)
this
->
getNumberOfNodesCF
();
index
++
)
this
->
gridInterface
->
findForGridInterfaceSparseIndexCF
(
this
,
fineGrid
.
get
(),
index
);
#pragma omp parallel for
for
(
int
index
=
0
;
index
<
(
int
)
this
->
getNumberOfNodesFC
();
index
++
)
this
->
gridInterface
->
findForGridInterfaceSparseIndexFC
(
this
,
fineGrid
.
get
(),
index
);
}
void
GridImp
::
updateSparseIndices
()
{
...
...
This diff is collapsed.
Click to expand it.
src/gpu/GridGenerator/grid/GridImp.h
+
9
−
8
View file @
3b21b811
...
...
@@ -28,7 +28,7 @@
//
//! \file GridImp.h
//! \ingroup grid
//! \author Soeren Peters, Stephan Lenz, Martin Schnherr
//! \author Soeren Peters, Stephan Lenz, Martin Sch
oe
nherr
//=======================================================================================
#ifndef GRID_IMP_H
#define GRID_IMP_H
...
...
@@ -53,19 +53,19 @@ class BoundingBox;
class
TriangularMeshDiscretizationStrategy
;
#ifdef __GNUC__
#ifndef __clang__
#pragma push
#pragma diag_suppress = 3156
#endif
#ifndef __clang__
#pragma push
#pragma diag_suppress = 3156
#endif
#endif
// GCC: warning #3156-D: extern declaration of the entity DIRECTIONS is treated as a static definition
extern
int
DIRECTIONS
[
DIR_END_MAX
][
DIMENSION
];
#ifdef __GNUC__
#ifndef __clang__
#pragma pop
#endif
#ifndef __clang__
#pragma pop
#endif
#endif
class
GRIDGENERATOR_EXPORT
GridImp
:
public
enableSharedFromThis
<
GridImp
>
,
public
Grid
...
...
@@ -266,6 +266,7 @@ public:
public:
virtual
void
findSparseIndices
(
SPtr
<
Grid
>
fineGrid
)
override
;
void
findForGridInterfaceNewIndices
(
SPtr
<
GridImp
>
fineGrid
);
void
updateSparseIndices
();
void
setNeighborIndices
(
uint
index
);
real
getFirstFluidNode
(
real
coords
[
3
],
int
direction
,
real
startCoord
)
const
override
;
...
...
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