Skip to content
Snippets Groups Projects
Commit 1f1fb999 authored by Martin Schönherr's avatar Martin Schönherr :speech_balloon:
Browse files

fix issues with Logger and raw pointers (addgrid())

parent 14f5cf45
No related branches found
No related tags found
1 merge request!256Kernel names changed
......@@ -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);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment