Skip to content
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

Add formulas 3.3 - 3.10 from 1992-1-1+C2:2011 #20

Merged
merged 41 commits into from
Nov 30, 2023
Merged

Add formulas 3.3 - 3.10 from 1992-1-1+C2:2011 #20

merged 41 commits into from
Nov 30, 2023

Conversation

LBSmulders
Copy link
Collaborator

@LBSmulders LBSmulders commented Nov 29, 2023 •
edited by egarciamendez
Loading

Description

Added formulas 3.3 up to and including 3.10 from 1992-1-1+C2:2011 including their test files.

Fixes #11

Type of change

  • New feature (non-breaking change which adds functionality)

Checklist:

  • I have added tests that prove my fix is effective or that my feature works
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • New and existing unit tests pass locally with my changes

@LBSmulders
(#11) Added formula 3.3
cf5b00f
@LBSmulders
(#11) Added test formula 3.3
e72c9b1
@LBSmulders
(#11) Added formula 3.4
60637a9
@LBSmulders
(#11) Added test formula 3.4
2455774
@LBSmulders
(#11) Added formula 3.5
e4c380e
@LBSmulders
(#11) Added test formula 3.5
3a3c69f
@LBSmulders
(#11) Added formula 3.6
9c63157
@LBSmulders
(#11) Added test formula 3.6
66442f9
@LBSmulders
(#11) Added formula 3.7
cb8a1bb
@LBSmulders
(#11) Added test formula 3.7
e3e605e
@LBSmulders
(#11) Added formula 3.8
814f06e
@LBSmulders
(#11) Added test formula 3.8
57d4128
@LBSmulders
(#11) Added formula 3.9
13b7207
@LBSmulders
(#11) Merging main into branch
4c55891
@LBSmulders
(#11) Added test formula 3.9
8b13fde
@LBSmulders
Merge branch '9-feature-request-add-formula-3_1-3_2' into 11-feature-…
297476e 
…request-add-formulas-3_3_till_3_16

# Conflicts:
#	blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_3_materials.py
@LBSmulders
(#11) Updates
4f4218d
@LBSmulders
(#11) Added formula 3.10
1309ef4
@LBSmulders
(#11) Added test formula 3.10
2394a40
@LBSmulders
(#11) Added test sub-formula 3.10
7699617
@LBSmulders
Merge branch 'main' into 11-feature-request-add-formulas-3_3_till_3_16
7e19242
@LBSmulders
Merge branch '9-feature-request-add-formula-3_1-3_2' into 11-feature-…
5f81bd5 
…request-add-formulas-3_3_till_3_16

# Conflicts:
#	blueprints/codes/eurocode/nen_en_1992_1_1_c2_2011/chapter_3_materials.py
@LBSmulders
(#11) Update formula 3.3 - 3.5
846e875
@LBSmulders
(#11) Update tests formula 3.3
1fc4194
@LBSmulders
(#11) Update tests formula 3.4
fb73537
@LBSmulders
(#11) Update tests formula 3.5
95b1224
@LBSmulders
(#11) Update formulas 3.3 - 3.10
32b1784
@LBSmulders
(#11) Updated tests formulas 3.5 - 3.10
494e95c
@github-actions GitHub Actions
Copy link

Thank you so much for contributing to Blueprints! This is your Pull Request # 2 to this project.
Your contributions help thousands of engineers work more efficiently and accurately.

Now that you've created your pull request, please don't go away; take a look at the bottom of this page for the automated checks that should already be running. If they pass, great! If not, please click on 'Details' and see if you can fix the problem they've identified. A maintainer should be along shortly to review your pull request and help get it added!

@egarciamendez
Copy link
Member

egarciamendez commented Nov 29, 2023 •
edited
Loading

afbeelding

Value check performed till formula 3.6. Work in Progress.

@egarciamendez
Copy link
Member

Great work Luuk!
afbeelding

@egarciamendez egarciamendez reopened this Nov 30, 2023
egarciamendez

This comment was marked as duplicate.

Sign in to view

egarciamendez
egarciamendez approved these changes Nov 30, 2023
View reviewed changes
Copy link
Member

@egarciamendez egarciamendez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀
afbeelding

@egarciamendez egarciamendez merged commit 4642bcb into main Nov 30, 2023
4 checks passed
@egarciamendez egarciamendez deleted the 11-feature-request-add-formulas-3_3_till_3_16 branch November 30, 2023 21:49
@egarciamendez egarciamendez added the enhancement New feature or request label Dec 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@egarciamendez egarciamendez egarciamendez approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[✨ Feature request]: Add from NEN-EN 1992-1-1+C2:2011 formula 3.3 till 3.10
2 participants
@LBSmulders @egarciamendez