diff --git a/applications/DEMApplication/DEM_application.cpp b/applications/DEMApplication/DEM_application.cpp index b36369b95afd..ac73821a23e6 100644 --- a/applications/DEMApplication/DEM_application.cpp +++ b/applications/DEMApplication/DEM_application.cpp @@ -375,7 +375,6 @@ KRATOS_CREATE_VARIABLE(double, PARTICLE_INELASTIC_ROLLING_RESISTANCE_ENERGY) KRATOS_CREATE_VARIABLE(double, PARTICLE_MAX_NORMAL_BALL_TO_BALL_FORCE_TIMES_RADIUS) KRATOS_CREATE_VARIABLE(int, COMPUTE_ENERGY_OPTION) KRATOS_CREATE_VARIABLE(double, GLOBAL_DAMPING) -KRATOS_CREATE_VARIABLE(double, GLOBAL_VISCOUS_DAMPING) KRATOS_CREATE_VARIABLE(double, NORMAL_IMPACT_VELOCITY) KRATOS_CREATE_VARIABLE(double, TANGENTIAL_IMPACT_VELOCITY) KRATOS_CREATE_VARIABLE(double, FACE_NORMAL_IMPACT_VELOCITY) @@ -883,7 +882,6 @@ void KratosDEMApplication::Register() { KRATOS_REGISTER_VARIABLE(PARTICLE_MAX_NORMAL_BALL_TO_BALL_FORCE_TIMES_RADIUS) KRATOS_REGISTER_VARIABLE(COMPUTE_ENERGY_OPTION) KRATOS_REGISTER_VARIABLE(GLOBAL_DAMPING) - KRATOS_REGISTER_VARIABLE(GLOBAL_VISCOUS_DAMPING) KRATOS_REGISTER_VARIABLE(NORMAL_IMPACT_VELOCITY) KRATOS_REGISTER_VARIABLE(TANGENTIAL_IMPACT_VELOCITY) KRATOS_REGISTER_VARIABLE(FACE_NORMAL_IMPACT_VELOCITY) diff --git a/applications/DEMApplication/DEM_application_variables.h b/applications/DEMApplication/DEM_application_variables.h index bad6448d5912..b0e38195abe7 100644 --- a/applications/DEMApplication/DEM_application_variables.h +++ b/applications/DEMApplication/DEM_application_variables.h @@ -341,7 +341,6 @@ namespace Kratos KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, PARTICLE_MAX_NORMAL_BALL_TO_BALL_FORCE_TIMES_RADIUS) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, int, COMPUTE_ENERGY_OPTION) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, GLOBAL_DAMPING) - KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, GLOBAL_VISCOUS_DAMPING) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, NORMAL_IMPACT_VELOCITY) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, TANGENTIAL_IMPACT_VELOCITY) KRATOS_DEFINE_APPLICATION_VARIABLE(DEM_APPLICATION, double, FACE_NORMAL_IMPACT_VELOCITY) diff --git a/applications/DEMApplication/custom_elements/spheric_particle.cpp b/applications/DEMApplication/custom_elements/spheric_particle.cpp index 04589e8d295e..721a86b15f27 100644 --- a/applications/DEMApplication/custom_elements/spheric_particle.cpp +++ b/applications/DEMApplication/custom_elements/spheric_particle.cpp @@ -142,7 +142,6 @@ SphericParticle& SphericParticle::operator=(const SphericParticle& rOther) { mSearchRadius = rOther.mSearchRadius; mRealMass = rOther.mRealMass; mClusterId = rOther.mClusterId; - mGlobalViscousDamping = rOther.mGlobalViscousDamping; mDiscontinuumConstitutiveLaw = rOther.mDiscontinuumConstitutiveLaw->CloneUnique(); mRollingFrictionModel = rOther.mRollingFrictionModel->CloneUnique(); mGlobalDampingModel = rOther.mGlobalDampingModel->CloneUnique(); @@ -1803,15 +1802,6 @@ void SphericParticle::ComputeAdditionalForces(array_1d& externally_ap noalias(externally_applied_force) += counter_force;} } else { noalias(externally_applied_force) += ComputeWeight(gravity, r_process_info); - //Global viscous damping force - const array_1d& vel = this->GetGeometry()[0].FastGetSolutionStepValue(VELOCITY); - const double vel_magnitude = DEM_MODULUS_3(vel); - if (vel_magnitude != 0.0) - { - mGlobalViscousDamping = r_process_info[GLOBAL_VISCOUS_DAMPING]; //update the coefficient of GLOBAL_VISCOUS_DAMPING - const array_1d viscous_damping_force = -2.0 * mGlobalViscousDamping * sqrt(GetMass() * GetRadius() * GetYoung()) * vel; - noalias(externally_applied_force) += viscous_damping_force; - } noalias(externally_applied_force) += this->GetGeometry()[0].FastGetSolutionStepValue(EXTERNAL_APPLIED_FORCE); noalias(externally_applied_moment) += this->GetGeometry()[0].FastGetSolutionStepValue(EXTERNAL_APPLIED_MOMENT); } @@ -1957,8 +1947,6 @@ void SphericParticle::MemberDeclarationFirstStep(const ProcessInfo& r_process_in mStrainTensor = NULL; mDifferentialStrainTensor = NULL; } - - mGlobalViscousDamping = r_process_info[GLOBAL_VISCOUS_DAMPING]; } std::unique_ptr SphericParticle::pCloneDiscontinuumConstitutiveLawWithNeighbour(SphericParticle* neighbour) { diff --git a/applications/DEMApplication/custom_elements/spheric_particle.h b/applications/DEMApplication/custom_elements/spheric_particle.h index 94508b494a17..90cace3eea14 100644 --- a/applications/DEMApplication/custom_elements/spheric_particle.h +++ b/applications/DEMApplication/custom_elements/spheric_particle.h @@ -459,7 +459,6 @@ PropertiesProxy* mFastProperties; int mClusterId; DEMIntegrationScheme* mpTranslationalIntegrationScheme; DEMIntegrationScheme* mpRotationalIntegrationScheme; -double mGlobalViscousDamping; double mBondedScalingFactor[3] = {0.0}; private: @@ -508,7 +507,6 @@ virtual void save(Serializer& rSerializer) const override rSerializer.save("mSearchRadius", mSearchRadius); rSerializer.save("mRealMass", mRealMass); rSerializer.save("mClusterId", mClusterId); - rSerializer.save("mGlobalViscousDamping",mGlobalViscousDamping); } virtual void load(Serializer& rSerializer) override @@ -562,7 +560,6 @@ virtual void load(Serializer& rSerializer) override rSerializer.load("mSearchRadius", mSearchRadius); rSerializer.load("mRealMass", mRealMass); rSerializer.load("mClusterId", mClusterId); - rSerializer.load("mGlobalViscousDamping",mGlobalViscousDamping); } }; // Class SphericParticle diff --git a/applications/DEMApplication/custom_python/DEM_python_application.cpp b/applications/DEMApplication/custom_python/DEM_python_application.cpp index 3795d153185d..3a2c2e2b49ba 100644 --- a/applications/DEMApplication/custom_python/DEM_python_application.cpp +++ b/applications/DEMApplication/custom_python/DEM_python_application.cpp @@ -312,7 +312,6 @@ PYBIND11_MODULE(KratosDEMApplication,m) KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, PARTICLE_MAX_NORMAL_BALL_TO_BALL_FORCE_TIMES_RADIUS) KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, COMPUTE_ENERGY_OPTION) KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, GLOBAL_DAMPING) - KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, GLOBAL_VISCOUS_DAMPING) KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, NORMAL_IMPACT_VELOCITY) KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, TANGENTIAL_IMPACT_VELOCITY) KRATOS_REGISTER_IN_PYTHON_VARIABLE(m, FACE_NORMAL_IMPACT_VELOCITY) diff --git a/applications/DEMApplication/python_scripts/dem_default_input_parameters.py b/applications/DEMApplication/python_scripts/dem_default_input_parameters.py index d4948895ebac..2aeb5df3ddcc 100644 --- a/applications/DEMApplication/python_scripts/dem_default_input_parameters.py +++ b/applications/DEMApplication/python_scripts/dem_default_input_parameters.py @@ -112,7 +112,6 @@ def GetDefaultInputParameters(): "ZStrainValue" : "0.0*t", "ImposeZStrainIn2DWithControlModule" : false, "GlobalDamping" : 0.0, - "GlobalViscousDamping" : 0.0, "GlobalDampingModel" : "NonViscousConstantForceDirection", "PoissonEffectOption" : true, "ShearStrainParallelToBondOption" : true, diff --git a/applications/DEMApplication/python_scripts/sphere_strategy.py b/applications/DEMApplication/python_scripts/sphere_strategy.py index 9583abd766db..599972a31923 100644 --- a/applications/DEMApplication/python_scripts/sphere_strategy.py +++ b/applications/DEMApplication/python_scripts/sphere_strategy.py @@ -180,12 +180,6 @@ def __init__(self, all_model_parts, creator_destructor, dem_fem_search, DEM_para Logger.PrintWarning("DEM", "\nGlobal Damping parameter not found! No damping will be applied...\n") else: self.global_damping = DEM_parameters["GlobalDamping"].GetDouble() - - if not "GlobalViscousDamping" in DEM_parameters.keys(): - self.global_viscous_damping = 0.0 - Logger.PrintWarning("DEM", "\nGlobal Viscous Damping parameter not found! No damping will be applied...\n") - else: - self.global_viscous_damping = DEM_parameters["GlobalViscousDamping"].GetDouble() self.global_damping_option = self.global_damping != 0.0 @@ -315,7 +309,6 @@ def SetVariablesAndOptions(self): self.spheres_model_part.ProcessInfo.SetValue(NODAL_MASS_COEFF, self.nodal_mass_coeff) self.SetOneOrZeroInProcessInfoAccordingToBoolValue(self.spheres_model_part, ROLLING_FRICTION_OPTION, self.rolling_friction_option) self.spheres_model_part.ProcessInfo.SetValue(GLOBAL_DAMPING, self.global_damping) - self.spheres_model_part.ProcessInfo.SetValue(GLOBAL_VISCOUS_DAMPING, self.global_viscous_damping) self.SetOneOrZeroInProcessInfoAccordingToBoolValue(self.spheres_model_part, GLOBAL_DAMPING_OPTION, self.global_damping_option) self.spheres_model_part.ProcessInfo.SetValue(DEM_GLOBAL_DAMPING_MODEL_NAME, self.global_damping_model) diff --git a/applications/DEMApplication/tests/servo_control_tests_files/ProjectParametersDEM.json b/applications/DEMApplication/tests/servo_control_tests_files/ProjectParametersDEM.json index b6a68a9500be..ef3b91f03da4 100644 --- a/applications/DEMApplication/tests/servo_control_tests_files/ProjectParametersDEM.json +++ b/applications/DEMApplication/tests/servo_control_tests_files/ProjectParametersDEM.json @@ -50,7 +50,6 @@ "VirtualMassCoefficient" : 1.0, "RollingFrictionOption" : true, "GlobalDamping" : 0.0, - "GlobalViscousDamping" : 0.0, "ContactMeshOption" : true, "OutputFileType" : "Ascii", "Multifile" : "multiple_files",