Skip to content

Commit

Permalink
Merge branch 'master' into fix-history
Browse files Browse the repository at this point in the history
  • Loading branch information
@roigcarlo
roigcarlo authored Oct 19, 2017
2 parents 81c99db + f78eb3f commit d3bc043
Show file tree
Hide file tree
Showing 33 changed files with 5,629 additions and 3,286 deletions.
81 changes: 40 additions & 41 deletions applications/DEM_application/python_scripts/DEM_procedures.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1326,44 +1326,43 @@ def __init__(self, DEM_parameters, post_path):
self.multifilelists = []

# Reading Post options from DEM_parameters
self.PostDisplacement = getattr(self.DEM_parameters, "PostDisplacement", 0)
self.PostVelocity = getattr(self.DEM_parameters, "PostVelocity", 0)
self.PostTotalForces = getattr(self.DEM_parameters, "PostTotalForces", 0)
self.PostNonDimensionalVolumeWear = getattr(self.DEM_parameters, "PostNonDimensionalVolumeWear", 0)
self.PostAppliedForces = getattr(self.DEM_parameters, "PostAppliedForces", 0)
self.PostDampForces = getattr(self.DEM_parameters, "PostDampForces", 0)
self.PostRadius = getattr(self.DEM_parameters, "PostRadius", 0)
self.PostExportId = getattr(self.DEM_parameters, "PostExportId", 0)
self.PostSkinSphere = getattr(self.DEM_parameters, "PostSkinSphere", 0)
self.PostAngularVelocity = getattr(self.DEM_parameters, "PostAngularVelocity", 0)
self.PostParticleMoment = getattr(self.DEM_parameters, "PostParticleMoment", 0)
self.PostEulerAngles = getattr(self.DEM_parameters, "PostEulerAngles", 0)
self.PostRollingResistanceMoment = getattr(self.DEM_parameters, "PostRollingResistanceMoment", 0)
self.PostLocalContactForce = getattr(self.DEM_parameters, "PostLocalContactForce", 0)
self.PostFailureCriterionState = getattr(self.DEM_parameters, "PostFailureCriterionState", 0)
self.PostContactFailureId = getattr(self.DEM_parameters, "PostContactFailureId", 0)
self.PostContactTau = getattr(self.DEM_parameters, "PostContactTau", 0)
self.PostContactSigma = getattr(self.DEM_parameters, "PostContactSigma", 0)
self.PostMeanContactArea = getattr(self.DEM_parameters, "PostMeanContactArea", 0)
self.PostElasticForces = getattr(self.DEM_parameters, "PostElasticForces", 0)
self.PostContactForces = getattr(self.DEM_parameters, "PostContactForces", 0)
self.PostRigidElementForces = getattr(self.DEM_parameters, "PostRigidElementForces", 0)
self.PostPressure = getattr(self.DEM_parameters, "PostPressure", 0)
self.PostTangentialElasticForces = getattr(self.DEM_parameters, "PostTangentialElasticForces", 0)
self.PostShearStress = getattr(self.DEM_parameters, "PostShearStress", 0)
self.PostNodalArea = getattr(self.DEM_parameters, "PostNodalArea", 0)
self.VelTrapGraphExportFreq = getattr(self.DEM_parameters, "VelTrapGraphExportFreq", 0)
self.PostTemperature = getattr(self.DEM_parameters, "PostTemperature", 0)
self.PostHeatFlux = getattr(self.DEM_parameters, "PostHeatFlux", 0)
self.PostNeighbourSize = getattr(self.DEM_parameters, "PostNeighbourSize", 0)
self.PostBrokenRatio = getattr(self.DEM_parameters, "PostBrokenRatio", 0)
self.PostNormalImpactVelocity = getattr(self.DEM_parameters, "PostNormalImpactVelocity", 0)
self.PostTangentialImpactVelocity = getattr(self.DEM_parameters, "PostTangentialImpactVelocity", 0)
self.PostDisplacement = self.DEM_parameters["PostDisplacement"].GetBool()
self.PostVelocity = self.DEM_parameters["PostVelocity"].GetBool()
self.PostTotalForces = self.DEM_parameters["PostTotalForces"].GetBool()
self.PostNonDimensionalVolumeWear = self.DEM_parameters["PostNonDimensionalVolumeWear"].GetBool()
self.PostAppliedForces = self.DEM_parameters["PostAppliedForces"].GetBool()
self.PostDampForces = self.DEM_parameters["PostDampForces"].GetBool()
self.PostRadius = self.DEM_parameters["PostRadius"].GetBool()
self.PostExportId = self.DEM_parameters["PostExportId"].GetBool()
self.PostSkinSphere = GetBoolParameterIfItExists(self.DEM_parameters, "PostSkinSphere")
self.PostAngularVelocity = self.DEM_parameters["PostAngularVelocity"].GetBool()
self.PostParticleMoment = self.DEM_parameters["PostParticleMoment"].GetBool()
self.PostEulerAngles = self.DEM_parameters["PostEulerAngles"].GetBool()
self.PostRollingResistanceMoment = self.DEM_parameters["PostRollingResistanceMoment"].GetBool()
self.PostLocalContactForce = GetBoolParameterIfItExists(self.DEM_parameters, "PostLocalContactForce")
self.PostFailureCriterionState = GetBoolParameterIfItExists(self.DEM_parameters, "PostFailureCriterionState")
self.PostContactFailureId = GetBoolParameterIfItExists(self.DEM_parameters, "PostContactFailureId")
self.PostContactTau = GetBoolParameterIfItExists(self.DEM_parameters, "PostContactTau")
self.PostContactSigma = GetBoolParameterIfItExists(self.DEM_parameters, "PostContactSigma")
self.PostMeanContactArea = GetBoolParameterIfItExists(self.DEM_parameters, "PostMeanContactArea")
self.PostElasticForces = self.DEM_parameters["PostElasticForces"].GetBool()
self.PostContactForces = self.DEM_parameters["PostContactForces"].GetBool()
self.PostRigidElementForces = self.DEM_parameters["PostRigidElementForces"].GetBool()
self.PostPressure = self.DEM_parameters["PostPressure"].GetBool()
self.PostTangentialElasticForces = self.DEM_parameters["PostTangentialElasticForces"].GetBool()
self.PostShearStress = self.DEM_parameters["PostShearStress"].GetBool()
self.PostNodalArea = self.DEM_parameters["PostNodalArea"].GetBool()
self.PostTemperature = GetBoolParameterIfItExists(self.DEM_parameters, "PostTemperature")
self.PostHeatFlux = GetBoolParameterIfItExists(self.DEM_parameters, "PostHeatFlux")
self.PostNeighbourSize = GetBoolParameterIfItExists(self.DEM_parameters, "PostNeighbourSize")
self.PostBrokenRatio = GetBoolParameterIfItExists(self.DEM_parameters, "PostBrokenRatio")
self.PostNormalImpactVelocity = GetBoolParameterIfItExists(self.DEM_parameters, "PostNormalImpactVelocity")
self.PostTangentialImpactVelocity = GetBoolParameterIfItExists(self.DEM_parameters, "PostTangentialImpactVelocity")
self.VelTrapGraphExportFreq = self.DEM_parameters["VelTrapGraphExportFreq"].GetDouble()
#self.PostFaceNormalImpactVelocity = getattr(self.DEM_parameters, "PostFaceNormalImpactVelocity", 0)
#self.PostFaceTangentialImpactVelocity = getattr(self.DEM_parameters, "PostFaceTangentialImpactVelocity", 0)
self.PostLinearImpulse = getattr(self.DEM_parameters, "PostLinearImpulse", 0)

