Skip to content

Commit e7aa4ff

Browse files
jginternationaljginternational
committed
Remove Solid dependency
1 parent af1ecbc commit e7aa4ff

5 files changed

Lines changed: 8 additions & 74 deletions

File tree

‎kratos.gid/apps/PfemFluid/start.tcl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ proc ::PfemFluid::LoadMyFiles { } {
2727
variable dir
2828
uplevel #0 [list source [file join $dir examples examples.tcl]]
2929
uplevel #0 [list source [file join $dir xml XmlController.tcl]]
30-
uplevel #0 [list source [file join $dir .. Solid write write.tcl]]
3130
uplevel #0 [list source [file join $dir write write.tcl]]
3231
uplevel #0 [list source [file join $dir write writeProjectParameters.tcl]]
3332
}

‎kratos.gid/apps/PfemFluid/write/write.tcl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ proc PfemFluid::write::Init { } {
99
set remesh_domains [dict create ]
1010
variable bodies_list
1111
set bodies_list [list ]
12-
Solid::write::AddValidApps "PfemFluid"
1312
variable Names
1413
set Names [dict create DeltaTime DeltaTime]
1514
}
@@ -32,7 +31,6 @@ proc PfemFluid::write::writeModelPartEvent { } {
3231
write::initWriteData $part_un "PFEMFLUID_Materials"
3332
write::writeElementConnectivities
3433
}
35-
Solid::write::writeConditions
3634
PfemFluid::write::writeMeshes
3735
}
3836

@@ -45,8 +43,6 @@ proc PfemFluid::write::writeMeshes { } {
4543
# Solo Malla , no en conditions
4644
writeNodalConditions "PFEMFLUID_NodalConditions"
4745

48-
# A Condition y a meshes-> salvo lo que no tenga topologia
49-
Solid::write::writeLoads
5046
}
5147

5248

