elasticipy 2.8.9__tar.gz → 2.8.10__tar.gz

{elasticipy-2.8.9/src/elasticipy.egg-info → elasticipy-2.8.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: elasticipy
-Version: 2.8.9
+Version: 2.8.10
 Summary: A Python library for elasticity tensor computations
 Author-email: Dorian Depriester <dorian.dep@gmail.com>
 License: MIT

{elasticipy-2.8.9 → elasticipy-2.8.10}/src/Elasticipy/SecondOrderTensor.py

@@ -1352,7 +1352,8 @@ def rotation_to_matrix(rotation, return_transpose=False):
     if isinstance(rotation, Rotation):
         matrix = rotation.as_matrix()
     elif is_orix_rotation(rotation):
-        matrix = rotation.to_matrix()
+        inv_rotation = ~rotation
+        matrix = inv_rotation.to_matrix()
     else:
         raise TypeError('The input argument must be of class scipy.transform.Rotation or '
                         'orix.quaternion.rotation.Rotation')

{elasticipy-2.8.9 → elasticipy-2.8.10/src/elasticipy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: elasticipy
-Version: 2.8.9
+Version: 2.8.10
 Summary: A Python library for elasticity tensor computations
 Author-email: Dorian Depriester <dorian.dep@gmail.com>
 License: MIT

{elasticipy-2.8.9 → elasticipy-2.8.10}/src/elasticipy.egg-info/SOURCES.txt

@@ -8,7 +8,6 @@ requirements.txt
 .github/workflows/Codecov.yml
 .github/workflows/JOSS build.yml
 .github/workflows/cloc.yml
-.github/workflows/conda-publish.yml
 .github/workflows/python-publish.yml
 Examples/Elasticipy_vs_pymatgen.py
 Examples/Elate_vs_Elasticipy.py
@@ -24,8 +23,6 @@ JOSS/Plot_E.png
 JOSS/YoungModulus.png
 JOSS/paper.bib
 JOSS/paper.md
-conda/build.sh
-conda/meta.yaml
 docs/index.rst
 docs/_static/images/HyperSphericalCoordinates.png
 docs/source/Elasticipy.FourthOrderTensor.rst

{elasticipy-2.8.9 → elasticipy-2.8.10}/tests/test_StiffnessTensor.py

@@ -398,11 +398,19 @@ class TestStiffnessConstructor(unittest.TestCase):
 
     def test_write_read_tensor(self):
         """Test export and import stiffness tensor to text file"""
-        C = StiffnessTensor.isotropic(E=210, nu=0.3)
         filename = 'C_tmp.txt'
+        C = StiffnessTensor.isotropic(E=210, nu=0.3)
+        C.save_to_txt(filename)
+        C2 = StiffnessTensor.from_txt_file(filename)
+        np.testing.assert_allclose(C2.matrix, C.matrix, atol=1e-2)
+
+        # Now the same with phase name
+        C = StiffnessTensor.isotropic(E=210, nu=0.3, phase_name='Steel')
         C.save_to_txt(filename)
         C2 = StiffnessTensor.from_txt_file(filename)
         np.testing.assert_allclose(C2.matrix, C.matrix, atol=1e-2)
+        assert C2.phase_name == 'Steel'
+
 
     def test_equality(self):
         """Test == operator"""
@@ -612,10 +620,18 @@ class TestStiffnessConstructor(unittest.TestCase):
         C_rotated = C * orix_rotations
         C_rotated_full = C_rotated.full_tensor()
         for i in range(n):
-            rot_mat = orix_rotations.to_matrix()[i]
+            inv_rotation = ~orix_rotations
+            rot_mat = inv_rotation.to_matrix()[i]
             tensor_i = np.einsum('im,jn,ko,lp,mnop -> ijkl', rot_mat, rot_mat, rot_mat, rot_mat, C.full_tensor())
             np.testing.assert_array_almost_equal(C_rotated_full[i], tensor_i)
 
+        # Check that the result is consistent with scipy.Rotation
+        euler = orix_rotations.to_euler()
+        scipy_rotations = Rotation.from_euler('ZXZ', euler)
+        C_rotated_scipy = C * scipy_rotations
+        C_rotated_full_scipy = C_rotated_scipy.full_tensor()
+        np.testing.assert_array_almost_equal(C_rotated_full_scipy, C_rotated_full)
+
 
     def test_linear_compressibility(self):
         E, nu = 210, 0.3

elasticipy-2.8.9/.github/workflows/conda-publish.yml

@@ -1,53 +0,0 @@
-name: Upload Elasticipy to Conda
-
-on:
-  push:
-    tags:
-      - "v*"  # Runs when a tag starting with "v" (e.g., v1.0.0) is pushed
-
-jobs:
-  build-and-upload:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - name: Copy requirements.txt
-      run: cp requirements.txt conda/
-
-    - name: Set up Conda
-      uses: conda-incubator/setup-miniconda@v2
-      with:
-        auto-update-conda: true
-        python-version: "3.10"
-        channels: conda-forge,defaults
-        activate-environment: elasticipy
-
-    - name: Install dependencies
-      run: |
-        conda create -n elasticipy python=3.10 -y
-        conda run -n elasticipy conda install anaconda-client conda-build -y
-        conda run -n elasticipy conda install numpy -y
-
-
-    - name: Extract version from tag
-      id: extract_version
-      run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-
-    - name: Build package
-      run: |
-        conda run -n elasticipy conda build conda --old-build-string --output-folder build --no-anaconda-upload
-
-    - name: Find built package
-      id: find-package
-      run: |
-        PACKAGE_PATH=$(find build/ -name "*.tar.bz2")
-        echo "PACKAGE_PATH=$PACKAGE_PATH" >> $GITHUB_ENV
-
-    - name: Upload package
-      env:
-        ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_API_TOKEN }}
-      run: |
-        conda run -n elasticipy anaconda login --token $ANACONDA_API_TOKEN
-        conda run -n elasticipy anaconda upload ${{ env.PACKAGE_PATH }}

elasticipy-2.8.9/conda/build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-pip install -r requirements.txt
-pip install .

elasticipy-2.8.9/conda/meta.yaml

@@ -1,15 +0,0 @@
-package:
-  name: elasticipy
-  version: {{ environ.get('VERSION', '0.1.0') }}
-
-source:
-  path: .
-
-requirements:
-  build:
-    - python
-    - setuptools
-    - wheel
-  run:
-    - python
-    - pip