From fbbe8a6b03f7d1d91786b24d64aaad28c2f338dd Mon Sep 17 00:00:00 2001
From: Sven Marcus <s.marcus@outlook.de>
Date: Wed, 9 Dec 2020 21:13:15 +0100
Subject: [PATCH] Use simulation.set_runtime_parameters()
---
Python/cubeflow/simulation.py | 28 +++++++++---------
Python/liddrivencavity/simulation.py | 2 +-
Python/poiseuille/simulation.py | 43 ++++++++++++++--------------
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/Python/cubeflow/simulation.py b/Python/cubeflow/simulation.py
index 628e83219..c8c145fdc 100644
--- a/Python/cubeflow/simulation.py
+++ b/Python/cubeflow/simulation.py
@@ -78,25 +78,25 @@ def run_simulation(physical_parameters=physical_params, grid_parameters=grid_par
writer.output_path = "./output"
writer.output_format = OutputFormat.BINARY
- builder = Simulation()
- builder.set_writer(writer)
+ simulation = Simulation()
+ simulation.set_writer(writer)
- builder.set_physical_parameters(physical_parameters)
- builder.set_grid_parameters(grid_parameters)
- builder.set_simulation_parameters(runtime_parameters)
- builder.set_kernel_config(kernel)
+ simulation.set_physical_parameters(physical_parameters)
+ simulation.set_grid_parameters(grid_parameters)
+ simulation.set_runtime_parameters(runtime_parameters)
+ simulation.set_kernel_config(kernel)
- # builder.add_object(bottom_wall, no_slip_bc, 1, "/geo/bottomWall")
- # builder.add_object(top_wall, no_slip_bc, 1, "/geo/topWall")
- # builder.add_object(left_wall, no_slip_bc, 1, "/geo/leftWall")
- # builder.add_object(right_wall, no_slip_bc, 1, "/geo/rightWall")
+ # simulation.add_object(bottom_wall, no_slip_bc, 1, "/geo/bottomWall")
+ # simulation.add_object(top_wall, no_slip_bc, 1, "/geo/topWall")
+ # simulation.add_object(left_wall, no_slip_bc, 1, "/geo/leftWall")
+ # simulation.add_object(right_wall, no_slip_bc, 1, "/geo/rightWall")
- builder.add_object(obstacle, no_slip_bc, 1, "/geo/obstacle")
+ simulation.add_object(obstacle, no_slip_bc, 1, "/geo/obstacle")
- builder.add_object(outflow_boundary, outflow_bc, 1, "/geo/outflow")
- builder.add_object(velocity_boundary, velocity_bc, 1, "/geo/velocityBoundary")
+ simulation.add_object(outflow_boundary, outflow_bc, 1, "/geo/outflow")
+ simulation.add_object(velocity_boundary, velocity_bc, 1, "/geo/velocityBoundary")
- builder.run_simulation()
+ simulation.run_simulation()
if __name__ == "__main__":
diff --git a/Python/liddrivencavity/simulation.py b/Python/liddrivencavity/simulation.py
index fc40f418f..f5e5921a3 100644
--- a/Python/liddrivencavity/simulation.py
+++ b/Python/liddrivencavity/simulation.py
@@ -30,7 +30,7 @@ def run_simulation(physical_params=physical_params, grid_params=grid_params, run
simulation.set_grid_parameters(grid_params)
simulation.set_physical_parameters(physical_params)
- simulation.set_simulation_parameters(runtime_params)
+ simulation.set_runtime_parameters(runtime_params)
simulation.set_kernel_config(kernel)
simulation.set_writer(writer)
diff --git a/Python/poiseuille/simulation.py b/Python/poiseuille/simulation.py
index 6906cef8f..40c40698a 100644
--- a/Python/poiseuille/simulation.py
+++ b/Python/poiseuille/simulation.py
@@ -28,10 +28,11 @@ def run_simulation(physical_params=physical_params, grid_params=grid_params, run
kernel.use_forcing = True
kernel.forcing_in_x1 = 1e-6
- g_min_x1, g_min_x2, g_min_x3 = 0, 0, 0
- g_max_x1 = (grid_params.number_of_nodes_per_direction[0]) * grid_params.node_distance
- g_max_x2 = (grid_params.number_of_nodes_per_direction[1]) * grid_params.node_distance
- g_max_x3 = (grid_params.number_of_nodes_per_direction[2]) * grid_params.node_distance
+ node_distance = grid_params.node_distance
+ min_x1, min_x2, min_x3 = 0, 0, 0
+ max_x1 = grid_params.number_of_nodes_per_direction[0] * node_distance
+ max_x2 = grid_params.number_of_nodes_per_direction[1] * node_distance
+ max_x3 = grid_params.number_of_nodes_per_direction[2] * node_distance
writer = Writer()
writer.output_path = "./output"
@@ -40,30 +41,30 @@ def run_simulation(physical_params=physical_params, grid_params=grid_params, run
simulation.set_kernel_config(kernel)
simulation.set_physical_parameters(physical_params)
simulation.set_grid_parameters(grid_params)
- simulation.set_simulation_parameters(runtime_params)
+ simulation.set_runtime_parameters(runtime_params)
simulation.set_writer(writer)
- no_slip_adapter = NoSlipBoundaryCondition()
+ no_slip_bc = NoSlipBoundaryCondition()
- block_length = 3 * grid_params.node_distance
+ block_width = 3 * node_distance
simulation.add_object(
- GbCuboid3D(g_min_x1 - block_length,
- g_min_x2 - block_length,
- g_min_x3 - block_length,
- g_max_x1 + block_length,
- g_max_x2 + block_length,
- g_min_x3),
- no_slip_adapter,
+ GbCuboid3D(min_x1 - block_width,
+ min_x2 - block_width,
+ min_x3 - block_width,
+ max_x1 + block_width,
+ max_x2 + block_width,
+ min_x3),
+ no_slip_bc,
State.SOLID, "/geo/addWallZMin")
simulation.add_object(
- GbCuboid3D(g_min_x1 - block_length,
- g_min_x2 - block_length,
- g_max_x3,
- g_max_x1 + block_length,
- g_max_x2 + block_length,
- g_max_x3 + block_length),
- no_slip_adapter,
+ GbCuboid3D(min_x1 - block_width,
+ min_x2 - block_width,
+ max_x3,
+ max_x1 + block_width,
+ max_x2 + block_width,
+ max_x3 + block_width),
+ no_slip_bc,
State.SOLID, "/geo/addWallZMax")
simulation.run_simulation()
--
GitLab