diff --git a/source/particle/property/cpo_bingham_average.cc b/source/particle/property/cpo_bingham_average.cc
index 8ccba63ae27..eecfba3634a 100644
--- a/source/particle/property/cpo_bingham_average.cc
+++ b/source/particle/property/cpo_bingham_average.cc
@@ -104,7 +104,7 @@ namespace aspect
             for (unsigned int i = 0; i < 3; ++i)
               for (unsigned int j = 0; j < 6; ++j)
                 {
-                  data[data_position + mineral_i*18 + i*3 + j] = bingham_average[i][j];
+                  data[data_position + mineral_i*18 + i*6 + j] = bingham_average[i][j];
                 }
           }
       }
diff --git a/tests/cpo_simple_shearbox/particles/particles-00000.0000.gnuplot b/tests/cpo_simple_shearbox/particles/particles-00000.0000.gnuplot
index de117c7ad07..0837f27ecb2 100644
--- a/tests/cpo_simple_shearbox/particles/particles-00000.0000.gnuplot
+++ b/tests/cpo_simple_shearbox/particles/particles-00000.0000.gnuplot
@@ -1,9 +1,9 @@
 # This file was generated by the deal.II library.
-# Date =  2024/6/8
-# Time =  11:54:22
+# Date =  2024/6/21
+# Time =  9:41:37
 #
 # For a description of the GNUPLOT format see the GNUPLOT manual.
 #
 # <x> <y> <z> <id> <integrated strain invariant> <cpo mineral 0 type> <cpo mineral 0 grain 0 rotation_matrix 0> <cpo mineral 0 grain 0 rotation_matrix 1> <cpo mineral 0 grain 0 rotation_matrix 2> <cpo mineral 0 grain 0 rotation_matrix 3> <cpo mineral 0 grain 0 rotation_matrix 4> <cpo mineral 0 grain 0 rotation_matrix 5> <cpo mineral 0 grain 0 rotation_matrix 6> <cpo mineral 0 grain 0 rotation_matrix 7> <cpo mineral 0 grain 0 rotation_matrix 8> <cpo mineral 0 grain 1 rotation_matrix 0> <cpo mineral 0 grain 1 rotation_matrix 1> <cpo mineral 0 grain 1 rotation_matrix 2> <cpo mineral 0 grain 1 rotation_matrix 3> <cpo mineral 0 grain 1 rotation_matrix 4> <cpo mineral 0 grain 1 rotation_matrix 5> <cpo mineral 0 grain 1 rotation_matrix 6> <cpo mineral 0 grain 1 rotation_matrix 7> <cpo mineral 0 grain 1 rotation_matrix 8> <cpo mineral 0 grain 2 rotation_matrix 0> <cpo mineral 0 grain 2 rotation_matrix 1> <cpo mineral 0 grain 2 rotation_matrix 2> <cpo mineral 0 grain 2 rotation_matrix 3> <cpo mineral 0 grain 2 rotation_matrix 4> <cpo mineral 0 grain 2 rotation_matrix 5> <cpo mineral 0 grain 2 rotation_matrix 6> <cpo mineral 0 grain 2 rotation_matrix 7> <cpo mineral 0 grain 2 rotation_matrix 8> <cpo mineral 0 grain 3 rotation_matrix 0> <cpo mineral 0 grain 3 rotation_matrix 1> <cpo mineral 0 grain 3 rotation_matrix 2> <cpo mineral 0 grain 3 rotation_matrix 3> <cpo mineral 0 grain 3 rotation_matrix 4> <cpo mineral 0 grain 3 rotation_matrix 5> <cpo mineral 0 grain 3 rotation_matrix 6> <cpo mineral 0 grain 3 rotation_matrix 7> <cpo mineral 0 grain 3 rotation_matrix 8> <cpo mineral 0 grain 4 rotation_matrix 0> <cpo mineral 0 grain 4 rotation_matrix 1> <cpo mineral 0 grain 4 rotation_matrix 2> <cpo mineral 0 grain 4 rotation_matrix 3> <cpo mineral 0 grain 4 rotation_matrix 4> <cpo mineral 0 grain 4 rotation_matrix 5> <cpo mineral 0 grain 4 rotation_matrix 6> <cpo mineral 0 grain 4 rotation_matrix 7> <cpo mineral 0 grain 4 rotation_matrix 8> <cpo mineral 1 type> <cpo mineral 1 grain 0 rotation_matrix 0> <cpo mineral 1 grain 0 rotation_matrix 1> <cpo mineral 1 grain 0 rotation_matrix 2> <cpo mineral 1 grain 0 rotation_matrix 3> <cpo mineral 1 grain 0 rotation_matrix 4> <cpo mineral 1 grain 0 rotation_matrix 5> <cpo mineral 1 grain 0 rotation_matrix 6> <cpo mineral 1 grain 0 rotation_matrix 7> <cpo mineral 1 grain 0 rotation_matrix 8> <cpo mineral 1 grain 1 rotation_matrix 0> <cpo mineral 1 grain 1 rotation_matrix 1> <cpo mineral 1 grain 1 rotation_matrix 2> <cpo mineral 1 grain 1 rotation_matrix 3> <cpo mineral 1 grain 1 rotation_matrix 4> <cpo mineral 1 grain 1 rotation_matrix 5> <cpo mineral 1 grain 1 rotation_matrix 6> <cpo mineral 1 grain 1 rotation_matrix 7> <cpo mineral 1 grain 1 rotation_matrix 8> <cpo mineral 1 grain 2 rotation_matrix 0> <cpo mineral 1 grain 2 rotation_matrix 1> <cpo mineral 1 grain 2 rotation_matrix 2> <cpo mineral 1 grain 2 rotation_matrix 3> <cpo mineral 1 grain 2 rotation_matrix 4> <cpo mineral 1 grain 2 rotation_matrix 5> <cpo mineral 1 grain 2 rotation_matrix 6> <cpo mineral 1 grain 2 rotation_matrix 7> <cpo mineral 1 grain 2 rotation_matrix 8> <cpo mineral 1 grain 3 rotation_matrix 0> <cpo mineral 1 grain 3 rotation_matrix 1> <cpo mineral 1 grain 3 rotation_matrix 2> <cpo mineral 1 grain 3 rotation_matrix 3> <cpo mineral 1 grain 3 rotation_matrix 4> <cpo mineral 1 grain 3 rotation_matrix 5> <cpo mineral 1 grain 3 rotation_matrix 6> <cpo mineral 1 grain 3 rotation_matrix 7> <cpo mineral 1 grain 3 rotation_matrix 8> <cpo mineral 1 grain 4 rotation_matrix 0> <cpo mineral 1 grain 4 rotation_matrix 1> <cpo mineral 1 grain 4 rotation_matrix 2> <cpo mineral 1 grain 4 rotation_matrix 3> <cpo mineral 1 grain 4 rotation_matrix 4> <cpo mineral 1 grain 4 rotation_matrix 5> <cpo mineral 1 grain 4 rotation_matrix 6> <cpo mineral 1 grain 4 rotation_matrix 7> <cpo mineral 1 grain 4 rotation_matrix 8> <cpo mineral 0 bingham average a axis> <cpo mineral 0 bingham average a axis> <cpo mineral 0 bingham average a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 eigenvalues c axis> <cpo mineral 1 eigenvalues c axis> <cpo mineral 1 eigenvalues c axis> <cpo_elastic_tensor_0> <cpo_elastic_tensor_1> <cpo_elastic_tensor_2> <cpo_elastic_tensor_3> <cpo_elastic_tensor_4> <cpo_elastic_tensor_5> <cpo_elastic_tensor_6> <cpo_elastic_tensor_7> <cpo_elastic_tensor_8> <cpo_elastic_tensor_9> <cpo_elastic_tensor_10> <cpo_elastic_tensor_11> <cpo_elastic_tensor_12> <cpo_elastic_tensor_13> <cpo_elastic_tensor_14> <cpo_elastic_tensor_15> <cpo_elastic_tensor_16> <cpo_elastic_tensor_17> <cpo_elastic_tensor_18> <cpo_elastic_tensor_19> <cpo_elastic_tensor_20> <cpo elastic axis e1> <cpo elastic axis e1> <cpo elastic axis e1> <cpo elastic axis e2> <cpo elastic axis e2> <cpo elastic axis e2> <cpo elastic axis e3> <cpo elastic axis e3> <cpo elastic axis e3> <cpo elastic hexagonal axis> <cpo elastic hexagonal axis> <cpo elastic hexagonal axis> <cpo elastic vector norm square> <cpo elastic triclinic vector norm square p1> <cpo elastic triclinic vector norm square p2> <cpo elastic triclinic vector norm square p3> <cpo elastic monoclinic vector norm square p1> <cpo elastic monoclinic vector norm square p2> <cpo elastic monoclinic vector norm square p3> <cpo elastic orthorhombic vector norm square p1> <cpo elastic orthorhombic vector norm square p2> <cpo elastic orthorhombic vector norm square p3> <cpo elastic tetragonal vector norm square p1> <cpo elastic tetragonal vector norm square p2> <cpo elastic tetragonal vector norm square p3> <cpo elastic hexagonal vector norm square p1> <cpo elastic hexagonal vector norm square p2> <cpo elastic hexagonal vector norm square p3> <cpo elastic isotropic vector norm square> 
