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
1f1fb999
Commit
1f1fb999
authored
1 year ago
by
Martin Schönherr
Browse files
Options
Downloads
Patches
Plain Diff
fix issues with Logger and raw pointers (addgrid())
parent
14f5cf45
No related branches found
No related tags found
1 merge request
!256
Kernel names changed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
+2
-3
2 additions, 3 deletions
apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
+8
-8
8 additions, 8 deletions
apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
with
10 additions
and
11 deletions
apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
+
2
−
3
View file @
1f1fb999
...
...
@@ -158,9 +158,8 @@ void multipleLevel(const std::string& configPath)
const
real
viscosity
=
nx
/
(
2.0
*
PI
)
*
velocity
/
Re
;
*
logging
::
out
<<
logging
::
Logger
::
INFO_HIGH
<<
"velocity = "
<<
velocity
<<
" s
\n
"
;
*
logging
::
out
<<
logging
::
Logger
::
INFO_HIGH
<<
"viscosity = "
<<
viscosity
<<
"
\n
"
;
VF_LOG_INFO
(
"velocity = {}"
,
velocity
);
VF_LOG_INFO
(
"viscosity = {}"
,
viscosity
);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
This diff is collapsed.
Click to expand it.
apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
+
8
−
8
View file @
1f1fb999
...
...
@@ -227,8 +227,8 @@ void multipleLevel(const std::string& configPath)
//const real vx = velocityLB / (real)sqrt(2.0); // LB units
//const real vy = velocityLB / (real)sqrt(2.0); // LB units
VF_LOG_INFO
(
"velocityLB [dx/dt] =
"
<<
velocityLB
);
VF_LOG_INFO
(
"viscosityLB [dx^2/dt] =
"
<<
viscosityLB
);
VF_LOG_INFO
(
"velocityLB [dx/dt] =
{}"
,
velocityLB
);
VF_LOG_INFO
(
"viscosityLB [dx^2/dt] =
{}"
,
viscosityLB
);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
@@ -406,14 +406,14 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
// FineGrid Level 2 -> dx = 1 cm; lvl 2
auto
FG2_1
=
std
::
make_shared
<
Cuboid
>
(
-
20
,
-
20
,
-
5
+
z_offset
,
760
,
200
,
10
+
z_offset
);
auto
FG2_2
=
std
::
make_shared
<
Cuboid
>
(
500
,
-
20
,
5
+
z_offset
,
680
,
210
,
50
+
z_offset
);
auto
FG2
=
new
Conglomerate
();
auto
FG2
=
std
::
make_shared
<
Conglomerate
>
();
FG2
->
add
(
FG2_1
);
FG2
->
add
(
FG2_2
);
// FineGrid Level 3 ->dx = 5 mm; lvl 3
auto
FG3_1
=
std
::
make_shared
<
Cuboid
>
(
517
,
-
20
,
-
5
+
z_offset
,
665
,
200
,
30
+
z_offset
);
auto
FG3_2
=
std
::
make_shared
<
Cuboid
>
(
550
,
58
,
-
5
+
z_offset
,
650
,
132
,
40
+
z_offset
);
auto
FG3
=
new
Conglomerate
();
auto
FG3
=
std
::
make_shared
<
Conglomerate
>
();
FG3
->
add
(
FG3_1
);
FG3
->
add
(
FG3_2
);
...
...
@@ -463,7 +463,7 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
//auto FG1_1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
auto
FG1_1
=
std
::
make_shared
<
Cuboid
>
(
-
20
,
-
20
,
-
5
+
z_offset
,
760
,
200
,
20
+
z_offset
);
auto
FG1_2
=
std
::
make_shared
<
Cuboid
>
(
500
,
-
20
,
5
+
z_offset
,
680
,
210
,
50
+
z_offset
);
auto
FG1
=
new
Conglomerate
();
auto
FG1
=
std
::
make_shared
<
Conglomerate
>
();
FG1
->
add
(
FG1_1
);
FG1
->
add
(
FG1_2
);
...
...
@@ -510,14 +510,14 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
// FineGrid Level 1 -> dx = 8.0 mm; lvl 1
auto
FG1_1
=
std
::
make_shared
<
Cuboid
>
(
-
20
,
-
20
,
-
5
+
z_offset
,
780
,
200
,
30
+
z_offset
);
auto
FG1_2
=
std
::
make_shared
<
Cuboid
>
(
500
,
-
20
,
5
+
z_offset
,
720
,
210
,
75
+
z_offset
);
auto
FG1
=
new
Conglomerate
();
auto
FG1
=
std
::
make_shared
<
Conglomerate
>
();
FG1
->
add
(
FG1_1
);
FG1
->
add
(
FG1_2
);
// FineGrid Level 2 -> dx = 4.0 mm; lvl 2
auto
FG2_1
=
std
::
make_shared
<
Cuboid
>
(
-
20
,
-
20
,
-
5
+
z_offset
,
760
,
200
,
10
+
z_offset
);
auto
FG2_2
=
std
::
make_shared
<
Cuboid
>
(
520
,
-
20
,
5
+
z_offset
,
700
,
210
,
50
+
z_offset
);
auto
FG2
=
new
Conglomerate
();
auto
FG2
=
std
::
make_shared
<
Conglomerate
>
();
FG2
->
add
(
FG2_1
);
FG2
->
add
(
FG2_2
);
...
...
@@ -565,7 +565,7 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
// FineGrid Level 2 -> dx = 1 cm; lvl 2
auto
FG2_1
=
std
::
make_shared
<
Cuboid
>
(
-
20
,
-
20
,
-
5
+
z_offset
,
760
,
200
,
10
+
z_offset
);
auto
FG2_2
=
std
::
make_shared
<
Cuboid
>
(
500
,
-
20
,
5
+
z_offset
,
680
,
210
,
50
+
z_offset
);
auto
FG2
=
new
Conglomerate
();
auto
FG2
=
std
::
make_shared
<
Conglomerate
>
();
FG2
->
add
(
FG2_1
);
FG2
->
add
(
FG2_2
);
...
...
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