Skip to content

Commit

Permalink
Merge pull request #1001 from KratosMultiphysics/coffee-impls
Browse files Browse the repository at this point in the history
Added two new cluster elements
  • Loading branch information
salvalatorre authored Feb 6, 2025
2 parents 862965a + 316732f commit 78fa234
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 1 deletion.
35 changes: 35 additions & 0 deletions kratos.gid/apps/DEM/clusters/coffeebean10cluster3D.clu
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// Cluster Name: "coffeebean10cluster3D"
// Author: Salva Latorre
// Date: $Date: 2025-01-17
//

Name
coffeebean10cluster3D

Begin centers_and_radii
2.697372549019607952e-04 -2.282392156862745128e-04 4.772274509803921803e-04 1.784898156389119360e-03
-2.054152941176470588e-03 -2.282392156862745128e-04 -6.224705882352941011e-05 1.544931370845591253e-03
2.303141176470588445e-03 6.224705882352941011e-05 -2.282392156862745128e-04 1.478285740765120440e-03
-6.017215686274509463e-04 3.527333333333333601e-04 -1.431682352941176595e-03 1.415807038116806416e-03
1.763666666666666638e-03 6.847176470588235654e-04 1.514678431372548997e-03 1.377584900882262292e-03
-1.348686274509803976e-03 5.187254901960784356e-04 1.556176470588235307e-03 1.352352272445655253e-03
1.141196078431372645e-03 6.017215686274509463e-04 -1.597674509803921616e-03 1.246323676814921951e-03
-2.344639215686274755e-03 6.847176470588235654e-04 -1.597674509803921616e-03 1.181054901173004450e-03
1.452431372549019750e-04 6.847176470588235654e-04 2.095650980392156897e-03 1.120447058823529490e-03
-3.008607843137254840e-03 4.772274509803921803e-04 1.224192156862745047e-03 1.116598036597129520e-03
End centers_and_radii

Particle_center_and_diameter //Needed by the mesher, KRATOS skips it
0.000000 0.000000 0.000000 0.009

Size
0.009

Volume
0.0000001

Inertia per unit mass
0.00001
0.000023
0.00002
45 changes: 45 additions & 0 deletions kratos.gid/apps/DEM/clusters/coffeebean20cluster3D.clu
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//
// Cluster Name: "coffeebean20cluster3D"
// Author: Salva Latorre
// Date: $Date: 2025-01-17
//

Name
coffeebean20cluster3D

Begin centers_and_radii
2.697372549019607952e-04 -2.282392156862745128e-04 4.772274509803921803e-04 1.784898156389119360e-03
-2.054152941176470588e-03 -2.282392156862745128e-04 -6.224705882352941011e-05 1.544931370845591253e-03
2.303141176470588445e-03 6.224705882352941011e-05 -2.282392156862745128e-04 1.478285740765120440e-03
-6.017215686274509463e-04 3.527333333333333601e-04 -1.431682352941176595e-03 1.415807038116806416e-03
1.763666666666666638e-03 6.847176470588235654e-04 1.514678431372548997e-03 1.377584900882262292e-03
-1.348686274509803976e-03 5.187254901960784356e-04 1.556176470588235307e-03 1.352352272445655253e-03
1.141196078431372645e-03 6.017215686274509463e-04 -1.597674509803921616e-03 1.246323676814921951e-03
-2.344639215686274755e-03 6.847176470588235654e-04 -1.597674509803921616e-03 1.181054901173004450e-03
1.452431372549019750e-04 6.847176470588235654e-04 2.095650980392156897e-03 1.120447058823529490e-03
-3.008607843137254840e-03 4.772274509803921803e-04 1.224192156862745047e-03 1.116598036597129520e-03
3.299094117647059007e-03 6.432196078431372558e-04 9.752039215686275153e-04 1.089274125863839851e-03
3.548082352941176430e-03 8.507098039215686951e-04 -8.507098039215686951e-04 1.053102176729700523e-03
-3.506584313725490121e-03 3.112352941176470505e-04 -6.847176470588235654e-04 1.019028270964167935e-03
9.337058823529412058e-04 -7.677137254901960760e-04 -1.016701960784313716e-03 9.802676626210940058e-04
-8.092117647058823856e-04 -9.337058823529412058e-04 -6.432196078431372558e-04 9.297783627783619579e-04
2.469133333333333249e-03 8.922078431372548963e-04 -1.763666666666666638e-03 9.279243661922657481e-04
1.680670588235294236e-03 -6.847176470588235654e-04 9.337058823529412058e-04 8.890658309510640058e-04
-1.182694117647058955e-03 -8.507098039215686951e-04 9.337058823529412058e-04 8.861556240234928338e-04
2.884113725490196345e-03 1.265690196078431357e-03 1.929658823529411876e-03 8.195206104248921796e-04
-3.112352941176470505e-04 1.058200000000000026e-03 9.337058823529412058e-04 8.142503267530537374e-04
End centers_and_radii