-0 0 0 0 0 1 -0.245194 -0.725536 0.643022 -0.031885 0.668946 0.742627 -0.96895 0.161585 -0.187155 -0.664605 0.398875 -0.631822 0.694243 0.642299 -0.324776 0.276273 -0.654486 -0.703791 -0.395435 0.304112 0.866687 0.196441 0.949765 -0.243634 -0.897241 0.0739114 -0.435311 -0.931515 -0.203225 0.301628 -0.304149 -0.0194781 -0.952425 0.199431 -0.978938 -0.0436666 -0.760236 -0.564037 0.322341 -0.64951 0.64973 -0.394952 0.0133329 -0.50962 -0.860296 6 -0.470211 0.131817 -0.872655 0.25314 0.967381 0.00972595 0.845471 -0.216331 -0.488241 0.27075 0.959437 -0.0785782 -0.260698 -0.00549874 -0.965405 -0.926677 0.281869 0.248634 0.0739383 0.239686 -0.968031 -0.361124 -0.898376 -0.250022 -0.929582 0.368065 0.020132 -0.35576 -0.934514 -0.0108638 0.915534 -0.350822 0.19678 -0.187705 0.0600602 0.980388 -0.373775 0.359282 -0.855107 0.429143 -0.750326 -0.502839 -0.82227 -0.554912 0.126269 3.1301 0.951338 -1.12699 0.843588 0.570701 3.43977 -1.14095 3.2162 0.571833 0.751241 0.170912 0.0778461 2.50252 -0.0522961 1.3329 0.607679 0.38994 0.00238132 0.687984 2.95997 -1.01418 1.05462 0.893396 2.93034 2.95656 -0.927715 -0.81326 0.974919 0.0249391 0.000141869 2.13008 -0.19131 -1.97024 0.633866 0.269704 0.0964296 236.048 219.524 229.998 78.8676 81.5823 78.5848 69.2846 70.5407 -2.15572 -2.55526 3.65098 75.1394 -5.28522 0.998761 0.281719 -1.48922 -3.4968 0.115975 -0.0440149 -2.35078 -2.47504 0.575235 0.411043 -0.707212 0.754588 -0.27677 0.594974 -0.0145018 0.888905 0.457862 0.575235 0.411043 -0.707212 270934 674.046 5463.95 4984.72 0 0 0 122.793 101.538 445.36 3.70369 0.444938 0.100818 320.625 345.139 1.66091 264926 
+0 0 0 0 0 1 -0.245194 -0.725536 0.643022 -0.031885 0.668946 0.742627 -0.96895 0.161585 -0.187155 -0.664605 0.398875 -0.631822 0.694243 0.642299 -0.324776 0.276273 -0.654486 -0.703791 -0.395435 0.304112 0.866687 0.196441 0.949765 -0.243634 -0.897241 0.0739114 -0.435311 -0.931515 -0.203225 0.301628 -0.304149 -0.0194781 -0.952425 0.199431 -0.978938 -0.0436666 -0.760236 -0.564037 0.322341 -0.64951 0.64973 -0.394952 0.0133329 -0.50962 -0.860296 6 -0.470211 0.131817 -0.872655 0.25314 0.967381 0.00972595 0.845471 -0.216331 -0.488241 0.27075 0.959437 -0.0785782 -0.260698 -0.00549874 -0.965405 -0.926677 0.281869 0.248634 0.0739383 0.239686 -0.968031 -0.361124 -0.898376 -0.250022 -0.929582 0.368065 0.020132 -0.35576 -0.934514 -0.0108638 0.915534 -0.350822 0.19678 -0.187705 0.0600602 0.980388 -0.373775 0.359282 -0.855107 0.429143 -0.750326 -0.502839 -0.82227 -0.554912 0.126269 3.1301 0.951338 -1.12699 0.692031 0.301071 0.00689771 0.843588 0.570701 3.43977 0.717477 0.213683 0.0688394 -1.14095 3.2162 0.571833 0.751241 0.170912 0.0778461 0.687984 2.95997 -1.01418 0.640727 0.334888 0.0243846 1.05462 0.893396 2.93034 0.647989 0.351666 0.000345357 2.95656 -0.927715 -0.81326 0.974919 0.0249391 0.000141869 236.048 219.524 229.998 78.8676 81.5823 78.5848 69.2846 70.5407 -2.15572 -2.55526 3.65098 75.1394 -5.28522 0.998761 0.281719 -1.48922 -3.4968 0.115975 -0.0440149 -2.35078 -2.47504 0.575235 0.411043 -0.707212 0.754588 -0.27677 0.594974 -0.0145018 0.888905 0.457862 0.575235 0.411043 -0.707212 270934 674.046 5463.95 4984.72 0 0 0 122.793 101.538 445.36 3.70369 0.444938 0.100818 320.625 345.139 1.66091 264926 
 
