Skip to content

Commit 4424334

Browse files
jginternationaljginternational
committed
Rename FSI Files
1 parent 397b1f3 commit 4424334

2 files changed

Lines changed: 88 additions & 88 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ proc ::FSI::Init { } {
3939
proc ::FSI::LoadMyFiles { } {
4040
variable dir
4141

42-
uplevel #0 [list source [file join $dir xml GetFromXML.tcl]]
42+
uplevel #0 [list source [file join $dir xml XmlController.tcl]]
4343
uplevel #0 [list source [file join $dir write write.tcl]]
4444
uplevel #0 [list source [file join $dir write writeProjectParameters.tcl]]
4545
uplevel #0 [list source [file join $FSI::dir examples examples.tcl]]

kratos.gid/apps/FSI/xml/GetFromXML.tcl renamed to kratos.gid/apps/FSI/xml/XmlController.tcl

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
1-
namespace eval FSI::xml {
2-
# Namespace variables declaration
3-
variable dir
4-
}
5-
6-
proc FSI::xml::Init { } {
7-
# Namespace variables initialization
8-
variable dir
9-
Model::InitVariables dir $FSI::dir
10-
11-
Model::ForgetSolutionStrategies
12-
Model::getSolutionStrategies "../../Fluid/xml/Strategies.xml"
13-
Model::getSolutionStrategies "../../Structural/xml/Strategies.xml"
14-
#Model::ForgetSolutionStrategy Eigen
15-
Model::getSolutionStrategies Strategies.xml
16-
Model::getConditions Conditions.xml
17-
18-
Model::ForgetSolvers
19-
Model::getSolvers "../../Common/xml/Solvers.xml"
20-
Model::getSolvers "../../Structural/xml/Solvers.xml"
21-
Model::getSolvers Coupling_solvers.xml
22-
}
23-
24-
proc FSI::xml::getUniqueName {name} {
25-
return ${::FSI::prefix}${name}
26-
}
27-
28-
proc ::FSI::xml::MultiAppEvent {args} {
29-
if {$args eq "init"} {
30-
::Structural::xml::MultiAppEvent init
31-
}
32-
}
33-
34-
35-
proc FSI::xml::CustomTree { args } {
36-
FSI::write::UpdateUniqueNames Fluid
37-
apps::setActiveAppSoft Fluid
38-
Fluid::xml::CustomTree
39-
40-
FSI::write::UpdateUniqueNames Structural
41-
apps::setActiveAppSoft Structural
42-
Structural::xml::CustomTree
43-
44-
FSI::write::UpdateUniqueNames FSI
45-
apps::setActiveAppSoft FSI
46-
47-
# Modify the tree: field newValue UniqueName OptionalChild
48-
spdAux::SetValueOnTreeItem v "Monolithic" FLSolStrat
49-
spdAux::SetValueOnTreeItem v "Yes" FLStratParams compute_reactions
50-
51-
# Remove Eigen
52-
#spdAux::SetValueOnTreeItem values "Static,Quasi-static,Dynamic,formfinding" STSoluType
53-
54-
55-
# Disable MPI parallelism until it is fully tested
56-
#spdAux::SetValueOnTreeItem values "OpenMP" ParallelType
57-
58-
# Mesh movement results in fluid output settings
59-
set root [customlib::GetBaseRoot]
60-
if {[$root selectNodes "[spdAux::getRoute FLResults]/container\[@n='OnNodes'\]"] ne ""} {
61-
gid_groups_conds::addF "[spdAux::getRoute FLResults]/container\[@n='OnNodes'\]" value [list n MESH_DISPLACEMENT pn "Mesh displacement" v Yes values "Yes,No"]
62-
gid_groups_conds::addF "[spdAux::getRoute FLResults]/container\[@n='OnNodes'\]" value [list n MESH_VELOCITY pn "Mesh velocity" v No values "Yes,No"]
63-
}
64-
}
65-
66-
# Overwriting some procs
67-
proc spdAux::injectNodalConditionsOutputs {basenode args} {
68-
set base [$basenode parent]
69-
set args {*}$args
70-
if {$args eq ""} {
71-
set app [apps::getAppById [spdAux::GetAppIdFromNode $base]]
72-
set args [list ImplementedInApplication [join [$app getKratosApplicationName] ","]]
73-
}
74-
return [spdAux::injectNodalConditionsOutputs_do $basenode $args]
75-
}
76-
77-
proc spdAux::injectElementOutputs {basenode args} {
78-
set base [$basenode parent]
79-
set args {*}$args
80-
if {$args eq ""} {
81-
set app [apps::getAppById [spdAux::GetAppIdFromNode $base]]
82-
set args [list ImplementedInApplication [join [$app getKratosApplicationName] ","]]
83-
}
84-
return [spdAux::injectElementOutputs_do $basenode $args]
85-
}
86-
87-
FSI::xml::Init
1+
namespace eval FSI::xml {
2+
# Namespace variables declaration
3+
variable dir
4+
}
5+
6+
proc FSI::xml::Init { } {
7+
# Namespace variables initialization
8+
variable dir
9+
Model::InitVariables dir $FSI::dir
10+
11+
Model::ForgetSolutionStrategies
12+
Model::getSolutionStrategies "../../Fluid/xml/Strategies.xml"
13+
Model::getSolutionStrategies "../../Structural/xml/Strategies.xml"
14+
#Model::ForgetSolutionStrategy Eigen
15+
Model::getSolutionStrategies Strategies.xml
16+
Model::getConditions Conditions.xml
17+
18+
Model::ForgetSolvers
19+
Model::getSolvers "../../Common/xml/Solvers.xml"
20+
Model::getSolvers "../../Structural/xml/Solvers.xml"
21+
Model::getSolvers Coupling_solvers.xml
22+
}
23+
24+
proc FSI::xml::getUniqueName {name} {
25+
return ${::FSI::prefix}${name}
26+
}
27+
28+
proc ::FSI::xml::MultiAppEvent {args} {
29+
if {$args eq "init"} {
30+
::Structural::xml::MultiAppEvent init
31+
}
32+
}
33+
34+
35+
proc FSI::xml::CustomTree { args } {
36+
FSI::write::UpdateUniqueNames Fluid
37+
apps::setActiveAppSoft Fluid
38+
Fluid::xml::CustomTree
39+
40+
FSI::write::UpdateUniqueNames Structural
41+
apps::setActiveAppSoft Structural
42+
Structural::xml::CustomTree
43+
44+
FSI::write::UpdateUniqueNames FSI
45+
apps::setActiveAppSoft FSI
46+
47+
# Modify the tree: field newValue UniqueName OptionalChild
48+
spdAux::SetValueOnTreeItem v "Monolithic" FLSolStrat
49+
spdAux::SetValueOnTreeItem v "Yes" FLStratParams compute_reactions
50+
51+
# Remove Eigen
52+
#spdAux::SetValueOnTreeItem values "Static,Quasi-static,Dynamic,formfinding" STSoluType
53+
54+
55+
# Disable MPI parallelism until it is fully tested
56+
#spdAux::SetValueOnTreeItem values "OpenMP" ParallelType
57+
58+
# Mesh movement results in fluid output settings
59+
set root [customlib::GetBaseRoot]
60+
if {[$root selectNodes "[spdAux::getRoute FLResults]/container\[@n='OnNodes'\]"] ne ""} {
61+
gid_groups_conds::addF "[spdAux::getRoute FLResults]/container\[@n='OnNodes'\]" value [list n MESH_DISPLACEMENT pn "Mesh displacement" v Yes values "Yes,No"]
62+
gid_groups_conds::addF "[spdAux::getRoute FLResults]/container\[@n='OnNodes'\]" value [list n MESH_VELOCITY pn "Mesh velocity" v No values "Yes,No"]
63+
}
64+
}
65+
66+
# Overwriting some procs
67+
proc spdAux::injectNodalConditionsOutputs {basenode args} {
68+
set base [$basenode parent]
69+
set args {*}$args
70+
if {$args eq ""} {
71+
set app [apps::getAppById [spdAux::GetAppIdFromNode $base]]
72+
set args [list ImplementedInApplication [join [$app getKratosApplicationName] ","]]
73+
}
74+
return [spdAux::injectNodalConditionsOutputs_do $basenode $args]
75+
}
76+
77+
proc spdAux::injectElementOutputs {basenode args} {
78+
set base [$basenode parent]
79+
set args {*}$args
80+
if {$args eq ""} {
81+
set app [apps::getAppById [spdAux::GetAppIdFromNode $base]]
82+
set args [list ImplementedInApplication [join [$app getKratosApplicationName] ","]]
83+
}
84+
return [spdAux::injectElementOutputs_do $basenode $args]
85+
}
86+
87+
FSI::xml::Init

0 commit comments

Comments
 (0)