Change names so that they are shorter: to_...

geodynamics · Jul 13, 2023 · f7a4ae5 · f7a4ae5
1 parent 13be08a
commit f7a4ae5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/include/aspect/utilities.h b/include/aspect/utilities.h
@@ -1243,37 +1243,37 @@ namespace aspect
        * See https://en.wikipedia.org/wiki/Voigt_notation for more info on the Voigt notation.
        */
       SymmetricTensor<2,6>
-      transform_full_stiffness_tensor_to_voigt_stiffness_matrix(const SymmetricTensor<4,3> &input_tensor);
+      to_voigt_stiffness_matrix(const SymmetricTensor<4,3> &input_tensor);
 
 
       /**
        * Transform a 6x6 Voigt stiffness matrix into a 4th order full stiffness tensor.
        * See https://en.wikipedia.org/wiki/Voigt_notation for more info on the Voigt notation.
        */
       SymmetricTensor<4,3>
-      transform_voigt_stiffness_matrix_to_full_stiffness_tensor(const SymmetricTensor<2,6> &input_tensor);
+      to_full_stiffness_tensor(const SymmetricTensor<2,6> &input_tensor);
 
 
       /**
        * Form a 21D voigt stiffness vector from a 6x6 Voigt stiffness matrix.
        * See https://en.wikipedia.org/wiki/Voigt_notation for more info on the Voigt notation.
        */
       Tensor<1,21>
-      transform_voigt_stiffness_matrix_to_voigt_stiffness_vector(const SymmetricTensor<2,6> &input_tensor);
+      to_voigt_stiffness_vector(const SymmetricTensor<2,6> &input_tensor);
 
       /**
        * Form a 21D voigt stiffness vector from a 6x6 Voigt stiffness matrix.
        * See https://en.wikipedia.org/wiki/Voigt_notation for more info on the Voigt notation.
        */
       SymmetricTensor<2,6>
-      transform_voigt_stiffness_vector_to_voigt_stiffness_matrix(const Tensor<1,21> &input_tensor);
+      to_voigt_stiffness_matrix(const Tensor<1,21> &input_tensor);
 
       /**
        * Transform a 4th order full stiffness tensor into a 21D Voigt stiffness vector.
        * See https://en.wikipedia.org/wiki/Voigt_notation for more info on the Voigt notation.
        */
       Tensor<1,21>
-      transform_full_stiffness_tensor_to_voigt_stiffness_vector(const SymmetricTensor<4,3> &input);
+      to_voigt_stiffness_vector(const SymmetricTensor<4,3> &input);
 
     }
 

diff --git a/source/utilities.cc b/source/utilities.cc
@@ -3199,7 +3199,7 @@ namespace aspect
 
 
       SymmetricTensor<2,6>
