[cig-commits] [commit] master: fix logic in cartesian_coordinates (6673226)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/8fa2c8d45d1626edc27365a78764013aed8e4889...66732265f79522b078ed1203475718a57ca16f45

>---------------------------------------------------------------

commit 66732265f79522b078ed1203475718a57ca16f45
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Jun 27 15:13:06 2014 -0400

    fix logic in cartesian_coordinates


>---------------------------------------------------------------

66732265f79522b078ed1203475718a57ca16f45
 include/aspect/utilities.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/aspect/utilities.h b/include/aspect/utilities.h
index 22f8665..1571519 100644
--- a/include/aspect/utilities.h
+++ b/include/aspect/utilities.h
@@ -79,15 +79,15 @@ namespace aspect
       {
       case 2:
         {
-          ccoord[0] = scoord[0] * std::sin(scoord[2]) * std::cos(scoord[1]); // X
-          ccoord[1] = scoord[0] * std::sin(scoord[2]) * std::sin(scoord[1]); // Y
-          ccoord[2] = scoord[0] * std::cos(scoord[2]); // Z
+          ccoord[0] = scoord[0] * std::cos(scoord[1]); // X
+          ccoord[1] = scoord[0] * std::sin(scoord[1]); // Y
           break;
         }
       case 3:
         {
-          ccoord[0] = scoord[0] * std::cos(scoord[1]); // X
-          ccoord[1] = scoord[0] * std::sin(scoord[1]); // Y
+          ccoord[0] = scoord[0] * std::sin(scoord[2]) * std::cos(scoord[1]); // X
+          ccoord[1] = scoord[0] * std::sin(scoord[2]) * std::sin(scoord[1]); // Y
+          ccoord[2] = scoord[0] * std::cos(scoord[2]); // Z
           break;
         }
       default: