Skip to content

Commit 5c857e1

Browse files
joaquinirazabaljoaquinirazabal
committed
Correct some problems
1 parent ed011e5 commit 5c857e1

4 files changed

Lines changed: 41 additions & 95 deletions

File tree

‎kratos.gid/apps/FreeSurface/examples/Box.tcl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,12 @@ proc ::FreeSurface::examples::Box::TreeAssignation2D {args} {
108108
set fluidConditions [spdAux::getRoute "FLNodalConditions"]
109109
[customlib::AddConditionGroupOnXPath "$fluidConditions/condition\[@n='DISTANCE'\]" Inlet] setAttribute ov line
110110
[customlib::AddConditionGroupOnXPath "$fluidConditions/condition\[@n='DISTANCE'\]" Surface_Bottom] setAttribute ov surface
111-
111+
[customlib::AddConditionGroupOnXPath "$fluidConditions/condition\[@n='LIN_DARCY_COEF'\]" Inlet] setAttribute ov line
112+
[customlib::AddConditionGroupOnXPath "$fluidConditions/condition\[@n='LIN_DARCY_COEF'\]" Surface_Bottom] setAttribute ov surface
113+
[customlib::AddConditionGroupOnXPath "$fluidConditions/condition\[@n='NONLIN_DARCY_COEF'\]" Inlet] setAttribute ov line
114+
[customlib::AddConditionGroupOnXPath "$fluidConditions/condition\[@n='NONLIN_DARCY_COEF'\]" Surface_Bottom] setAttribute ov surface
115+
[customlib::AddConditionGroupOnXPath "$fluidConditions/condition\[@n='POROSITY'\]" Inlet] setAttribute ov line
116+
[customlib::AddConditionGroupOnXPath "$fluidConditions/condition\[@n='POROSITY'\]" Surface_Bottom] setAttribute ov surface
112117

113118
set fluidConditions [spdAux::getRoute "FLBC"]
114119
::Fluid::examples::ErasePreviousIntervals

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

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ConditionList>
33

4-
<ConditionItem n="Lin_Darcy_Coef_2D" pn="Linear darcy coefficient" ImplementedInFile=".cpp" Interval="False" ImplementedInApplication="FluidApplication"
5-
MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="1"
6-
SkinConditions="True" VariableName="LIN_DARCY_COEF" App="Fluid" ElementType="Surface" ProcessName="AssignScalarVariableProcess"
7-
help="" function="1" >
8-
<TopologyFeatures>
9-
</TopologyFeatures>
10-
<DegreesOfFreedom></DegreesOfFreedom>
11-
<inputs></inputs>
12-
<DefaultValues>
13-
<value n="constrained" v="0" state="hidden" />
14-
<value n="value" v="1500" />
15-
</DefaultValues>
16-
<outputs></outputs>
17-
</ConditionItem>
18-
19-
<ConditionItem n="Lin_Darcy_Coef_3D" pn="Linear darcy coefficient" ImplementedInFile=".cpp" Interval="False" ImplementedInApplication="FluidApplication"
20-
MinimumKratosVersion="9000" WorkingSpaceDimension="3D" LocalSpaceDimension="2"
21-
SkinConditions="True" VariableName="LIN_DARCY_COEF" App="Fluid" ElementType="Volume" ProcessName="AssignScalarVariableProcess"
22-
help="" function="1">
23-
<TopologyFeatures>
24-
</TopologyFeatures>
25-
<DegreesOfFreedom></DegreesOfFreedom>
26-
<inputs></inputs>
27-
<DefaultValues>
28-
<value n="constrained" v="0" state="hidden" />
29-
<value n="value" v="1500" />
30-
</DefaultValues>
31-
<outputs></outputs>
32-
</ConditionItem>
33-
34-
<ConditionItem n="Non_Lin_Darcy_Coef_2D" pn="Nonlinear darcy coefficient" ImplementedInFile=".cpp" Interval="False" ImplementedInApplication="FluidApplication"
35-
MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="1"
36-
SkinConditions="False" VariableName="NONLIN_DARCY_COEF" App="Fluid" ElementType="Surface" ProcessName="AssignScalarVariableProcess"
37-
help="" function="1" >
38-
<TopologyFeatures>
39-
</TopologyFeatures>
40-
<DegreesOfFreedom></DegreesOfFreedom>
41-
<inputs></inputs>
42-
<DefaultValues>
43-
<value n="constrained" v="0" state="hidden" />
44-
<value n="value" v="4000" />
45-
</DefaultValues>
46-
<outputs></outputs>
47-
</ConditionItem>
48-
49-
<ConditionItem n="Non_Lin_Darcy_Coef_3D" pn="Nonlinear darcy coefficient" ImplementedInFile=".cpp" Interval="False" ImplementedInApplication="FluidApplication"
50-
MinimumKratosVersion="9000" WorkingSpaceDimension="3D" LocalSpaceDimension="2"
51-
SkinConditions="False" VariableName="NONLIN_DARCY_COEF" App="Fluid" ElementType="Volume" ProcessName="AssignScalarVariableProcess"
52-
help="" function="1">
53-
<TopologyFeatures>
54-
</TopologyFeatures>
55-
<DegreesOfFreedom></DegreesOfFreedom>
56-
<inputs></inputs>
57-
<DefaultValues>
58-
<value n="constrained" v="0" state="hidden" />
59-
<value n="value" v="4000" />
60-
</DefaultValues>
61-
<outputs></outputs>
62-
</ConditionItem>
63-
64-
65-
<ConditionItem n="Porosity2D" pn="Porosity" ImplementedInFile=".cpp" Interval="False" ImplementedInApplication="FluidApplication"
66-
MinimumKratosVersion="9000" WorkingSpaceDimension="2D" LocalSpaceDimension="1"
67-
SkinConditions="False" VariableName="POROSITY" App="Fluid" ElementType="Surface" ProcessName="AssignScalarVariableProcess"
68-
help="" function="1" >
69-
<TopologyFeatures>
70-
</TopologyFeatures>
71-
<DegreesOfFreedom></DegreesOfFreedom>
72-
<inputs></inputs>
73-
<DefaultValues>
74-
<value n="constrained" v="0" state="hidden" />
75-
<value n="value" v="0.5" />
76-
</DefaultValues>
77-
<outputs></outputs>
78-
</ConditionItem>
79-
80-
<ConditionItem n="Porosity3D" pn="Porosity" ImplementedInFile=".cpp" Interval="False" ImplementedInApplication="FluidApplication"
81-
MinimumKratosVersion="9000" WorkingSpaceDimension="3D" LocalSpaceDimension="2"
82-
SkinConditions="False" VariableName="POROSITY" App="Fluid" ElementType="Volume" ProcessName="AssignScalarVariableProcess"
83-
help="" function="1">
84-
<TopologyFeatures>
85-
</TopologyFeatures>
86-
<DegreesOfFreedom></DegreesOfFreedom>
87-
<inputs></inputs>
88-
<DefaultValues>
89-
<value n="constrained" v="0" state="hidden" />
90-
<value n="value" v="0.5" />
91-
</DefaultValues>
92-
<outputs></outputs>
93-
</ConditionItem>
94-
95-
964
</ConditionList>

‎kratos.gid/apps/FreeSurface/xml/Elements.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<NodalCondition n="VELOCITY"/>
1717
<NodalCondition n="PRESSURE"/>
1818
<NodalCondition n="DISTANCE"/>
19+
<NodalCondition n="LIN_DARCY_COEF"/>
20+
<NodalCondition n="NONLIN_DARCY_COEF"/>
21+
<NodalCondition n="POROSITY"/>
1922
</NodalConditions>
2023
<inputs>
2124
</inputs>
@@ -39,6 +42,9 @@
3942
<NodalCondition n="VELOCITY"/>
4043
<NodalCondition n="PRESSURE"/>
4144
<NodalCondition n="DISTANCE"/>
45+
<NodalCondition n="LIN_DARCY_COEF"/>
46+
<NodalCondition n="NONLIN_DARCY_COEF"/>
47+
<NodalCondition n="POROSITY"/>
4248
</NodalConditions>
4349
<inputs>
4450
</inputs>

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

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,39 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<NodalConditionList>
33

4-
<NodalConditionItem n="DISTANCE" pn="Distance" ProcessName="AssignScalarVariableProcess" VariableName="DISTANCE" Interval="False" unit_magnitude="L" units="m" App="Fluid" ImplementedInApplication="FluidDynamicsApplication">
4+
<NodalConditionItem n="DISTANCE" pn="Distance" ProcessName="AssignScalarVariableProcess" VariableName="DISTANCE" Interval="Initial" App="Fluid" ImplementedInApplication="FluidDynamicsApplication">
55

66
<DefaultValues>
77
<value n="constrained" v="0" state="hidden" />
88
<value n="value" v="-1.0" />
99
</DefaultValues>
1010
</NodalConditionItem>
1111

12-
</NodalConditionList>
12+
<NodalConditionItem n="LIN_DARCY_COEF" pn="Linear Darcy coefficient" ProcessName="AssignScalarVariableProcess" VariableName="LIN_DARCY_COEF" Interval="False" App="Fluid" ImplementedInApplication="FluidApplication">
13+
14+
<DefaultValues>
15+
<value n="constrained" v="0" state="hidden" />
16+
<value n="value" v="1500" />
17+
</DefaultValues>
18+
<outputs></outputs>
19+
</NodalConditionItem>
20+
21+
<NodalConditionItem n="NONLIN_DARCY_COEF" pn="NonLinear Darcy coefficient" ProcessName="AssignScalarVariableProcess" VariableName="NONLIN_DARCY_COEF" Interval="False" App="Fluid" ImplementedInApplication="FluidApplication">
22+
23+
<DefaultValues>
24+
<value n="constrained" v="0" state="hidden" />
25+
<value n="value" v="4000" />
26+
</DefaultValues>
27+
<outputs></outputs>
28+
</NodalConditionItem>
29+
30+
<NodalConditionItem n="POROSITY" pn="Porosity" ProcessName="AssignScalarVariableProcess" VariableName="POROSITY" Interval="False" App="Fluid" ImplementedInApplication="FluidApplication">
31+
32+
<DefaultValues>
33+
<value n="constrained" v="0" state="hidden" />
34+
<value n="value" v="0.5" />
35+
</DefaultValues>
36+
<outputs></outputs>
37+
</NodalConditionItem>
38+
39+
</NodalConditionList>

0 commit comments

Comments
 (0)