Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FreeSurface] Remove unused options in the Free Surface Application #955

Merged
merged 2 commits into from
Oct 9, 2023
Merged

[FreeSurface] Remove unused options in the Free Surface Application #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e861c
Hide unused options
joaquinirazabal Oct 6, 2023
695c4c1
Remove more unused options
joaquinirazabal Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kratos.gid/apps/FreeSurface/xml/Main.spd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
<include n="SolutionStrategy" active="1" path="apps/Fluid/xml/SolutionStrategy.spd"/>
<include n="Results" active="1" un="FLResults" path="apps/Common/xml/Results.spd"/>
<include n="GenericSubModelPart" active="1" path="apps/Common/xml/GenericSubModelPart.spd"/>
<include n="Materials" active="1" path="apps/Fluid/xml/Materials.spd"/>
</container>
<include n="Materials" active="0" path="apps/Fluid/xml/Materials.spd"/>
</container>
7 changes: 0 additions & 7 deletions kratos.gid/apps/FreeSurface/xml/Parts.spd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,5 @@

<condition n="FluidParts" pn="Parts" ov="[CheckGeometry 1]" icon="reservoir16" help="Select your group" un="FLParts" update_proc="UpdateParts">
<value n="Element" pn="Element" v="" dict="[GetElements]" actualize="1" values="" state="hidden">
<dependencies node="../value[@n!='Material']" actualize="1"/>
</value>
<value n="ConstitutiveLaw" pn="Fluid type" v="" actualize_tree="1" values="[GetConstitutiveLaws]" state="hidden" dict="[GetAllConstitutiveLaws]">
<dependencies node="../value[@n!='Material']" actualize="1"/>
</value>
<value n="Material" pn="Material" state="hidden" help="Choose a material from the database" v="Air" values="[GetMaterialsList]">
<edit_command n="Edit materials" pn="Edit materials" icon="refresh.png" proc='EditDatabaseList'/>
</value>
</condition>
7 changes: 5 additions & 2 deletions kratos.gid/apps/FreeSurface/xml/XmlController.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ proc ::FreeSurface::xml::Init { } {
Model::getConditions Conditions.xml


# Remove No splip
# Remove No slip
Model::ForgetCondition NoSlip2D
Model::ForgetCondition NoSlip3D
# Remove Wall Law
Model::ForgetCondition WallLaw2D
Model::ForgetCondition WallLaw3D
}

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

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