Skip to content

Commit

Permalink
Squashed 'openseespy-docs/' changes from 41208757d..d9f49ec9a
Browse files Browse the repository at this point in the history
d9f49ec9a Merge pull request #243 from kkolozvari/patch-1
5724ba7ce Merge pull request #246 from Mengesh/patch-3
77bfca374 Fix Notes link typo in CoupledZeroLength.rst
1e3911f89 Merge branch 'master' of github.com:zhuminjie/OpenSeesPyDoc
2c8ce69fe update concreteCM command
0490b39d3 Update SFI_MVLEM_3D.rst

git-subtree-dir: openseespy-docs
git-subtree-split: d9f49ec9aa07e49b4a2589079071082c6e3f6177
  • Loading branch information
zhuminjie committed Dec 14, 2021
1 parent 0eed7c5 commit 9c0652a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"restructuredtext.confPath": "${workspaceFolder}",
"python.pythonPath": "/home/mj/Downloads/miniconda3/envs/openseespy/bin/python",
"python.pythonPath": "/usr/bin/python3",
}
6 changes: 4 additions & 2 deletions src/ConcreteCM.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
ConcreteCM
==================

.. function:: uniaxialMaterial('ConcreteCM', matTag, fpcc, epcc, Ec, rc, xcrn, ft, et, rt, xcrp, '-GapClose', GapClose=0)
.. function:: uniaxialMaterial('ConcreteCM', matTag, fpcc, epcc, Ec, rc, xcrn, ft, et, rt, xcrp, mon, '-GapClose', GapClose=0)
:noindex:

This command is used to construct a uniaxialMaterial ConcreteCM (Kolozvari et al., 2015), which is a uniaxial hysteretic constitutive model for concrete developed by Chang and Mander (1994).
Expand All @@ -26,7 +26,9 @@
starts following a straight line - large value
[e.g., 10000] recommended when tension stiffening
is considered)
``GapClose`` |float| GapClose = 0, less gradual gap closure (default);
``mon`` optional, monotonic stress-strain relationship only: mon=1 (invoked in FSAM only), mon=0 (no impact since monotonic)
``'-GapClose'`` |str| optional, denote next parameter is ``GapClose``
``GapClose`` |float| optional, GapClose = 0, less gradual gap closure (default);
GapClose = 1, more gradual gap closure
=================================== ===========================================================================

Expand Down
2 changes: 1 addition & 1 deletion src/CoupledZeroLength.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ CoupledZeroLength Element
.. seealso::


`Notes <dhttp://opensees.berkeley.edu/wiki/index.php/CoupledZeroLength_Element>`_
`Notes <http://opensees.berkeley.edu/wiki/index.php/CoupledZeroLength_Element>`_
2 changes: 1 addition & 1 deletion src/SFI_MVLEM_3D.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The SFI-MVLEM-3D model (Figure 1a) is a three-dimensional four-node element with

This element shall be used in Domain defined with **-ndm 3 -ndf 6**.

.. figure:: SFI_MVLEM_3D_formulation.jpg
.. figure:: SFI_MVLEM_3D_formulation.JPG
:align: center
:figclass: align-center

Expand Down

0 comments on commit 9c0652a

Please sign in to comment.