diff --git a/tests/cpo_simple_shearbox/particles/particles-00001.0000.gnuplot b/tests/cpo_simple_shearbox/particles/particles-00001.0000.gnuplot
index 64092544d90..199ab26fbd5 100644
--- a/tests/cpo_simple_shearbox/particles/particles-00001.0000.gnuplot
+++ b/tests/cpo_simple_shearbox/particles/particles-00001.0000.gnuplot
@@ -1,9 +1,9 @@
 # This file was generated by the deal.II library.
-# Date =  2024/6/8
-# Time =  11:55:17
+# Date =  2024/6/21
+# Time =  9:43:41
 #
 # For a description of the GNUPLOT format see the GNUPLOT manual.
 #
 # <x> <y> <z> <id> <integrated strain invariant> <cpo mineral 0 type> <cpo mineral 0 grain 0 rotation_matrix 0> <cpo mineral 0 grain 0 rotation_matrix 1> <cpo mineral 0 grain 0 rotation_matrix 2> <cpo mineral 0 grain 0 rotation_matrix 3> <cpo mineral 0 grain 0 rotation_matrix 4> <cpo mineral 0 grain 0 rotation_matrix 5> <cpo mineral 0 grain 0 rotation_matrix 6> <cpo mineral 0 grain 0 rotation_matrix 7> <cpo mineral 0 grain 0 rotation_matrix 8> <cpo mineral 0 grain 1 rotation_matrix 0> <cpo mineral 0 grain 1 rotation_matrix 1> <cpo mineral 0 grain 1 rotation_matrix 2> <cpo mineral 0 grain 1 rotation_matrix 3> <cpo mineral 0 grain 1 rotation_matrix 4> <cpo mineral 0 grain 1 rotation_matrix 5> <cpo mineral 0 grain 1 rotation_matrix 6> <cpo mineral 0 grain 1 rotation_matrix 7> <cpo mineral 0 grain 1 rotation_matrix 8> <cpo mineral 0 grain 2 rotation_matrix 0> <cpo mineral 0 grain 2 rotation_matrix 1> <cpo mineral 0 grain 2 rotation_matrix 2> <cpo mineral 0 grain 2 rotation_matrix 3> <cpo mineral 0 grain 2 rotation_matrix 4> <cpo mineral 0 grain 2 rotation_matrix 5> <cpo mineral 0 grain 2 rotation_matrix 6> <cpo mineral 0 grain 2 rotation_matrix 7> <cpo mineral 0 grain 2 rotation_matrix 8> <cpo mineral 0 grain 3 rotation_matrix 0> <cpo mineral 0 grain 3 rotation_matrix 1> <cpo mineral 0 grain 3 rotation_matrix 2> <cpo mineral 0 grain 3 rotation_matrix 3> <cpo mineral 0 grain 3 rotation_matrix 4> <cpo mineral 0 grain 3 rotation_matrix 5> <cpo mineral 0 grain 3 rotation_matrix 6> <cpo mineral 0 grain 3 rotation_matrix 7> <cpo mineral 0 grain 3 rotation_matrix 8> <cpo mineral 0 grain 4 rotation_matrix 0> <cpo mineral 0 grain 4 rotation_matrix 1> <cpo mineral 0 grain 4 rotation_matrix 2> <cpo mineral 0 grain 4 rotation_matrix 3> <cpo mineral 0 grain 4 rotation_matrix 4> <cpo mineral 0 grain 4 rotation_matrix 5> <cpo mineral 0 grain 4 rotation_matrix 6> <cpo mineral 0 grain 4 rotation_matrix 7> <cpo mineral 0 grain 4 rotation_matrix 8> <cpo mineral 1 type> <cpo mineral 1 grain 0 rotation_matrix 0> <cpo mineral 1 grain 0 rotation_matrix 1> <cpo mineral 1 grain 0 rotation_matrix 2> <cpo mineral 1 grain 0 rotation_matrix 3> <cpo mineral 1 grain 0 rotation_matrix 4> <cpo mineral 1 grain 0 rotation_matrix 5> <cpo mineral 1 grain 0 rotation_matrix 6> <cpo mineral 1 grain 0 rotation_matrix 7> <cpo mineral 1 grain 0 rotation_matrix 8> <cpo mineral 1 grain 1 rotation_matrix 0> <cpo mineral 1 grain 1 rotation_matrix 1> <cpo mineral 1 grain 1 rotation_matrix 2> <cpo mineral 1 grain 1 rotation_matrix 3> <cpo mineral 1 grain 1 rotation_matrix 4> <cpo mineral 1 grain 1 rotation_matrix 5> <cpo mineral 1 grain 1 rotation_matrix 6> <cpo mineral 1 grain 1 rotation_matrix 7> <cpo mineral 1 grain 1 rotation_matrix 8> <cpo mineral 1 grain 2 rotation_matrix 0> <cpo mineral 1 grain 2 rotation_matrix 1> <cpo mineral 1 grain 2 rotation_matrix 2> <cpo mineral 1 grain 2 rotation_matrix 3> <cpo mineral 1 grain 2 rotation_matrix 4> <cpo mineral 1 grain 2 rotation_matrix 5> <cpo mineral 1 grain 2 rotation_matrix 6> <cpo mineral 1 grain 2 rotation_matrix 7> <cpo mineral 1 grain 2 rotation_matrix 8> <cpo mineral 1 grain 3 rotation_matrix 0> <cpo mineral 1 grain 3 rotation_matrix 1> <cpo mineral 1 grain 3 rotation_matrix 2> <cpo mineral 1 grain 3 rotation_matrix 3> <cpo mineral 1 grain 3 rotation_matrix 4> <cpo mineral 1 grain 3 rotation_matrix 5> <cpo mineral 1 grain 3 rotation_matrix 6> <cpo mineral 1 grain 3 rotation_matrix 7> <cpo mineral 1 grain 3 rotation_matrix 8> <cpo mineral 1 grain 4 rotation_matrix 0> <cpo mineral 1 grain 4 rotation_matrix 1> <cpo mineral 1 grain 4 rotation_matrix 2> <cpo mineral 1 grain 4 rotation_matrix 3> <cpo mineral 1 grain 4 rotation_matrix 4> <cpo mineral 1 grain 4 rotation_matrix 5> <cpo mineral 1 grain 4 rotation_matrix 6> <cpo mineral 1 grain 4 rotation_matrix 7> <cpo mineral 1 grain 4 rotation_matrix 8> <cpo mineral 0 bingham average a axis> <cpo mineral 0 bingham average a axis> <cpo mineral 0 bingham average a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 eigenvalues c axis> <cpo mineral 1 eigenvalues c axis> <cpo mineral 1 eigenvalues c axis> <cpo_elastic_tensor_0> <cpo_elastic_tensor_1> <cpo_elastic_tensor_2> <cpo_elastic_tensor_3> <cpo_elastic_tensor_4> <cpo_elastic_tensor_5> <cpo_elastic_tensor_6> <cpo_elastic_tensor_7> <cpo_elastic_tensor_8> <cpo_elastic_tensor_9> <cpo_elastic_tensor_10> <cpo_elastic_tensor_11> <cpo_elastic_tensor_12> <cpo_elastic_tensor_13> <cpo_elastic_tensor_14> <cpo_elastic_tensor_15> <cpo_elastic_tensor_16> <cpo_elastic_tensor_17> <cpo_elastic_tensor_18> <cpo_elastic_tensor_19> <cpo_elastic_tensor_20> <cpo elastic axis e1> <cpo elastic axis e1> <cpo elastic axis e1> <cpo elastic axis e2> <cpo elastic axis e2> <cpo elastic axis e2> <cpo elastic axis e3> <cpo elastic axis e3> <cpo elastic axis e3> <cpo elastic hexagonal axis> <cpo elastic hexagonal axis> <cpo elastic hexagonal axis> <cpo elastic vector norm square> <cpo elastic triclinic vector norm square p1> <cpo elastic triclinic vector norm square p2> <cpo elastic triclinic vector norm square p3> <cpo elastic monoclinic vector norm square p1> <cpo elastic monoclinic vector norm square p2> <cpo elastic monoclinic vector norm square p3> <cpo elastic orthorhombic vector norm square p1> <cpo elastic orthorhombic vector norm square p2> <cpo elastic orthorhombic vector norm square p3> <cpo elastic tetragonal vector norm square p1> <cpo elastic tetragonal vector norm square p2> <cpo elastic tetragonal vector norm square p3> <cpo elastic hexagonal vector norm square p1> <cpo elastic hexagonal vector norm square p2> <cpo elastic hexagonal vector norm square p3> <cpo elastic isotropic vector norm square> 
