Skip to content

Main #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 113 commits into
base: bmcs_course
Choose a base branch
from
Open

Main #1

wants to merge 113 commits into from

Conversation

@pyCG
Copy link
Collaborator

@pyCG pyCG commented May 21, 2024

No description provided.

ishomam and others added 30 commits March 18, 2021 10:28
@ishomam
Fix a bug in inv_M_kappa
b5ecb8e
@srtgn
minor changes to update
6f37f4e
@srtgn
Merge remote-tracking branch 'origin/main' into main
eabfb22
@ishomam
Small change
edff649
@ishomam
Merge remote-tracking branch 'origin/main' into main
2d4da8c
@rosoba
environment
af21d60
@rosoba
Merge branch 'bmcs_course' into merge_for_app_window
f5d6420 
# Conflicts:
#	environment.yml
@rosoba
merged
296a354
@rosoba
after merge
a60df3f
@rosoba
factor added to material models
48936c3
@ishomam
Some changes including carbon law
e376920
@ishomam
Merge remote-tracking branch 'origin/main' into main
5d2727d 
# Conflicts:
#	bmcs_cross_section/matmod/concrete.py
@ishomam
Some changes
ad38d23
@ishomam
Steel yielding was limited to a value eps_ud
9ea8b67
@ishomam
Some plot cleaning and preliminary plot_strain
2407739
@rosoba
added fixed boundary options
4dcc889
@rosoba
Merge remote-tracking branch 'origin/main' into main
8702b8f
@rosoba
minor fixes
f9bf54a
@ishomam
Small fix in the imports
0ce12dd
@rosoba
layout - backward link from layer
7757316
@rosoba
Merge remote-tracking branch 'origin/main' into main
6bbf2ce 
# Conflicts:
#	bmcs_cross_section/pullout/pullout_sim.py
@ishomam
Better default values for t-section and adding version number to sympy
273e613
@ishomam
Adding IShape and preliminary working CustomShape
b9186fa
@ishomam
Adding one by one solution for kappa values
a218a20
@ishomam
Solution of eps_bot is mostly stable now
665f6cf
@ishomam
Fix showing strain profile and adding inclination to steel law avoidi…
f57e863 
…ng instability
@rosoba
minor fixes
4d00b7f
@rosoba
Merge remote-tracking branch 'origin/main' into main
4c1c94e 
# Conflicts:
#	bmcs_cross_section/mkappa/mkappa.py
@rosoba
fixed mkappa for plain concrete
321f5d9
@ishomam
Kappa piecewise solutions are now working for negative range too
9927ae8
ishomam and others added 30 commits May 9, 2023 14:00
@ishomam
Test
41321fe
@ishomam
Improved version of the M_u closed-form formulas
0892045
@ishomam
Final cleaned M_u/psi closed-form formulas notebook
5f7ec66
@ishomam
Analytical M_u class with validation and some fixes
09d5c47
@ishomam
Added deflection calculation to ACI and adapted carbon law
d503cd1
@ishomam
slight fix
8b21581
@ishomam
Fix a bug in the last ACI deflection function
6bce30d
@ishomam
Added steel-reinf. deflection function
5ac8acb
@ishomam
New efficient design diagrams are derived
b73d452
@ishomam
New efficient design diagrams are derived 2
4b30a38
@rosoba
minor adaptions
9e954cb
@ishomam
Tiny fix to improve mk solution stability
52445bd
@rosoba
before merge
7e7b442
@rosoba
fixed bug in cs_dsign
6fbb670
@rosoba
todo
8a60c45
@rosoba
carbon footprint added
1c446f3
@rosoba
minor change
bd7517d
@rosoba
description updated
300a0fa
@rosoba
carbon footprint quantification
e81ed2c
@ishomam
Some additions to carbon_footprint.ipynb
8558ed7
@rosoba
generalizing for CO2 footprint
f3dadb7
@rosoba
updated figure of specific emissions
81722d7
@rosoba
carbon footprint versus slenderness
dea9c81
@rosoba
minor
c3de4e2
@rosoba
carbon footprint added
77117a1
@pyCG
First commit
3fa3f79
@pyCG
First commit
c5281e7
@pyCG
New code comments
1e83b52
@pyCG
cg edit file commit
611768f
@pyCG
Add files via upload
04c874a 
M-Kappa Tool Test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@pyCG @ishomam @srtgn @rosoba @RiekeStr