optimization

Author: jginternational

kratos.gid/scripts/Controllers/CommonProcs.tcl

@@ -79,18 +79,18 @@ proc spdAux::ProcGetElementsDict { domNode args } {
 proc spdAux::ProcGetSolutionStrategies {domNode args} {
     set names [list ]
     set pnames [list ]
-    #W $args
-    set Sols [::Model::GetSolutionStrategies {*}$args]
-    #W $Sols
-    foreach ss $Sols {
+    # W $args
+    set sols [::Model::GetSolutionStrategies {*}$args]
+    # W $Sols
+    foreach ss $sols {
         lappend names [$ss getName]
         lappend pnames [$ss getName]
         lappend pnames [$ss getPublicName]
     }
 
     $domNode setAttribute values [join $names ","]
     set dv [lindex $names 0]
-    #W "dv $dv"
+    # W "dv $dv"
     if {[$domNode getAttribute v] eq ""} {$domNode setAttribute v $dv; spdAux::RequestRefresh}
     if {[$domNode getAttribute v] ni $names} {$domNode setAttribute v $dv; spdAux::RequestRefresh}
 
@@ -99,7 +99,7 @@ proc spdAux::ProcGetSolutionStrategies {domNode args} {
 
 proc spdAux::ProcGetSchemes {domNode args} {
     set nodeApp [GetAppIdFromNode $domNode]
-    #W $nodeApp
+    # W $nodeApp
     set sol_stratUN [apps::getAppUniqueName $nodeApp SolStrat]
     set sol_stat_path [spdAux::getRoute $sol_stratUN]
 
@@ -109,6 +109,7 @@ proc spdAux::ProcGetSchemes {domNode args} {
         get_domnode_attribute [$domNode selectNodes $sol_stat_path] values
         #}
     set solStratName [::write::getValue $sol_stratUN]
+    if {$solStratName eq "" } {error "No solution strategy"}
     #W "Unique name: $sol_stratUN - Nombre $solStratName"
     set schemes [::Model::GetAvailableSchemes $solStratName {*}$args]
 

kratos.gid/scripts/Model/Model.tcl

@@ -30,9 +30,7 @@ proc Model::Init { } {
     variable ConstitutiveLaws
     variable Solvers
     variable Processes
-    
-    #set dir $::Kratos::kratos_private(Path)
-    
+        
     set SolutionStrategies [list ]
     set Elements [list ]
     set Materials [list ]
@@ -53,70 +51,42 @@ proc Model::InitVariables {varName varValue} {
 }
 
 proc Model::getSolutionStrategies { SolutionStrategyFileName } {
-    #variable SolutionStrategies
     variable dir
-    
-    #set SolutionStrategies [list ]
     dom parse [tDOM::xmlReadFile [file join $dir xml $SolutionStrategyFileName]] doc
-    
     ParseSolutionStrategies $doc
 }
 
 proc Model::getElements { ElementsFileName } {
-    #variable Elements
     variable dir
-    
-    #set Elements [list ]
     dom parse [tDOM::xmlReadFile [file join $dir xml $ElementsFileName]] doc
-    
     ParseElements $doc
 }
 proc Model::getConditions { ConditionsFileName } {
-    #variable Conditions
     variable dir
-    
-    #set Conditions [list ]
     dom parse [tDOM::xmlReadFile [file join $dir xml $ConditionsFileName]] doc
-    
     ParseConditions $doc
 }
 proc Model::getNodalConditions { NodalConditionsFileName } {
-    #variable NodalConditions
     variable dir
-    
-    #set Conditions [list ]
     dom parse [tDOM::xmlReadFile [file join $dir xml $NodalConditionsFileName]] doc
-    #W [$doc asXML]
     ParseNodalConditions $doc
 }
 
 proc Model::getConstitutiveLaws { ConstitutiveLawsFileName } {
-    #variable ConstitutiveLaws
     variable dir
-    
-    #set ConstitutiveLaws [list ]
     dom parse [tDOM::xmlReadFile [file join $dir xml $ConstitutiveLawsFileName]] doc
-    
     ParseConstitutiveLaws $doc
 }
 
 proc Model::getSolvers { SolversFileName } {
-    #variable Solvers
     variable dir
-    
-    #set Solvers [list ]
     dom parse [tDOM::xmlReadFile [file join $dir xml $SolversFileName]] doc
-    
     ParseSolvers $doc
 }
 
 proc Model::getProcesses { ProcessesFileName } {
-    #variable Processes
     variable dir
-    
-    #set Processes [list ]
     dom parse [tDOM::xmlReadFile [file join $dir xml $ProcessesFileName]] doc
-    
     ParseProcesses $doc
 }
 proc Model::getMaterials { MaterialsFileName } {

kratos.gid/scripts/Model/SolutionStrategy.tcl

@@ -124,9 +124,10 @@ oo::class create SolStrat {
     }
     method cumple {args} {
         set c [next {*}$args]
-
+        # W "[my getName] $c"
         if {$c && ![write::isBooleanFalse [my getAttribute "NeedElements"]]} {
             set c 0
+            # W "[my getName] $c"
             foreach sc [my getSchemes] {
                 if [llength [Model::GetAvailableElements [my getName] [$sc getName]]] {
                     set c 1; break
@@ -361,7 +362,6 @@ proc Model::GetSchemesParams {args} {
 
 proc Model::GetAvailableElements {solutionStrategyId schemeId} {
     variable Elements
-    variable SolutionStrategies
     #W "GetAvailableElements ss $solutionStrategyId sch $schemeId"
     set cumplen [list ]
     set solst [Model::GetSolutionStrategy $solutionStrategyId]
@@ -387,7 +387,6 @@ proc Model::GetAvailableElements {solutionStrategyId schemeId} {
 
 proc Model::GetAvailableConditions {solutionStrategyId schemeId} {
     variable Conditions
-    variable SolutionStrategies
 
     set cumplen [list ]
     #W $solutionStrategyId