@@ -92,7 +88,6 @@ proc PfemFluid::write::GetPartsUN { } {
9288

9389
# Custom files (Copy python scripts, write materials file...)
9490
proc PfemFluid::write::writeCustomFilesEvent { } {
95-
Solid::write::WriteMaterialsFile
9691

9792
write::CopyFileIntoModel "python/RunPFEM.py"
9893
write::RenameFileInModel "RunPFEM.py" "MainKratos.py"

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

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -138,21 +138,6 @@ proc PfemFluid::write::GetPFEM_NewSolverSettingsDict { } {
138138

139139
set problemtype [write::getValue PFEMFLUID_DomainType]
140140

141-
if {$problemtype eq "Solids"} {
142-
143-
dict set solverSettingsDict solution_type [write::getValue PFEMFLUID_SolutionType]
144-
145-
set solutiontype [write::getValue PFEMFLUID_SolutionType]
146-
147-
if {$solutiontype eq "Static"} {
148-
dict set solverSettingsDict analysis_type [write::getValue PFEMFLUID_LinearType]
149-
} elseif {$solutiontype eq "Dynamic"} {
150-
dict set solverSettingsDict time_integration_method [write::getValue PFEMFLUID_SolStrat]
151-
dict set solverSettingsDict scheme_type [write::getValue PFEMFLUID_Scheme]
152-
}
153-
}
154-
155-
156141
dict set solverSettingsDict model_part_name "PfemFluidModelPart"
157142
if {$problemtype eq "Fluids"} {
158143
dict set solverSettingsDict physics_type "fluid"
@@ -219,22 +204,6 @@ proc PfemFluid::write::GetPFEM_SolverSettingsDict { } {
219204
set strategy_write_name [[::Model::GetSolutionStrategy $currentStrategyId] getAttribute "python_module"]
220205
dict set solverSettingsDict solver_type $strategy_write_name
221206

222-
set problemtype [write::getValue PFEMFLUID_DomainType]
223-
224-
if {$problemtype eq "Solids"} {
225-
226-
dict set solverSettingsDict solution_type [write::getValue PFEMFLUID_SolutionType]
227-
228-
set solutiontype [write::getValue PFEMFLUID_SolutionType]
229-
230-
if {$solutiontype eq "Static"} {
231-
dict set solverSettingsDict analysis_type [write::getValue PFEMFLUID_LinearType]
232-
} elseif {$solutiontype eq "Dynamic"} {
233-
dict set solverSettingsDict time_integration_method [write::getValue PFEMFLUID_SolStrat]
234-
dict set solverSettingsDict scheme_type [write::getValue PFEMFLUID_Scheme]
235-
}
236-
}
237-
238207
# model import settings
239208
set modelDict [dict create]
240209
dict set modelDict input_type "mdpa"
@@ -249,9 +218,9 @@ proc PfemFluid::write::GetPFEM_SolverSettingsDict { } {
249218
set bodies_parts_list [list ]
250219
foreach body $bodies_list {
251220
set body_parts [dict get $body parts_list]
252-
foreach part $body_parts {
253-
lappend bodies_parts_list $part
254-
}
221+
foreach part $body_parts {
222+
lappend bodies_parts_list $part
223+
}
255224
}
256225

257226
dict set solverSettingsDict bodies_list $bodies_list
@@ -269,11 +238,7 @@ proc PfemFluid::write::GetPFEM_OutputProcessList { } {
269238
proc PfemFluid::write::GetPFEM_ProblemProcessList { } {
270239
set resultList [list ]
271240
set problemtype [write::getValue PFEMFLUID_DomainType]
272-
if {$problemtype ne "Solids"} {
273-
lappend resultList [GetPFEM_FluidRemeshDict]
274-
} else {
275-
lappend resultList [GetPFEM_RemeshDict]
276-
}
241+
lappend resultList [GetPFEM_FluidRemeshDict]
277242
return $resultList
278243
}
279244

‎kratos.gid/apps/PfemFluid/xml/Main.spd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<include n="ModelType" active="1" path="apps/PfemFluid/xml/ModelType.spd"/>
44
<include n="Bodies" active="1" path="apps/PfemFluid/xml/Bodies.spd"/>
55
<include n="BoundaryConditions" active="1" path="apps/PfemFluid/xml/NodalConditions.spd"/>
6-
<include n="Loads" active="1" path="apps/Solid/xml/Loads.spd" state="[getStateFromXPathValue {string(../container[@n='ModelType']/value[@n='DomainType']/@v)} FSI]"/>
76
<include n="TimeSettings" active="1" icon="timeParams" path="apps/PfemFluid/xml/TimeSettings.spd"/>
87
<include n="Gravity" active="1" icon="gravityForce" path="apps/PfemFluid/xml/Gravity.spd"/>
98
<include n="MeshBoxes" active="1" icon="boundingBox" path="apps/PfemFluid/xml/MeshBoxes.spd"/>

‎kratos.gid/apps/PfemFluid/xml/XmlController.tcl‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ proc PfemFluid::xml::Init { } {
1414
Model::getSolutionStrategies Strategies.xml
1515
Model::getElements Elements.xml
1616
Model::getConstitutiveLaws ConstitutiveLaws.xml
17-
Model::getProcesses "../../Solid/xml/Processes.xml"
1817
Model::getProcesses "../../Common/xml/Processes.xml"
1918
Model::getProcesses Processes.xml
2019
Model::getNodalConditions NodalConditions.xml
21-
Model::getConditions "../../Solid/xml/Conditions.xml"
2220
Model::getSolvers "../../Pfem/xml/Solvers.xml"
2321

2422
Model::ForgetNodalCondition "CONTACT"
@@ -239,24 +237,6 @@ proc PfemFluid::xml::ProcGetContactDomains {domNode args} {
239237
return [join $values ,]
240238
}
241239

242-
proc PfemFluid::xml::ProcCheckNodalConditionStateSolid {domNode args} {
243-
# Overwritten the base function to add Solution Type restrictions
244-
set elemsactive [list ]
245-
foreach parts_un [PfemFluid::write::GetPartsUN] {
246-
set parts_path [spdAux::getRoute $parts_un]
247-
set xp1 "$parts_path/group/value\[@n='Element'\]"
248-
foreach gNode [[customlib::GetBaseRoot] selectNodes $xp1] {
249-
lappend elemsactive [get_domnode_attribute $gNode v]
250-
}
251-
}
252-
if {$elemsactive eq ""} {return "hidden"}
253-
set elemsactive [lsort -unique $elemsactive]
254-
set conditionId [$domNode @n]
255-
set solutionType [get_domnode_attribute [$domNode selectNodes [spdAux::getRoute PFEMFLUID_SolutionType]] v]
256-
set params [list analysis_type $solutionType]
257-
if {[::Model::CheckElementsNodalCondition $conditionId $elemsactive $params]} {return "normal"} else {return "hidden"}
258-
}
259-
260240
proc PfemFluid::xml::ProcSolutionTypeState {domNode args} {
261241
set domain_type_un PFEMFLUID_DomainType
262242
set domain_type_route [spdAux::getRoute $domain_type_un]
@@ -265,14 +245,10 @@ proc PfemFluid::xml::ProcSolutionTypeState {domNode args} {
265245
set domain_type_node [$domNode selectNodes $domain_type_route]
266246
set domain_type_value [get_domnode_attribute $domain_type_node v]
267247

268-
if {$domain_type_value ne "Solids"} {
269-
$domNode setAttribute values Dynamic
270-
$domNode setAttribute v Dynamic
271-
set state disabled
272-
} {
273-
$domNode setAttribute values "Dynamic,Static"
274-
set state normal
275-
}
248+
$domNode setAttribute values Dynamic
249+
$domNode setAttribute v Dynamic
250+
set state disabled
251+
276252
}
277253
return $state
278254
}

0 commit comments

Comments
 (0)