-      transform_full_stiffness_tensor_to_voigt_stiffness_matrix(const SymmetricTensor<4,3> &input_tensor)
+      to_voigt_stiffness_matrix(const SymmetricTensor<4,3> &input_tensor)
       {
         SymmetricTensor<2,6> output;
 
@@ -3251,7 +3251,7 @@ namespace aspect
 
 
       SymmetricTensor<4,3>
-      transform_voigt_stiffness_matrix_to_full_stiffness_tensor(const SymmetricTensor<2,6> &input_tensor)
+      to_full_stiffness_tensor(const SymmetricTensor<2,6> &input_tensor)
       {
         SymmetricTensor<4,3> output;
 
@@ -3274,7 +3274,7 @@ namespace aspect
 
 
       Tensor<1,21>
-      transform_voigt_stiffness_matrix_to_voigt_stiffness_vector(const SymmetricTensor<2,6> &input)
+      to_voigt_stiffness_vector(const SymmetricTensor<2,6> &input)
       {
         return Tensor<1,21,double> (
         {
@@ -3306,7 +3306,7 @@ namespace aspect
 
 
       SymmetricTensor<2,6>
-      transform_voigt_stiffness_vector_to_voigt_stiffness_matrix(const Tensor<1,21> &input)
+      to_voigt_stiffness_matrix(const Tensor<1,21> &input)
       {
         SymmetricTensor<2,6> result;
 
@@ -3341,7 +3341,7 @@ namespace aspect
 
 
       Tensor<1,21>
-      transform_full_stiffness_tensor_to_voigt_stiffness_vector(const SymmetricTensor<4,3> &input_tensor)
+      to_voigt_stiffness_vector(const SymmetricTensor<4,3> &input_tensor)
       {
         return Tensor<1,21,double> (
         {

diff --git a/unit_tests/utilities.cc b/unit_tests/utilities.cc
@@ -257,7 +257,7 @@ TEST_CASE("CPO elastic tensor transform functions")
 
 // first test whether the functions are invertable
   {
-    dealii::SymmetricTensor<2,6> result_up_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(reference_elastic_tensor));
+    dealii::SymmetricTensor<2,6> result_up_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(aspect::Utilities::Tensors::to_full_stiffness_tensor(reference_elastic_tensor));
 
     for (size_t i = 0; i < 6; i++)
       {
@@ -268,7 +268,7 @@ TEST_CASE("CPO elastic tensor transform functions")
       }
   }
   {
-    dealii::SymmetricTensor<2,6> result_down_up = aspect::Utilities::Tensors::transform_voigt_stiffness_vector_to_voigt_stiffness_matrix(aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_voigt_stiffness_vector(reference_elastic_tensor));
+    dealii::SymmetricTensor<2,6> result_down_up = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(aspect::Utilities::Tensors::to_voigt_stiffness_vector(reference_elastic_tensor));
 
     for (size_t i = 0; i < 6; i++)
       {
@@ -279,7 +279,7 @@ TEST_CASE("CPO elastic tensor transform functions")
       }
   }
   {
-    dealii::SymmetricTensor<2,6> result_up_2down_up = aspect::Utilities::Tensors::transform_voigt_stiffness_vector_to_voigt_stiffness_matrix(aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_vector(aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(reference_elastic_tensor)));
+    dealii::SymmetricTensor<2,6> result_up_2down_up = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(aspect::Utilities::Tensors::to_voigt_stiffness_vector(aspect::Utilities::Tensors::to_full_stiffness_tensor(reference_elastic_tensor)));
 
     for (size_t i = 0; i < 6; i++)
       {
@@ -314,7 +314,7 @@ TEST_CASE("CPO elastic tensor transform functions")
     }
 
     {
-      dealii::SymmetricTensor<4,3> result_full_stiffness_tensor = aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(reference_elastic_tensor);
+      dealii::SymmetricTensor<4,3> result_full_stiffness_tensor = aspect::Utilities::Tensors::to_full_stiffness_tensor(reference_elastic_tensor);
       dealii::SymmetricTensor<4,3> result_full_stiffness_tensor_rotate_zero = aspect::Utilities::Tensors::rotate_full_stiffness_tensor(rotation_tensor,result_full_stiffness_tensor);
 
       // first check that one the tensors didn't change with zero rotation
@@ -334,9 +334,9 @@ TEST_CASE("CPO elastic tensor transform functions")
     }
 
     {
-      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(
+      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(
                                                                aspect::Utilities::Tensors::rotate_full_stiffness_tensor(rotation_tensor,
-                                                                   aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(reference_elastic_tensor)));
+                                                                   aspect::Utilities::Tensors::to_full_stiffness_tensor(reference_elastic_tensor)));
       dealii::SymmetricTensor<2,6> result_1_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor,reference_elastic_tensor);
 
       // first check that one the tensors didn't change with zero rotation
@@ -376,9 +376,9 @@ TEST_CASE("CPO elastic tensor transform functions")
     }
 
     {
-      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(
+      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(
                                                                aspect::Utilities::Tensors::rotate_full_stiffness_tensor(rotation_tensor,
-                                                                   aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(reference_elastic_tensor)));
+                                                                   aspect::Utilities::Tensors::to_full_stiffness_tensor(reference_elastic_tensor)));
       dealii::SymmetricTensor<2,6> result_1_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor,reference_elastic_tensor);
 
       for (size_t i = 0; i < 6; i++)
@@ -389,7 +389,7 @@ TEST_CASE("CPO elastic tensor transform functions")
             }
         }
 
-      dealii::SymmetricTensor<4,3> result_up_10_rotate = aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(result_up_1_rotate_down);
+      dealii::SymmetricTensor<4,3> result_up_10_rotate = aspect::Utilities::Tensors::to_full_stiffness_tensor(result_up_1_rotate_down);
 
       dealii::SymmetricTensor<2,6> result_5_rotate = result_1_rotate;
 
@@ -399,7 +399,7 @@ TEST_CASE("CPO elastic tensor transform functions")
           result_5_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor, result_5_rotate);
         }
 
-      dealii::SymmetricTensor<2,6> result_up_10_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(result_up_10_rotate);
+      dealii::SymmetricTensor<2,6> result_up_10_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(result_up_10_rotate);
 
       for (size_t i = 0; i < 6; i++)
         {
@@ -431,9 +431,9 @@ TEST_CASE("CPO elastic tensor transform functions")
     }
 
     {
-      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(
+      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(
                                                                aspect::Utilities::Tensors::rotate_full_stiffness_tensor(rotation_tensor,
-                                                                   aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(reference_elastic_tensor)));
+                                                                   aspect::Utilities::Tensors::to_full_stiffness_tensor(reference_elastic_tensor)));
       dealii::SymmetricTensor<2,6> result_1_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor,reference_elastic_tensor);
 
       for (size_t i = 0; i < 6; i++)
@@ -444,7 +444,7 @@ TEST_CASE("CPO elastic tensor transform functions")
             }
         }
 
