Skip to content

Commit 5285649

Browse files
robbievanleeuwenrobbievanleeuwen
authored
Merge pull request #38 from robbievanleeuwen/remove_alpha_squash
Remove alpha_squash from Concrete material
2 parents e85446a + d7951b3 commit 5285649

16 files changed

+37
-44
lines changed

‎concreteproperties/design_codes.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -327,13 +327,6 @@ def create_concrete_material(
327327
gamma = 0.97 - 0.0025 * compressive_strength
328328
gamma = max(gamma, 0.67)
329329

330-
# max compression strain for squash load = 0.0025!
331-
332-
# calculate alpha_squash
333-
alpha_squash = 1 - 0.003 * compressive_strength
334-
alpha_squash = min(alpha_squash, 0.85)
335-
alpha_squash = max(alpha_squash, 0.72)
336-
337330
# calculate flexural_tensile_strength
338331
flexural_tensile_strength = 0.6 * np.sqrt(compressive_strength)
339332

@@ -351,7 +344,6 @@ def create_concrete_material(
351344
gamma=gamma,
352345
ultimate_strain=0.003,
353346
),
354-
alpha_squash=alpha_squash,
355347
flexural_tensile_strength=flexural_tensile_strength,
356348
colour=colour,
357349
)
@@ -413,10 +405,22 @@ def squash_tensile_load(
413405
# calculate area
414406
area = conc_geom.calculate_area()
415407

408+
# calculate alpha_squash
409+
comp_strength = (
410+
conc_geom.material.stress_strain_profile.get_compressive_strength()
411+
)
412+
413+
if comp_strength:
414+
alpha_squash = 1 - 0.003 * comp_strength
415+
alpha_squash = min(alpha_squash, 0.85)
416+
alpha_squash = max(alpha_squash, 0.72)
417+
else:
418+
alpha_squash = 1
419+
416420
# calculate compressive force
417421
force_c = (
418422
area
419-
* conc_geom.material.alpha_squash
423+
* alpha_squash
420424
* conc_geom.material.ultimate_stress_strain_profile.get_compressive_strength()
421425
)
422426

‎concreteproperties/material.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ class Concrete(Material):
3636
:param density: Concrete density (mass per unit volume)
3737
:param stress_strain_profile: Service concrete stress-strain profile
3838
:param ultimate_stress_strain_profile: Ultimate concrete stress-strain profile
39-
:param alpha_squash: Factor that modifies the concrete compressive strength at
40-
squash load
4139
:param flexural_tensile_strength: Absolute value of the concrete flexural
4240
tensile strength
4341
:param colour: Colour of the material for rendering
@@ -47,7 +45,6 @@ class Concrete(Material):
4745
density: float
4846
stress_strain_profile: ssp.ConcreteServiceProfile
4947
ultimate_stress_strain_profile: ssp.ConcreteUltimateProfile
50-
alpha_squash: float
5148
flexural_tensile_strength: float
5249
colour: str
5350
meshed: bool = field(default=True, init=False)

‎concreteproperties/tests/test_moment_interaction.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
gamma=0.83,
1919
ultimate_strain=0.003,
2020
),
21-
alpha_squash=0.85,
2221
flexural_tensile_strength=1.0,
2322
colour="lightgrey",
2423
)

‎concreteproperties/tests/test_reinforced_concrete_basics.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ def test_example_3_1():
2626
gamma=0.83,
2727
ultimate_strain=0.003,
2828
),
29-
alpha_squash=0.85,
3029
flexural_tensile_strength=1.0,
3130
colour="lightgrey",
3231
)
@@ -89,7 +88,6 @@ def test_example_3_2():
8988
gamma=0.83,
9089
ultimate_strain=0.003,
9190
),
92-
alpha_squash=0.85,
9391
flexural_tensile_strength=0.6,
9492
colour="lightgrey",
9593
)
@@ -180,7 +178,6 @@ def test_example_3_4():
180178
gamma=0.83,
181179
ultimate_strain=0.003,
182180
),
183-
alpha_squash=0.85,
184181
flexural_tensile_strength=0.6,
185182
colour="lightgrey",
186183
)
@@ -244,7 +241,6 @@ def test_example_3_8():
244241
gamma=0.83,
245242
ultimate_strain=0.003,
246243
),
247-
alpha_squash=0.85,
248244
flexural_tensile_strength=1.0,
249245
colour="lightgrey",
250246
)
@@ -293,7 +289,6 @@ def test_example_3_9():
293289
gamma=0.83,
294290
ultimate_strain=0.003,
295291
),
296-
alpha_squash=0.85,
297292
flexural_tensile_strength=1.0,
298293
colour="lightgrey",
299294
)
@@ -342,7 +337,6 @@ def test_example_3_11():
342337
gamma=0.85,
343338
ultimate_strain=0.003,
344339
),
345-
alpha_squash=0.85,
346340
flexural_tensile_strength=0,
347341
colour="lightgrey",
348342
)
@@ -394,7 +388,6 @@ def test_example_5_2():
394388
gamma=0.77,
395389
ultimate_strain=0.003,
396390
),
397-
alpha_squash=0.85,
398391
flexural_tensile_strength=3.4,
399392
colour="lightgrey",
400393
)

