Skip to content

Commit 0cf404f

Browse files
committed
update gallery
1 parent 8b9a0a8 commit 0cf404f

20 files changed

Lines changed: 154 additions & 583 deletions

gallery2/frames/frame-2007.ipynb

Lines changed: 5 additions & 30 deletions
Large diffs are not rendered by default.

gallery2/material/material-0002.ipynb

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,28 @@
106106
"ax.set_ylabel(r\"$\\sigma/\\sigma_y$\");"
107107
]
108108
},
109+
{
110+
"cell_type": "markdown",
111+
"metadata": {},
112+
"source": [
113+
"Now create two instances of ``Steel02`` with differing values for the `R0` parameter:"
114+
]
115+
},
116+
{
117+
"cell_type": "code",
118+
"execution_count": null,
119+
"metadata": {},
120+
"outputs": [],
121+
"source": [
122+
"\n",
123+
"steel_material = xara.UniaxialMaterial(\"Steel02\", E=Es, Fy=Fy, R0=5, b=0.05)\n",
124+
"\n",
125+
"steel_material_20 = xara.UniaxialMaterial(\"Steel02\", E=Es, Fy=Fy, R0=20, b=0.05)\n"
126+
]
127+
},
109128
{
110129
"cell_type": "code",
111-
"execution_count": 5,
130+
"execution_count": null,
112131
"metadata": {},
113132
"outputs": [
114133
{
@@ -129,14 +148,12 @@
129148
"\n",
130149
"strain = np.linspace(0, Fy/Es*5, 100)\n",
131150
"\n",
132-
"steel_material = xara.UniaxialMaterial(\"Steel02\", E=Es, Fy=Fy, R0=5, b=0.05)\n",
133151
"with steel_material as tmp:\n",
134152
" ln = ax.plot(strain/(Fy/Es), \n",
135153
" [tmp.getStress(e, commit=True)/Fy for e in strain],\n",
136154
" label=\"$R_0=5$\")\n",
137155
"\n",
138156
"\n",
139-
"steel_material_20 = xara.UniaxialMaterial(\"Steel02\", E=Es, Fy=Fy, R0=20, b=0.05)\n",
140157
"with steel_material_20 as tmp:\n",
141158
" ln = ax.plot(strain/(Fy/Es), \n",
142159
" [tmp.getStress(e, commit=True)/Fy for e in strain],\n",
@@ -154,32 +171,6 @@
154171
"ax.legend();"
155172
]
156173
},
157-
{
158-
"cell_type": "code",
159-
"execution_count": 6,
160-
"metadata": {},
161-
"outputs": [],
162-
"source": [
163-
"\n",
164-
"# strain = 0.01*(sin(linspace(0, 3.5*pi, 300))**2-0.01)*linspace(0.5, 1, 300)**2\n",
165-
"\n",
166-
"\n",
167-
"# fig, ax = plt.subplots()\n",
168-
"# with uniaxial.Steel02(Fy, Es, 0.02, 15, 0.925, 0.15, 0.05, 1, 0, 1).handle() as mat:\n",
169-
"# ln = ax.plot(strain/(Fy/Es), \n",
170-
"# [mat.getStress(e, commit=True)/Fy for e in strain],\n",
171-
"# )\n",
172-
"\n",
173-
"\n",
174-
"# # Draw a horizontal line at the yield stress Fy\n",
175-
"# ax.axhline(y=1, color='darkgrey', linestyle='--')\n",
176-
"# ax.text(-1, 1, r\"$\\sigma_y$\", color='k', va='center', ha='right', bbox=dict(facecolor='white', edgecolor='none', pad=2.0))\n",
177-
"\n",
178-
"# ax.set_xlabel(r\"$\\varepsilon/\\varepsilon_y$\")\n",
179-
"# ax.set_ylabel(r\"$\\sigma/\\sigma_y$\")\n",
180-
"# ax.legend()"
181-
]
182-
},
183174
{
184175
"cell_type": "code",
185176
"execution_count": null,

gallery2/plane/plane-0101.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "markdown",
5-
"id": "6e05ae94",
5+
"id": "3bbf16ae",
66
"metadata": {},
77
"source": [
88
"# Koyna Dam "

gallery2/sections/fiber-0002.ipynb

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

gallery2/sections/fiber-0003.ipynb

Lines changed: 9 additions & 9 deletions
Large diffs are not rendered by default.

gallery2/sections/fiber-0004.ipynb

Lines changed: 5 additions & 20 deletions
Large diffs are not rendered by default.

source/_setup/param_dl.py

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -62,28 +62,6 @@ def _split_field_name(text):
6262

6363
return parts[0], parts[1]
6464

65-
66-
# def _parse_gparam_arg(arg):
67-
# parts = shlex.split(arg)
68-
69-
# if len(parts) == 1:
70-
# return "Parameters", parts[0]
71-
72-
# if len(parts) >= 2:
73-
# return " ".join(parts[:-1]), parts[-1]
74-
75-
# return "Parameters", ""
76-
77-
# def _parse_gparam_arg(arg):
78-
# parts = shlex.split(arg)
79-
80-
# if len(parts) == 1:
81-
# return "Parameters", parts[0]
82-
83-
# if len(parts) >= 2:
84-
# return " ".join(parts[:-1]), parts[-1]
85-
86-
# return "Parameters", ""
8765
def _parse_gparam_arg(arg):
8866
try:
8967
parts = shlex.split(arg)
@@ -147,29 +125,6 @@ def make_field(
147125
)
148126
)
149127

150-
# fieldtype = types.pop(fieldarg, None)
151-
# if fieldtype:
152-
# term += nodes.Text(" ")
153-
# type_span = nodes.inline(classes=["param-type"])
154-
# type_span += nodes.Text("(")
155-
156-
# if len(fieldtype) == 1 and isinstance(fieldtype[0], nodes.Text):
157-
# type_span.extend(
158-
# self.make_xrefs(
159-
# self.typerolename,
160-
# domain,
161-
# fieldtype[0].astext(),
162-
# addnodes.literal_emphasis,
163-
# env=env,
164-
# inliner=inliner,
165-
# location=location,
166-
# )
167-
# )
168-
# else:
169-
# type_span.extend(fieldtype)
170-
171-
# type_span += nodes.Text(")")
172-
# term += type_span
173128
fieldtype = types.pop(fieldarg, None)
174129
if fieldtype:
175130
term += nodes.Text(": ")
@@ -260,26 +215,6 @@ def _replace_builtin_param_field():
260215
_clear_field_type_cache()
261216

262217

263-
# def _ensure_dynamic_group(label):
264-
# slug = _slug(label)
265-
# field_name = f"gparam_{slug}"
266-
267-
# if field_name in _DYNAMIC_FIELD_NAMES:
268-
# return slug
269-
270-
# PyObject.doc_field_types.append(
271-
# _make_param_field(
272-
# name=field_name,
273-
# label=label,
274-
# names=(field_name,),
275-
# typenames=(f"gtype_{slug}",),
276-
# )
277-
# )
278-
279-
# _DYNAMIC_FIELD_NAMES.add(field_name)
280-
# _clear_field_type_cache()
281-
282-
# return slug
283218
def _ensure_dynamic_group(label):
284219
if label in {"Parameter", "Parameters"}:
285220
slug = "default"

source/user/guides/develop.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ The following steps only need to be performed once to set up the development env
7272
might be ``./build/temp.linux-x86_64-cpython-39_local/``, where ``.`` refers
7373
to the directory that contains ``setup.py``.
7474

75+
b. After the configure step is complete, the following message should be printed to the terminal:
76+
77+
.. code-block:: shell
78+
79+
-- Build files have been written to: /home/facundo/repositories/xara/build/temp.linux-x86_64-cpython-313_release
80+
81+
This will build the C++ code and place the resulting shared library in the same directory as ``setup.py``.
82+
The name of the resulting shared library will depend on your operating system and Python version.
83+
For example, on Linux with Python 3.9, the file might be named ``OpenSeesRT.cpython-39-x86_64-linux-gnu.so``.
84+
7585
b. Navigate into the build tree that was generated by the last step, and
7686
build the ``OpenSeesRT`` target to create ``libOpenSeesRT.so``:
7787

source/user/manual/material/ndMaterials/BoundingCamClay.rst renamed to source/user/manual/material/bounding/BoundingCamClay.rst

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
Bounding Cam Clay
44
^^^^^^^^^^^^^^^^^
55

6-
Code Developed by: |chris| and |pedro| U.Washington
76

87
This command is used to construct a multi-dimensional bounding surface Cam Clay material after Borja et al. ([Borja2001]_).
98

10-
.. function:: nDMaterial BoundingCamClay $matTag $massDensity $C $bulkMod $OCR $mu_o $alpha $lambda $h $m
9+
.. tabs::
10+
11+
.. tab:: Tcl
1112

13+
.. function:: nDMaterial BoundingCamClay $tag $density $C $K $OCR $mu_o $alpha $lambda $h $m
1214

1315

14-
.. csv-table::
15-
:header: "Argument", "Type", "Description"
16-
:widths: 10, 10, 40
16+
.. csv-table::
17+
:header: "Argument", "Type", "Description"
18+
:widths: 10, 10, 40
1719

18-
$matTag, |integer|, tag identifying material
19-
$massDensity, |float|, mass density
20-
$C, |float|, ellipsoidal axis ratio (defines shape of ellipsoidal loading/bounding surfaces)
21-
$bulkMod, |float|, initial bulk modulus
22-
$OCR, |float|, overconsolidation ratio
23-
$mu_o, |float|, initial shear modulus
24-
$alpha, |float|, pressure-dependency parameter for moduli (greater than or equal to zero)
25-
$lambda, |float|, soil compressibility index for virgin loading
26-
$h, |float|, hardening parameter for plastic response inside of bounding surface
27-
$m, |float|, hardening parameter (exponent) for plastic response inside of bounding surface
20+
$tag, |integer|, tag identifying material
21+
$density, |float|, mass density
22+
$C, |float|, ellipsoidal axis ratio (defines shape of ellipsoidal loading/bounding surfaces)
23+
$K, |float|, initial bulk modulus :math:`\kappa`
24+
$OCR, |float|, overconsolidation ratio
25+
$mu_o, |float|, initial shear modulus
26+
$alpha, |float|, pressure-dependency parameter for moduli (greater than or equal to zero)
27+
$lambda, |float|, soil compressibility index for virgin loading
28+
$h, |float|, hardening parameter for plastic response inside of bounding surface
29+
$m, |float|, hardening parameter (exponent) for plastic response inside of bounding surface
2830

2931

3032
.. note::
31-
32-
The material formulations for the BoundingCamClay object are ``"ThreeDimensional"`` and ``"PlaneStrain"``
3333

34-
* If h = 0, no hardening
34+
* If $h = 0$, no hardening
3535

36-
* If m = 0, only linear hardening
36+
* If $m = 0$, only linear hardening
3737

3838

3939
General Information
@@ -46,13 +46,14 @@ The full theory of this model is discussed in great detail in Borja et al. (2001
4646

4747
.. note::
4848

49-
* The ellipsoidal axis ratio parameter $C is defined such that the ellipsoidal surfaces are C times as wide in the deviatoric direction as they are along the hydrostatic axis. When $C = 1, the surfaces are spherical.
49+
* The ellipsoidal axis ratio parameter ``C`` is defined such that the ellipsoidal surfaces are ``C`` times as wide in the deviatoric direction as they are along the hydrostatic axis.
50+
When ``C = 1``, the surfaces are spherical.
5051

51-
* The overconsolidation ratio (input parameter $OCR) defines the relationship between the loading surface and bounding surface. The radius of the bounding surface, R, is equal to the product of the OCR and the radius of the loading surface, r. When the soil is normally consolidated and $OCR = 1, the bounding and loading surfaces are coincident and virgin loading will occur.
52+
* The overconsolidation ratio (input parameter ``OCR``) defines the relationship between the loading surface and bounding surface. The radius of the bounding surface, R, is equal to the product of the OCR and the radius of the loading surface, r. When the soil is normally consolidated and $OCR = 1, the bounding and loading surfaces are coincident and virgin loading will occur.
5253

53-
* When the hyperelastic pressure-dependency parameter (input parameter $alpha) is set to zero, the elastic shear modulus will be constant with a value equal to the initial shear modulus (input parameter $mu_o) and the deviatoric and volumetric responses are uncoupled in the elastic regime.
54+
* When the hyperelastic pressure-dependency parameter (input parameter ``alpha``) is set to zero, the elastic shear modulus will be constant with a value equal to the initial shear modulus (input parameter $mu_o) and the deviatoric and volumetric responses are uncoupled in the elastic regime.
5455

55-
* The virgin compressibility parameter (input parameter $lambda) describes the relationship between the specific volume v = 1 + e and the logarithm of the mean effective stress (where e is the void ratio). This is is related to the compression index C_c that describes the relationship between the void ratio and the logarithm of the mean effective stress in consolidation testing.
56+
* The virgin compressibility parameter (input parameter ``lambda``) describes the relationship between the specific volume v = 1 + e and the logarithm of the mean effective stress (where e is the void ratio). This is is related to the compression index C_c that describes the relationship between the void ratio and the logarithm of the mean effective stress in consolidation testing.
5657

5758
Examples
5859
--------
@@ -79,7 +80,9 @@ The units of this analysis are kN and m, thus the prescribed initial shear modul
7980
References
8081
----------
8182

82-
.. [Borja2001] Borja, R.I., Lin, C.-H., and Montans, F.J. (2001) 'Cam-Clay plasticity, Part IV: Implicit integration of anisotropic bounding surface model with nonlinear hyperelasticity and ellipsoidal loading function,' Computer Methods in Applied Mechanics and Engineering, 190(26), 3293-3323, doi: 10.1016/S0045-7825(00)00301-7.
83+
.. [Borja2001] Borja, R.I., Lin, C.-H., and Montans, F.J. (2001) 'Cam-Clay plasticity, Part IV: Implicit integration of anisotropic bounding surface model with nonlinear hyperelasticity and ellipsoidal loading function,' Computer Methods in Applied Mechanics and Engineering, 190(26), 3293-3323, `doi: 10.1016/S0045-7825(00)00301-7 <https://doi.org/10.1016/S0045-7825(00)00301-7>`__.
8384
8485
.. [Schofied-Wroth1968] Schofield, A. and Wroth, P. (1968) Critical State Soil Mechanics, McGraw Hill, New York.
8586
87+
88+
Code Developed by: |chris| and |pedro| U.Washington

source/user/manual/material/ndMaterials/PressureDependentMultiYield.csv renamed to source/user/manual/material/multiyield/PressureDependentMultiYield.csv

File renamed without changes.

0 commit comments

Comments
 (0)