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.

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

Updated 14.0.0 #4

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![](https://img.shields.io/badge/SDK-v13.0.0-blue) <Please check version is the same as specified in requirements.txt>
![](https://img.shields.io/badge/SDK-v14.0.0-blue) <Please check version is the same as specified in requirements.txt>

# PLAXIS embankment evaluator
This sample app shows how to integrate PLAXIS into a VIKTOR application. In this application the following tutorial is
Expand Down
22 changes: 18 additions & 4 deletions app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,21 @@
SOFTWARE.
"""

from app.embankment.controller import EmbankmentController
from app.embankment_folder.controller import EmbankmentFolderController
from app.material.controller import MaterialController
from app.material_folder.controller import MaterialFolderController
from app.embankment.controller import EmbankmentController as Embankment
from app.embankment_folder.controller import EmbankmentFolderController as EmbankmentFolder
from app.material.controller import MaterialController as Material
from app.material_folder.controller import MaterialFolderController as MaterialFolder

from viktor import InitialEntity

initial_entities = [
InitialEntity('EmbankmentFolder', name='Embankments', children=[
InitialEntity('Embankment', name='sample embankment', params='../manifest/Embankment/sample-embankment.json')
]),
InitialEntity('MaterialFolder', name='Materials', children=[
InitialEntity('Material', name='Embankment', params='../manifest/Material/embankment.json'),
InitialEntity('Material', name='Peat', params='../manifest/Material/peat.json'),
InitialEntity('Material', name='Clay', params='../manifest/Material/clay.json'),
InitialEntity('Material', name='Sand', params='../manifest/Material/sand.json')
])
]
6 changes: 3 additions & 3 deletions app/embankment/visualisation.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import numpy as np
from munch import Munch
from viktor import Color
from viktor import UserException
from viktor import UserError
from viktor.geometry import Group
from viktor.geometry import Material
from viktor.geometry import Point
Expand All @@ -37,7 +37,7 @@ def _check_params(params: Munch) -> None:
):
err_list.append("Please make sure materials are defined for the embankment and soil layers")
if err_list:
raise UserException(". ".join(err_list))
raise UserError(". ".join(err_list))


def _get_rgb(value: int):
Expand Down Expand Up @@ -98,7 +98,7 @@ def get_embankment_geometry_group(params: Munch) -> Group:
try:
drain_depth = layers[params.geometry_tab.drain.depth - 1].points[-1].y
except IndexError as err:
raise UserException("This drain depth is deeper than the amount of layers available") from err
raise UserError("This drain depth is deeper than the amount of layers available") from err
drains = [
Polygon(
points=[
Expand Down
1 change: 0 additions & 1 deletion manifest/Embankment/sample-embankment.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"name": "sample embankment",
"geometry_tab": {
"soil": {
"width": 60,
Expand Down
1 change: 0 additions & 1 deletion manifest/Material/clay.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"name": "Clay",
"param": {
"phi": 25,
"psi": 0,
Expand Down
1 change: 0 additions & 1 deletion manifest/Material/embankment.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"name": "Embankment",
"param": {
"phi": 30,
"psi": 0,
Expand Down
1 change: 0 additions & 1 deletion manifest/Material/peat.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"name": "Peat",
"param": {
"phi": 23,
"psi": 0,
Expand Down
1 change: 0 additions & 1 deletion manifest/Material/sand.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"name": "Sand",
"param": {
"phi": 33,
"psi": 3,
Expand Down
33 changes: 0 additions & 33 deletions manifest/manifest.yml

This file was deleted.

4 changes: 1 addition & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# viktor==13.0.0
viktor==14.0.0
plotly==5.5.0
numpy==1.21.5
pandas==1.3.*
munch==2.5.0
1 change: 1 addition & 0 deletions viktor.config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app_type = 'tree'