Skip to content

Commit e250fe9

Browse files
committed
Merge branch 'master' into shallow-water-ptype
2 parents 7f7bafe + 8ca49fb commit e250fe9

4 files changed

Lines changed: 3 additions & 5 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ proc ::Fluid::xml::CreateNewInlet { base_group_name {interval_data {new true nam
9191
W "Warning - Couldn't find property Inlet $prop"
9292
}
9393
}
94-
9594
}
9695

97-
9896
proc ::Fluid::xml::ClearInlets { delete_groups {fluid_conditions_UN FLBC} {inlet_condition_name_base AutomaticInlet} } {
9997

10098
set nd $::Model::SpatialDimension

kratos.gid/apps/PfemFluid/examples/WaterDamBreak.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ proc ::PfemFluid::examples::WaterDamBreak::Init {args} {
1313

1414
Kratos::ResetModel
1515
DrawGeometry$::Model::SpatialDimension
16-
AssignGroupsGeometry$::Model::SpatialDimension
16+
AssignGroups$::Model::SpatialDimension
1717
TreeAssignation$::Model::SpatialDimension
1818

1919
GiD_Process 'Redraw

kratos.gid/apps/PfemFluid/write/write.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ proc PfemFluid::write::writeMeshes { } {
6464

6565

6666
proc PfemFluid::write::writeNodalConditions { keyword } {
67-
write::writeNodalConditions $keyword
67+
::write::writeNodalConditions $keyword
6868
}
6969

7070
proc PfemFluid::write::GetPartsUN { } {

kratos.gid/scripts/Controllers/TreeInjections.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ proc spdAux::_injectCondsToTree {basenode cond_list {cond_type "normal"} args }
253253
append node [GetParameterValueString $in $forcedParams $cnd]
254254
}
255255
set CondUsesIntervals [$cnd getAttribute "Interval"]
256-
if {$app_uses_intervals && $CondUsesIntervals ne "False"} {
256+
if {$app_uses_intervals && ![write::isBooleanFalse $CondUsesIntervals]} {
257257
set state normal
258258
if {$initial_conds_flag} {
259259
set CondUsesIntervals Initial

0 commit comments

Comments
 (0)