Skip to content

Commit a954e98

Browse files
jginternationaljginternational
committed
Merge branch 'master' into fluid-write-orchestrator-multistage
2 parents 8a34560 + c88070a commit a954e98

4 files changed

Lines changed: 13 additions & 17 deletions

File tree

‎kratos.gid/apps/ConvectionDiffusion/xml/Conditions.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ConditionList>
3-
<ConditionItem n="HeatFlux2D" pn="External heat flux" ImplementedInFile=".cpp" Interval="True" ImplementedInApplication="ConvectionDiffusionApplication"
3+
<ConditionItem n="HeatFlux2D" pn="External heat flux" ImplementedInFile=".cpp" Interval="Total" ImplementedInApplication="ConvectionDiffusionApplication"
44
MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="1"
55
SkinConditions="True" VariableName="FACE_HEAT_FLUX" App="ConvectionDiffusion" ElementType="Line" ProcessName="AssignScalarVariableProcess"
66
help="Applies an external thermal load" function="1" units="W/m^2" unit_magnitude="Power/L^2">
@@ -15,7 +15,7 @@
1515
<outputs></outputs>
1616
</ConditionItem>
1717

18-
<ConditionItem n="HeatFlux3D" pn="External heat flux" ImplementedInFile=".cpp" Interval="True" ImplementedInApplication="ConvectionDiffusionApplication"
18+
<ConditionItem n="HeatFlux3D" pn="External heat flux" ImplementedInFile=".cpp" Interval="Total" ImplementedInApplication="ConvectionDiffusionApplication"
1919
MinimumKratosVersion="9000" WorkingSpaceDimension="3D" LocalSpaceDimension="2"
2020
SkinConditions="True" VariableName="FACE_HEAT_FLUX" App="ConvectionDiffusion" ElementType="Surface" ProcessName="AssignScalarVariableProcess"
2121
help="Applies an external thermal load" function="1" units="W/m^2" unit_magnitude="Power/L^2">
@@ -31,7 +31,7 @@
3131
<outputs></outputs>
3232
</ConditionItem>
3333

34-
<ConditionItem n="ImposedTemperature2D" pn="Imposed temperature" ImplementedInFile=".cpp" Interval="True" ImplementedInApplication="ConvectionDiffusionApplication"
34+
<ConditionItem n="ImposedTemperature2D" pn="Imposed temperature" ImplementedInFile=".cpp" Interval="Total" ImplementedInApplication="ConvectionDiffusionApplication"
3535
MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="1"
3636
SkinConditions="True" VariableName="TEMPERATURE" App="ConvectionDiffusion" ElementType="Point,Line" ProcessName="AssignScalarVariableProcess"
3737
help="Imposes a fixed temperature" units="K" unit_magnitude="Temp">
@@ -46,7 +46,7 @@
4646
<outputs></outputs>
4747
</ConditionItem>
4848

49-
<ConditionItem n="ImposedTemperature3D" pn="Imposed temperature" ImplementedInFile=".cpp" Interval="True" ImplementedInApplication="ConvectionDiffusionApplication"
49+
<ConditionItem n="ImposedTemperature3D" pn="Imposed temperature" ImplementedInFile=".cpp" Interval="Total" ImplementedInApplication="ConvectionDiffusionApplication"
5050
MinimumKratosVersion="9000" WorkingSpaceDimension="3D" LocalSpaceDimension="2"
5151
SkinConditions="True" VariableName="TEMPERATURE" App="ConvectionDiffusion" ElementType="Point,Line,Surface" ProcessName="AssignScalarVariableProcess"
5252
help="Imposes a fixed temperature" units="K" unit_magnitude="Temp">
@@ -63,7 +63,7 @@
6363
<outputs></outputs>
6464
</ConditionItem>
6565

66-
<ConditionItem n="ThermalFace2D" pn="Thermal face conditions" ImplementedInFile=".cpp" Interval="True" ImplementedInApplication="ConvectionDiffusionApplication"
66+
<ConditionItem n="ThermalFace2D" pn="Thermal face conditions" ImplementedInFile=".cpp" Interval="Total" ImplementedInApplication="ConvectionDiffusionApplication"
6767
MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="1"
6868
SkinConditions="True" App="ConvectionDiffusion" ElementType="Line" ProcessName="ApplyThermalFaceProcess"
6969
help="Assigns the thermal behaviour of the boundary. If it is not set, adiabatic behaviour is assumed">
@@ -77,7 +77,7 @@
7777
<outputs></outputs>
7878
</ConditionItem>
7979

