Merge pull request #1006 from KratosMultiphysics/dam/assign_scalar_variable_process

[Dam] Changes needed by the Kratos PR #13472

Author: djvicente

kratos.gid/apps/Dam/examples/ThermoMechaDam2D.tcl

@@ -154,23 +154,23 @@ proc ::Dam::examples::ThermoMechaDam2D::TreeAssignation {args} {
         # Surface Temperature
         set temperature_base "$damDirichletConditions/condition\[@n='INITIALTEMPERATURE'\]"
         set dam_temperature [customlib::AddConditionGroupOnXPath $temperature_base Dam]
-        set props_dam_temperature [list is_fixed false value 7.5 ]
+        set props_dam_temperature [list constrained false value 7.5 ]
         spdAux::SetValuesOnBaseNode $dam_temperature $props_dam_temperature
 
         set ground_temperature [customlib::AddConditionGroupOnXPath $temperature_base Ground]
-        set props_ground_temperature [list is_fixed false value 7.5 ]
+        set props_ground_temperature [list constrained false value 7.5 ]
         spdAux::SetValuesOnBaseNode $ground_temperature $props_ground_temperature
 
         # Bofang Temperature
         set bofang_temperature "$damDirichletConditions/condition\[@n='BOFANGTEMPERATURE'\]"
         set bofang_temperature_node [customlib::AddConditionGroupOnXPath $bofang_temperature Water]
-        set props_bofang_temperature [list is_fixed 1 Gravity_Direction Y Reservoir_Bottom_Coordinate_in_Gravity_Direction 0.0 Surface_Temp 15.19 Bottom_Temp 9.35 Height_Dam 30.0 Temperature_Amplitude 6.51 Day_Max_Temp 201 Water_level 20.0 Month 7 ]
+        set props_bofang_temperature [list constrained 1 Gravity_Direction Y Reservoir_Bottom_Coordinate_in_Gravity_Direction 0.0 Surface_Temp 15.19 Bottom_Temp 9.35 Height_Dam 30.0 Temperature_Amplitude 6.51 Day_Max_Temp 201 Water_level 20.0 Month 7 ]
         spdAux::SetValuesOnBaseNode $bofang_temperature_node $props_bofang_temperature
 
         # Uniform Temperature
         set uniform_temperature "$damDirichletConditions/condition\[@n='INITIALTEMPERATURE'\]"
         set uniform_temperature_node [customlib::AddConditionGroupOnXPath $uniform_temperature UniformTemperature]
-        set props_uniform_temperature [list is_fixed true value 10.0 ]
+        set props_uniform_temperature [list constrained true value 10.0 ]
         spdAux::SetValuesOnBaseNode $uniform_temperature_node $props_uniform_temperature
 
 

kratos.gid/apps/Dam/examples/ThermoMechaDam3D.tcl

@@ -159,17 +159,17 @@ proc ::Dam::examples::ThermoMechaDam3D::TreeAssignation {args} {
         # Surface Temperature
         set temperature_base "$damDirichletConditions/condition\[@n='INITIALTEMPERATURE'\]"
         set dam_temperature [customlib::AddConditionGroupOnXPath $temperature_base Dam]
-        set props_dam_temperature [list is_fixed false value 7.5 ]
+        set props_dam_temperature [list constrained false value 7.5 ]
         spdAux::SetValuesOnBaseNode $dam_temperature $props_dam_temperature
 
         set ground_temperature [customlib::AddConditionGroupOnXPath $temperature_base Ground]
-        set props_ground_temperature [list is_fixed false value 7.5 ]
+        set props_ground_temperature [list constrained false value 7.5 ]
         spdAux::SetValuesOnBaseNode $ground_temperature $props_ground_temperature
 
         # Constant Temperature
         set water_path "$damDirichletConditions/condition\[@n='CONSTANTRESERVOIRTEMPERATURE'\]"
         set water_node [customlib::AddConditionGroupOnXPath $water_path Water]
-        set props_water [list is_fixed true Gravity_Direction Z Reservoir_Bottom_Coordinate_in_Gravity_Direction 0.0 Water_temp 6 Water_level 15]
+        set props_water [list constrained true Gravity_Direction Z Reservoir_Bottom_Coordinate_in_Gravity_Direction 0.0 Water_temp 6 Water_level 15]
         spdAux::SetValuesOnBaseNode $water_node $props_water
 
     # Load Conditions

kratos.gid/apps/Dam/write/writeProjectParameters.tcl

@@ -887,7 +887,7 @@ proc ::Dam::write::TemperaturebyDevices { } {
 
             set name [$node @name]
 
-            set xp2 "[spdAux::getRoute DamTempDevice]/blockdata\[@name='$name'\]/value\[@n='is_fixed'\]"
+            set xp2 "[spdAux::getRoute DamTempDevice]/blockdata\[@name='$name'\]/value\[@n='constrained'\]"
             set node_xp2 [$root selectNodes $xp2]
             set isfixed [get_domnode_attribute $node_xp2 v]
 
@@ -915,7 +915,7 @@ proc ::Dam::write::TemperaturebyDevices { } {
             set positionList [list ]
             dict set parameterDict model_part_name "MainModelPart"
             dict set parameterDict variable_name "TEMPERATURE"
-            dict set parameterDict is_fixed $isfixed
+            dict set parameterDict constrained $isfixed
             dict set parameterDict value $value
 
             if {$fileid ni [list "" "- No file" $::spdAux::no_file_string]} {

kratos.gid/apps/Dam/xml/Processes.xml

@@ -6,7 +6,7 @@
   <Process n="ApplyConstraintVectorDamTableProcess" pn="Impose vector value by components process" python_module="apply_constraint_vector_dam_table_process"
 		kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the selected components of a given vector variable">
     <inputs>
-		    <parameter n="is_fixed" pn="Imposed" type="vector" vectorType="bool" v="1,1,1"/>
+		    <parameter n="constrained" pn="Imposed" type="vector" vectorType="bool" v="1,1,1"/>
         <parameter n="value" pn="Value" type="vector" v="0.0,0.0,0.0"/>
         <parameter n="Value_Table" pn="Value table filename" type="vector" vectorType="tablefile" v=""/>
     </inputs>
@@ -16,7 +16,7 @@
   <Process n="ImposeUniformPressureProcess" pn="Impose uniform value of pressure by process" python_module="impose_uniform_temperature_process"
 		kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
     <inputs>
-		    <parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
+		    <parameter n="constrained" pn="Imposed" type="bool" v="1"/>
         <parameter n="value" pn="Value" type="double" v="0.0"/>
         <parameter n="table" pn="Pressure table filename" type="tablefile" v=""/>
     </inputs>
@@ -26,7 +26,7 @@
   <Process n="ImposeUniformTemperatureProcess" pn="Impose uniform value of temperature by process" python_module="impose_uniform_temperature_process"
 		kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
     <inputs>
-		    <parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
+		    <parameter n="constrained" pn="Imposed" type="bool" v="1"/>
         <parameter n="value" pn="Value" type="double" v="0.0"/>
         <parameter n="table" pn="Uniform Temperature table filename" type="tablefile" v=""/>
     </inputs>
@@ -36,7 +36,7 @@
   <Process n="ImposeBofangConditionProcess" pn="Impose Bofang scalar field value" python_module="impose_reservoir_temperature_condition_process"
 		kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
     <inputs>
-		<parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
+		<parameter n="constrained" pn="Imposed" type="bool" v="1"/>
         <parameter n="Gravity_Direction" pn="Gravity Direction" type="combo" v="Z" values="X,Y,Z" />
         <parameter n="Reservoir_Bottom_Coordinate_in_Gravity_Direction" pn="Reservoir Bottom Coordinate in Gravity Direction" type="double" v="0.0"/>
         <parameter n="Surface_Temp" pn="Surface Temperature" type="double" v="0.0"/>
@@ -55,7 +55,7 @@
   <Process n="ImposeReservoirConstantTemperatureConditionProcess" pn="Impose constant reservoir temperature value" python_module="impose_reservoir_temperature_condition_process"
 		kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
     <inputs>
-        <parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
+        <parameter n="constrained" pn="Imposed" type="bool" v="1"/>
         <parameter n="Gravity_Direction" pn="Gravity Direction" type="combo" v="Z" values="X,Y,Z" />
         <parameter n="Reservoir_Bottom_Coordinate_in_Gravity_Direction" pn="Reservoir Bottom Coordinate in Gravity Direction" type="double" v="0.0"/>
         <parameter n="Water_temp" pn="Water Temperature" type="double" v="0.0"/>
@@ -69,7 +69,7 @@
   <Process n="ImposeReservoirMonitoringTemperatureConditionProcess" pn="Impose constant reservoir temperature value" python_module="impose_reservoir_temperature_condition_process"
 		kratos_module="KratosMultiphysics.DamApplication" help="This process fixes the given scalar variable">
     <inputs>
-        <parameter n="is_fixed" pn="Imposed" type="bool" v="1"/>
+        <parameter n="constrained" pn="Imposed" type="bool" v="1"/>
         <parameter n="Gravity_Direction" pn="Gravity Direction" type="combo" v="Z" values="X,Y,Z" />
         <parameter n="Reservoir_Bottom_Coordinate_in_Gravity_Direction" pn="Reservoir Bottom Coordinate in Gravity Direction" type="double" v="0.0"/>
         <parameter n="Height_Dam" pn="Height Dam" type="double" v="0.0"/>

kratos.gid/apps/Dam/xml/Utilities.spd

@@ -84,7 +84,7 @@
     <container n="TemperatureDevice" pn="Temperature Device" ProcessName="ImposeTemperaturebyDeviceProcess" un="DamTempDevice" icon="temp_device" open_window="0">
         <value n="DeviceTemperatureState" pn="Device State" un="DamTemperatureState" v="False" values="True,False" actualize_tree="1"/>
         <blockdata n="device" pn="Device" name="Device 1" state="[HideIfUniqueName DamTemperatureState False]" sequence="1" editable_name="unique" help="Interval">
-            <value n="is_fixed" pn="Imposed" actualize_tree="1" type="bool" v="true" values="true,false" />
+            <value n="constrained" pn="Imposed" actualize_tree="1" type="bool" v="true" values="true,false" />
             <value n="value" pn="Value" type="double" v="0.0" />
             <value n="table" pn="Temperature table filename" type="tablefile" v="" values = "[GetFilesValues]" update_proc = "AddFile" />
             <value n="XPosition" pn="X Position" actualize_tree="1" type="double" v="0.0" />