Skip to content
Snippets Groups Projects
Commit 8841e352 authored by Hkorb's avatar Hkorb
Browse files

minor changes to typing

parent 556a77e6
No related branches found
No related tags found
1 merge request!245Add new probe, Refactor File Writer
......@@ -107,8 +107,8 @@ length = np.array([6,4,1])*boundary_layer_height
dx = boundary_layer_height/nodes_per_height
dt = dx * mach / (np.sqrt(3) * velocity)
velocity_ratio = dx/dt
velocity_LB = velocity / velocity_ratio # LB units
viscosity_LB = viscosity / (velocity_ratio * dx) # LB units
velocity_LB = velocity / velocity_ratio # LB units
viscosity_LB = viscosity / (velocity_ratio * dx) # LB units
pressure_gradient = u_star * u_star / boundary_layer_height
pressure_gradient_LB = pressure_gradient * (dt*dt)/dx
......@@ -145,7 +145,7 @@ tm_factory.read_config_file(config)
grid_scaling_factory = gpu.GridScalingFactory()
grid_scaling_factory.set_scaling_factory(gpu.GridScaling.ScaleCompressible)
grid_builder.add_coarse_grid(0.0, 0.0, 0.0, *length, dx)
grid_builder.add_coarse_grid(0.0, 0.0, 0.0, length[0], length[1], length[2], dx)
grid_builder.set_periodic_boundary_condition(not read_precursor, True, False)
grid_builder.build_grids(basics.LbmOrGks.LBM, False)
......@@ -165,7 +165,7 @@ bc_factory.set_slip_boundary_condition(gpu.SlipBC.SlipBounceBack)
bc_factory.set_pressure_boundary_condition(gpu.PressureBC.OutflowNonReflective)
if read_precursor:
bc_factory.set_precursor_boundary_condition(gpu.PrecursorBC.DistributionsPrecursor if use_distributions else gpu.PrecursorBC.VelocityPrecursor)
para.set_outflow_pressure_correction_factor(0.0);
para.set_outflow_pressure_correction_factor(0.0)
#%%
# don't use python init functions, they are very slow! Just kept as an example.
# Define lambda in bindings and set it here.
......@@ -179,7 +179,7 @@ para.set_outflow_pressure_correction_factor(0.0);
para.set_initial_condition_perturbed_log_law(u_star, z0, length[0], length[2], boundary_layer_height, velocity_ratio)
#%%
turb_pos = np.array([3,3,3])*turbine_diameter
turb_pos = np.array([3, 3, 3])*turbine_diameter
epsilon = 1.5*dx
density = 1.225
level = 0
......@@ -188,7 +188,7 @@ n_blade_nodes = 32
omega = 1
blade_radii = np.arange(n_blade_nodes, dtype=np.float32)/(0.5*turbine_diameter)
alm = gpu.ActuatorFarm(n_blades, density, n_blade_nodes, epsilon, level, dt, dx, True)
alm.add_turbine(turb_pos[0],turb_pos[1],turb_pos[2], turbine_diameter, omega, 0, 0, blade_radii)
alm.add_turbine(turb_pos[0], turb_pos[1], turb_pos[2], turbine_diameter, omega, 0, 0, blade_radii)
para.add_actuator(alm)
#%%
planar_average_probe = gpu.probes.PlanarAverageProbe("horizontalPlanes", para.get_output_path(), 0, int(t_start_tmp_averaging/dt), int(t_averaging/dt) , int(t_start_out_probe/dt), int(t_out_probe/dt), 'z')
......
......@@ -166,6 +166,7 @@ void multipleLevel(const std::string& configPath)
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
gridBuilder->setPeriodicBoundaryCondition(false, false, false);
gridBuilder->setPeriodicShiftOnXBoundaryInYDirection(L_y/10);
gridBuilder->buildGrids(lbmOrGks, false); // buildGrids() has to be called before setting the BCs!!!!
......
......@@ -35,7 +35,7 @@ r"""
from __future__ import annotations
from typing import Callable, ClassVar, List, Optional
from typing import overload
from typing import overload, Union
import numpy as np
import numpy.typing as npt
import pyfluids.bindings.basics
......@@ -136,13 +136,13 @@ class ActuatorFarm(PreCollisionInteractor):
class BoundaryConditionFactory:
def __init__(self) -> None: ...
def set_geometry_boundary_condition(self, boundary_condition_type) -> None: ...
def set_no_slip_boundary_condition(self, boundary_condition_type) -> None: ...
def set_precursor_boundary_condition(self, boundary_condition_type) -> None: ...
def set_pressure_boundary_condition(self, boundary_condition_type) -> None: ...
def set_slip_boundary_condition(self, boundary_condition_type) -> None: ...
def set_stress_boundary_condition(self, boundary_condition_type) -> None: ...
def set_velocity_boundary_condition(self, boundary_condition_type) -> None: ...
def set_geometry_boundary_condition(self, boundary_condition_type: Union[SlipBC, VelocityBC, NoSlipBC]) -> None: ...
def set_no_slip_boundary_condition(self, boundary_condition_type: NoSlipBC) -> None: ...
def set_precursor_boundary_condition(self, boundary_condition_type: PrecursorBC) -> None: ...
def set_pressure_boundary_condition(self, boundary_condition_type: PressureBC) -> None: ...
def set_slip_boundary_condition(self, boundary_condition_type: SlipBC) -> None: ...
def set_stress_boundary_condition(self, boundary_condition_type: StressBC) -> None: ...
def set_velocity_boundary_condition(self, boundary_condition_type: VelocityBC) -> None: ...
class Communicator:
......
......@@ -32,8 +32,8 @@
//=======================================================================================
#include <pybind11/pybind11.h>
#include <pybind11/numpy.h>
#include <gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.h>
#include <gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h>
#include "gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.h"
#include "gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h"
class PyActuatorFarm : public ActuatorFarm
{
public:
......
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