Merge branch 'master' into feature/increase-logs

Author: jginternational

kratos.gid/apps/Buoyancy/xml/Parts.spd

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <container n="DEM" pn="DEM" icon="units" prefix="DEM" tree_state="open" open_window="0">
+  <container n="CDEM" pn="CDEM" icon="units" prefix="DEM" tree_state="open" open_window="0">
     <include n="StageInfo"        active="1" path="apps/DEM/xml/StageInfo.spd"/>
     <include n="PartsCont"        active="1" path="apps/CDEM/xml/PartsCont.spd"   un="DEMParts"/>
     <include n="Conditions"       active="1" path="apps/DEM/xml/Conditions.spd"/>

kratos.gid/apps/CDEM/xml/Main.spd

@@ -41,6 +41,7 @@
                 <value n="GlobalDamping"                        v="0.0"         pn="Global damping"                       icon="black1"                               help="Choose the value for the damping. Set it to 1.0 for maximum energy dissipation."/>
                 <value n="AmplifiedSearchRadius"                v="1.1"         pn="AmplifiedSearchRadius"                icon="black1" state="hidden" />
                 <!-- <value n="NeighbourSearchAcceptedGap"          v="1.0"             pn="NeighbourSearchAcceptedGap" icon="black1"/> -->
+                <value n="SearchTolerance"                      v="0.001"       pn="Search tolerance"                     icon="black1"                               help="Minimum tolerance to avoid initial overlaps"/>
         </container>
         <container     n="TestMaterial"                 un="DEMTestMaterial"    pn="Material Analysis"    help="Testing specimens under certain pressure conditions" icon="black1" open_window="0">
                 <value n="Active"                       v="false" type="bool"   pn="Activate"             values="true,false" icon="black1"/>

kratos.gid/apps/CDEM/xml/SolutionStrategy.spd

@@ -6,7 +6,7 @@
 
         <container n="Fluid" pn="Fluid" icon="units" prefix="FL" tree_state="open" open_window="0">
             <include n="AnalysisType" active="1" path="apps/Fluid/xml/AnalysisType.spd"/>
-            <include n="Parts" active="1" un="FLParts" path="apps/Buoyancy/xml/Parts.spd"/>
+            <include n="Parts" active="1" un="FLParts" path="apps/Fluid/xml/Parts.spd"/>
             <include n="InitialConditions" active="1" path="apps/Fluid/xml/InitialConditions.spd"/>
             <include n="BoundaryConditions" active="1" path="apps/Fluid/xml/BoundaryConditions.spd"/>
             <include n="SolutionStrategy" active="1" path="apps/Buoyancy/xml/SolutionStrategyFluid.spd"/>

kratos.gid/apps/ConjugateHeatTransfer/xml/Main.spd

@@ -8,11 +8,8 @@ proc ConjugateHeatTransfer::xml::Init { } {
     variable dir
     Model::InitVariables dir $ConjugateHeatTransfer::dir
 
-    Model::getProcesses Processes.xml
     Model::getConditions Conditions.xml
-
     Model::getMaterials "../../ConvectionDiffusion/xml/Materials.xml"
-
     Model::getConstitutiveLaws "../../ConvectionDiffusion/xml/ConstitutiveLaws.xml"
 }
 

kratos.gid/apps/ConjugateHeatTransfer/xml/Processes.xml

@@ -877,7 +877,7 @@ proc spdAux::ProcConditionParameterState {domNode args} {
             set parent_dependency_node [$domNode selectNodes "../value\[@n='$depN'\]"]
             set current_parent_dep_state [$parent_dependency_node getAttribute cal_state ""]
             if {$current_parent_dep_state eq ""} {
-                set current_parent_dep_state [get_domnode_attribute $current_parent_dep_state state]
+                set current_parent_dep_state [get_domnode_attribute $parent_dependency_node state]
             }
             set realV [get_domnode_attribute $parent_dependency_node v]
             if {$realV ni $depV || $current_parent_dep_state eq "hidden"} {set ret hidden}

kratos.gid/apps/ConjugateHeatTransfer/xml/XmlController.tcl

@@ -434,7 +434,7 @@ proc spdAux::_GetBooleanParameterString {param inName pn v state help show_in_wi
         append node " actualize_tree='1' "
     }
     append node " state='$state' show_in_window='$show_in_window'>"
-    # if {$base ne ""} {append node [_insert_cond_param_dependencies $base $inName]}
+    if {$base ne ""} {append node [_insert_cond_param_dependencies $base $inName]}
     append node "</value>"
     return $node
 }
@@ -453,7 +453,7 @@ proc spdAux::_GetComboParameterString {param inName pn v state help show_in_wind
         append node "  actualize_tree='1'  "
     }
     append node " state='$state' help='$help' show_in_window='$show_in_window'>"
-    # if {$base ne ""} { append node [_insert_cond_param_dependencies $base $inName] }
+    if {$base ne ""} { append node [_insert_cond_param_dependencies $base $inName] }
     append node "</value>"
     return $node
 }
@@ -476,6 +476,7 @@ proc spdAux::_insert_cond_param_dependencies {base param_name} {
         }
     }
     set ret ""
+    
     foreach {name values} $dep_list {
         set ins ""
         set out ""

kratos.gid/scripts/Controllers/CommonProcs.tcl

@@ -262,6 +262,7 @@ proc spdAux::insertDependencies { baseNode originUN } {
     set insertxpath [getRoute $originUN]
     set insertonnode [$root selectNodes $insertxpath]
     # a lo bestia, cambiar cuando sepamos inyectar la dependencia, abajo esta a medias
+    $insertonnode setAttribute "actualize" 1
     $insertonnode setAttribute "actualize_tree" 1
 
     ## Aun no soy capaz de insertar y que funcione