Skip to content
Snippets Groups Projects
Commit 1aae6efe authored by wenqing's avatar wenqing Committed by Dmitri Naumov
Browse files

[LIE/M] Remove constructors

parent a0b3985f
No related branches found
No related tags found
No related merge requests found
...@@ -181,10 +181,10 @@ std::unique_ptr<Process> createSmallDeformationProcess( ...@@ -181,10 +181,10 @@ std::unique_ptr<Process> createSmallDeformationProcess(
config.getConfigParameter<double>( config.getConfigParameter<double>(
"reference_temperature", std::numeric_limits<double>::quiet_NaN()); "reference_temperature", std::numeric_limits<double>::quiet_NaN());
SmallDeformationProcessData<DisplacementDim> process_data( SmallDeformationProcessData<DisplacementDim> process_data{
materialIDs(mesh), std::move(solid_constitutive_relations), materialIDs(mesh), std::move(solid_constitutive_relations),
std::move(fracture_model), std::move(fracture_properties), std::move(fracture_model), std::move(fracture_properties),
reference_temperature); reference_temperature};
SecondaryVariableCollection secondary_variables; SecondaryVariableCollection secondary_variables;
......
...@@ -32,36 +32,6 @@ namespace SmallDeformation ...@@ -32,36 +32,6 @@ namespace SmallDeformation
template <int DisplacementDim> template <int DisplacementDim>
struct SmallDeformationProcessData struct SmallDeformationProcessData
{ {
SmallDeformationProcessData(
MeshLib::PropertyVector<int> const* const material_ids_,
std::map<int,
std::unique_ptr<
MaterialLib::Solids::MechanicsBase<DisplacementDim>>>&&
solid_materials_,
std::unique_ptr<
MaterialLib::Fracture::FractureModelBase<DisplacementDim>>&&
fracture_model,
std::vector<FractureProperty>&& fracture_properties_,
double const reference_temperature)
: material_ids(material_ids_),
solid_materials{std::move(solid_materials_)},
fracture_model{std::move(fracture_model)},
fracture_properties(std::move(fracture_properties_)),
reference_temperature(reference_temperature)
{
}
SmallDeformationProcessData(SmallDeformationProcessData&& other) = default;
//! Copies are forbidden.
SmallDeformationProcessData(SmallDeformationProcessData const&) = delete;
//! Assignments are not needed.
void operator=(SmallDeformationProcessData const&) = delete;
//! Assignments are not needed.
void operator=(SmallDeformationProcessData&&) = delete;
MeshLib::PropertyVector<int> const* const material_ids; MeshLib::PropertyVector<int> const* const material_ids;
/// The constitutive relation for the mechanical part. /// The constitutive relation for the mechanical part.
...@@ -73,14 +43,17 @@ struct SmallDeformationProcessData ...@@ -73,14 +43,17 @@ struct SmallDeformationProcessData
std::unique_ptr<MaterialLib::Fracture::FractureModelBase<DisplacementDim>> std::unique_ptr<MaterialLib::Fracture::FractureModelBase<DisplacementDim>>
fracture_model; fracture_model;
std::vector<FractureProperty> fracture_properties; std::vector<FractureProperty> fracture_properties;
std::vector<JunctionProperty> junction_properties;
double const reference_temperature;
std::vector<JunctionProperty> junction_properties = {};
MeshLib::PropertyVector<int> const* mesh_prop_materialIDs = nullptr; MeshLib::PropertyVector<int> const* mesh_prop_materialIDs = nullptr;
std::vector<int> map_materialID_to_fractureID; std::vector<int> map_materialID_to_fractureID = {};
// a table of connected fracture IDs for each element // a table of connected fracture IDs for each element
std::vector<std::vector<int>> vec_ele_connected_fractureIDs; std::vector<std::vector<int>> vec_ele_connected_fractureIDs = {};
std::vector<std::vector<int>> vec_ele_connected_junctionIDs; std::vector<std::vector<int>> vec_ele_connected_junctionIDs = {};
// mesh properties to output element's stress. // mesh properties to output element's stress.
MeshLib::PropertyVector<double>* element_stresses = nullptr; MeshLib::PropertyVector<double>* element_stresses = nullptr;
...@@ -89,8 +62,6 @@ struct SmallDeformationProcessData ...@@ -89,8 +62,6 @@ struct SmallDeformationProcessData
// mesh property for fracture aperture // mesh property for fracture aperture
MeshLib::PropertyVector<double>* mesh_prop_b = nullptr; MeshLib::PropertyVector<double>* mesh_prop_b = nullptr;
double const reference_temperature;
}; };
} // namespace SmallDeformation } // namespace SmallDeformation
......
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