-      dealii::SymmetricTensor<4,3> result_up_10_rotate = aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(result_up_1_rotate_down);
+      dealii::SymmetricTensor<4,3> result_up_10_rotate = aspect::Utilities::Tensors::to_full_stiffness_tensor(result_up_1_rotate_down);
 
       dealii::SymmetricTensor<2,6> result_5_rotate = result_1_rotate;
 
@@ -454,7 +454,7 @@ TEST_CASE("CPO elastic tensor transform functions")
           result_5_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor, result_5_rotate);
         }
 
-      dealii::SymmetricTensor<2,6> result_up_10_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(result_up_10_rotate);
+      dealii::SymmetricTensor<2,6> result_up_10_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(result_up_10_rotate);
 
       for (size_t i = 0; i < 6; i++)
         {
@@ -485,9 +485,9 @@ TEST_CASE("CPO elastic tensor transform functions")
     }
 
     {
-      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(
+      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(
                                                                aspect::Utilities::Tensors::rotate_full_stiffness_tensor(rotation_tensor,
-                                                                   aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(reference_elastic_tensor)));
+                                                                   aspect::Utilities::Tensors::to_full_stiffness_tensor(reference_elastic_tensor)));
       dealii::SymmetricTensor<2,6> result_1_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor, reference_elastic_tensor);
 
       for (size_t i = 0; i < 6; i++)
@@ -498,7 +498,7 @@ TEST_CASE("CPO elastic tensor transform functions")
             }
         }
 
-      dealii::SymmetricTensor<4,3> result_up_10_rotate = aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(result_up_1_rotate_down);
+      dealii::SymmetricTensor<4,3> result_up_10_rotate = aspect::Utilities::Tensors::to_full_stiffness_tensor(result_up_1_rotate_down);
 
       dealii::SymmetricTensor<2,6> result_5_rotate = result_1_rotate;
 
@@ -508,7 +508,7 @@ TEST_CASE("CPO elastic tensor transform functions")
           result_5_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor, result_5_rotate);
         }
 
-      dealii::SymmetricTensor<2,6> result_up_10_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(result_up_10_rotate);
+      dealii::SymmetricTensor<2,6> result_up_10_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(result_up_10_rotate);
 
       for (size_t i = 0; i < 6; i++)
         {
@@ -540,9 +540,9 @@ TEST_CASE("CPO elastic tensor transform functions")
     }
 
     {
-      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(
+      dealii::SymmetricTensor<2,6> result_up_1_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(
                                                                aspect::Utilities::Tensors::rotate_full_stiffness_tensor(rotation_tensor,
-                                                                   aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(reference_elastic_tensor)));
+                                                                   aspect::Utilities::Tensors::to_full_stiffness_tensor(reference_elastic_tensor)));
       dealii::SymmetricTensor<2,6> result_1_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor, reference_elastic_tensor);
 
       for (size_t i = 0; i < 6; i++)
@@ -553,7 +553,7 @@ TEST_CASE("CPO elastic tensor transform functions")
             }
         }
 
-      dealii::SymmetricTensor<4,3> result_up_10_rotate = aspect::Utilities::Tensors::transform_voigt_stiffness_matrix_to_full_stiffness_tensor(result_up_1_rotate_down);
+      dealii::SymmetricTensor<4,3> result_up_10_rotate = aspect::Utilities::Tensors::to_full_stiffness_tensor(result_up_1_rotate_down);
 
       dealii::SymmetricTensor<2,6> result_5_rotate = result_1_rotate;
 
@@ -563,7 +563,7 @@ TEST_CASE("CPO elastic tensor transform functions")
           result_5_rotate = aspect::Utilities::Tensors::rotate_voigt_stiffness_matrix(rotation_tensor, result_5_rotate);
         }
 
-      dealii::SymmetricTensor<2,6> result_up_10_rotate_down = aspect::Utilities::Tensors::transform_full_stiffness_tensor_to_voigt_stiffness_matrix(result_up_10_rotate);
+      dealii::SymmetricTensor<2,6> result_up_10_rotate_down = aspect::Utilities::Tensors::to_voigt_stiffness_matrix(result_up_10_rotate);
 
       for (size_t i = 0; i < 6; i++)
         {