Skip to content

Commit 1157c1b

Browse files
miguelmasomiguelmaso
committed
Merge branch 'shallow-water-ptype' of https://github.com/KratosMultiphysics/GiDInterface into shallow-water-ptype
2 parents b57baae + e250fe9 commit 1157c1b

7 files changed

Lines changed: 32 additions & 14 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/apps/ShallowWater/write/writeProjectParameters.tcl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ proc ::ShallowWater::write::GetSolverSettingsDict { } {
7171

7272
# Time stepping settings
7373
set timeSteppingDict [dict create]
74+
dict set timeSteppingDict automatic_time_step [write::getValue SWAutomaticDeltaTime]
7475
if {[write::getValue SWAutomaticDeltaTime] eq "Yes"} {
7576
dict set timeSteppingDict courant_number [write::getValue SWTimeParameters CFLNumber]
7677
dict set timeSteppingDict maximum_delta_time [write::getValue SWTimeParameters MaximumDeltaTime]

‎kratos.gid/apps/ShallowWater/xml/NodalConditions.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@
99
ImplementedInApplication="ShallowWaterApplication"
1010
Interval="Initial">
1111
</NodalConditionItem>
12+
<NodalConditionItem
13+
n="InitialPerturbation"
14+
pn="Initial perturbation"
15+
ProcessName="InitialPerturbationProcess"
16+
App="ShallowWater"
17+
Type="Initial"
18+
ImplementedInApplication="ShallowWaterApplication"
19+
Interval="Initial">
20+
</NodalConditionItem>
1221
<NodalConditionItem
1322
n="Topography"
1423
pn="Topography"

‎kratos.gid/apps/ShallowWater/xml/Processes.xml‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,38 @@
22

33
<ProcessList>
44

5-
<Process n="ApplySlipProcess" pn="Slip" python_module="apply_slip_process" kratos_module="KratosMultiphysics.ShallowWaterApplication" help="">
5+
<Process n="ApplySlipProcess" pn="slip process" python_module="apply_slip_process" kratos_module="KratosMultiphysics.ShallowWaterApplication" help="">
66
<inputs>
77
</inputs>
88
</Process>
99

10-
<Process n="InitialWaterLevelProcess" pn="Initial condition process" python_module="set_initial_water_level_process" kratos_module="KratosMultiphysics.ShallowWaterApplication" help="">
10+
<Process n="InitialWaterLevelProcess" pn="water level process" python_module="set_initial_water_level_process" kratos_module="KratosMultiphysics.ShallowWaterApplication" help="">
1111
<inputs>
12-
<parameter n="variable_name" pn="Variable name" type="combo" values="HEIGHT,FREE_SURFACE_ELEVATION" v="HEIGHT" />
13-
<parameter n="constrained" pn="Constrained" type="bool" v="0" />
14-
<parameter n="value" pn="Value" function="1" v="0.0" has_units="1"/>
15-
<parameter n="set_minimum_height" pn="Set minimum height" type="bool" v="1" />
16-
<parameter n="minimum_height_value" pn="Minimum height values" type="double" v="1e-3" />
12+
<parameter n="variable_name" pn="Variable name" type="combo" values="HEIGHT,FREE_SURFACE_ELEVATION" v="HEIGHT"/>
13+
<parameter n="value" pn="Value" function="1" fv="z" v="0.0" has_units="1"/>
14+
<parameter n="set_minimum_height" pn="Set minimum height" type="bool" v="1"/>
15+
<parameter n="minimum_height_value" pn="Minimum height value" type="double" v="1e-3"/>
16+
</inputs>
17+
</Process>
18+
19+
<Process n="InitialPerturbationProcess" pn="perturbation process" python_module="set_initial_perturbation_process" kratos_module="KratosMultiphysics.ShallowWaterApplication" help="">
20+
<inputs>
21+
<parameter n="variable_name" pn="Variable name" type="combo" values="HEIGHT,FREE_SURFACE_ELEVATION" v="HEIGHT"/>
22+
<parameter n="maximum_perturbation_value" pn="Maximum value" type="double" v="1.0" has_units="0"/>
23+
<parameter n="distance_of_influence" pn="Distance of influence" type="double" v="1.0"/>
24+
<parameter n="default_value" pn="Default value" type="double" v="0.0"/>
25+
<parameter n="source_type" pn="Source type" type="combo" values="coordinates,model part" v="coordinates"/>
26+
<parameter n="source_coordinates" pn="Coordinates" type="vector" v="0.0,0.0,0.0"/>
1727
</inputs>
1828
</Process>
1929

20-
<Process n="TopographyProcess" pn="Topography process" python_module="set_topography_process" kratos_module="KratosMultiphysics.ShallowWaterApplication" help="">
30+
<Process n="TopographyProcess" pn="topography process" python_module="set_topography_process" kratos_module="KratosMultiphysics.ShallowWaterApplication" help="">
2131
<inputs>
2232
<parameter n="value" pn="Value" type="double" function="1" v="0.0" fv="z" has_units="1"/>
2333
</inputs>
2434
</Process>
2535

26-
<Process n="ApplyConstantScalarValueProcess" pn="Apply constant scalar value process" python_module="process_factory" kratos_module="KratosMultiphysics" process_name="ApplyConstantScalarValueProcess" help="">
36+
<Process n="ApplyConstantScalarValueProcess" pn="scalar process" python_module="process_factory" kratos_module="KratosMultiphysics" process_name="ApplyConstantScalarValueProcess" help="">
2737
<inputs>
2838
<parameter n="variable_name" pn="Variable name" type="combo" values="" v="" />
2939
<parameter n="value" pn="Value" function="1" v="0.0" has_units="1"/>

‎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)