diff --git a/docs/source/notebooks/candidates/main.py b/docs/source/notebooks/candidates/main.py index b9920b3..66de9b5 100644 --- a/docs/source/notebooks/candidates/main.py +++ b/docs/source/notebooks/candidates/main.py @@ -56,7 +56,7 @@ ############ # Add way back -# s = stiff_mandel6_bunch.to_abaqusMaterialAnisotropic() +# s = stiff_mandel6_bunch.to_abaqusMatAniso() # s.to_mandel6() diff --git a/mechkit/notation.py b/mechkit/notation.py index 8cbaff2..fc8bbfb 100644 --- a/mechkit/notation.py +++ b/mechkit/notation.py @@ -724,7 +724,7 @@ class ExplicitConverter(object): and in addition for quantity type "stiffness": - - abaqusMaterialAnisotropic + - abaqusMatAniso **Voigt notation** @@ -837,7 +837,7 @@ class ExplicitConverter(object): [1.41 1.41 1.41 2. 2. 2. ]] - todo: add stiffness abaqusMaterialAnisotropic + todo: add stiffness abaqusMatAniso """ @@ -957,11 +957,11 @@ def __init__(self, dtype="float64"): ("vumat", "voigt", dict(func=self._vumat_to_voigt_stiffness)), ( "voigt", - "abaqusMaterialAnisotropic", + "abaqusMatAniso", dict(func=self._voigt_to_abaqusMaterialElasticAnisotropic), ), ( - "abaqusMaterialAnisotropic", + "abaqusMatAniso", "voigt", dict(func=self._abaqusMaterialElasticAnisotropic_to_voigt), ), @@ -1268,5 +1268,5 @@ def to_umat(self): def to_vumat(self): return self.wrapped(self.converter.convert)(target="vumat") - def to_abaqusMaterialAnisotropic(self): - return self.wrapped(self.converter.convert)(target="abaqusMaterialAnisotropic") + def to_abaqusMatAniso(self): + return self.wrapped(self.converter.convert)(target="abaqusMatAniso") diff --git a/paper/figures/graph.py b/paper/figures/graph.py index fc1252c..fff25c3 100644 --- a/paper/figures/graph.py +++ b/paper/figures/graph.py @@ -20,7 +20,7 @@ titlefont_options = dict( fontsize=32, ) -alias_abaquas_material_anisotropic = "abaqMatAniso" +alias_abaquas_material_anisotropic = "abaqMatAniso" # "abaqusMatAniso" pos = { "mandel6": (0.33, 0.5), "mandel9": (0.15, 0.25), diff --git a/test/test_notation.py b/test/test_notation.py index 072f818..afe6b4c 100644 --- a/test/test_notation.py +++ b/test/test_notation.py @@ -385,7 +385,7 @@ def explicit_converter(): class Test_ExplicitConverter: def test_loop_minor_sym(self, con, tensor_min_sym): - excluded_notations = ["abaqusMaterialAnisotropic"] + excluded_notations = ["abaqusMatAniso"] start_notation = "mandel6" for key_quantity, graph in con.graphs_dict.items(): nodes = graph.nodes @@ -447,12 +447,12 @@ def test_loop_inner_sym_stiffness(self, con): new = con.convert( inp=origin, source="voigt", - target="abaqusMaterialAnisotropic", + target="abaqusMatAniso", quantity="stiffness", ) back = con.convert( inp=new, - source="abaqusMaterialAnisotropic", + source="abaqusMatAniso", target="voigt", quantity="stiffness", )