if not (hasattr(self.DEM_parameters, "PostBoundingBox")):
if not "PostBoundingBox" in self.DEM_parameters.keys():
self.PostBoundingBox = 0
else:
self.PostBoundingBox = self.DEM_parameters["PostBoundingBox"].GetBool()
Expand Down Expand Up @@ -1392,17 +1391,17 @@ def __init__(self, DEM_parameters, post_path):
self.SetMultifileLists(self.multifiles)

#Analytic
if not (hasattr(self.DEM_parameters, "PostNormalImpactVelocity")):
if not "PostNormalImpactVelocity" in self.DEM_parameters.keys():
self.PostNormalImpactVelocity = 0
self.PostTangentialImpactVelocity = 0
self.PostFaceNormalImpactVelocity = 0
self.PostFaceTangentialImpactVelocity = 0
self.PostFaceNormalImpactVelocity = 0
else:
self.PostNormalImpactVelocity = Var_Translator(self.DEM_parameters.PostNormalImpactVelocity)
self.PostTangentialImpactVelocity = Var_Translator(self.DEM_parameters.PostTangentialImpactVelocity)
self.PostFaceNormalImpactVelocity = 1
self.PostNormalImpactVelocity = self.DEM_parameters["PostNormalImpactVelocity"].GetBool()
self.PostTangentialImpactVelocity = self.DEM_parameters["PostTangentialImpactVelocity"].GetBool()
self.PostFaceTangentialImpactVelocity = 1

