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

Merge from master. #54

Merged
merged 7 commits into from
Nov 9, 2023
Merged

Merge from master. #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
573a475
plante: fix orientation of returned fe
kimauth Oct 12, 2022
b5b9129
Merge pull request #52 from CALFEM/develop
jonaslindemann Oct 8, 2023
0d54e46
Fix is None issues
jonaslindemann Oct 8, 2023
8a7fa31
Update version number
jonaslindemann Oct 9, 2023
ead74f1
Merge pull request #53 from CALFEM/develop
jonaslindemann Oct 31, 2023
80cebbf
Prepare for release
jonaslindemann Oct 31, 2023
db9af5c
Merge pull request #45 from kimauth/bugfix_plante
jonaslindemann Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ venv-calfem

calfem/shapes - kopia.py

calfem_python.egg-info/*
calfem_python_small.egg-info/*

.vscode/launch.json
*.project
.pydevproject
Expand Down
2 changes: 1 addition & 1 deletion build-package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def build_package():

if __name__ == "__main__":

package_version = "3.6.3"
package_version = "3.6.4"

update_setup("calfem-python", package_version, "'numpy', 'visvis', 'pyvtk', 'matplotlib', 'scipy', 'gmsh', 'qtpy', 'vedo', 'tabulate'")

Expand Down
32 changes: 16 additions & 16 deletions calfem/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def bar1s(ex, ep, ed, eq=None, nep=None):
edi=u
eci=X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -416,7 +416,7 @@ def bar1ws(ex, ep, ed, eq=None, nep=None):
edi = u
eci = X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -580,7 +580,7 @@ def bar2s(ex, ey, ep, ed, eq=None, nep=None):
edi = u
eci = X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -748,7 +748,7 @@ def bar2gs(ex, ey, ep, ed, nep=None):
edi=u
eci=X

if nep == None:
if nep is None:
return es, QX
else:
return es, QX, edi, eci
Expand Down Expand Up @@ -919,7 +919,7 @@ def bar3s(ex, ey, ez, ep, ed, eq=None, nep=None):
edi=u
eci=X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -1068,7 +1068,7 @@ def beam1s(ex, ep, ed, eq=None, nep=None):
edi = v
eci = X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -1241,7 +1241,7 @@ def beam1ws(ex, ep, ed, eq=None, nep=None):
edi = v
eci = X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -1451,7 +1451,7 @@ def beam2s(ex, ey, ep, ed, eq=None, nep=None):
edi = np.concatenate((u, v), 1)
eci = X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -1693,7 +1693,7 @@ def beam2ws(ex, ey, ep, ed, eq=None, nep=None):
edi = np.concatenate((u, v), 1)
eci = X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -1935,7 +1935,7 @@ def beam2gs(ex, ey, ep, ed, QX, eq=None, nep=None):
edi = np.concatenate((u, v), 1)
eci = X

if nep == None:
if nep is None:
return es, QX
else:
return es, QX, edi, eci
Expand Down Expand Up @@ -2222,7 +2222,7 @@ def beam2gxs(ex, ey, ep, ed, QX, eq=None, nep=None):
edi = np.concatenate((u, v), 1)
eci = X

if nep == None:
if nep is None:
return es, QX
else:
return es, QX, edi, eci
Expand Down Expand Up @@ -2449,7 +2449,7 @@ def beam2ts(ex, ey, ep, ed, eq=None, nep=None):
edi = np.concatenate((u, v, theta), 1)
eci = X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -2972,7 +2972,7 @@ def beam3s(ex, ey, ez, eo, ep, ed, eq=None, nep=None):
edi = np.concatenate((u, v, w, fi), 1)
eci = X

if nep == None:
if nep is None:
return es
else:
return es, edi, eci
Expand Down Expand Up @@ -4166,7 +4166,7 @@ def plante(ex, ey, ep, D, eq=None):
if eq is None:
return Ke
else:
return Ke, fe.T
return Ke, fe

#--------- plane strain --------------------------------------

Expand All @@ -4190,7 +4190,7 @@ def plante(ex, ey, ep, D, eq=None):
if eq is None:
return Ke
else:
return Ke, fe.T
return Ke, fe

else:
info("Error ! Check first argument, ptype=1 or 2 allowed")
Expand Down Expand Up @@ -6329,4 +6329,4 @@ def beam2crd(ex=None, ey=None, ed=None, mag=None):
excd[i, :] = xyc[0, :]+mag*cd[0, :]
eycd[i, :] = xyc[1, :]+mag*cd[1, :]

return excd, eycd
return excd, eycd
22 changes: 0 additions & 22 deletions calfem_python_small.egg-info/PKG-INFO
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions calfem_python_small.egg-info/SOURCES.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion calfem_python_small.egg-info/dependency_links.txt
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions calfem_python_small.egg-info/requires.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion calfem_python_small.egg-info/top_level.txt
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions setup-org.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def gen_data_files(*dirs):
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html

version='3.6.3',
version='3.6.4',

description='CALFEM for Python',
long_description='The computer program CALFEM is written for the software MATLAB and is an interactive tool for learning the finite element method. CALFEM is an abbreviation of "Computer Aided Learning of the Finite Element Method" and been developed by the Division of Structural Mechanics at Lund University since the late 70s.',
Expand Down Expand Up @@ -68,7 +68,8 @@ def gen_data_files(*dirs):
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
],

# What does your project relate to?
Expand Down
4 changes: 3 additions & 1 deletion setup-template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ def gen_data_files(*dirs):
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
],

# What does your project relate to?
Expand Down
7 changes: 4 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def gen_data_files(*dirs):
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html

version='3.6.3',
version='3.6.4',

description='CALFEM for Python',
long_description='The computer program CALFEM is written for the software MATLAB and is an interactive tool for learning the finite element method. CALFEM is an abbreviation of "Computer Aided Learning of the Finite Element Method" and been developed by the Division of Structural Mechanics at Lund University since the late 70s.',
Expand All @@ -42,7 +42,7 @@ def gen_data_files(*dirs):

# Author details
author='Jonas Lindemann, et al',
author_email='jonas.lindemann@byggmek.lth.se',
author_email='jonas.lindemann@lunarc.lu.se',

# Choose your license
license='MIT',
Expand All @@ -68,7 +68,8 @@ def gen_data_files(*dirs):
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
],

# What does your project relate to?
Expand Down