80-
<ConditionItem n="ThermalFace3D" pn="Thermal face conditions" ImplementedInFile=".cpp" Interval="True" ImplementedInApplication="ConvectionDiffusionApplication"
80+
<ConditionItem n="ThermalFace3D" pn="Thermal face conditions" ImplementedInFile=".cpp" Interval="Total" ImplementedInApplication="ConvectionDiffusionApplication"
8181
MinimumKratosVersion="9000" WorkingSpaceDimension="3D" LocalSpaceDimension="2"
8282
SkinConditions="True" App="ConvectionDiffusion" ElementType="Surface" ProcessName="ApplyThermalFaceProcess"
8383
help="Assigns the thermal behaviour of the boundary. If it is not set, adiabatic behaviour is assumed">

‎kratos.gid/apps/FreeSurface/xml/Main.spd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
<include n="SolutionStrategy" active="1" path="apps/Fluid/xml/SolutionStrategy.spd"/>
1010
<include n="Results" active="1" un="FLResults" path="apps/Common/xml/Results.spd"/>
1111
<include n="GenericSubModelPart" active="1" path="apps/Common/xml/GenericSubModelPart.spd"/>
12-
<include n="Materials" active="1" path="apps/Fluid/xml/Materials.spd"/>
13-
</container>
12+
<include n="Materials" active="0" path="apps/Fluid/xml/Materials.spd"/>
13+
</container>

‎kratos.gid/apps/FreeSurface/xml/Parts.spd‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,5 @@
22

33
<condition n="FluidParts" pn="Parts" ov="[CheckGeometry 1]" icon="reservoir16" help="Select your group" un="FLParts" update_proc="UpdateParts">
44
<value n="Element" pn="Element" v="" dict="[GetElements]" actualize="1" values="" state="hidden">
5-
<dependencies node="../value[@n!='Material']" actualize="1"/>
6-
</value>
7-
<value n="ConstitutiveLaw" pn="Fluid type" v="" actualize_tree="1" values="[GetConstitutiveLaws]" state="hidden" dict="[GetAllConstitutiveLaws]">
8-
<dependencies node="../value[@n!='Material']" actualize="1"/>
9-
</value>
10-
<value n="Material" pn="Material" state="hidden" help="Choose a material from the database" v="Air" values="[GetMaterialsList]">
11-
<edit_command n="Edit materials" pn="Edit materials" icon="refresh.png" proc='EditDatabaseList'/>
125
</value>
136
</condition>

‎kratos.gid/apps/FreeSurface/xml/XmlController.tcl‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ proc ::FreeSurface::xml::Init { } {
2020
Model::getConditions Conditions.xml
2121

2222

23-
# Remove No splip
23+
# Remove No slip
2424
Model::ForgetCondition NoSlip2D
2525
Model::ForgetCondition NoSlip3D
26+
# Remove Wall Law
27+
Model::ForgetCondition WallLaw2D
28+
Model::ForgetCondition WallLaw3D
2629
}
2730

2831
proc ::FreeSurface::xml::getUniqueName {name} {
@@ -40,7 +43,7 @@ proc ::FreeSurface::xml::CustomTree { args } {
4043
spdAux::SetValueOnTreeItem v 9.8 FLGravity GravityValue
4144

4245
set root [customlib::GetBaseRoot]
43-
foreach {n pn} [list LIN_DARCY_COEF "Linear darcy coefficient" NONLIN_DARCY_COEF "Nonlinear darcy coefficient" POROSITY "Porosity" BODY_FORCE "Body force"] {
46+
foreach {n pn} [list LIN_DARCY_COEF "Linear darcy coefficient" NONLIN_DARCY_COEF "Nonlinear darcy coefficient" POROSITY "Porosity"] {
4447
if {[$root selectNodes "[spdAux::getRoute NodalResults]/value\[@n='$n'\]"] eq ""} {
4548
gid_groups_conds::addF [spdAux::getRoute NodalResults] value [list n $n pn $pn v Yes values "Yes,No"]
4649
}

0 commit comments

Comments
 (0)