Skip to content

Commit fbbf8f7

Browse files
Merge pull request #672 from KratosMultiphysics/rename-xml-controllers
Rename xml controllers
2 parents fe123ac + fd16bfc commit fbbf8f7

36 files changed

Lines changed: 1417 additions & 1417 deletions

kratos.gid/apps/Buoyancy/start.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ proc ::Buoyancy::LoadMyFiles { } {
4141
variable id
4242
variable dir
4343

44-
uplevel #0 [list source [file join $dir xml GetFromXML.tcl]]
44+
uplevel #0 [list source [file join $dir xml XmlController.tcl]]
4545
uplevel #0 [list source [file join $dir write write.tcl]]
4646
uplevel #0 [list source [file join $dir write writeProjectParameters.tcl]]
4747
if {[apps::getActiveAppId] eq $id} {
File renamed without changes.

kratos.gid/apps/CDEM/start.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ proc ::CDEM::Init { } {
3535
proc ::CDEM::LoadMyFiles { } {
3636
variable dir
3737

38-
uplevel #0 [list source [file join $dir xml GetFromXML.tcl]]
38+
uplevel #0 [list source [file join $dir xml XmlController.tcl]]
3939
uplevel #0 [list source [file join $dir xml BulkGroup.tcl]]
4040
uplevel #0 [list source [file join $dir write write.tcl]]
4141
uplevel #0 [list source [file join $dir write writeMDPA_Parts.tcl]]
File renamed without changes.

kratos.gid/apps/ConjugateHeatTransfer/start.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ proc ::ConjugateHeatTransfer::LoadMyFiles { } {
3737
variable id
3838
variable dir
3939

40-
uplevel #0 [list source [file join $dir xml GetFromXML.tcl]]
40+
uplevel #0 [list source [file join $dir xml XmlController.tcl]]
4141
uplevel #0 [list source [file join $dir write write.tcl]]
4242
uplevel #0 [list source [file join $dir write writeProjectParameters.tcl]]
4343
if {[apps::getActiveAppId] eq $id} {

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

File renamed without changes.

kratos.gid/apps/ConvectionDiffusion/start.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ proc ::ConvectionDiffusion::LoadMyFiles { } {
3737
variable dir
3838

3939
#uplevel #0 [list source [file join $dir examples examples.tcl]]
40-
uplevel #0 [list source [file join $dir xml GetFromXML.tcl]]
40+
uplevel #0 [list source [file join $dir xml XmlController.tcl]]
4141
uplevel #0 [list source [file join $dir write write.tcl]]
4242
uplevel #0 [list source [file join $dir write writeProjectParameters.tcl]]
4343
if {[apps::getActiveAppId] eq $id} {

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

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
namespace eval ConvectionDiffusion::xml {
2-
# Namespace variables declaration
3-
variable dir
4-
}
5-
6-
proc ConvectionDiffusion::xml::Init { } {
7-
# Namespace variables inicialization
8-
variable dir
9-
Model::InitVariables dir $ConvectionDiffusion::dir
10-
11-
Model::getSolutionStrategies Strategies.xml
12-
Model::getElements Elements.xml
13-
Model::getMaterials Materials.xml
14-
Model::getNodalConditions NodalConditions.xml
15-
Model::getConstitutiveLaws ConstitutiveLaws.xml
16-
Model::getProcesses "../../Common/xml/Processes.xml"
17-
Model::getProcesses Processes.xml
18-
Model::getConditions Conditions.xml
19-
Model::getSolvers "../../Common/xml/Solvers.xml"
20-
}
21-
22-
proc ConvectionDiffusion::xml::getUniqueName {name} {
23-
return ${::ConvectionDiffusion::prefix}${name}
24-
}
25-
26-
proc ConvectionDiffusion::xml::CustomTree { args } {
27-
set root [customlib::GetBaseRoot]
28-
29-
# Output control in output settings
30-
spdAux::SetValueOnTreeItem v time Results FileLabel
31-
spdAux::SetValueOnTreeItem v time Results OutputControlType
32-
33-
customlib::ProcessIncludes $::Kratos::kratos_private(Path)
34-
spdAux::parseRoutes
35-
36-
# Nodal reactions in output settings
37-
set xpath "[spdAux::getRoute Results]/container\[@n='GiDOutput'\]/container\[@n='OnNodes'\]"
38-
if {[$root selectNodes $xpath] ne ""} {
39-
gid_groups_conds::addF $xpath value [list n REACTION_FLUX pn "Reaction flux" v No values "Yes,No"]
40-
}
41-
42-
# Make line_search appear only with non-linear strategy
43-
[$root selectNodes "[spdAux::getRoute CNVDFFStratParams]/value\[@n='line_search'\]"] setAttribute state "\[checkStateByUniqueName CNVDFFAnalysisType non_linear\]"
44-
}
45-
46-
ConvectionDiffusion::xml::Init
1+
namespace eval ConvectionDiffusion::xml {
2+
# Namespace variables declaration
3+
variable dir
4+
}
5+
6+
proc ConvectionDiffusion::xml::Init { } {
7+
# Namespace variables inicialization
8+
variable dir
9+
Model::InitVariables dir $ConvectionDiffusion::dir
10+
11+
Model::getSolutionStrategies Strategies.xml
12+
Model::getElements Elements.xml
13+
Model::getMaterials Materials.xml
14+
Model::getNodalConditions NodalConditions.xml
15+
Model::getConstitutiveLaws ConstitutiveLaws.xml
16+
Model::getProcesses "../../Common/xml/Processes.xml"
17+
Model::getProcesses Processes.xml
18+
Model::getConditions Conditions.xml
19+
Model::getSolvers "../../Common/xml/Solvers.xml"
20+
}
21+
22+
proc ConvectionDiffusion::xml::getUniqueName {name} {
23+
return ${::ConvectionDiffusion::prefix}${name}
24+
}
25+
26+
proc ConvectionDiffusion::xml::CustomTree { args } {
27+
set root [customlib::GetBaseRoot]
28+
29+
# Output control in output settings
30+
spdAux::SetValueOnTreeItem v time Results FileLabel
31+
spdAux::SetValueOnTreeItem v time Results OutputControlType
32+
33+
customlib::ProcessIncludes $::Kratos::kratos_private(Path)
34+
spdAux::parseRoutes
35+
36+
# Nodal reactions in output settings
37+
set xpath "[spdAux::getRoute Results]/container\[@n='GiDOutput'\]/container\[@n='OnNodes'\]"
38+
if {[$root selectNodes $xpath] ne ""} {
39+
gid_groups_conds::addF $xpath value [list n REACTION_FLUX pn "Reaction flux" v No values "Yes,No"]
40+
}
41+
42+
# Make line_search appear only with non-linear strategy
43+
[$root selectNodes "[spdAux::getRoute CNVDFFStratParams]/value\[@n='line_search'\]"] setAttribute state "\[checkStateByUniqueName CNVDFFAnalysisType non_linear\]"
44+
}
45+
46+
ConvectionDiffusion::xml::Init

kratos.gid/apps/DEM/start.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ proc ::DEM::Init { } {
2828
proc ::DEM::LoadMyFiles { } {
2929
variable dir
3030

31-
uplevel #0 [list source [file join $dir xml GetFromXML.tcl]]
31+
uplevel #0 [list source [file join $dir xml XmlController.tcl]]
3232
uplevel #0 [list source [file join $dir write write.tcl]]
3333
uplevel #0 [list source [file join $dir write writeMDPA_Parts.tcl]]
3434
uplevel #0 [list source [file join $dir write writeMDPA_Inlet.tcl]]

0 commit comments

Comments
 (0)