‎concreteproperties/tests/test_rotation.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
gamma=0.77,
2424
ultimate_strain=0.003,
2525
),
26-
alpha_squash=0.85,
2726
flexural_tensile_strength=0.6 * np.sqrt(40),
2827
colour="lightgrey",
2928
)

‎concreteproperties/tests/test_stress_equilibrium.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
gamma=0.77,
2424
ultimate_strain=0.003,
2525
),
26-
alpha_squash=0.85,
2726
flexural_tensile_strength=0.6 * np.sqrt(40),
2827
colour="lightgrey",
2928
)

‎docs/source/_static/animation.ipynb

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

‎docs/source/notebooks/area_properties.ipynb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
" gamma=0.89,\n",
6161
" ultimate_strain=0.003,\n",
6262
" ),\n",
63-
" alpha_squash=0.85,\n",
6463
" flexural_tensile_strength=3.4,\n",
6564
" colour=\"lightgrey\",\n",
6665
")\n",

‎docs/source/notebooks/biaxial_bending.ipynb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
" gamma=0.87,\n",
6363
" ultimate_strain=0.003,\n",
6464
" ),\n",
65-
" alpha_squash=0.85,\n",
6665
" flexural_tensile_strength=3.8,\n",
6766
" colour=\"lightgrey\",\n",
6867
")\n",

‎docs/source/notebooks/composite_section.ipynb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
" gamma=0.845,\n",
6565
" ultimate_strain=0.003,\n",
6666
" ),\n",
67-
" alpha_squash=0.85,\n",
6867
" flexural_tensile_strength=4.2,\n",
6968
" colour=\"lightgrey\",\n",
7069
")\n",
@@ -532,7 +531,6 @@
532531
" gamma=0.89,\n",
533532
" ultimate_strain=0.003,\n",
534533
" ),\n",
535-
" alpha_squash=0.85,\n",
536534
" flexural_tensile_strength=3.4,\n",
537535
" colour=\"lightgrey\",\n",
538536
")"
@@ -682,7 +680,7 @@
682680
],
683681
"metadata": {
684682
"kernelspec": {
685-
"display_name": "Python 3 (ipykernel)",
683+
"display_name": "Python 3.8.12 ('cp')",
686684
"language": "python",
687685
"name": "python3"
688686
},
@@ -697,6 +695,11 @@
697695
"nbconvert_exporter": "python",
698696
"pygments_lexer": "ipython3",
699697
"version": "3.8.12"
698+
},
699+
"vscode": {
700+
"interpreter": {
701+
"hash": "893b3ef6d13023afab4be8c5000be38ce11a760491bcfa4047435852657817d1"
702+
}
700703
}
701704
},
702705
"nbformat": 4,

‎docs/source/notebooks/cracked_properties.ipynb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
" gamma=0.87,\n",
6262
" ultimate_strain=0.003,\n",
6363
" ),\n",
64-
" alpha_squash=0.85,\n",
6564
" flexural_tensile_strength=3.8,\n",
6665
" colour=\"lightgrey\",\n",
6766
")\n",

‎docs/source/notebooks/design_codes.ipynb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"print(f\"Density = {concrete.density} kg/mm^3\")\n",
6666
"concrete.stress_strain_profile.plot_stress_strain(title=\"Service Profile\")\n",
6767
"concrete.ultimate_stress_strain_profile.plot_stress_strain(title=\"Ultimate Profile\")\n",
68-
"print(f\"Alpha Squash = {concrete.alpha_squash}\")\n",
6968
"print(\n",
7069
" f\"Concrete Flexural Tensile Strength: {concrete.flexural_tensile_strength:.2f} MPa\"\n",
7170
")"
@@ -418,7 +417,7 @@
418417
],
419418
"metadata": {
420419
"kernelspec": {
421-
"display_name": "Python 3 (ipykernel)",
420+
"display_name": "Python 3.8.12 ('cp')",
422421
"language": "python",
423422
"name": "python3"
424423
},
@@ -436,7 +435,7 @@
436435
},
437436
"vscode": {
438437
"interpreter": {
439-
"hash": "cbcd46708823968cdeec8140ad70b4bb10e53ceac96cecaaf557485e336f0189"
438+
"hash": "893b3ef6d13023afab4be8c5000be38ce11a760491bcfa4047435852657817d1"
440439
}
441440
}
442441
},

