[cig-commits] [commit] rajesh-petsc-schur: Corrected the signature of from_xyz_to_rtf and from_rtf_to_xyz (756905f)

[cig_noreply at geodynamics.org]

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

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

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

commit 756905f4cc80a22d242b0020c5469b8033f22dae
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Fri Sep 19 09:48:31 2014 -0700

    Corrected the signature of from_xyz_to_rtf and from_rtf_to_xyz


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

756905f4cc80a22d242b0020c5469b8033f22dae
 lib/Solver_multigrid.c | 36 ++++++++++++++++++------------------
 lib/prototypes.h       |  4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/Solver_multigrid.c b/lib/Solver_multigrid.c
index eff88d7..8af0912 100644
--- a/lib/Solver_multigrid.c
+++ b/lib/Solver_multigrid.c
@@ -507,7 +507,7 @@ void project_vector(E,start_lev,AU,AD,ic)
  void from_xyz_to_rtf(E,level,xyz,rtf)
  struct All_variables *E;
  int level;
- double **rtf,**xyz;
+ double *rtf,*xyz;
  {
 
  int i,j,m,eqn1,eqn2,eqn3;
@@ -521,14 +521,14 @@ void project_vector(E,start_lev,AU,AD,ic)
      sinf = E->SinCos[level][CPPR][1][i];
      cost = E->SinCos[level][CPPR][2][i];
      cosf = E->SinCos[level][CPPR][3][i];
-     rtf[CPPR][eqn1] = xyz[CPPR][eqn1]*cost*cosf
-                  + xyz[CPPR][eqn2]*cost*sinf
-                  - xyz[CPPR][eqn3]*sint;
-     rtf[CPPR][eqn2] = -xyz[CPPR][eqn1]*sinf
-                  + xyz[CPPR][eqn2]*cosf;
-     rtf[CPPR][eqn3] = xyz[CPPR][eqn1]*sint*cosf
-                  + xyz[CPPR][eqn2]*sint*sinf
-                  + xyz[CPPR][eqn3]*cost;
+     rtf[eqn1] = xyz[eqn1]*cost*cosf
+                  + xyz[eqn2]*cost*sinf
+                  - xyz[eqn3]*sint;
+     rtf[eqn2] = -xyz[eqn1]*sinf
+                  + xyz[eqn2]*cosf;
+     rtf[eqn3] = xyz[eqn1]*sint*cosf
+                  + xyz[eqn2]*sint*sinf
+                  + xyz[eqn3]*cost;
      }
  }
 
@@ -536,7 +536,7 @@ void project_vector(E,start_lev,AU,AD,ic)
  void from_rtf_to_xyz(E,level,rtf,xyz)
  struct All_variables *E;
  int level;
- double **rtf,**xyz;
+ double *rtf,*xyz;
  {
 
  int i,j,m,eqn1,eqn2,eqn3;
@@ -550,14 +550,14 @@ void project_vector(E,start_lev,AU,AD,ic)
      sinf = E->SinCos[level][CPPR][1][i];
      cost = E->SinCos[level][CPPR][2][i];
      cosf = E->SinCos[level][CPPR][3][i];
-     xyz[CPPR][eqn1] = rtf[CPPR][eqn1]*cost*cosf
-                  - rtf[CPPR][eqn2]*sinf
-                  + rtf[CPPR][eqn3]*sint*cosf;
-     xyz[CPPR][eqn2] = rtf[CPPR][eqn1]*cost*sinf
-                  + rtf[CPPR][eqn2]*cosf
-                  + rtf[CPPR][eqn3]*sint*sinf;
-     xyz[CPPR][eqn3] = -rtf[CPPR][eqn1]*sint
-                  + rtf[CPPR][eqn3]*cost;
+     xyz[eqn1] = rtf[eqn1]*cost*cosf
+                  - rtf[eqn2]*sinf
+                  + rtf[eqn3]*sint*cosf;
+     xyz[eqn2] = rtf[eqn1]*cost*sinf
+                  + rtf[eqn2]*cosf
+                  + rtf[eqn3]*sint*sinf;
+     xyz[eqn3] = -rtf[eqn1]*sint
+                  + rtf[eqn3]*cost;
 
      }
  }
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 3871873..48911d9 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -473,8 +473,8 @@ void inject_scalar_e(struct All_variables *, int, float **, float **);
 void project_scalar_e(struct All_variables *, int, float **, float **);
 void project_scalar(struct All_variables *, int, float **, float **);
 void project_vector(struct All_variables *, int, double *, double *, int);
-void from_xyz_to_rtf(struct All_variables *, int, double **, double **);
-void from_rtf_to_xyz(struct All_variables *, int, double **, double **);
+void from_xyz_to_rtf(struct All_variables *, int, double *, double *);
+void from_rtf_to_xyz(struct All_variables *, int, double *, double *);
 void fill_in_gaps(struct All_variables *, double **, int);
 /* Sphere_harmonics.c */
 void set_sphere_harmonics(struct All_variables *);