self.PostFaceNormalImpactVelocity = 1

# Ice
if "PostVirtualSeaSurfaceX1" in self.DEM_parameters.keys():
self.SeaSurfaceX1 = self.DEM_parameters["PostVirtualSeaSurfaceX1"]
Expand Down
10 changes: 5 additions & 5 deletions applications/DEM_application/python_scripts/main_script.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ def model_part_reader(modelpart, nodeid=0, elemid=0, condid=0):
self.solver_strategy = self.SetSolverStrategy()
self.creator_destructor = self.SetParticleCreatorDestructor()
self.dem_fem_search = self.SetDemFemSearch()
self.procedures = self.SetProcedures()
self.procedures = self.SetProcedures()
self.SetAnalyticParticleWatcher()
self.procedures.CheckInputParameters(DEM_parameters)
self.PreUtilities = PreUtilities()

# Creating necessary directories:
Expand Down Expand Up @@ -386,16 +385,17 @@ def BeforeSolveOperations(self, time):
#time_to_print = self.time - self.time_old_print # add new particles to analytic mp each time an output is generated
#if (self.DEM_parameters["OutputTimeStep"].GetDouble() - time_to_print < 1e-2 * self.dt):
self.FillAnalyticSubModelPartsWithNewParticles()
def BeforePrintingOperations(self, time):
pass

def AfterSolveOperations(self):
if (hasattr(DEM_parameters, "PostNormalImpactVelocity")):
if (DEM_parameters.PostNormalImpactVelocity):
if "PostNormalImpactVelocity" in self.DEM_parameters.keys():
if self.DEM_parameters["PostNormalImpactVelocity"].GetBool():
self.particle_watcher.MakeMeasurements(self.analytic_model_part)
time_to_print = self.time - self.time_old_print
if (self.DEM_parameters["OutputTimeStep"].GetDouble() - time_to_print < 1e-2 * self.dt):
self.particle_watcher.SetNodalMaxImpactVelocities(self.analytic_model_part)
self.particle_watcher.SetNodalMaxFaceImpactVelocities(self.analytic_model_part)
#self.particle_watcher.MakeMeasurements(self.all_model_parts.Get('AnalyticParticlesPart'))

def FinalizeTimeStep(self, time):
pass
Expand Down
2 changes: 2 additions & 0 deletions applications/StructuralMechanicsApplication/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ set( KRATOS_STRUCTURAL_MECHANICS_APPLICATION_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/linear_plane_strain.cpp
${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/elastic_isotropic_3d.cpp
${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/axisym_elastic_isotropic.cpp
${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/hyper_elastic_isotropic_neo_hookean_3d.cpp
${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/hyper_elastic_isotropic_neo_hookean_plane_strain_2d.cpp
${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/linear_elastic_orthotropic_2D_law.cpp

## ELEMENTS
Expand Down
Loading

0 comments on commit d3bc043

Please sign in to comment.