-0 0 0 0 5 1 0.870258 -0.4079 0.263663 0.382237 0.912127 0.136798 -0.296929 -0.0170569 0.95023 -0.801781 0.59524 0.0191541 -0.25396 -0.310453 -0.91325 -0.537397 -0.737978 0.401141 0.897827 0.19754 0.378908 -0.108216 0.964123 -0.241391 -0.413032 0.176521 0.887014 0.980468 0.109809 0.107141 -0.125518 0.17412 0.968695 0.0917251 -0.977484 0.18709 0.175472 -0.834236 0.518131 -0.387024 0.426675 0.813327 -0.900362 -0.347185 -0.248717 6 -0.206174 -0.0141995 0.970765 -0.250245 0.96697 -0.0371207 -0.938137 -0.25285 -0.203341 -0.239525 0.854493 -0.457857 -0.88635 -0.00421451 0.453329 0.384955 0.518663 0.758587 -0.366647 -0.438522 0.811855 0.137193 -0.896148 -0.416245 0.911605 -0.0418207 0.389009 -0.0472925 -0.935962 0.346741 0.062482 -0.350399 -0.930498 0.992619 -0.0212298 0.0750655 -0.10736 0.477674 0.864424 -0.562295 -0.749715 0.340032 0.811119 -0.456123 0.349521 3.58597 -0.4919 0.475214 -0.496853 1.20285 4.48022 0.569464 3.52345 -0.76681 0.753551 0.21687 0.0263887 2.50252 -0.0522961 1.3329 0.607679 0.38994 0.00238132 -0.835729 -0.483692 3.9917 -1.02156 3.99167 0.230319 3.95296 0.829906 0.742553 0.971561 0.0150192 4.06359e-18 2.13008 -0.19131 -1.97024 0.633866 0.269704 0.0964296 258.485 212.328 211.801 72.0641 77.4516 79.5015 64.5437 66.2784 0.0717563 6.1143 2.39441 74.6427 -3.0708 -1.79545 2.26121 -1.66567 0.357183 -1.46508 0.15731 1.83558 0.780978 0.990968 0.0680196 0.115569 -0.0280589 -0.752975 0.657451 -0.151029 0.625505 0.765463 0.990968 0.0680196 0.115569 256219 732.779 173.747 589.554 0 0 0 1053.23 44.154 1478.8 184.027 25.3273 112.254 707.465 1875.24 353.667 253526 
+0 0 0 0 5 1 0.870258 -0.4079 0.263663 0.382237 0.912127 0.136798 -0.296929 -0.0170569 0.95023 -0.801781 0.59524 0.0191541 -0.25396 -0.310453 -0.91325 -0.537397 -0.737978 0.401141 0.897827 0.19754 0.378908 -0.108216 0.964123 -0.241391 -0.413032 0.176521 0.887014 0.980468 0.109809 0.107141 -0.125518 0.17412 0.968695 0.0917251 -0.977484 0.18709 0.175472 -0.834236 0.518131 -0.387024 0.426675 0.813327 -0.900362 -0.347185 -0.248717 6 -0.206174 -0.0141995 0.970765 -0.250245 0.96697 -0.0371207 -0.938137 -0.25285 -0.203341 -0.239525 0.854493 -0.457857 -0.88635 -0.00421451 0.453329 0.384955 0.518663 0.758587 -0.366647 -0.438522 0.811855 0.137193 -0.896148 -0.416245 0.911605 -0.0418207 0.389009 -0.0472925 -0.935962 0.346741 0.062482 -0.350399 -0.930498 0.992619 -0.0212298 0.0750655 -0.10736 0.477674 0.864424 -0.562295 -0.749715 0.340032 0.811119 -0.456123 0.349521 3.58597 -0.4919 0.475214 0.730123 0.234023 0.025313 -0.496853 1.20285 4.48022 0.933083 0.0434505 0.0117799 0.569464 3.52345 -0.76681 0.753551 0.21687 0.0263887 -0.835729 -0.483692 3.9917 0.821366 0.166409 5.32289e-18 -1.02156 3.99167 0.230319 0.825349 0.172378 -3.88372e-18 3.95296 0.829906 0.742553 0.971561 0.0150192 4.06359e-18 258.485 212.328 211.801 72.0641 77.4516 79.5015 64.5437 66.2784 0.0717563 6.1143 2.39441 74.6427 -3.0708 -1.79545 2.26121 -1.66567 0.357183 -1.46508 0.15731 1.83558 0.780978 0.990968 0.0680196 0.115569 -0.0280589 -0.752975 0.657451 -0.151029 0.625505 0.765463 0.990968 0.0680196 0.115569 256219 732.779 173.747 589.554 0 0 0 1053.23 44.154 1478.8 184.027 25.3273 112.254 707.465 1875.24 353.667 253526 
 
