Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
robbievanleeuwen committed Jul 9, 2022
1 parent 4db4455 commit 9a53072
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 20 deletions.
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ documentation can found at [https://robbievanleeuwen.github.io/concrete-properti

### Material Properties
- [x] Concrete material
- [x] Service stress-strain profile
- [x] Ultimate stress-strain profile
- [x] Service stress-strain profiles
- [x] Linear profile
- [x] Linear profile (no tension)
- [x] Eurocode Non-Linear
- [x] Ultimate stress-strain profiles
- [x] Rectangular stress block
- [x] Bilinear stress-strain profile
- [x] Eurocode parabolic
- [x] Flexural tensile strength
- [x] Steel material
- [x] Stress-strain profile
- [x] Built-in stress-strain profiles
- [x] Piecewise linear profile
- [x] Linear profile
- [x] Bilinear profile
- [x] Whitney stress block (AS stress block)
- [ ] Parabolic stress profile
- [ ] PCA stress profile
- [x] Steel elastic-plastic profile
- [x] Stress-strain profiles
- [x] Elastic-plastic
- [x] Elastic-plastic (with hardening)

### Gross Section Properties
- [x] Cross-sectional areas (total, concrete, steel)
Expand Down
5 changes: 3 additions & 2 deletions concreteproperties/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""
xxx
A python package to calculate the section properties of arbitrary reinforced concrete
sections.
"""
__version__ = "0.0.5"
__version__ = "0.0.6"
2 changes: 1 addition & 1 deletion concreteproperties/stress_strain_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ def __post_init__(
- self.tensile_strength / self.tension_softening_stiffness
)

self.strains.append(1.1 * strain_zero_tension)
self.strains.append(1.01 * strain_zero_tension)
self.stresses.append(0)
self.strains.append(strain_zero_tension)
self.stresses.append(0)
Expand Down
5 changes: 2 additions & 3 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
Documentation
=============

What is *concreteproperties*???

- Can only have only value of ultimate concrete strain
A python package to calculate the section properties of arbitrary reinforced concrete
sections.

.. toctree::
:maxdepth: 1
Expand Down
9 changes: 8 additions & 1 deletion examples/ex4.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@
EurocodeNonLinear,
)

concrete_profile = EurocodeNonLinear(35e3, 0.0035, 40, 0.0023, 3.5, 7e3)
concrete_profile = EurocodeNonLinear(
elastic_modulus=35e3,
ultimate_strain=0.0035,
compressive_strength=40,
compressive_strain=0.0023,
tensile_strength=3.5,
tension_softening_stiffness=7e3,
)
concrete_profile.plot_stress_strain(title="Concrete Stress-Strain Profile")

steel_profile = SteelHardening(
Expand Down
4 changes: 2 additions & 2 deletions todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
- [x] Add steel strain to StressResult & ku to UltimateResult (=dn/d)
- [x] Clean up profiles - maybe require that certain profiles may only be used for each material?
- [x] Finish pre.py
- [ ] Start to add design codes
- [ ] Documentation!
- [ ] Is there a way to generate output within a docstring??
- [x] Is there a way to generate output within a docstring??
- [ ] gif of progressive service stress plot?

# POST-RELEASE ITEMS
- [ ] Speed up
- [ ] Profiling
- [ ] Clean up all the na_local, points_na etc. etc.
- [ ] Start to add design codes

0 comments on commit 9a53072

Please sign in to comment.