Skip to content

Commit aa02c19

Browse files
jginternationaljginternational
committed
Merge branch 'master' into write-geoms-migration
2 parents de5c5e8 + 441ecbf commit aa02c19

9 files changed

Lines changed: 103 additions & 17 deletions

File tree

‎kratos.gid/apps/DEM/clusters/coffeebean10cluster3D.clu‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
//
2+
// Cluster Name: "coffeebean10cluster3D"
3+
// Author: Salva Latorre
4+
// Date: $Date: 2025-01-17
5+
//
6+
7+
Name
8+
coffeebean10cluster3D
9+
10+
Begin centers_and_radii
11+
2.697372549019607952e-04 -2.282392156862745128e-04 4.772274509803921803e-04 1.784898156389119360e-03
12+
-2.054152941176470588e-03 -2.282392156862745128e-04 -6.224705882352941011e-05 1.544931370845591253e-03
13+
2.303141176470588445e-03 6.224705882352941011e-05 -2.282392156862745128e-04 1.478285740765120440e-03
14+
-6.017215686274509463e-04 3.527333333333333601e-04 -1.431682352941176595e-03 1.415807038116806416e-03
15+
1.763666666666666638e-03 6.847176470588235654e-04 1.514678431372548997e-03 1.377584900882262292e-03
16+
-1.348686274509803976e-03 5.187254901960784356e-04 1.556176470588235307e-03 1.352352272445655253e-03
17+
1.141196078431372645e-03 6.017215686274509463e-04 -1.597674509803921616e-03 1.246323676814921951e-03
18+
-2.344639215686274755e-03 6.847176470588235654e-04 -1.597674509803921616e-03 1.181054901173004450e-03
19+
1.452431372549019750e-04 6.847176470588235654e-04 2.095650980392156897e-03 1.120447058823529490e-03
20+
-3.008607843137254840e-03 4.772274509803921803e-04 1.224192156862745047e-03 1.116598036597129520e-03
21+
End centers_and_radii
22+
23+
Particle_center_and_diameter //Needed by the mesher, KRATOS skips it
24+
0.000000 0.000000 0.000000 0.009
25+
26+
Size
27+
0.009
28+
29+
Volume
30+
0.0000001
31+
32+
Inertia per unit mass
33+
0.00001
34+
0.000023
35+
0.00002

‎kratos.gid/apps/DEM/clusters/coffeebean20cluster3D.clu‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
//
2+
// Cluster Name: "coffeebean20cluster3D"
3+
// Author: Salva Latorre
4+
// Date: $Date: 2025-01-17
5+
//
6+
7+
Name
8+
coffeebean20cluster3D
9+
10+
Begin centers_and_radii
11+
2.697372549019607952e-04 -2.282392156862745128e-04 4.772274509803921803e-04 1.784898156389119360e-03
12+
-2.054152941176470588e-03 -2.282392156862745128e-04 -6.224705882352941011e-05 1.544931370845591253e-03
13+
2.303141176470588445e-03 6.224705882352941011e-05 -2.282392156862745128e-04 1.478285740765120440e-03
14+
-6.017215686274509463e-04 3.527333333333333601e-04 -1.431682352941176595e-03 1.415807038116806416e-03
15+
1.763666666666666638e-03 6.847176470588235654e-04 1.514678431372548997e-03 1.377584900882262292e-03
16+
-1.348686274509803976e-03 5.187254901960784356e-04 1.556176470588235307e-03 1.352352272445655253e-03
17+
1.141196078431372645e-03 6.017215686274509463e-04 -1.597674509803921616e-03 1.246323676814921951e-03
18+
-2.344639215686274755e-03 6.847176470588235654e-04 -1.597674509803921616e-03 1.181054901173004450e-03
19+
1.452431372549019750e-04 6.847176470588235654e-04 2.095650980392156897e-03 1.120447058823529490e-03
20+
-3.008607843137254840e-03 4.772274509803921803e-04 1.224192156862745047e-03 1.116598036597129520e-03
21+
3.299094117647059007e-03 6.432196078431372558e-04 9.752039215686275153e-04 1.089274125863839851e-03
22+
3.548082352941176430e-03 8.507098039215686951e-04 -8.507098039215686951e-04 1.053102176729700523e-03
23+
-3.506584313725490121e-03 3.112352941176470505e-04 -6.847176470588235654e-04 1.019028270964167935e-03
24+
9.337058823529412058e-04 -7.677137254901960760e-04 -1.016701960784313716e-03 9.802676626210940058e-04
25+
-8.092117647058823856e-04 -9.337058823529412058e-04 -6.432196078431372558e-04 9.297783627783619579e-04
26+
2.469133333333333249e-03 8.922078431372548963e-04 -1.763666666666666638e-03 9.279243661922657481e-04
27+
1.680670588235294236e-03 -6.847176470588235654e-04 9.337058823529412058e-04 8.890658309510640058e-04
28+
-1.182694117647058955e-03 -8.507098039215686951e-04 9.337058823529412058e-04 8.861556240234928338e-04
29+
2.884113725490196345e-03 1.265690196078431357e-03 1.929658823529411876e-03 8.195206104248921796e-04
30+
-3.112352941176470505e-04 1.058200000000000026e-03 9.337058823529412058e-04 8.142503267530537374e-04
31+
End centers_and_radii
32+
33+
Particle_center_and_diameter //Needed by the mesher, KRATOS skips it
34+
0.000000 0.000000 0.000000 0.009
35+
36+
Size
37+
0.009
38+
39+
Volume
40+
0.0000001
41+
42+
Inertia per unit mass
43+
0.00001
44+
0.000023
45+
0.00002