diff --git a/tests/cpo_simple_shearbox/particles/particles-00002.0000.gnuplot b/tests/cpo_simple_shearbox/particles/particles-00002.0000.gnuplot
index 85eb5950501..27632438850 100644
--- a/tests/cpo_simple_shearbox/particles/particles-00002.0000.gnuplot
+++ b/tests/cpo_simple_shearbox/particles/particles-00002.0000.gnuplot
@@ -1,9 +1,9 @@
 # This file was generated by the deal.II library.
-# Date =  2024/6/8
-# Time =  11:56:12
+# Date =  2024/6/21
+# Time =  9:45:50
 #
 # For a description of the GNUPLOT format see the GNUPLOT manual.
 #
 # <x> <y> <z> <id> <integrated strain invariant> <cpo mineral 0 type> <cpo mineral 0 grain 0 rotation_matrix 0> <cpo mineral 0 grain 0 rotation_matrix 1> <cpo mineral 0 grain 0 rotation_matrix 2> <cpo mineral 0 grain 0 rotation_matrix 3> <cpo mineral 0 grain 0 rotation_matrix 4> <cpo mineral 0 grain 0 rotation_matrix 5> <cpo mineral 0 grain 0 rotation_matrix 6> <cpo mineral 0 grain 0 rotation_matrix 7> <cpo mineral 0 grain 0 rotation_matrix 8> <cpo mineral 0 grain 1 rotation_matrix 0> <cpo mineral 0 grain 1 rotation_matrix 1> <cpo mineral 0 grain 1 rotation_matrix 2> <cpo mineral 0 grain 1 rotation_matrix 3> <cpo mineral 0 grain 1 rotation_matrix 4> <cpo mineral 0 grain 1 rotation_matrix 5> <cpo mineral 0 grain 1 rotation_matrix 6> <cpo mineral 0 grain 1 rotation_matrix 7> <cpo mineral 0 grain 1 rotation_matrix 8> <cpo mineral 0 grain 2 rotation_matrix 0> <cpo mineral 0 grain 2 rotation_matrix 1> <cpo mineral 0 grain 2 rotation_matrix 2> <cpo mineral 0 grain 2 rotation_matrix 3> <cpo mineral 0 grain 2 rotation_matrix 4> <cpo mineral 0 grain 2 rotation_matrix 5> <cpo mineral 0 grain 2 rotation_matrix 6> <cpo mineral 0 grain 2 rotation_matrix 7> <cpo mineral 0 grain 2 rotation_matrix 8> <cpo mineral 0 grain 3 rotation_matrix 0> <cpo mineral 0 grain 3 rotation_matrix 1> <cpo mineral 0 grain 3 rotation_matrix 2> <cpo mineral 0 grain 3 rotation_matrix 3> <cpo mineral 0 grain 3 rotation_matrix 4> <cpo mineral 0 grain 3 rotation_matrix 5> <cpo mineral 0 grain 3 rotation_matrix 6> <cpo mineral 0 grain 3 rotation_matrix 7> <cpo mineral 0 grain 3 rotation_matrix 8> <cpo mineral 0 grain 4 rotation_matrix 0> <cpo mineral 0 grain 4 rotation_matrix 1> <cpo mineral 0 grain 4 rotation_matrix 2> <cpo mineral 0 grain 4 rotation_matrix 3> <cpo mineral 0 grain 4 rotation_matrix 4> <cpo mineral 0 grain 4 rotation_matrix 5> <cpo mineral 0 grain 4 rotation_matrix 6> <cpo mineral 0 grain 4 rotation_matrix 7> <cpo mineral 0 grain 4 rotation_matrix 8> <cpo mineral 1 type> <cpo mineral 1 grain 0 rotation_matrix 0> <cpo mineral 1 grain 0 rotation_matrix 1> <cpo mineral 1 grain 0 rotation_matrix 2> <cpo mineral 1 grain 0 rotation_matrix 3> <cpo mineral 1 grain 0 rotation_matrix 4> <cpo mineral 1 grain 0 rotation_matrix 5> <cpo mineral 1 grain 0 rotation_matrix 6> <cpo mineral 1 grain 0 rotation_matrix 7> <cpo mineral 1 grain 0 rotation_matrix 8> <cpo mineral 1 grain 1 rotation_matrix 0> <cpo mineral 1 grain 1 rotation_matrix 1> <cpo mineral 1 grain 1 rotation_matrix 2> <cpo mineral 1 grain 1 rotation_matrix 3> <cpo mineral 1 grain 1 rotation_matrix 4> <cpo mineral 1 grain 1 rotation_matrix 5> <cpo mineral 1 grain 1 rotation_matrix 6> <cpo mineral 1 grain 1 rotation_matrix 7> <cpo mineral 1 grain 1 rotation_matrix 8> <cpo mineral 1 grain 2 rotation_matrix 0> <cpo mineral 1 grain 2 rotation_matrix 1> <cpo mineral 1 grain 2 rotation_matrix 2> <cpo mineral 1 grain 2 rotation_matrix 3> <cpo mineral 1 grain 2 rotation_matrix 4> <cpo mineral 1 grain 2 rotation_matrix 5> <cpo mineral 1 grain 2 rotation_matrix 6> <cpo mineral 1 grain 2 rotation_matrix 7> <cpo mineral 1 grain 2 rotation_matrix 8> <cpo mineral 1 grain 3 rotation_matrix 0> <cpo mineral 1 grain 3 rotation_matrix 1> <cpo mineral 1 grain 3 rotation_matrix 2> <cpo mineral 1 grain 3 rotation_matrix 3> <cpo mineral 1 grain 3 rotation_matrix 4> <cpo mineral 1 grain 3 rotation_matrix 5> <cpo mineral 1 grain 3 rotation_matrix 6> <cpo mineral 1 grain 3 rotation_matrix 7> <cpo mineral 1 grain 3 rotation_matrix 8> <cpo mineral 1 grain 4 rotation_matrix 0> <cpo mineral 1 grain 4 rotation_matrix 1> <cpo mineral 1 grain 4 rotation_matrix 2> <cpo mineral 1 grain 4 rotation_matrix 3> <cpo mineral 1 grain 4 rotation_matrix 4> <cpo mineral 1 grain 4 rotation_matrix 5> <cpo mineral 1 grain 4 rotation_matrix 6> <cpo mineral 1 grain 4 rotation_matrix 7> <cpo mineral 1 grain 4 rotation_matrix 8> <cpo mineral 0 bingham average a axis> <cpo mineral 0 bingham average a axis> <cpo mineral 0 bingham average a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 eigenvalues a axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 bingham average b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 eigenvalues b axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 bingham average c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 0 eigenvalues c axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 bingham average a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 eigenvalues a axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 bingham average b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 eigenvalues b axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 bingham average c axis> <cpo mineral 1 eigenvalues c axis> <cpo mineral 1 eigenvalues c axis> <cpo mineral 1 eigenvalues c axis> <cpo_elastic_tensor_0> <cpo_elastic_tensor_1> <cpo_elastic_tensor_2> <cpo_elastic_tensor_3> <cpo_elastic_tensor_4> <cpo_elastic_tensor_5> <cpo_elastic_tensor_6> <cpo_elastic_tensor_7> <cpo_elastic_tensor_8> <cpo_elastic_tensor_9> <cpo_elastic_tensor_10> <cpo_elastic_tensor_11> <cpo_elastic_tensor_12> <cpo_elastic_tensor_13> <cpo_elastic_tensor_14> <cpo_elastic_tensor_15> <cpo_elastic_tensor_16> <cpo_elastic_tensor_17> <cpo_elastic_tensor_18> <cpo_elastic_tensor_19> <cpo_elastic_tensor_20> <cpo elastic axis e1> <cpo elastic axis e1> <cpo elastic axis e1> <cpo elastic axis e2> <cpo elastic axis e2> <cpo elastic axis e2> <cpo elastic axis e3> <cpo elastic axis e3> <cpo elastic axis e3> <cpo elastic hexagonal axis> <cpo elastic hexagonal axis> <cpo elastic hexagonal axis> <cpo elastic vector norm square> <cpo elastic triclinic vector norm square p1> <cpo elastic triclinic vector norm square p2> <cpo elastic triclinic vector norm square p3> <cpo elastic monoclinic vector norm square p1> <cpo elastic monoclinic vector norm square p2> <cpo elastic monoclinic vector norm square p3> <cpo elastic orthorhombic vector norm square p1> <cpo elastic orthorhombic vector norm square p2> <cpo elastic orthorhombic vector norm square p3> <cpo elastic tetragonal vector norm square p1> <cpo elastic tetragonal vector norm square p2> <cpo elastic tetragonal vector norm square p3> <cpo elastic hexagonal vector norm square p1> <cpo elastic hexagonal vector norm square p2> <cpo elastic hexagonal vector norm square p3> <cpo elastic isotropic vector norm square> 
