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
7a818ede
Commit
7a818ede
authored
3 years ago
by
Anna Wellmann
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused code from FileWriter
parent
fb72c8a9
No related branches found
No related tags found
1 merge request
!104
Add Communication Hiding to GPU version
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
+6
-12
6 additions, 12 deletions
src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
src/gpu/VirtualFluids_GPU/Output/FileWriter.h
+0
-1
0 additions, 1 deletion
src/gpu/VirtualFluids_GPU/Output/FileWriter.h
with
6 additions
and
13 deletions
src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
+
6
−
12
View file @
7a818ede
...
@@ -181,8 +181,8 @@ void FileWriter::writeUnstrucuredGridLT(std::shared_ptr<Parameter> para, int lev
...
@@ -181,8 +181,8 @@ void FileWriter::writeUnstrucuredGridLT(std::shared_ptr<Parameter> para, int lev
nodedatanames
.
push_back
(
"vx2"
);
nodedatanames
.
push_back
(
"vx2"
);
nodedatanames
.
push_back
(
"vx3"
);
nodedatanames
.
push_back
(
"vx3"
);
nodedatanames
.
push_back
(
"geo"
);
nodedatanames
.
push_back
(
"geo"
);
nodedatanames
.
push_back
(
"sendNodes"
);
//
nodedatanames.push_back("sendNodes");
nodedatanames
.
push_back
(
"sparseIndex"
);
//
nodedatanames.push_back("sparseIndex");
unsigned
int
number1
,
number2
,
number3
,
number4
,
number5
,
number6
,
number7
,
number8
;
unsigned
int
number1
,
number2
,
number3
,
number4
,
number5
,
number6
,
number7
,
number8
;
uint
dn1
,
dn2
,
dn3
,
dn4
,
dn5
,
dn6
,
dn7
,
dn8
;
uint
dn1
,
dn2
,
dn3
,
dn4
,
dn5
,
dn6
,
dn7
,
dn8
;
bool
neighborsAreFluid
;
bool
neighborsAreFluid
;
...
@@ -229,10 +229,10 @@ void FileWriter::writeUnstrucuredGridLT(std::shared_ptr<Parameter> para, int lev
...
@@ -229,10 +229,10 @@ void FileWriter::writeUnstrucuredGridLT(std::shared_ptr<Parameter> para, int lev
nodedata
[
4
][
dn1
]
=
(
double
)
para
->
getParH
(
level
)
->
vz_SP
[
pos
]
*
(
double
)
para
->
getVelocityRatio
();
nodedata
[
4
][
dn1
]
=
(
double
)
para
->
getParH
(
level
)
->
vz_SP
[
pos
]
*
(
double
)
para
->
getVelocityRatio
();
nodedata
[
5
][
dn1
]
=
(
double
)
para
->
getParH
(
level
)
->
geoSP
[
pos
];
nodedata
[
5
][
dn1
]
=
(
double
)
para
->
getParH
(
level
)
->
geoSP
[
pos
];
int
sendNode
=
0
;
// 0 - not a sendNode; 1 - sendNode; 2 - sendNode in communication after fine to coarse
//
int sendNode = 0; // 0 - not a sendNode; 1 - sendNode; 2 - sendNode in communication after fine to coarse
testForSendNodeY
(
para
,
level
,
pos
,
sendNode
);
// slow
, doesn't need to
be done multiple times --> use for debugging only!
//
testForSendNodeY(para, level, pos, sendNode); // slow
and should not
be done multiple times --> use for debugging only!
nodedata
[
6
][
dn1
]
=
(
double
)
sendNode
;
//
nodedata[6][dn1] = (double) sendNode;
nodedata
[
7
][
dn1
]
=
(
double
)
pos
;
//
nodedata[7][dn1] = (double) pos;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
number2
=
para
->
getParH
(
level
)
->
neighborX_SP
[
number1
];
number2
=
para
->
getParH
(
level
)
->
neighborX_SP
[
number1
];
number3
=
para
->
getParH
(
level
)
->
neighborY_SP
[
number2
];
number3
=
para
->
getParH
(
level
)
->
neighborY_SP
[
number2
];
...
@@ -283,12 +283,6 @@ void FileWriter::testForSendNodeY(std::shared_ptr<Parameter> ¶, int level, u
...
@@ -283,12 +283,6 @@ void FileWriter::testForSendNodeY(std::shared_ptr<Parameter> ¶, int level, u
&
para
->
getParH
(
level
)
->
sendProcessNeighborsAfterFtoCY
);
&
para
->
getParH
(
level
)
->
sendProcessNeighborsAfterFtoCY
);
}
}
void
FileWriter
::
testForRecvNodeY
(
std
::
shared_ptr
<
Parameter
>
&
para
,
int
level
,
unsigned
int
pos
,
int
&
sendNode
)
{
testForCommunicationNode
(
para
,
level
,
pos
,
sendNode
,
&
para
->
getParH
(
level
)
->
recvProcessNeighborY
,
&
para
->
getParH
(
level
)
->
recvProcessNeighborsAfterFtoCY
);
}
void
FileWriter
::
testForCommunicationNode
(
std
::
shared_ptr
<
Parameter
>
&
para
,
int
level
,
unsigned
int
pos
,
int
&
sendNode
,
void
FileWriter
::
testForCommunicationNode
(
std
::
shared_ptr
<
Parameter
>
&
para
,
int
level
,
unsigned
int
pos
,
int
&
sendNode
,
std
::
vector
<
PN27
>
*
sendOrRecvProcessNeighbor
,
std
::
vector
<
PN27
>
*
sendOrRecvProcessNeighbor
,
std
::
vector
<
PN27
>
*
sendOrRecvProcessNeighborAfterFtoC
)
std
::
vector
<
PN27
>
*
sendOrRecvProcessNeighborAfterFtoC
)
...
...
This diff is collapsed.
Click to expand it.
src/gpu/VirtualFluids_GPU/Output/FileWriter.h
+
0
−
1
View file @
7a818ede
...
@@ -27,7 +27,6 @@ private:
...
@@ -27,7 +27,6 @@ private:
void
VIRTUALFLUIDS_GPU_EXPORT
writeUnstrucuredGridLT
(
std
::
shared_ptr
<
Parameter
>
para
,
int
level
,
void
VIRTUALFLUIDS_GPU_EXPORT
writeUnstrucuredGridLT
(
std
::
shared_ptr
<
Parameter
>
para
,
int
level
,
std
::
vector
<
std
::
string
>
&
fname
);
std
::
vector
<
std
::
string
>
&
fname
);
void
testForSendNodeY
(
std
::
shared_ptr
<
Parameter
>
&
para
,
int
level
,
unsigned
int
pos
,
int
&
sendNode
);
void
testForSendNodeY
(
std
::
shared_ptr
<
Parameter
>
&
para
,
int
level
,
unsigned
int
pos
,
int
&
sendNode
);
void
testForRecvNodeY
(
std
::
shared_ptr
<
Parameter
>
&
para
,
int
level
,
unsigned
int
pos
,
int
&
sendNode
);
void
testForCommunicationNode
(
std
::
shared_ptr
<
Parameter
>
&
para
,
int
level
,
unsigned
int
pos
,
int
&
sendNode
,
void
testForCommunicationNode
(
std
::
shared_ptr
<
Parameter
>
&
para
,
int
level
,
unsigned
int
pos
,
int
&
sendNode
,
std
::
vector
<
PN27
>
*
sendOrRecvProcessNeighbor
,
std
::
vector
<
PN27
>
*
sendOrRecvProcessNeighbor
,
std
::
vector
<
PN27
>
*
sendOrRecvProcessNeighborAfterFtoC
);
std
::
vector
<
PN27
>
*
sendOrRecvProcessNeighborAfterFtoC
);
...
...
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