Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FluidApp] Adding CFD utilities to calculate Y_PLUS and U_TAU #7039

Closed
wants to merge 56 commits into from
Closed

[FluidApp] Adding CFD utilities to calculate Y_PLUS and U_TAU #7039

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
5b982fe
adding variables
sunethwarna Jun 4, 2020
8fb798e
initial cfd_utilities commit
sunethwarna Jun 4, 2020
565c494
adding cfd utilities
sunethwarna Jun 7, 2020
b627bf1
adding cfd_function_process.py
sunethwarna Jun 8, 2020
aeaeae7
adding cfd_utility tests
sunethwarna Jun 9, 2020
acf2a78
bug fix
sunethwarna Jun 9, 2020
f4254cb
adding cfd_function_process minor change
sunethwarna Jun 9, 2020
a7779bd
adding cfd_function_process test
sunethwarna Jun 9, 2020
ab096c3
method name change
sunethwarna Jun 9, 2020
a7e29ed
add test to Fluid app
sunethwarna Jun 9, 2020
af809dc
bug fix
sunethwarna Jun 9, 2020
55aecd7
remove unused variable
sunethwarna Jun 9, 2020
76b097f
remove unused import
sunethwarna Jun 9, 2020
e8be43b
merge remote-tracking branch 'origin/master' into flud-cfd-utility-y-…
sunethwarna Jun 9, 2020
b9613a3
update
sunethwarna Jun 9, 2020
65408f0
adding KRATOS_API
sunethwarna Jun 9, 2020
2506440
using isinstance
sunethwarna Jun 9, 2020
23393f1
fix KRATOS_API
sunethwarna Jun 9, 2020
b47bd33
using parallel_utilities.h
sunethwarna Jun 9, 2020
4e0bf6d
adding doxygen comments
sunethwarna Jun 9, 2020
e52de15
using geoemtry normals
sunethwarna Jun 10, 2020
320a43e
using geometry center
sunethwarna Jun 11, 2020
df3c179
adding checks
sunethwarna Jun 11, 2020
4e43561
Update applications/FluidDynamicsApplication/custom_utilities/cfd_uti…
sunethwarna Jun 11, 2020
65659b0
fix copy paste error
sunethwarna Jun 11, 2020
87ebff6
Merge branch 'flud-cfd-utility-y-plus' of https://github.com/KratosMu…
sunethwarna Jun 11, 2020
258e554
formatting
sunethwarna Jun 11, 2020
bf27154
Merge remote-tracking branch 'origin/master' into flud-cfd-utility-y-…
sunethwarna Jun 11, 2020
2b05bcb
Merge remote-tracking branch 'origin/master' into flud-cfd-utility-y-…
sunethwarna Jun 11, 2020
78ee65c
removing evaluate in point
sunethwarna Jun 11, 2020
4671657
Merge remote-tracking branch 'origin/master' into flud-cfd-utility-y-…
sunethwarna Jun 15, 2020
c021ef6
seperating files
sunethwarna Jun 19, 2020
31e875b
add missing kratos_api
sunethwarna Jun 19, 2020
e961c3f
change name
sunethwarna Jun 19, 2020
5b36c9e
checks
sunethwarna Jun 19, 2020
d1f4133
remove unused import
sunethwarna Jun 19, 2020
defeed1
adding kratos_api
sunethwarna Jun 19, 2020
53bbf46
adding kratos_api to cpp
sunethwarna Jun 19, 2020
bd57bec
remove kratos_api from cpp
sunethwarna Jun 19, 2020
8075af9
minor
sunethwarna Jun 19, 2020
49339a7
Merge remote-tracking branch 'origin/master' into flud-cfd-utility-y-…
sunethwarna Jun 19, 2020
f3169f1
Update applications/FluidDynamicsApplication/tests/cfd_function_proce…
sunethwarna Jun 19, 2020
1a5dc52
remove defaults for python
sunethwarna Jun 19, 2020
7a5c065
Merge branch 'flud-cfd-utility-y-plus' of https://github.com/KratosMu…
sunethwarna Jun 19, 2020
7edd3a2
bugfix - missing closing brace
sunethwarna Jun 19, 2020
86e726a
update tests
sunethwarna Jun 19, 2020
2e06daa
Merge remote-tracking branch 'origin/master' into flud-cfd-utility-y-…
sunethwarna Jun 26, 2020
85b532b
adding distribute method to variable_utils
sunethwarna Jun 27, 2020
3cef0d8
adding distribute method test
sunethwarna Jun 27, 2020
4eaf227
update to use variable utils
sunethwarna Jun 27, 2020
48e6766
fix for windows compilation
sunethwarna Jun 27, 2020
5a357f7
add int versions
sunethwarna Jun 27, 2020
e0c065d
fix variable type conflict
sunethwarna Jun 27, 2020
9e4317c
applying codacy suggestions
sunethwarna Jun 27, 2020
809efc3
Merge remote-tracking branch 'origin/master' into flud-cfd-utility-y-…
sunethwarna Jun 28, 2020
bc7c234
adopt to newer variable_utils
sunethwarna Jun 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions applications/FluidDynamicsApplication/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set( KRATOS_FLUID_DYNAMICS_APPLICATION_CORE_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/custom_utilities/statistics_record.cpp
${CMAKE_CURRENT_SOURCE_DIR}/custom_utilities/vorticity_utilities.cpp
${CMAKE_CURRENT_SOURCE_DIR}/custom_utilities/acceleration_limitation_utilities.cpp
${CMAKE_CURRENT_SOURCE_DIR}/custom_utilities/cfd_utilities.cpp

# elements
${CMAKE_CURRENT_SOURCE_DIR}/custom_elements/vms.cpp
Expand Down
31 changes: 31 additions & 0 deletions applications/FluidDynamicsApplication/custom_python/add_custom_utilities_to_python.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "custom_utilities/periodic_condition_utilities.h"
#include "custom_utilities/compressible_element_rotation_utility.h"
#include "custom_utilities/acceleration_limitation_utilities.h"
#include "custom_utilities/cfd_utilities.h"

#include "utilities/split_tetrahedra.h"

Expand Down Expand Up @@ -180,6 +181,36 @@ void AddCustomUtilitiesToPython(pybind11::module& m)
.def("Execute", &AccelerationLimitationUtilities::Execute)
;

// Adding cfd utilities
m.def_submodule("CFDUtilities")
.def("CalculateNumberOfNeighbourConditions", &CFDUtilities::CalculateNumberOfNeighbourConditions)
.def("CalculateLinearLogarithmicWallFunctionBasedYPlusLimit", &CFDUtilities::CalculateLinearLogarithmicWallFunctionBasedYPlusLimit,
py::arg("von_karman") = 0.41,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is done this way to oblige using kwargs?

Copy link
Member Author

@sunethwarna sunethwarna Jun 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did this merely to avoid everytime passing the well known values for constants used in wall modelling.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to the best pf my understanding (it these are kwargs) you are impicitly adding a dictionary on every call.

this will be negligible if you call once the function for many elements, however it wouldn't be acceptable if you are calling it once per node.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These python level calls are not used at the moment, I just exposed them to python in case someone wants to use them in their own scripts. If someone uses them, they need to call this method for every entity (node, element, condition). So I will remove them.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping @sunethwarna

py::arg("wall_smoothness") = 5.2,
py::arg("max_iterations") = 20,
py::arg("tolerance") = 1e-6)
.def("CalculateLinearLogarithmicWallFunctionBasedYPlusAndUtau", &CFDUtilities::CalculateLinearLogarithmicWallFunctionBasedYPlusAndUtau,
py::arg("friction_velocity"),
py::arg("wall_velocity"),
py::arg("normal"),
py::arg("kinematic_viscosity"),
py::arg("wall_height"),
py::arg("von_karman") = 0.41,
py::arg("wall_smoothness") = 5.2,
py::arg("max_iterations") = 20,
py::arg("tolerance") = 1e-6)
.def("CalculateReactionBasedYPlusUTau", &CFDUtilities::CalculateReactionBasedYPlusUTau)
.def("CalculateYPlusAndUTauForConditionsBasedOnReaction", &CFDUtilities::CalculateYPlusAndUTauForConditionsBasedOnReaction)
.def("CalculateYPlusAndUTauForConditionsBasedOnLinearLogarithmicWallFunction", &CFDUtilities::CalculateYPlusAndUTauForConditionsBasedOnLinearLogarithmicWallFunction,
py::arg("model_part"),
py::arg("kinematic_viscosity_variable"),
py::arg("von_karman") = 0.41,
py::arg("wall_smoothness") = 5.2,
py::arg("max_iterations") = 20,
py::arg("tolerance") = 1e-6)
.def("DistributeConditionVariableToNodes", &CFDUtilities::DistributeConditionVariableToNodes<double>)
.def("DistributeConditionVariableToNodes", &CFDUtilities::DistributeConditionVariableToNodes<array_1d<double,3>>)
;
}

} // namespace Python.
Expand Down
5 changes: 5 additions & 0 deletions applications/FluidDynamicsApplication/custom_python/fluid_dynamics_python_application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ PYBIND11_MODULE(KratosFluidDynamicsApplication,m)
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m,SHOCK_SENSOR);
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m,SHOCK_CAPTURING_VISCOSITY);
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m,SHOCK_CAPTURING_CONDUCTIVITY);

// CFD Utility variables
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, Y_PLUS);
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, NUMBER_OF_NEIGHBOUR_CONDITIONS);
KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, FRICTION_VELOCITY);
}


Expand Down
Loading