Skip to content

Closes #2 #3

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

Open
svandermeer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Closes #2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ None.
None.

### Internal
None.
- (#2) Remove munch dependency on lib/plaxis.py

## v1.0.0 (10/05/2022)
### Added
Expand Down
44 changes: 22 additions & 22 deletions app/lib/plaxis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
from typing import Union

import numpy as np
from munch import munchify
from plxscripting.easy import new_server

# Define the paths where the json files are created. This is with respect to the current working directory of the VIKTOR
Expand Down Expand Up @@ -200,47 +199,48 @@ def get_deepest_dict(dict_list: Union[List[Dict], Dict]) -> Dict:
material.setproperties(*material_zip) # Set all the properties of the material in an iterative fashion
materials.update({material_flattened_dict["MaterialName"]: material})

embankment_parameters = munchify(params_embankment["geometry_tab"]["embankment"])
soil_parameters = munchify(params_embankment["geometry_tab"]["soil"])
drain_parameters = munchify(params_embankment["geometry_tab"]["drain"])
layer_thicknesses = [layer.thickness for layer in soil_parameters.layers]
embankment_parameters = params_embankment["geometry_tab"]["embankment"]
soil_parameters = params_embankment["geometry_tab"]["soil"]
drain_parameters = params_embankment["geometry_tab"]["drain"]
layer_thicknesses = [layer["thickness"] for layer in soil_parameters["layers"]]
soil_depth = -1 * sum(layer_thicknesses)
g_i.SoilContour.initializerectangular(0, soil_depth, soil_parameters.width, embankment_parameters.height)
g_i.SoilContour.initializerectangular(0, soil_depth, soil_parameters["width"], embankment_parameters["height"])
borehole = g_i.borehole(0)
layers = [g_i.soillayer(layer.thickness) for layer in soil_parameters.layers]
layers = [g_i.soillayer(layer["thickness"]) for layer in soil_parameters["layers"]]
borehole.Head = -1 # Water level is at -1 m
_ = [
g_i.setmaterial(soil, materials[layer.material.name]) for soil, layer in zip(g_i.Soils, soil_parameters.layers)
g_i.setmaterial(soil, materials[layer["material"]["name"]])
for soil, layer in zip(g_i.Soils, soil_parameters["layers"])
]
g_i.gotostructures()
# Define the points of the embankment structure
point_list = [
g_i.point(x, y)
for x, y in [
(0, embankment_parameters.height),
(embankment_parameters.width / 2.0, embankment_parameters.height),
(0, embankment_parameters["height"]),
(embankment_parameters["width"] / 2.0, embankment_parameters["height"]),
(
(embankment_parameters.width + embankment_parameters.slope_width) / 2.0,
embankment_parameters.height / 2.0,
(embankment_parameters["width"] + embankment_parameters["slope_width"]) / 2.0,
embankment_parameters["height"] / 2.0,
),
(0, embankment_parameters.height / 2.0),
(0, embankment_parameters["height"] / 2.0),
(0, 0),
(embankment_parameters.width / 2.0 + embankment_parameters.slope_width, 0),
(embankment_parameters["width"] / 2.0 + embankment_parameters["slope_width"], 0),
]
]
# Always draw the bottom layer first, as it otherwise does not connect
embankment_bottom_layer = g_i.polygon(*point_list[2:])[0] # Last four points are the bottom layer
embankment_top_layer = g_i.polygon(*point_list[:4])[0] # First four points are the top layer
# Set the proper materials on the embankment layers
g_i.setmaterial(embankment_top_layer.Soil, materials[embankment_parameters.material.name])
g_i.setmaterial(embankment_bottom_layer.Soil, materials[embankment_parameters.material.name])
if drain_parameters.selector: # If drains are enabled
g_i.setmaterial(embankment_top_layer.Soil, materials[embankment_parameters["material.name"]])
g_i.setmaterial(embankment_bottom_layer.Soil, materials[embankment_parameters["material.name"]])
if drain_parameters["selector"]: # If drains are enabled
_ = [ # Set the drain depth to just above the end of the selected layer
g_i.drain((x, 0), (x, (-1 + 1e-7) * sum(layer_thicknesses[: drain_parameters.depth])))
g_i.drain((x, 0), (x, (-1 + 1e-7) * sum(layer_thicknesses[: drain_parameters["depth"]])))
for x in np.arange(
drain_parameters.spacing / 2.0,
embankment_parameters.width / 2.0 + embankment_parameters.slope_width,
drain_parameters.spacing,
drain_parameters["spacing"] / 2.0,
embankment_parameters["width"] / 2.0 + embankment_parameters["slope_width"],
drain_parameters["spacing"],
)
]
g_i.gotomesh()
Expand All @@ -261,7 +261,7 @@ def get_deepest_dict(dict_list: Union[List[Dict], Dict]) -> Dict:
phase_1.DeformCalcType = "Consolidation"
phase_1.TimeInterval = 2 # Phase takes two days
g_i.activate(embankment_bottom_layer, phase_1)
if drain_parameters.selector: # If drains are enabled
if drain_parameters["selector"]: # If drains are enabled
g_i.activate(g_i.Drains, phase_1)
phase_2 = g_i.phase(phase_1)
phase_2.Identification = phase_names[1]
Expand Down