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
34ce7f37
Commit
34ce7f37
authored
3 years ago
by
Anna Wellmann
Browse files
Options
Downloads
Patches
Plain Diff
Clean up log messages and file paths
parent
7164e3c9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!104
Add Communication Hiding to GPU version
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+12
-13
12 additions, 13 deletions
apps/gpu/LBM/MusselOyster/MusselOyster.cpp
src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
+2
-2
2 additions, 2 deletions
...pu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
with
14 additions
and
15 deletions
apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+
12
−
13
View file @
34ce7f37
...
...
@@ -67,9 +67,9 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
std
::
string
path
(
"E:/temp/MusselOyster"
);
std
::
string
path
(
"E:/temp/MusselOyster
Results
"
);
std
::
string
gridPathParent
=
"E:/temp/GridMussel/"
;
std
::
string
simulationName
(
"MusselOyster
TestNewBC
"
);
std
::
string
simulationName
(
"MusselOyster"
);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -142,10 +142,10 @@ void multipleLevel(const std::string& configPath)
para
->
setFName
(
para
->
getOutputPath
()
+
"/"
+
para
->
getOutputPrefix
());
para
->
setPrintFiles
(
true
);
//
para->setMaxLevel(2);
para
->
setMaxLevel
(
2
);
para
->
setMainKernel
(
"CumulantK17CompChim"
);
//
para->setMainKernel("CumulantK17CompChimSparse");
//
para->setMainKernel("CumulantK17CompChim");
para
->
setMainKernel
(
"CumulantK17CompChimSparse"
);
*
logging
::
out
<<
logging
::
Logger
::
INFO_HIGH
<<
"Kernel: "
<<
para
->
getMainKernel
()
<<
"
\n
"
;
if
(
useMultiGPU
)
{
...
...
@@ -184,11 +184,10 @@ void multipleLevel(const std::string& configPath)
TriangularMesh
*
bivalveSTL
=
TriangularMesh
::
make
(
"C:/Users/Master/Documents/MasterAnna/STL/"
+
bivalveType
+
".stl"
);
//
TriangularMesh* bivalveRef_1_STL =
//
TriangularMesh::make("C:/Users/Master/Documents/MasterAnna/STL/" + bivalveType + "_Level1.stl");
TriangularMesh
*
bivalveRef_1_STL
=
TriangularMesh
::
make
(
"C:/Users/Master/Documents/MasterAnna/STL/"
+
bivalveType
+
"_Level1.stl"
);
if
(
useMultiGPU
)
{
// const uint generatePart = 1;
const
uint
generatePart
=
vf
::
gpu
::
Communicator
::
getInstanz
()
->
getPID
();
real
overlap
=
(
real
)
8.0
*
dxGrid
;
...
...
@@ -203,8 +202,8 @@ void multipleLevel(const std::string& configPath)
xGridMax
,
yGridMax
,
zGridMax
,
dxGrid
);
}
//
gridBuilder->setNumberOfLayers(6, 8);
//
gridBuilder->addGrid(bivalveRef_1_STL, 1);
gridBuilder
->
setNumberOfLayers
(
6
,
8
);
gridBuilder
->
addGrid
(
bivalveRef_1_STL
,
1
);
gridBuilder
->
addGeometry
(
bivalveSTL
);
...
...
@@ -253,8 +252,8 @@ void multipleLevel(const std::string& configPath)
gridBuilder
->
addCoarseGrid
(
xGridMin
,
yGridMin
,
zGridMin
,
xGridMax
,
yGridMax
,
zGridMax
,
dxGrid
);
//
gridBuilder->setNumberOfLayers(6, 8);
//
gridBuilder->addGrid(bivalveRef_1_STL, 1);
gridBuilder
->
setNumberOfLayers
(
6
,
8
);
gridBuilder
->
addGrid
(
bivalveRef_1_STL
,
1
);
gridBuilder
->
addGeometry
(
bivalveSTL
);
...
...
@@ -272,7 +271,7 @@ void multipleLevel(const std::string& configPath)
gridBuilder
->
setVelocityBoundaryCondition
(
SideType
::
GEOMETRY
,
0.0
,
0.0
,
0.0
);
//////////////////////////////////////////////////////////////////////////
//gridBuilder->writeGridsToVtk("E:/temp/MusselOyster/" + bivalveType + "/grid/");
//
gridBuilder->writeGridsToVtk("E:/temp/MusselOyster/" + bivalveType + "/grid/");
// gridBuilder->writeArrows ("E:/temp/MusselOyster/" + bivalveType + "/arrow");
SimulationFileWriter
::
write
(
gridPath
,
gridBuilder
,
FILEFORMAT
::
BINARY
);
...
...
This diff is collapsed.
Click to expand it.
src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
+
2
−
2
View file @
34ce7f37
...
...
@@ -602,10 +602,10 @@ void MultipleGridBuilder::findCommunicationIndices(int direction, LbmOrGks lbmOr
void
MultipleGridBuilder
::
findGeoFluidNodes
()
{
*
logging
::
out
<<
logging
::
Logger
::
INFO_HIGH
<<
"Start find
Geo
FluidNodes()
\n
"
;
*
logging
::
out
<<
logging
::
Logger
::
INFO_HIGH
<<
"Start findFluidNodes()
\n
"
;
for
(
uint
i
=
0
;
i
<
grids
.
size
();
i
++
)
grids
[
i
]
->
findFluidNodeIndices
();
*
logging
::
out
<<
logging
::
Logger
::
INFO_HIGH
<<
"Done with find
Geo
FluidNodes()
\n
"
;
*
logging
::
out
<<
logging
::
Logger
::
INFO_HIGH
<<
"Done with findFluidNodes()
\n
"
;
}
void
MultipleGridBuilder
::
writeGridsToVtk
(
const
std
::
string
&
path
)
const
...
...
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