From 57c6c59ef960b0ce35a5afb51098c17991821ac9 Mon Sep 17 00:00:00 2001
From: rch <rostislav.chudoba@rwth-aachen.de>
Date: Thu, 13 Apr 2023 11:35:39 +0200
Subject: [PATCH] without k3d
---
Dockerfile | 4 +--
environment.yml | 31 +++++++++----------
index.ipynb | 26 ++++++++--------
mkappa/mkappa.ipynb | 6 ++--
pull_out/2_1_1_PO_observation.ipynb | 2 +-
.../2_2_1_PO_configuration_explorer.ipynb | 2 +-
pull_out/fragmentation.ipynb | 2 +-
...3_elastic_stiffness_of_the_composite.ipynb | 4 +--
tour3_nonlinear_bond/3_1_nonlinear_bond.ipynb | 1 +
9 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 2554e9c..4ce6ecb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
# Specify parent image. Please select a fixed tag here.
-#ARG BASE_IMAGE=registry.git.rwth-aachen.de/jupyter/profiles/rwth-courses:latest
-ARG BASE_IMAGE=registry.jupyter.rwth-aachen.de/profiles/rwth-minimal-2021-ss:latest
+ARG BASE_IMAGE=registry.git.rwth-aachen.de/jupyter/profiles/rwth-courses:latest
+#ARG BASE_IMAGE=registry.jupyter.rwth-aachen.de/profiles/rwth-minimal-2021-ss:latest
FROM ${BASE_IMAGE}
# .. Or update conda base environment to match specifications in environment.yml
ADD environment.yml /tmp/environment.yml
diff --git a/environment.yml b/environment.yml
index 3cd6443..c9de34a 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,24 +2,23 @@ name: base
channels:
- conda-forge
dependencies:
-- traits=6.3.2=py310h5764c6d_1
-- matplotlib-base=3.6.2=py310h8d5ebf3_0
-- numpy=1.23.5=py310h53a5b5f_0
-- sympy=1.11.1=py310hff52083_2
-- scipy=1.9.3=py310hdfbd76f_2
-# - k3d
-- ipywidgets=7.7.0=pyhd8ed1ab_0
-- ipympl=0.9.2=pyhd8ed1ab_0
-- jupyterlab=3.5.0=pyhd8ed1ab_0
-- ipytree=0.2.2=pyhd8ed1ab_0
-- pandas=1.5.2=py310h769672d_0
-- shapely=1.8.5=py310h5b266fc_2
-- importlib_resources=5.10.0=pyhd8ed1ab_0
-- pip=22.3.1=pyhd8ed1ab_0
+- traits=6.3.2
+- matplotlib-base>=3.6.2
+- numpy>=1.23.5
+- sympy>=1.11.1
+- scipy>=1.9.3
+- ipywidgets=7.7.0
+- ipympl=0.9.2
+- jupyterlab=3.2.0
+- ipytree=0.2.2
+- pandas>=1.5.2
+- shapely>=1.8.5
+- importlib_resources>=5.10.0
+- pip
- pip:
- anastruct==1.2.0
- openpyxl==3.0.10
- - bmcs-utils==0.0.32a0
- - bmcs-ibvpy==0.0.28a0
+ - bmcs-utils==0.0.34a0
+ - bmcs-ibvpy==0.0.29a0
- bmcs-cross-section==0.0.55a0
- bmcs-beam==0.0.20a0
diff --git a/index.ipynb b/index.ipynb
index 87467cf..f296150 100644
--- a/index.ipynb
+++ b/index.ipynb
@@ -73,10 +73,22 @@
"| | | | | \n",
"|-|-|-------|------| \n",
"|  |  |  |  | \n",
- "|  | [](pull_out/pull_out.ipynb) | | [](mkappa/mkappa.ipynb) |\n",
+ "|  |  | | [](mkappa/mkappa.ipynb) |\n",
"|  | [](pull_out/fragmentation.ipynb) | [](bending/bending_3pt.ipynb) |  |"
]
},
+ {
+ "cell_type": "markdown",
+ "metadata": {
+ "pycharm": {
+ "name": "#%% md\n"
+ }
+ },
+ "source": [
+ "<div style=\"background-color:lightgreen;text-align:left\"> <img src=\"icons/rest.png\" alt=\"Step by step\" width=\"40\" height=\"40\">\n",
+ " <b>Our current location</b> </div>"
+ ]
+ },
{
"cell_type": "markdown",
"metadata": {
@@ -430,18 +442,6 @@
"## **Tour 9:** Retrospective, summary of questions\n"
]
},
- {
- "cell_type": "markdown",
- "metadata": {
- "pycharm": {
- "name": "#%% md\n"
- }
- },
- "source": [
- "<div style=\"background-color:lightgreen;text-align:left\"> <img src=\"icons/rest.png\" alt=\"Step by step\" width=\"40\" height=\"40\">\n",
- " <b>Our current location</b> </div>"
- ]
- },
{
"cell_type": "code",
"execution_count": null,
diff --git a/mkappa/mkappa.ipynb b/mkappa/mkappa.ipynb
index f99d44f..a218f4a 100644
--- a/mkappa/mkappa.ipynb
+++ b/mkappa/mkappa.ipynb
@@ -19,7 +19,7 @@
"source": [
"from bmcs_cross_section.mkappa.mkappa import MKappa\n",
"from bmcs_cross_section.cs_design import TShape, BarLayer, CrossSectionDesign\n",
- "from bmcs_cross_section.matmod import PWLConcreteMatMod, EC2ConcreteMatMod\n",
+ "#from bmcs_cross_section.matmod import PWLConcreteMatMod, EC2ConcreteMatMod\n",
"import numpy as np\n",
"import sympy as sp\n",
"sp.init_printing()"
@@ -42,8 +42,8 @@
"metadata": {},
"outputs": [],
"source": [
- "mc.matrix = 'piecewise linear'\n",
- "css = mc.cross_section_shape = 'T-shape'\n",
+ "#mc.matrix = 'piecewise linear'\n",
+ "css = mc.cross_section_shape_ = 'T-shape'\n",
"csl = mc.cross_section_layout\n",
"bl1 = BarLayer(name='steel 1', z=10, ds=10, count=2 )\n",
"bl2 = BarLayer(name='steel 2', z=30, ds=10, count=2 )\n",
diff --git a/pull_out/2_1_1_PO_observation.ipynb b/pull_out/2_1_1_PO_observation.ipynb
index 07aa36f..c420fa6 100644
--- a/pull_out/2_1_1_PO_observation.ipynb
+++ b/pull_out/2_1_1_PO_observation.ipynb
@@ -212,7 +212,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
diff --git a/pull_out/2_2_1_PO_configuration_explorer.ipynb b/pull_out/2_2_1_PO_configuration_explorer.ipynb
index 6313bb0..5ecd7ad 100644
--- a/pull_out/2_2_1_PO_configuration_explorer.ipynb
+++ b/pull_out/2_2_1_PO_configuration_explorer.ipynb
@@ -231,7 +231,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
diff --git a/pull_out/fragmentation.ipynb b/pull_out/fragmentation.ipynb
index 3b052cf..0f1387a 100644
--- a/pull_out/fragmentation.ipynb
+++ b/pull_out/fragmentation.ipynb
@@ -687,7 +687,7 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
diff --git a/tour1_intro/1_3_elastic_stiffness_of_the_composite.ipynb b/tour1_intro/1_3_elastic_stiffness_of_the_composite.ipynb
index 1d37a89..af40a50 100644
--- a/tour1_intro/1_3_elastic_stiffness_of_the_composite.ipynb
+++ b/tour1_intro/1_3_elastic_stiffness_of_the_composite.ipynb
@@ -325,9 +325,9 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3 (ipykernel)",
+ "display_name": "bmcs_env2",
"language": "python",
- "name": "python3"
+ "name": "bmcs_env2"
},
"language_info": {
"codemirror_mode": {
diff --git a/tour3_nonlinear_bond/3_1_nonlinear_bond.ipynb b/tour3_nonlinear_bond/3_1_nonlinear_bond.ipynb
index e3f99a6..7755256 100644
--- a/tour3_nonlinear_bond/3_1_nonlinear_bond.ipynb
+++ b/tour3_nonlinear_bond/3_1_nonlinear_bond.ipynb
@@ -555,6 +555,7 @@
"metadata": {},
"outputs": [],
"source": [
+ "%matplotlib widget\n",
"po.interact()"
]
},
--
GitLab