diff --git a/ntrfc/utils/pyvista_utils/plane.py b/ntrfc/utils/pyvista_utils/plane.py index 71ac04725eff89eb2d0a5e11d044dee0d09ebb95..505bfb567c8c6b6ad4c8764e0802031f28b60f83 100644 --- a/ntrfc/utils/pyvista_utils/plane.py +++ b/ntrfc/utils/pyvista_utils/plane.py @@ -3,35 +3,34 @@ import numpy as np from ntrfc.utils.math.vectorcalc import vecAbs, vecProjection -def massflow_plane(mesh, rhoname="rho", velocityname="U"): +def massflow_plane(mesh): if not "Normals" in mesh.array_names: mesh = mesh.compute_normals() if not "Area" in mesh.array_names: mesh = mesh.compute_cell_sizes() mesh = mesh.point_data_to_cell_data() normals = mesh.cell_normals - rhos = mesh[rhoname] + rhos = mesh["rho"] areas = mesh["Area"] - velocities = mesh[velocityname] + velocities = mesh["U"] massflow = np.array( [vecAbs(vecProjection(velocities[i], normals[i])) for i in range(mesh.number_of_cells)]) ** 2 * rhos * areas return massflow +def massflowave_plane(mesh,valname): + massflow = massflow_plane(mesh) -def massflowave_plane(mesh, valname, rhoname="rho", velocityname="U"): - massflow = massflow_plane(mesh, rhoname=rhoname, velocityname=velocityname) - - mass_ave = np.sum(mesh[valname] * massflow) / np.sum(massflow) + mass_ave = np.sum(mesh[valname]*massflow)/np.sum(massflow) return mass_ave def areaave_plane(mesh, valname): - array = mesh[valname] + array=mesh[valname] if not "Area" in mesh.array_names: mesh = mesh.compute_cell_sizes() areas = mesh["Area"] - area_ave = np.sum((array.T * areas).T) / np.sum(areas) + area_ave = np.sum((array.T*areas).T)/np.sum(areas) return area_ave