Skip to content

Commit a94cad1

Browse files
jginternationaljginternational
committed
Merge branch 'master' into examples-update
2 parents 598eb7d + cfdd091 commit a94cad1

269 files changed

Lines changed: 4719 additions & 1864 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎kratos.gid/apps/Buoyancy/examples/HeatedSquare.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ proc Buoyancy::examples::TreeAssignation2D {args} {
133133
# Fluid Parts
134134
set fluidParts [spdAux::getRoute "FLParts"]
135135
set fluidNode [customlib::AddConditionGroupOnXPath $fluidParts Fluid]
136-
set props [list Element Monolithic$nd ConstitutiveLaw Newtonian DENSITY 1.2039 DYNAMIC_VISCOSITY 0.000587 CONDUCTIVITY 0.83052 SPECIFIC_HEAT 1004.84]
136+
set props [list Element QSVMS$nd ConstitutiveLaw Newtonian2DLaw DENSITY 1.2039 DYNAMIC_VISCOSITY 0.000587 CONDUCTIVITY 0.83052 SPECIFIC_HEAT 1004.84]
137137
spdAux::SetValuesOnBaseNode $fluidNode $props
138138

139139
set fluidConditions [spdAux::getRoute "FLBC"]

‎kratos.gid/apps/Buoyancy/examples/examples.tcl‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,5 @@ proc Buoyancy::examples::Init { } {
66
uplevel #0 [list source [file join $::Buoyancy::dir examples HeatedSquare.tcl]]
77
}
88

9-
proc Buoyancy::examples::UpdateMenus { } {
10-
if {$::Model::SpatialDimension eq "2D"} {
11-
GiDMenu::InsertOption "Kratos" [list "---"] 8 PRE "" "" "" insertafter =
12-
GiDMenu::InsertOption "Kratos" [list "Heated square" ] 8 PRE [list ::Buoyancy::examples::HeatedSquare] "" "" insertafter =
13-
GiDMenu::UpdateMenus
14-
}
15-
}
169

1710
Buoyancy::examples::Init

‎kratos.gid/apps/Buoyancy/examples/examples.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Group id="Thermic" name="Thermic examples">
3+
<Example id="BuoyancyHeatedSquare2D" app="Buoyancy" logo="HeatedSquare2D.png" name="Buoyancy heated\nsquare 2D" dim="2D" cmd="::Buoyancy::examples::HeatedSquare"/>
4+
</Group>

‎kratos.gid/apps/Buoyancy/images/HeatedSquare2D.png‎

11.3 KB
Loading

‎kratos.gid/apps/Buoyancy/start.tcl‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,4 @@ proc ::Buoyancy::GetAttribute {name} {
5656
return $value
5757
}
5858

59-
proc ::Buoyancy::CustomToolbarItems { } {
60-
variable dir
61-
62-
if {$::Model::SpatialDimension eq "2D"} {
63-
Kratos::ToolbarAddItem "Example" "example.png" [list -np- ::Buoyancy::examples::HeatedSquare] [= "Example\nBuoyancy driven cavity flow (Ra = 1e6 - Pr = 0.71)"]
64-
}
65-
}
66-
6759
::Buoyancy::Init

‎kratos.gid/apps/Buoyancy/write/write.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ proc Buoyancy::write::writeModelPartEvent { } {
4646
}
4747
proc Buoyancy::write::writeCustomFilesEvent { } {
4848
# Materials
49-
Buoyancy::write::WriteMaterialsFile False
49+
Buoyancy::write::WriteMaterialsFile True
5050

5151
# Main python script
5252
set orig_name "MainKratos.py"

‎kratos.gid/apps/Buoyancy/xml/ConstitutiveLaws.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ConstitutiveLaws>
3-
<!--linear elastic laws-->
4-
<CLaw n="Newtonian" pn="Newtonian" ProductionReady="ProductionReady" help="Newtonian fluid" App="Fluid" ImplementedInApplication="FluidDynamicsApplication" OutputMode="Parameters">
3+
<CLaw n="Newtonian2DLaw" pn="Newtonian" ProductionReady="ProductionReady" help="Newtonian fluid" App="Fluid" ImplementedInApplication="FluidDynamicsApplication" Dimension="2D">
4+
<inputs>
5+
<parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="1.225"/>
6+
<parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" unit_magnitude="M/(L*T)" units="kg/(m*s)" v="1.846e-5" help="Set the dynamic viscosity."/>
7+
<parameter n="CONDUCTIVITY" pn="Thermal conductivity" unit_magnitude="Power/(L*Temp)" units="W/(m*K)" v="0.024"/>
8+
<parameter n="SPECIFIC_HEAT" pn="Specific heat" unit_magnitude="Energy/(M*Temp)" units="J/(kg*K)" v="1012.0"/>
9+
</inputs>
10+
<outputs>
11+
</outputs>
12+
</CLaw>
13+
14+
<CLaw n="Newtonian3DLaw" pn="Newtonian" ProductionReady="ProductionReady" help="Newtonian fluid" App="Fluid" ImplementedInApplication="FluidDynamicsApplication" Dimension="3D">
515
<inputs>
616
<parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="1.225"/>
717
<parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" unit_magnitude="M/(L*T)" units="kg/(m*s)" v="1.846e-5" help="Set the dynamic viscosity."/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<container n="Fluid" pn="Fluid" icon="units" prefix="FL" tree_state="open" open_window="0">
66
<include n="AnalysisType" active="1" path="apps/Fluid/xml/AnalysisType.spd"/>
7-
<include n="Parts" active="1" path="apps/Buoyancy/xml/Parts.spd"/>
7+
<include n="Parts" active="1" path="apps/Fluid/xml/Parts.spd"/>
88
<include n="InitialConditions" active="1" path="apps/Fluid/xml/InitialConditions.spd"/>
99
<include n="BoundaryConditions" active="1" path="apps/Fluid/xml/BoundaryConditions.spd"/>
1010
<include n="SolutionStrategy" active="1" path="apps/Buoyancy/xml/SolutionStrategyFluid.spd"/>
@@ -13,7 +13,7 @@
1313

1414
<container n="ConvectionDiffusion" pn="Thermal" icon="app" prefix="CNVDFF" tree_state="open" open_window="0">
1515
<include n="StageInfo" active="1" path="apps/ConvectionDiffusion/xml/StageInfo.spd"/>
16-
<include n="Parts" active="1" state="hidden" path="apps/ConvectionDiffusion/xml/Parts.spd"/>
16+
<!-- <include n="Parts" active="1" state="hidden" path="apps/ConvectionDiffusion/xml/Parts.spd"/> -->
1717
<include n="InitialConditions" active="1" path="apps/ConvectionDiffusion/xml/InitialConditions.spd"/>
1818
<include n="BoundaryConditions" active="1" path="apps/ConvectionDiffusion/xml/BoundaryConditions.spd"/>
1919
<include n="SolutionStrategy" active="1" path="apps/Buoyancy/xml/SolutionStrategyConvectionDiffusion.spd"/>

‎kratos.gid/apps/Buoyancy/xml/Materials.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<Material n="Air" MaterialType="Fluid" help="Air physical properties">
44
<inputs>
55
<parameter n="DENSITY" pn="Density" v="1.225" unit_magnitude="Density" units="kg/m^3"/>
6-
<parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" v="1.846e-5" unit_magnitude="M/L*T" units="kg/m*s"/>
6+
<parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" v="1.846e-5" unit_magnitude="M/(L*T)" units="kg/(m*s)"/>
77
<parameter n="CONDUCTIVITY" pn="Thermal conductivity" v="0.024" unit_magnitude="Power/(L*Temp)" units="W/(m*K)"/>
88
<parameter n="SPECIFIC_HEAT" pn="Specific heat" v="1012.0" unit_magnitude="Energy/(M*Temp)" units="J/(kg*K)"/>
99
</inputs>
1010
</Material>
1111
<Material n="Water" MaterialType="Fluid" help="Water physical properties">
1212
<inputs>
1313
<parameter n="DENSITY" pn="Density" v="1000" unit_magnitude="Density" units="kg/m^3"/>
14-
<parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" v="1.002e-3" unit_magnitude="M/L*T" units="kg/m*s"/>
14+
<parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" v="1.002e-3" unit_magnitude="M/(L*T)" units="kg/(m*s)"/>
1515
<parameter n="CONDUCTIVITY" pn="Thermal conductivity" v="0.58" unit_magnitude="Power/(L*Temp)" units="W/(m*K)"/>
1616
<parameter n="SPECIFIC_HEAT" pn="Specific heat" v="4181.3" unit_magnitude="Energy/(M*Temp)" units="J/(kg*K)"/>
1717
</inputs>

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)