-0 0 0 0 10 1 0.881505 -0.395777 0.244006 0.390074 0.916736 0.0638617 -0.249592 0.0401479 0.962977 -0.873636 0.383943 0.293112 -0.47015 -0.537323 -0.695791 -0.108716 -0.746555 0.650692 0.918474 0.256716 0.280834 -0.196822 0.954606 -0.222053 -0.325171 0.149664 0.927456 0.97953 -0.157648 -0.00941713 0.0312117 0.136076 0.981992 -0.153245 -0.977129 0.13978 0.380872 -0.786888 0.479285 -0.307243 0.382987 0.867156 -0.866193 -0.481923 -0.09682 6 0.0292031 0.254841 0.958381 -0.0317597 0.965362 -0.253881 -0.991233 -0.0252807 0.0367027 -0.292627 0.935001 -0.190982 -0.555567 -0.00512364 0.824597 0.77066 0.352677 0.521526 0.105086 0.434641 0.885448 -0.0429455 -0.888882 0.447106 0.984625 -0.085982 -0.074669 -0.0413381 -0.917195 0.394339 -0.387063 -0.349508 -0.847575 0.915601 -0.186833 -0.340624 0.13066 0.483506 0.857485 0.576521 -0.742071 0.326007 0.799853 0.4489 -0.378296 4.85935 -0.782076 -0.0467174 0.154789 0.674847 4.87003 0.755119 4.81482 -0.68877 0.997805 0 0 2.50252 -0.0522961 1.3329 0.607679 0.38994 0.00238132 0.144864 1.26416 4.75412 -0.158591 4.8205 -1.26774 4.91649 0.125392 -0.182044 0.98453 0 -3.46945e-19 2.13008 -0.19131 -1.97024 0.633866 0.269704 0.0964296 259.856 212.073 211.719 70.1859 76.576 80.5849 65.2785 64.6413 0.637099 0.196442 -6.1119 73.9359 3.05311 -0.0767694 0.0839554 -1.1441 0.174364 -0.10809 -1.32149 -0.451966 -0.493404 0.988087 -0.153875 -0.00250402 0.121343 0.836887 0.533757 -0.0638512 -0.465386 0.882802 0.988087 -0.153875 -0.00250402 257440 2334.19 97.5589 2353.56 0 0 0 1287.14 7.1795 1449.02 150.458 12.9506 164.914 611.047 2028.52 434.714 252999 
+0 0 0 0 10 1 0.881505 -0.395777 0.244006 0.390074 0.916736 0.0638617 -0.249592 0.0401479 0.962977 -0.873636 0.383943 0.293112 -0.47015 -0.537323 -0.695791 -0.108716 -0.746555 0.650692 0.918474 0.256716 0.280834 -0.196822 0.954606 -0.222053 -0.325171 0.149664 0.927456 0.97953 -0.157648 -0.00941713 0.0312117 0.136076 0.981992 -0.153245 -0.977129 0.13978 0.380872 -0.786888 0.479285 -0.307243 0.382987 0.867156 -0.866193 -0.481923 -0.09682 6 0.0292031 0.254841 0.958381 -0.0317597 0.965362 -0.253881 -0.991233 -0.0252807 0.0367027 -0.292627 0.935001 -0.190982 -0.555567 -0.00512364 0.824597 0.77066 0.352677 0.521526 0.105086 0.434641 0.885448 -0.0429455 -0.888882 0.447106 0.984625 -0.085982 -0.074669 -0.0413381 -0.917195 0.394339 -0.387063 -0.349508 -0.847575 0.915601 -0.186833 -0.340624 0.13066 0.483506 0.857485 0.576521 -0.742071 0.326007 0.799853 0.4489 -0.378296 4.85935 -0.782076 -0.0467174 0.984421 -9.72911e-25 -2.7864e-18 0.154789 0.674847 4.87003 0.9838 1.73472e-19 -2.77556e-18 0.755119 4.81482 -0.68877 0.997805 0 0 0.144864 1.26416 4.75412 0.984291 9.23846e-20 -2.22968e-17 -0.158591 4.8205 -1.26774 0.997388 1.11022e-17 1.73472e-19 4.91649 0.125392 -0.182044 0.98453 0 -3.46945e-19 259.856 212.073 211.719 70.1859 76.576 80.5849 65.2785 64.6413 0.637099 0.196442 -6.1119 73.9359 3.05311 -0.0767694 0.0839554 -1.1441 0.174364 -0.10809 -1.32149 -0.451966 -0.493404 0.988087 -0.153875 -0.00250402 0.121343 0.836887 0.533757 -0.0638512 -0.465386 0.882802 0.988087 -0.153875 -0.00250402 257440 2334.19 97.5589 2353.56 0 0 0 1287.14 7.1795 1449.02 150.458 12.9506 164.914 611.047 2028.52 434.714 252999