Particle_center_and_diameter //Needed by the mesher, KRATOS skips it
0.000000 0.000000 0.000000 0.009

Size
0.009

Volume
0.0000001

Inertia per unit mass
0.00001
0.000023
0.00002
6 changes: 6 additions & 0 deletions kratos.gid/apps/DEM/write/writeMDPA_Inlet.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,12 @@ proc ::DEM::write::GetClusterFileNameAndReplaceInletElementType {inlet_element_t
} elseif {$inlet_element_type eq "Rock3RefinedCluster3D"} {
set inlet_element_type "Cluster3D"
set cluster_file_name "rock3refinedcluster3D.clu"
} elseif {$inlet_element_type eq "CoffeeBean10Cluster3D"} {
set inlet_element_type "Cluster3D"
set cluster_file_name "coffeebean10cluster3D.clu"
} elseif {$inlet_element_type eq "CoffeeBean20Cluster3D"} {
set inlet_element_type "Cluster3D"
set cluster_file_name "coffeebean20cluster3D.clu"
} else {
error "No cluster found"
}
Expand Down
2 changes: 1 addition & 1 deletion kratos.gid/apps/DEM/xml/Processes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
<parameter n="Excentricity" parent="SingleSphereCluster" type="double" v="0.1" pn="Excentricity (%)" help="% of the radius" show_in_window="0"/>
<parameter n="ProbabilityDistributionOfExcentricity" parent="SingleSphereCluster" type="combo" v="normal" pn="Probability Distribution of excentricity" values="normal,lognormal" help="Choose the probablility distribution of the diameter" show_in_window="0"/>
<parameter n="StandardDeviationOfExcentricity" parent="SingleSphereCluster" type="double" v="0.1" pn="Standard Deviation of excentricity" help="Standard Deviation of the Diameter, assuming Normal Distribution. If 0.0 is chosen, a uniform diameter distribution will be created" show_in_window="0"/>
<parameter n="ClusterType" pn="Cluster Type" parent="Cluster3D" type="combo" v="FromFile" values="FromFile,Rock1Cluster3D,Rock2Cluster3D,Ballast1Cluster3D,Ballast1Cluster3Dred,Ballast2Cluster3D,Ballast2Cluster3Dred,Ballast3Cluster3D,Ballast3Cluster3Dred,Ballast4Cluster3D,Ballast4Cluster3Dred,Ballast5Cluster3D,Ballast2Cluster5Dred,Ballast6Cluster3D,Ballast6Cluster3Dred,LineCluster3D,RingCluster3D,SoyBeanCluster3D,SoyBean3Cluster3D,CornKernelCluster3D,CornKernel3Cluster3D,Wheat5Cluster3D,CapsuleCluster3D" help="Choose the shape of the particle or cluster of particles" show_in_window="0">
<parameter n="ClusterType" pn="Cluster Type" parent="Cluster3D" type="combo" v="FromFile" values="FromFile,CoffeeBean10Cluster3D,CoffeeBean20Cluster3D,Rock1Cluster3D,Rock2Cluster3D,Ballast1Cluster3D,Ballast1Cluster3Dred,Ballast2Cluster3D,Ballast2Cluster3Dred,Ballast3Cluster3D,Ballast3Cluster3Dred,Ballast4Cluster3D,Ballast4Cluster3Dred,Ballast5Cluster3D,Ballast2Cluster5Dred,Ballast6Cluster3D,Ballast6Cluster3Dred,LineCluster3D,RingCluster3D,SoyBeanCluster3D,SoyBean3Cluster3D,CornKernelCluster3D,CornKernel3Cluster3D,Wheat5Cluster3D,CapsuleCluster3D" help="Choose the shape of the particle or cluster of particles" show_in_window="0">
<parameter n="ClusterFilename" pn="Cluster file" parent="FromFile" type="file" v="custom.clu" show_in_window="0"/>
</parameter>
<parameter n="RandomOrientation" pn="Random Orientation" parent="Cluster3D" type="combo" v="Yes" values="Yes,No" help="Random Orientation" show_in_window="0">
Expand Down

0 comments on commit 78fa234

Please sign in to comment.