‎docs/source/notebooks/moment_curvature.ipynb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
" compressive_strain=0.00175,\n",
6464
" ultimate_strain=0.0035,\n",
6565
" ),\n",
66-
" alpha_squash=0.85,\n",
6766
" flexural_tensile_strength=3.5,\n",
6867
" colour=\"lightgrey\",\n",
6968
")\n",
@@ -79,7 +78,6 @@
7978
" compressive_strain=0.00175,\n",
8079
" ultimate_strain=0.0035,\n",
8180
" ),\n",
82-
" alpha_squash=0.85,\n",
8381
" flexural_tensile_strength=3.5,\n",
8482
" colour=\"lightgrey\",\n",
8583
")\n",
@@ -101,7 +99,6 @@
10199
" compressive_strain=0.00175,\n",
102100
" ultimate_strain=0.0035,\n",
103101
" ),\n",
104-
" alpha_squash=0.85,\n",
105102
" flexural_tensile_strength=3.5,\n",
106103
" colour=\"lightgrey\",\n",
107104
")\n",
@@ -458,7 +455,7 @@
458455
],
459456
"metadata": {
460457
"kernelspec": {
461-
"display_name": "Python 3 (ipykernel)",
458+
"display_name": "Python 3.8.12 ('cp')",
462459
"language": "python",
463460
"name": "python3"
464461
},
@@ -473,6 +470,11 @@
473470
"nbconvert_exporter": "python",
474471
"pygments_lexer": "ipython3",
475472
"version": "3.8.12"
473+
},
474+
"vscode": {
475+
"interpreter": {
476+
"hash": "893b3ef6d13023afab4be8c5000be38ce11a760491bcfa4047435852657817d1"
477+
}
476478
}
477479
},
478480
"nbformat": 4,

‎docs/source/notebooks/moment_interaction.ipynb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
" gamma=0.89,\n",
6262
" ultimate_strain=0.003,\n",
6363
" ),\n",
64-
" alpha_squash=0.85,\n",
6564
" flexural_tensile_strength=3.4,\n",
6665
" colour=\"lightgrey\",\n",
6766
")\n",
@@ -358,7 +357,7 @@
358357
],
359358
"metadata": {
360359
"kernelspec": {
361-
"display_name": "Python 3 (ipykernel)",
360+
"display_name": "Python 3.8.12 ('cp')",
362361
"language": "python",
363362
"name": "python3"
364363
},
@@ -376,7 +375,7 @@
376375
},
377376
"vscode": {
378377
"interpreter": {
379-
"hash": "cbcd46708823968cdeec8140ad70b4bb10e53ceac96cecaaf557485e336f0189"
378+
"hash": "893b3ef6d13023afab4be8c5000be38ce11a760491bcfa4047435852657817d1"
380379
}
381380
}
382381
},

‎docs/source/notebooks/stress_analysis.ipynb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
" gamma=0.87,\n",
6969
" ultimate_strain=0.003,\n",
7070
" ),\n",
71-
" alpha_squash=0.85,\n",
7271
" flexural_tensile_strength=3.8,\n",
7372
" colour=\"lightgrey\",\n",
7473
")\n",
@@ -539,7 +538,7 @@
539538
],
540539
"metadata": {
541540
"kernelspec": {
542-
"display_name": "Python 3 (ipykernel)",
541+
"display_name": "Python 3.8.12 ('cp')",
543542
"language": "python",
544543
"name": "python3"
545544
},
@@ -554,6 +553,11 @@
554553
"nbconvert_exporter": "python",
555554
"pygments_lexer": "ipython3",
556555
"version": "3.8.12"
556+
},
557+
"vscode": {
558+
"interpreter": {
559+
"hash": "893b3ef6d13023afab4be8c5000be38ce11a760491bcfa4047435852657817d1"
560+
}
557561
}
558562
},
559563
"nbformat": 4,

‎docs/source/notebooks/ultimate_bending.ipynb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
" gamma=0.845,\n",
5858
" ultimate_strain=0.003,\n",
5959
" ),\n",
60-
" alpha_squash=0.85,\n",
6160
" flexural_tensile_strength=4.2,\n",
6261
" colour=\"lightgrey\",\n",
6362
")\n",

0 commit comments

Comments
 (0)