Skip to content

Commit 4eab92d

Browse files
jginternationaljginternational
committed
Merge branch 'master' into geo-print
2 parents 6d0ce58 + 7cb7f2e commit 4eab92d

2 files changed

Lines changed: 165 additions & 9 deletions

File tree

‎kratos.gid/kratos.transform‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
#map changes from v 6.0 to 9.3.2
2+
3+
CONDITION RENAME_QUESTION {SelfWeight3D directionX value_direction_X}
4+
CONDITION RENAME_QUESTION {SelfWeight3D directionY value_direction_Y}
5+
CONDITION RENAME_QUESTION {SelfWeight3D directionZ value_direction_Z}
6+
7+
CONDITION RENAME_QUESTION {SelfWeight2D directionX value_direction_X}
8+
CONDITION RENAME_QUESTION {SelfWeight2D directionY value_direction_Y}
9+
CONDITION RENAME_QUESTION {SelfWeight2D directionZ value_direction_Z}
10+
11+
12+
CONDITION RENAME_QUESTION {SelfWeight2Da directionX value_direction_X}
13+
CONDITION RENAME_QUESTION {SelfWeight2Da directionY value_direction_Y}
14+
CONDITION RENAME_QUESTION {SelfWeight2Da directionZ value_direction_Z}
15+
16+
CONDITION RENAME_QUESTION {PointLoad2D directionX value_direction_X}
17+
CONDITION RENAME_QUESTION {PointLoad2D directionY value_direction_Y}
18+
CONDITION RENAME_QUESTION {PointLoad2D directionZ value_direction_Z}
19+
20+
CONDITION RENAME_QUESTION {PointLoad2DAxisym directionX value_direction_X}
21+
CONDITION RENAME_QUESTION {PointLoad2DAxisym directionY value_direction_Y}
22+
CONDITION RENAME_QUESTION {PointLoad2DAxisym directionZ value_direction_Z}
23+
24+
CONDITION RENAME_QUESTION {PointLoad3D directionX value_direction_X}
25+
CONDITION RENAME_QUESTION {PointLoad3D directionY value_direction_Y}
26+
CONDITION RENAME_QUESTION {PointLoad3D directionZ value_direction_Z}
27+
28+
CONDITION RENAME_QUESTION {PointMoment3D directionX value_direction_X}
29+
CONDITION RENAME_QUESTION {PointMoment3D directionY value_direction_Y}
30+
CONDITION RENAME_QUESTION {PointMoment3D directionZ value_direction_Z}
31+
32+
CONDITION RENAME_QUESTION {LineLoad2D directionX value_direction_X}
33+
CONDITION RENAME_QUESTION {LineLoad2D directionY value_direction_Y}
34+
CONDITION RENAME_QUESTION {LineLoad2D directionZ value_direction_Z}
35+
36+
CONDITION RENAME_QUESTION {LineLoad2DAxisym directionX value_direction_X}
37+
CONDITION RENAME_QUESTION {LineLoad2DAxisym directionY value_direction_Y}
38+
CONDITION RENAME_QUESTION {LineLoad2DAxisym directionZ value_direction_Z}
39+
40+
CONDITION RENAME_QUESTION {SurfaceLoad3D directionX value_direction_X}
41+
CONDITION RENAME_QUESTION {SurfaceLoad3D directionY value_direction_Y}
42+
CONDITION RENAME_QUESTION {SurfaceLoad3D directionZ value_direction_Z}
43+
44+
# este caso DISPLACEMENT debo combinar dos values originales {constrainedX 0,1+ ByFunctionX Yes,No} en uno conjunto selector_component_X ByFunction,ByValue,Not
45+
CONDITION COMBINE_QUESTIONS_PROC {DISPLACEMENT {constrainedX ByFunctionX} selector_component_X gid_groups_conds::transform_combine_two_dom_boolean_values {Not ByValue ByFunction ByValue}}
46+
CONDITION COMBINE_QUESTIONS_PROC {DISPLACEMENT {constrainedY ByFunctionY} selector_component_Y gid_groups_conds::transform_combine_two_dom_boolean_values {Not ByValue ByFunction ByValue}}
47+
CONDITION COMBINE_QUESTIONS_PROC {DISPLACEMENT {constrainedZ ByFunctionZ} selector_component_Z gid_groups_conds::transform_combine_two_dom_boolean_values {Not ByValue ByFunction ByValue}}
48+
49+
CONDITION COMBINE_QUESTIONS_PROC {ALEMeshDisplacementBC2D {constrainedX ByFunctionX} selector_component_X gid_groups_conds::transform_combine_two_dom_boolean_values {Not ByValue ByFunction ByValue}}
50+
CONDITION COMBINE_QUESTIONS_PROC {ALEMeshDisplacementBC2D {constrainedY ByFunctionY} selector_component_Y gid_groups_conds::transform_combine_two_dom_boolean_values {Not ByValue ByFunction ByValue}}
51+
CONDITION COMBINE_QUESTIONS_PROC {ALEMeshDisplacementBC2D {constrainedZ ByFunctionZ} selector_component_Z gid_groups_conds::transform_combine_two_dom_boolean_values {Not ByValue ByFunction ByValue}}
52+
53+
54+
CONDITION RENAME_QUESTION {DISPLACEMENT valueX value_component_X}
55+
CONDITION RENAME_QUESTION {DISPLACEMENT Xfunction_value function_component_X}
56+
57+
CONDITION RENAME_QUESTION {DISPLACEMENT valueY value_component_Y}
58+
CONDITION RENAME_QUESTION {DISPLACEMENT Yfunction_value function_component_Y}
59+
60+
CONDITION RENAME_QUESTION {DISPLACEMENT valueZ value_component_Z}
61+
CONDITION RENAME_QUESTION {DISPLACEMENT Zfunction_value function_component_Z}
62+
63+
# do not use CONDITION RENAME because Parts are mapped in more that one possibility, depends on the application, use CONDITION XPATH
64+
# CONDITION RENAME {Parts FluidParts}
65+
66+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Fluid"]]} {//condition[@n="FluidParts"]}}
67+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="EmbeddedFluid"]]} {//condition[@n="FluidParts"]}}
68+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="SmallDisplacementElement2D"]]]} {//condition[@n="Parts_Solid"]}}
69+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="SmallDisplacementBbarElement2D"]]]} {//condition[@n="Parts_Solid"]}}
70+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="TotalLagrangianElement2D"]]]} {//condition[@n="Parts_Solid"]}}
71+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="UpdatedLagrangianElement2D"]]]} {//condition[@n="Parts_Solid"]}}
72+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="LinearBeamElement2D"]]]} {//condition[@n="Parts_Beam"]}}
73+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="BeamElement2D"]]]} {//condition[@n="Parts_Beam"]}}
74+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="TrussLinearElement2D"]]]} {//condition[@n="Parts_Truss"]}}
75+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="TrussElement2D"]]]} {//condition[@n="Parts_Truss"]}}
76+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="Structural"] and child::group[child::value[@n="Element" and @v="CableElement2D"]]]} {//condition[@n="Parts_Cable"]}}
77+
CONDITION XPATH {Parts {//condition[@n="Parts" and parent::container[@n="ConvectionDiffusion"]]} {//condition[@n="CNVDFFParts"]}}
78+
# CONDITION RENAME {Parts_Solid Parts_Material_domain}
79+
CONDITION XPATH {Parts_Solid {//condition[@n="Parts_Solid" and parent::container[@n="MPM"]]} {//condition[@n="Parts_Material_domain"]}}
80+

‎kratos.gid/scripts/Controllers/MdpaImportMesh.tcl‎

Lines changed: 85 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,29 @@ proc Kratos::ReadPre { filename } {
7474
}
7575
}
7676
}
77+
78+
if {[string match "Begin Geometries*" $line]} {
79+
set element_type [Kratos::GuessElementTypeFromMDPA $line]
80+
while { ![eof $fp] } {
81+
gets $fp line
82+
if {$line ne "End Geometries"} {
83+
# lo del elemento
84+
set raw [regsub -all {\s+} $line $space]
85+
set id [lindex $raw 0]
86+
set nodes [lrange $raw 1 end]
87+
if {[llength $nodes] > 1} {
88+
set nodes_new [list ]
89+
foreach node $nodes {lappend nodes_new [expr $node + $offset_nodes]}
90+
GiD_Mesh create element [expr $offset_elements + $id] $element_type [llength $nodes_new] $nodes_new
91+
} else {
92+
dict set spheres_dict $nodes element_type $element_type
93+
dict set spheres_dict $nodes element $id
94+
}
95+
} else {
96+
break
97+
}
98+
}
99+
}
77100
if {[string match "Begin NodalData RADIUS*" $line]} {
78101
while { ![eof $fp] } {
79102
gets $fp line
@@ -142,6 +165,16 @@ proc Kratos::ReadPre { filename } {
142165
}
143166
}
144167
}
168+
if {[string trim $line] eq "Begin SubModelPartGeometries"} {
169+
while { ![eof $fp] } {
170+
gets $fp line
171+
if {[string trim $line] ne "End SubModelPartGeometries"} {
172+
GiD_EntitiesGroups assign $group_name elements [expr $offset_elements + [string trim $line]]
173+
} else {
174+
break
175+
}
176+
}
177+
}
145178
if {[string trim $line] eq "Begin SubModelPartConditions"} {
146179
while { ![eof $fp] } {
147180
gets $fp line
@@ -186,24 +219,46 @@ proc Kratos::ReadPre { filename } {
186219

187220
proc Kratos::GuessElementTypeFromMDPA {line} {
188221
set element_type "unknown"
189-
set element_name [lindex $line 2]
190-
set element_name [lindex [split $element_name "//"] 0]
191-
222+
set entity [lindex $line 1]
223+
set element_name1 [lindex $line 2]
224+
set element_name [lindex [split $element_name1 "//"] 0]
225+
192226
if {$element_name eq "Sphere3D"} {
193227
set element_type "Sphere"
194228
} elseif {$element_name in {"SphericContinuumParticle3D" "SphericParticle3D"}} {
195229
set element_type "Sphere"
196230
} elseif {$element_name in {"CylinderContinuumParticle2D" "CylinderParticle2D"}} {
197231
set element_type "Circle"
198232
} else {
199-
set dim [string index $element_name end-3]
200-
set nnodes [string index $element_name end-1]
233+
if {$entity eq "Geometries"} {
234+
set dim [string index $element_name end-2]
235+
set nnodes [string index $element_name end]
236+
} else {
237+
set dim [string index $element_name end-3]
238+
set nnodes [string index $element_name end-1]
239+
}
240+
# 0: linear, 1: quadratic, 2: biquadratic
241+
set detected_mesh_quad [Kratos::GuessQuadMesh $element_name $dim $nnodes]
242+
set is_quadratic [GiD_Set Model(QuadraticType)]
243+
if { $detected_mesh_quad eq "0" } {
244+
if {$is_quadratic ne "0"} {W "We have changed the mesh mode to linear. Check Mesh menu to change it back."}
245+
GiD_Set Model(QuadraticType) 0
246+
}
247+
if {$detected_mesh_quad eq "1"} {
248+
if {$is_quadratic ne "1"} {W "We have changed the mesh mode to quadratic. Check Mesh menu to change it back."}
249+
GiD_Set Model(QuadraticType) 1
250+
}
251+
201252
switch $nnodes {
202253
2 {
203254
set element_type "Line"
204255
}
205256
3 {
206-
set element_type "Triangle"
257+
if {$is_quadratic eq "0"} {
258+
set element_type "Triangle"
259+
} else {
260+
set element_type "Line"
261+
}
207262
}
208263
4 {
209264
if {$dim eq 2} {
@@ -216,10 +271,14 @@ proc Kratos::GuessElementTypeFromMDPA {line} {
216271
set element_type "Pyramid"
217272
}
218273
6 {
219-
if {$dim eq 2} {
220-
set element_type "Triangle"
274+
if {$is_quadratic eq "0"} {
275+
if {$dim eq 2} {
276+
set element_type "Triangle"
277+
}
221278
} else {
222-
set element_type "Prism"
279+
if {$dim eq 2} {
280+
set element_type "Triangle"
281+
}
223282
}
224283
}
225284
8 {
@@ -255,5 +314,22 @@ proc Kratos::GuessElementTypeFromMDPA {line} {
255314
return $element_type
256315
}
257316

317+
proc Kratos::GuessQuadMesh {element_name dim nnodes} {
318+
if {$nnodes eq 6 && $dim eq 2} {return 1}
319+
if {$nnodes eq 4 && $dim eq 2} {return 0}
320+
if {$nnodes eq 4 && $dim eq 3} {return 0}
321+
if {$nnodes eq 8 && $dim eq 2} {return 1}
322+
if {$nnodes eq 8 && $dim eq 3} {return 0}
323+
if {$nnodes eq 2 } {return 0}
324+
if {$nnodes eq 9 } {return 2}
325+
if {$nnodes eq 20 } {return 1}
326+
if {$nnodes eq 27 } {return 2}
327+
if {$nnodes eq 15 } {return 1}
328+
if {$nnodes eq 18 } {return 2}
329+
if {$nnodes eq 5 } {return 0}
330+
if {$nnodes eq 13 } {return 1}
331+
return -1
332+
}
333+
258334
#register the proc to be automatically called when dropping a file
259335
GiD_RegisterExtensionProc ".mdpa" PRE Kratos::ReadPreSingleFile

0 commit comments

Comments
 (0)