Merge pull request #53 from adtzlr/adtzlr-patch-miehe-goektepe

Rename Miehe Göktepe Lulei model

README.md

@@ -115,7 +115,7 @@ Available [micro-sphere hyperelastic frameworks](https://github.com/adtzlr/matad
 - [non-affine tube](https://doi.org/10.1016/j.jmps.2004.03.011) ([code](https://github.com/adtzlr/matadi/blob/main/matadi/models/microsphere/nonaffine/_models.py#L20-L32))
 
 Available [micro-sphere hyperelastic material models](https://github.com/adtzlr/matadi/blob/main/matadi/models/microsphere) (Miehe, Göktepe, Lulei) [[2](https://doi.org/10.1016/j.jmps.2004.03.011)]:
-- [non-affine micro-sphere](https://doi.org/10.1016/j.jmps.2004.03.011) ([code](https://github.com/adtzlr/matadi/blob/main/matadi/models/microsphere/nonaffine/_models.py#L35-L49))
+- [Miehe Göktepe Lulei](https://doi.org/10.1016/j.jmps.2004.03.011) ([code](https://github.com/adtzlr/matadi/blob/main/matadi/models/microsphere/nonaffine/_models.py#L35-L49))
 
 Any user-defined isotropic hyperelastic strain energy density function may be passed as the `fun` argument of `MaterialHyperelastic` by using the following template:
 
@@ -144,10 +144,10 @@ In the `Lab` :lab_coat: experiments on homogenous loadcases can be performed. Le
 
 ```python
 from matadi import Lab, MaterialHyperelastic
-from matadi.models import microsphere
+from matadi.models import miehe_goektepe_lulei
 
 mat = MaterialHyperelastic(
-    microsphere.nonaffine.miehe, 
+    miehe_goektepe_lulei, 
     mu=0.1475, 
     N=3.273, 
     p=9.31, 

matadi/__about__.py

@@ -1 +1 @@
-__version__ = "0.0.17"
+__version__ = "0.0.18"

matadi/models/__init__.py

@@ -22,3 +22,4 @@
 )
 
 from . import microsphere
+from .microsphere.nonaffine import miehe_goektepe_lulei

matadi/models/microsphere/nonaffine/__init__.py

@@ -1,3 +1,3 @@
 from ._models import microsphere_nonaffine_stretch as stretch
 from ._models import microsphere_nonaffine_tube as tube
-from ._models import microsphere_nonaffine_miehe as miehe
+from ._models import microsphere_nonaffine_miehe_goektepe_lulei as miehe_goektepe_lulei

matadi/models/microsphere/nonaffine/_models.py

@@ -33,7 +33,7 @@ def microsphere_nonaffine_tube(F, q, f, kwargs, quadrature=BazantOh(n=21)):
 
 
 @isochoric_volumetric_split
-def microsphere_nonaffine_miehe(F, mu, N, U, p, q):
+def microsphere_nonaffine_miehe_goektepe_lulei(F, mu, N, U, p, q):
     """Micro-sphere model: Combined non-affine stretch and
     tube model (for details see Miehe, Goektepe and Lulei (2004))."""
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matadi"
-version = "0.0.17"
+version = "0.0.18"
 description = "Material Definition with Automatic Differentiation"
 readme = "README.md"
 requires-python = ">=3.6"
@@ -58,4 +58,4 @@ issues = "https://github.com/adtzlr/matadi/issues"
 
 [build-system]
 requires = ["setuptools>=42", "wheel"]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = matadi
-version = 0.0.17
+version = 0.0.18
 author = Andreas Dutzler
 author_email = [email protected]
 description = Material Definition with Automatic Differentiation
@@ -38,4 +38,4 @@ python_requires = >=3.6
 [options.extras_require]
 all =
     matplotlib
-	scipy
+	scipy

tests/test_models.py

@@ -51,7 +51,7 @@ def library():
             "f": md.microsphere.linear,
             "kwargs": {"mu": 1},
         },
-        matadi.models.microsphere.nonaffine.miehe: {
+        matadi.models.miehe_goektepe_lulei: {
             "mu": 0.1475,
             "N": 3.273,
             "p": 9.31,