Skip to content

Commit

Permalink
Merge pull request #17 from compmec/dev
Browse files Browse the repository at this point in the history
Finish basic version 0.3.0
  • Loading branch information
carlos-adir authored Feb 25, 2024
2 parents f5d35c1 + 91f2ab2 commit 3ef115e
Show file tree
Hide file tree
Showing 30 changed files with 2,388 additions and 1,277 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/black.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- uses: psf/black@stable
- uses: psf/black
rev: 24.2.0
with:
options: "--check --verbose --exclude docs"


2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ repos:
rev: v2.14.5
hooks:
- id: pylint
additional_dependencies: [numpy]
additional_dependencies: [numpy, compmec-nurbs, compmec-shape, jsonschema]
exclude: "(tests|docs)/.*" # Prevent files in tests/ and /docs to be passed in to pylint.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@

![compmec-section logo](docs/source/img/logo.svg)

A python package for bidimensional geometric sections boolean manipulation.

A python package for analysis of beam sections by using Boundary Element Method.

### Installation:

Expand Down
14 changes: 14 additions & 0 deletions examples/materials.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"Steel": {
"behaviour": "Isotropic",
"young_modulus": 210e+3,
"poissons_ratio": 0.3,
"density": 7.7e-9
},
"Aluminium": {
"behaviour": "Isotropic",
"young_modulus": 70e+3,
"poissons_ratio": 0.3,
"density": 2.7e-9
}
}
29 changes: 29 additions & 0 deletions examples/steel_square.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"nodes": [
[1, 1, 1],
[2, -1, 1],
[3, -1, -1],
[4, -1, -1]
],
"curves": [
{"label": 1000,
"degree": 1,
"knotvector": [0, 0, 0.25, 0.5, 0.75, 1, 1],
"ctrlpoints": [1, 2, 3, 4, 1]}
],
"shapes": {
"square": [1000]
},
"materials": {
"steel": {
"young_modulus": 210e+3,
"poissons_ratio": 0.3
}
},
"sections": {
"square": {
"shapes": ["square"],
"materials": ["steel"]
}
}
}
12 changes: 11 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
[tool.poetry]
name = "compmec-section"
version = "0.2.0"
version = "0.3.0"
description = "Analysis of beams cross-section using the boundary element method"
authors = ["Carlos Adir <[email protected]>"]
readme = "README.md"
packages = [{ include = "compmec/section", from = "src" }]
include = ["schema/*.json"]

[tool.setuptools.packages.find]
include = ["src/compmec/section/schema/*.json"]

[tool.poetry.dependencies]
numpy = "^1.0.0"
compmec-nurbs = "^1.0.0"
compmec-shape = "^1.0.0"
python = "^3.7"
jsonschema = "^4.17.3"

[tool.poetry.dev-dependencies]
pytest = "^5.2"
Expand All @@ -23,3 +30,6 @@ build-backend = "poetry.core.masonry.api"

[tool.scriv]
version = "literal: src/compmec/section/__init__.py: __version__"

[tool.black]
line-length = 79
5 changes: 4 additions & 1 deletion src/compmec/section/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
It uses mainly curves as boundary to compute the elements.
"""

__version__ = "0.2.0"
from .material import Isotropic, Material
from .section import Section

__version__ = "0.3.0"

if __name__ == "__main__":
pass
Loading

0 comments on commit 3ef115e

Please sign in to comment.