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

[Core] Adding deprecation message to CheckSameModelPartUsingSkinDistanceProcess + check dimension #10715

Merged
merged 12 commits into from
Oct 27, 2023
Merged

[Core] Adding deprecation message to CheckSameModelPartUsingSkinDistanceProcess + check dimension #10715

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0b5eb91
[Core] Adding deprecation message to CheckSameModelPartUsingSkinDista…
loumalouomega Feb 2, 2023
7fd64f5
Adding model part constructors
loumalouomega Feb 2, 2023
a813f1f
Expose to python
loumalouomega Feb 2, 2023
a19de2a
Consistent
loumalouomega Feb 2, 2023
c3aadef
Parameters without &
loumalouomega Feb 2, 2023
d16ccc7
Adding exception
loumalouomega Feb 7, 2023
29b8c17
Commenting model part constructor
loumalouomega Feb 7, 2023
303301f
Merge branch 'master' into core/adding-warning-process
loumalouomega Apr 24, 2023
077b276
Suggestion
loumalouomega Oct 26, 2023
f6f44f2
Leftover
loumalouomega Oct 27, 2023
a0317d3
More leftover
loumalouomega Oct 27, 2023
237c5cb
Even more leftover
loumalouomega Oct 27, 2023
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
44 changes: 20 additions & 24 deletions kratos/processes/check_same_modelpart_using_skin_distance_process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,21 @@ void CheckSameModelPartUsingSkinDistanceProcess<TDim>::Execute()
{
KRATOS_TRY

// We get the names of the model parts
const std::string& r_skin_model_part_1_name = mThisParameters["skin_model_part_1_name"].GetString();
const std::string& r_skin_model_part_2_name = mThisParameters["skin_model_part_2_name"].GetString();

// We get the model parts
ModelPart& r_skin_model_part_1 = mrModel.GetModelPart(r_skin_model_part_1_name);
ModelPart& r_skin_model_part_2 = mrModel.GetModelPart(r_skin_model_part_2_name);

// Checking that the model part contains conditions
KRATOS_ERROR_IF(r_skin_model_part_1.NumberOfConditions() == 0) << "The first model part does not contain conditions" << std::endl;
KRATOS_ERROR_IF(r_skin_model_part_2.NumberOfConditions() == 0) << "The second model part does not contain conditions" << std::endl;
KRATOS_ERROR_IF(mrSkinModelPart1.NumberOfConditions() == 0) << "The first model part does not contain conditions" << std::endl;
KRATOS_ERROR_IF(mrSkinModelPart2.NumberOfConditions() == 0) << "The second model part does not contain conditions" << std::endl;
if constexpr (TDim == 2) { // 2D
KRATOS_ERROR_IF_NOT(r_skin_model_part_1.Conditions().begin()->GetGeometry().GetGeometryType() == GeometryData::KratosGeometryType::Kratos_Line2D2) << "Conditions from first model part must be lines in 2D space" << std::endl;
KRATOS_ERROR_IF_NOT(r_skin_model_part_2.Conditions().begin()->GetGeometry().GetGeometryType() == GeometryData::KratosGeometryType::Kratos_Line2D2) << "Conditions from second model part must be lines in 2D space" << std::endl;
KRATOS_ERROR_IF_NOT(mrSkinModelPart1.Conditions().begin()->GetGeometry().GetGeometryType() == GeometryData::KratosGeometryType::Kratos_Line2D2) << "Conditions from first model part must be lines in 2D space" << std::endl;
KRATOS_ERROR_IF_NOT(mrSkinModelPart2.Conditions().begin()->GetGeometry().GetGeometryType() == GeometryData::KratosGeometryType::Kratos_Line2D2) << "Conditions from second model part must be lines in 2D space" << std::endl;
} else { // 3D
KRATOS_ERROR_IF_NOT(r_skin_model_part_1.Conditions().begin()->GetGeometry().GetGeometryType() == GeometryData::KratosGeometryType::Kratos_Triangle3D3) << "Conditions from first model part must be triangles in 3D space" << std::endl;
KRATOS_ERROR_IF_NOT(r_skin_model_part_2.Conditions().begin()->GetGeometry().GetGeometryType() == GeometryData::KratosGeometryType::Kratos_Triangle3D3) << "Conditions from second model part must be triangles in 3D space" << std::endl;
KRATOS_ERROR_IF_NOT(mrSkinModelPart1.Conditions().begin()->GetGeometry().GetGeometryType() == GeometryData::KratosGeometryType::Kratos_Triangle3D3) << "Conditions from first model part must be triangles in 3D space" << std::endl;
KRATOS_ERROR_IF_NOT(mrSkinModelPart2.Conditions().begin()->GetGeometry().GetGeometryType() == GeometryData::KratosGeometryType::Kratos_Triangle3D3) << "Conditions from second model part must be triangles in 3D space" << std::endl;
}

// Getting the parent models
auto& r_model_1 = mrSkinModelPart1.GetModel();
auto& r_model_2 = mrSkinModelPart2.GetModel();

// We get the coordinates of the bounding box
const double zero_tolerance = std::numeric_limits<double>::epsilon();
using NodeType = Node<3>;
Expand All @@ -60,12 +56,12 @@ void CheckSameModelPartUsingSkinDistanceProcess<TDim>::Execute()
"create_skin_sub_model_part" : false
})");
mesher_parameters["number_of_divisions"].SetInt(mThisParameters["number_of_divisions_background_mesh"].GetInt());
ModelPart& r_model_part_1 = mrModel.CreateModelPart("BACKGROUND_MESH_1");
ModelPart& r_model_part_1 = r_model_1.CreateModelPart("BACKGROUND_MESH_1");
const double bounding_box_scale_factor = mThisParameters["bounding_box_scale_factor"].GetDouble();
if constexpr (TDim == 2) { // 2D
mesher_parameters["element_name"].SetString("Element2D3N");
using BBReduction = CombinedReduction<MaxReduction<double>, MinReduction<double>, MaxReduction<double>, MinReduction<double>>;
auto [max_x, min_x, max_y, min_y] = block_for_each<BBReduction>(r_skin_model_part_1.Nodes(), [&](NodeType& rNode) {
auto [max_x, min_x, max_y, min_y] = block_for_each<BBReduction>(mrSkinModelPart1.Nodes(), [&](NodeType& rNode) {
return std::make_tuple(rNode.X(),rNode.X(),rNode.Y(),rNode.Y());
});
if (max_x > zero_tolerance) max_x *= bounding_box_scale_factor; else max_x /= bounding_box_scale_factor;
Expand All @@ -82,7 +78,7 @@ void CheckSameModelPartUsingSkinDistanceProcess<TDim>::Execute()
StructuredMeshGeneratorProcess(geometry, r_model_part_1, mesher_parameters).Execute();
} else { // 3D
using BBReduction = CombinedReduction<MaxReduction<double>, MinReduction<double>, MaxReduction<double>, MinReduction<double>, MaxReduction<double>, MinReduction<double>>;
auto [max_x, min_x, max_y, min_y, max_z, min_z] = block_for_each<BBReduction>(r_skin_model_part_1.Nodes(), [&](NodeType& rNode) {
auto [max_x, min_x, max_y, min_y, max_z, min_z] = block_for_each<BBReduction>(mrSkinModelPart1.Nodes(), [&](NodeType& rNode) {
return std::make_tuple(rNode.X(),rNode.X(),rNode.Y(),rNode.Y(),rNode.Z(),rNode.Z());
});
if (max_x > zero_tolerance) max_x *= bounding_box_scale_factor; else max_x /= bounding_box_scale_factor;
Expand All @@ -106,18 +102,18 @@ void CheckSameModelPartUsingSkinDistanceProcess<TDim>::Execute()
}

// Using the same geometry, we create the second background mesh, but values are stored in a different model part
ModelPart& r_model_part_2 = AuxiliarModelPartUtilities(r_model_part_1).DeepCopyModelPart("BACKGROUND_MESH_2", &mrModel);
ModelPart& r_model_part_2 = AuxiliarModelPartUtilities(r_model_part_1).DeepCopyModelPart("BACKGROUND_MESH_2", &r_model_2);

// Compute the distance to the skin
Parameters distance_parameters = mThisParameters["discontinuous_distance_settings"];
CalculateDiscontinuousDistanceToSkinProcess<TDim> distance_calculator_1(r_model_part_1, r_skin_model_part_1, distance_parameters);
CalculateDiscontinuousDistanceToSkinProcess<TDim> distance_calculator_1(r_model_part_1, mrSkinModelPart1, distance_parameters);
distance_calculator_1.Execute();
CalculateDiscontinuousDistanceToSkinProcess<TDim> distance_calculator_2(r_model_part_2, r_skin_model_part_2, distance_parameters);
CalculateDiscontinuousDistanceToSkinProcess<TDim> distance_calculator_2(r_model_part_2, mrSkinModelPart2, distance_parameters);
distance_calculator_2.Execute();

// Compute the average length of the elements in order to compute the tolerance
auto it_cond_begin_1 = r_skin_model_part_1.ConditionsBegin();
const std::size_t total_number_conditions = r_skin_model_part_1.NumberOfConditions();
auto it_cond_begin_1 = mrSkinModelPart1.ConditionsBegin();
const std::size_t total_number_conditions = mrSkinModelPart1.NumberOfConditions();
double average_length = IndexPartition<std::size_t>(total_number_conditions).for_each<SumReduction<double>>([&](std::size_t i) {
auto it_cond_1 = it_cond_begin_1 + i;
return it_cond_1->GetGeometry().Length();
Expand Down Expand Up @@ -148,8 +144,8 @@ void CheckSameModelPartUsingSkinDistanceProcess<TDim>::Execute()
// TODO: Add MPI version

// Cleaning up created model parts
mrModel.DeleteModelPart("BACKGROUND_MESH_1");
mrModel.DeleteModelPart("BACKGROUND_MESH_2");
r_model_1.DeleteModelPart("BACKGROUND_MESH_1");
r_model_2.DeleteModelPart("BACKGROUND_MESH_2");

KRATOS_CATCH("")
}
Expand Down
26 changes: 23 additions & 3 deletions kratos/processes/check_same_modelpart_using_skin_distance_process.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ class KRATOS_API(KRATOS_CORE) CheckSameModelPartUsingSkinDistanceProcess
Model& rModel,
Parameters ThisParameters = Parameters(R"({})")
)
: mrModel(rModel),
: mrSkinModelPart1(rModel.GetModelPart(ThisParameters["skin_model_part_1_name"].GetString())),
mrSkinModelPart2(rModel.GetModelPart(ThisParameters["skin_model_part_2_name"].GetString())),
mThisParameters(ThisParameters)
{
KRATOS_TRY
Expand All @@ -83,6 +84,24 @@ class KRATOS_API(KRATOS_CORE) CheckSameModelPartUsingSkinDistanceProcess
KRATOS_CATCH("");
}

// /// Default constructor.
// explicit CheckSameModelPartUsingSkinDistanceProcess(
// ModelPart& rSkinModelPart1,
// ModelPart& rSkinModelPart2,
// Parameters ThisParameters = Parameters(R"({})")
// )
// : mrSkinModelPart1(rSkinModelPart1),
// mrSkinModelPart2(rSkinModelPart2),
// mThisParameters(ThisParameters)
// {
// KRATOS_TRY

// Parameters default_parameters = GetDefaultParameters();
// mThisParameters.RecursivelyValidateAndAssignDefaults(default_parameters);

// KRATOS_CATCH("");
// }

loumalouomega marked this conversation as resolved.
Show resolved Hide resolved
/// Destructor.
~CheckSameModelPartUsingSkinDistanceProcess() override = default;

Expand Down Expand Up @@ -159,8 +178,9 @@ class KRATOS_API(KRATOS_CORE) CheckSameModelPartUsingSkinDistanceProcess
///@name Member Variables
///@{

Model& mrModel; /// The model containing the model parts
Parameters mThisParameters; /// The parameters containing the settings
ModelPart& mrSkinModelPart1; /// The modelpart containing the skin of the first model part
ModelPart& mrSkinModelPart2; /// The modelpart containing the skin of the second model part
Parameters mThisParameters; /// The parameters containing the settings

///@}
///@name Private Operators
Expand Down
2 changes: 2 additions & 0 deletions kratos/python/add_processes_to_python.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,11 @@ void AddProcessesToPython(pybind11::module& m)
// Check the same model part using skin distance
py::class_<CheckSameModelPartUsingSkinDistanceProcess<2>, CheckSameModelPartUsingSkinDistanceProcess<2>::Pointer, Process>(m,"CheckSameModelPartUsingSkinDistanceProcess2D")
.def(py::init<Model&, Parameters>())
//.def(py::init<ModelPart&, ModelPart&, Parameters>())
loumalouomega marked this conversation as resolved.
Show resolved Hide resolved
;
py::class_<CheckSameModelPartUsingSkinDistanceProcess<3>, CheckSameModelPartUsingSkinDistanceProcess<3>::Pointer, Process>(m,"CheckSameModelPartUsingSkinDistanceProcess3D")
.def(py::init<Model&, Parameters>())
//.def(py::init<ModelPart&, ModelPart&, Parameters>())
loumalouomega marked this conversation as resolved.
Show resolved Hide resolved
;

// Discontinuous distance computation methods
Expand Down
12 changes: 11 additions & 1 deletion kratos/python_scripts/check_same_model_part_using_skin_process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,23 @@ def __init__(self, model, settings):
model -- the container of the different model parts.
settings -- Kratos parameters containing solver settings.
"""
KratosMultiphysics.Logger.PrintWarning("DEPRECATION-Warning", "This python process will be removed in the future. Please use the C++ version instead with the register instead")
KratosMultiphysics.Process.__init__(self)

# Assigning values
self.model = model

# Get first model part (must be defined anyway)
self.model_part = self.model[settings["skin_model_part_1_name"].GetString()]
if not self.model_part.ProcessInfo.Has(KratosMultiphysics.DOMAIN_SIZE)
raise ValueError("DOMAIN_SIZE nor defined in ProcessInfo")


# Create the process
self.process = KratosMultiphysics.CheckSameModelPartUsingSkinDistanceProcess3D(self.model, settings)
if self.dimension == 2:
self.process = KratosMultiphysics.CheckSameModelPartUsingSkinDistanceProcess2D(self.model, settings)
else:
self.process = KratosMultiphysics.CheckSameModelPartUsingSkinDistanceProcess3D(self.model, settings)

def ExecuteBeforeSolutionLoop(self):
"""This method is executed in before initialize the solution step
Expand Down