[cig-commits] commit: Fix rotation of components in initial

Mercurial hg at geodynamics.org
Wed Mar 28 06:33:37 PDT 2012


changeset:   129:e6db0bbfac61
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Mar 28 06:33:20 2012 -0700
files:       initial.cxx
description:
Fix rotation of components in initial


diff -r 22520c38035a -r e6db0bbfac61 initial.cxx
--- a/initial.cxx	Wed Mar 28 05:50:40 2012 -0700
+++ b/initial.cxx	Wed Mar 28 06:33:20 2012 -0700
@@ -128,7 +128,7 @@ void initial(const Model &model, double 
               case Model::solCx:
                 {
                   FTensor::Tensor1<double,2> f(0,pi*pi*sin(pi*y)*cos(pi*x));
-                  fx[i][j]=f(b)*rot(0,b);
+                  fx[i][j]=f(b)*rot(b,0);
                 }
                 distx[i][j]=x-middle;
                 if(x>middle)
@@ -167,7 +167,7 @@ void initial(const Model &model, double 
                       (v*csh + (v+tau_eta)*kx*snh
                        - sign*rho*(cs - csh - kx*snh)/(2*eta))
                       *std::sin(pi*y)*eta);
-                  zx[i][j]=rot(0,b)*z(b);
+                  zx[i][j]=rot(b,0)*z(b);
                 }
                 break;
               case Model::sinker:
@@ -218,7 +218,7 @@ void initial(const Model &model, double 
               case Model::solCx:
                 {
                   FTensor::Tensor1<double,2> f(0,pi*pi*sin(pi*y)*cos(pi*x));
-                  fy[i][j]=f(b)*rot(1,b);
+                  fy[i][j]=f(b)*rot(b,1);
                 }
                 disty[i][j]=x-middle;
                 if(x>middle)
@@ -257,7 +257,7 @@ void initial(const Model &model, double 
                       (v*csh + (v+tau_eta)*kx*snh
                        - sign*rho*(cs - csh - kx*snh)/(2*eta))
                       *std::sin(pi*y)*eta);
-                  zy[i][j]=rot(1,b)*z(b);
+                  zy[i][j]=rot(b,1)*z(b);
                 }
                 break;
               case Model::sinker:



More information about the CIG-COMMITS mailing list