‎kratos.gid/apps/DEM/write/writeMDPA_Inlet.tcl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,12 @@ proc ::DEM::write::GetClusterFileNameAndReplaceInletElementType {inlet_element_t
402402
} elseif {$inlet_element_type eq "Rock3RefinedCluster3D"} {
403403
set inlet_element_type "Cluster3D"
404404
set cluster_file_name "rock3refinedcluster3D.clu"
405+
} elseif {$inlet_element_type eq "CoffeeBean10Cluster3D"} {
406+
set inlet_element_type "Cluster3D"
407+
set cluster_file_name "coffeebean10cluster3D.clu"
408+
} elseif {$inlet_element_type eq "CoffeeBean20Cluster3D"} {
409+
set inlet_element_type "Cluster3D"
410+
set cluster_file_name "coffeebean20cluster3D.clu"
405411
} else {
406412
error "No cluster found"
407413
}

‎kratos.gid/apps/DEM/xml/Processes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
<parameter n="Excentricity" parent="SingleSphereCluster" type="double" v="0.1" pn="Excentricity (%)" help="% of the radius" show_in_window="0"/>
363363
<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"/>
364364
<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"/>
365-
<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">
365+
<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">
366366
<parameter n="ClusterFilename" pn="Cluster file" parent="FromFile" type="file" v="custom.clu" show_in_window="0"/>
367367
</parameter>
368368
<parameter n="RandomOrientation" pn="Random Orientation" parent="Cluster3D" type="combo" v="Yes" values="Yes,No" help="Random Orientation" show_in_window="0">

‎kratos.gid/apps/Dam/examples/ThermoMechaDam2D.tcl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,23 +154,23 @@ proc ::Dam::examples::ThermoMechaDam2D::TreeAssignation {args} {
154154
# Surface Temperature
155155
set temperature_base "$damDirichletConditions/condition\[@n='INITIALTEMPERATURE'\]"
156156
set dam_temperature [customlib::AddConditionGroupOnXPath $temperature_base Dam]
157-
set props_dam_temperature [list is_fixed false value 7.5 ]
157+
set props_dam_temperature [list constrained false value 7.5 ]
158158
spdAux::SetValuesOnBaseNode $dam_temperature $props_dam_temperature
159159

160160
set ground_temperature [customlib::AddConditionGroupOnXPath $temperature_base Ground]
161-
set props_ground_temperature [list is_fixed false value 7.5 ]
161+
set props_ground_temperature [list constrained false value 7.5 ]
162162
spdAux::SetValuesOnBaseNode $ground_temperature $props_ground_temperature
163163

164164
# Bofang Temperature
165165
set bofang_temperature "$damDirichletConditions/condition\[@n='BOFANGTEMPERATURE'\]"
166166
set bofang_temperature_node [customlib::AddConditionGroupOnXPath $bofang_temperature Water]
167-
set props_bofang_temperature [list is_fixed 1 Gravity_Direction Y Reservoir_Bottom_Coordinate_in_Gravity_Direction 0.0 Surface_Temp 15.19 Bottom_Temp 9.35 Height_Dam 30.0 Temperature_Amplitude 6.51 Day_Max_Temp 201 Water_level 20.0 Month 7 ]
167+
set props_bofang_temperature [list constrained 1 Gravity_Direction Y Reservoir_Bottom_Coordinate_in_Gravity_Direction 0.0 Surface_Temp 15.19 Bottom_Temp 9.35 Height_Dam 30.0 Temperature_Amplitude 6.51 Day_Max_Temp 201 Water_level 20.0 Month 7 ]
168168
spdAux::SetValuesOnBaseNode $bofang_temperature_node $props_bofang_temperature
169169

170170
# Uniform Temperature
171171
set uniform_temperature "$damDirichletConditions/condition\[@n='INITIALTEMPERATURE'\]"
172172
set uniform_temperature_node [customlib::AddConditionGroupOnXPath $uniform_temperature UniformTemperature]
173-
set props_uniform_temperature [list is_fixed true value 10.0 ]
173+
set props_uniform_temperature [list constrained true value 10.0 ]
174174
spdAux::SetValuesOnBaseNode $uniform_temperature_node $props_uniform_temperature
175175

176176

‎kratos.gid/apps/Dam/examples/ThermoMechaDam3D.tcl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,17 @@ proc ::Dam::examples::ThermoMechaDam3D::TreeAssignation {args} {
159159
# Surface Temperature
160160
set temperature_base "$damDirichletConditions/condition\[@n='INITIALTEMPERATURE'\]"
161161
set dam_temperature [customlib::AddConditionGroupOnXPath $temperature_base Dam]
162-
set props_dam_temperature [list is_fixed false value 7.5 ]
162+
set props_dam_temperature [list constrained false value 7.5 ]
163163
spdAux::SetValuesOnBaseNode $dam_temperature $props_dam_temperature
164164

165165
set ground_temperature [customlib::AddConditionGroupOnXPath $temperature_base Ground]
166-
set props_ground_temperature [list is_fixed false value 7.5 ]
166+
set props_ground_temperature [list constrained false value 7.5 ]
167167
spdAux::SetValuesOnBaseNode $ground_temperature $props_ground_temperature
168168

169169
# Constant Temperature
170170
set water_path "$damDirichletConditions/condition\[@n='CONSTANTRESERVOIRTEMPERATURE'\]"
171171
set water_node [customlib::AddConditionGroupOnXPath $water_path Water]
172-
set props_water [list is_fixed true Gravity_Direction Z Reservoir_Bottom_Coordinate_in_Gravity_Direction 0.0 Water_temp 6 Water_level 15]
172+
set props_water [list constrained true Gravity_Direction Z Reservoir_Bottom_Coordinate_in_Gravity_Direction 0.0 Water_temp 6 Water_level 15]
173173
spdAux::SetValuesOnBaseNode $water_node $props_water
174174

175175
# Load Conditions

‎kratos.gid/apps/Dam/write/writeProjectParameters.tcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ proc ::Dam::write::TemperaturebyDevices { } {
887887

888888
set name [$node @name]
889889

890-
set xp2 "[spdAux::getRoute DamTempDevice]/blockdata\[@name='$name'\]/value\[@n='is_fixed'\]"
890+
set xp2 "[spdAux::getRoute DamTempDevice]/blockdata\[@name='$name'\]/value\[@n='constrained'\]"
891891
set node_xp2 [$root selectNodes $xp2]
892892
set isfixed [get_domnode_attribute $node_xp2 v]
893893

@@ -915,7 +915,7 @@ proc ::Dam::write::TemperaturebyDevices { } {
915915
set positionList [list ]
916916
dict set parameterDict model_part_name "MainModelPart"
917917
dict set parameterDict variable_name "TEMPERATURE"
918-
dict set parameterDict is_fixed $isfixed
918+
dict set parameterDict constrained $isfixed
919919
dict set parameterDict value $value
920920

921921
if {$fileid ni [list "" "- No file" $::spdAux::no_file_string]} {

‎kratos.gid/apps/Dam/xml/Processes.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Process n="ApplyConstraintVectorDamTableProcess" pn="Impose vector value by components process" python_module="apply_constraint_vector_dam_table_process"
77
kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the selected components of a given vector variable">
88
<inputs>
9-
<parameter n="is_fixed" pn="Imposed" type="vector" vectorType="bool" v="1,1,1"/>
9+
<parameter n="constrained" pn="Imposed" type="vector" vectorType="bool" v="1,1,1"/>
1010
<parameter n="value" pn="Value" type="vector" v="0.0,0.0,0.0"/>
1111
<parameter n="Value_Table" pn="Value table filename" type="vector" vectorType="tablefile" v=""/>
1212
</inputs>
@@ -16,7 +16,7 @@
1616
<Process n="ImposeUniformPressureProcess" pn="Impose uniform value of pressure by process" python_module="impose_uniform_temperature_process"
1717
kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
1818
<inputs>
19-
<parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
19+
<parameter n="constrained" pn="Imposed" type="bool" v="1"/>
2020
<parameter n="value" pn="Value" type="double" v="0.0"/>
2121
<parameter n="table" pn="Pressure table filename" type="tablefile" v=""/>
2222
</inputs>
@@ -26,7 +26,7 @@
2626
<Process n="ImposeUniformTemperatureProcess" pn="Impose uniform value of temperature by process" python_module="impose_uniform_temperature_process"
2727
kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
2828
<inputs>
29-
<parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
29+
<parameter n="constrained" pn="Imposed" type="bool" v="1"/>
3030
<parameter n="value" pn="Value" type="double" v="0.0"/>
3131
<parameter n="table" pn="Uniform Temperature table filename" type="tablefile" v=""/>
3232
</inputs>
@@ -36,7 +36,7 @@
3636
<Process n="ImposeBofangConditionProcess" pn="Impose Bofang scalar field value" python_module="impose_reservoir_temperature_condition_process"
3737
kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
3838
<inputs>
39-
<parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
39+
<parameter n="constrained" pn="Imposed" type="bool" v="1"/>
4040
<parameter n="Gravity_Direction" pn="Gravity Direction" type="combo" v="Z" values="X,Y,Z" />
4141
<parameter n="Reservoir_Bottom_Coordinate_in_Gravity_Direction" pn="Reservoir Bottom Coordinate in Gravity Direction" type="double" v="0.0"/>
4242
<parameter n="Surface_Temp" pn="Surface Temperature" type="double" v="0.0"/>
@@ -55,7 +55,7 @@
5555
<Process n="ImposeReservoirConstantTemperatureConditionProcess" pn="Impose constant reservoir temperature value" python_module="impose_reservoir_temperature_condition_process"
5656
kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
5757
<inputs>
58-
<parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
58+
<parameter n="constrained" pn="Imposed" type="bool" v="1"/>
5959
<parameter n="Gravity_Direction" pn="Gravity Direction" type="combo" v="Z" values="X,Y,Z" />
6060
<parameter n="Reservoir_Bottom_Coordinate_in_Gravity_Direction" pn="Reservoir Bottom Coordinate in Gravity Direction" type="double" v="0.0"/>
6161
<parameter n="Water_temp" pn="Water Temperature" type="double" v="0.0"/>
@@ -69,7 +69,7 @@
6969
<Process n="ImposeReservoirMonitoringTemperatureConditionProcess" pn="Impose constant reservoir temperature value" python_module="impose_reservoir_temperature_condition_process"
7070
kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
7171
<inputs>
72-
<parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
72+
<parameter n="constrained" pn="Imposed" type="bool" v="1"/>
7373
<parameter n="Gravity_Direction" pn="Gravity Direction" type="combo" v="Z" values="X,Y,Z" />
7474
<parameter n="Reservoir_Bottom_Coordinate_in_Gravity_Direction" pn="Reservoir Bottom Coordinate in Gravity Direction" type="double" v="0.0"/>
7575
<parameter n="Height_Dam" pn="Height Dam" type="double" v="0.0"/>

‎kratos.gid/apps/Dam/xml/Utilities.spd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<container n="TemperatureDevice" pn="Temperature Device" ProcessName="ImposeTemperaturebyDeviceProcess" un="DamTempDevice" icon="temp_device" open_window="0">
8585
<value n="DeviceTemperatureState" pn="Device State" un="DamTemperatureState" v="False" values="True,False" actualize_tree="1"/>
8686
<blockdata n="device" pn="Device" name="Device 1" state="[HideIfUniqueName DamTemperatureState False]" sequence="1" editable_name="unique" help="Interval">
87-
<value n="is_fixed" pn="Imposed" actualize_tree="1" type="bool" v="true" values="true,false" />
87+
<value n="constrained" pn="Imposed" actualize_tree="1" type="bool" v="true" values="true,false" />
8888
<value n="value" pn="Value" type="double" v="0.0" />
8989
<value n="table" pn="Temperature table filename" type="tablefile" v="" values = "[GetFilesValues]" update_proc = "AddFile" />
9090
<value n="XPosition" pn="X Position" actualize_tree="1" type="double" v="0.0" />

0 commit comments

Comments
 (0)