[cig-commits] [commit] rajesh-petsc-schur: Removed caps_per_proc for loops from Full_version_dependent.c (74392d4)

[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 74392d4ad87c8cd467b892a4b0920a48a3983edb
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 16 16:02:53 2014 -0700

    Removed caps_per_proc for loops from Full_version_dependent.c


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

74392d4ad87c8cd467b892a4b0920a48a3983edb
 lib/Full_version_dependent.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/Full_version_dependent.c b/lib/Full_version_dependent.c
index dee2eaf..b0eb495 100644
--- a/lib/Full_version_dependent.c
+++ b/lib/Full_version_dependent.c
@@ -163,15 +163,12 @@ void full_node_locations(E)
   free ((void *) rr);
   free ((void *) RR);
 
-  for (j=1;j<=E->sphere.caps_per_proc;j++)   {
-     ii = E->sphere.capid[CPPR];
-     full_coord_of_cap(E,CPPR,ii);
-     }
+   ii = E->sphere.capid[CPPR];
+   full_coord_of_cap(E,CPPR,ii);
 
   if (E->control.verbose) {
       for (lev=E->mesh.levmin;lev<=E->mesh.levmax;lev++)   {
           fprintf(E->fp_out,"output_coordinates before rotation %d \n",lev);
-          for (j=1;j<=E->sphere.caps_per_proc;j++)
               for (i=1;i<=E->lmesh.NNO[lev];i++)
                   if(i%E->lmesh.NOZ[lev]==1)
                       fprintf(E->fp_out,"%d %d %g %g %g\n",CPPR,i,E->SX[lev][CPPR][1][i],E->SX[lev][CPPR][2][i],E->SX[lev][CPPR][3][i]);
@@ -194,15 +191,12 @@ void full_node_locations(E)
   dircos[3][2] = sin(ro)*sin(fo);
   dircos[3][3] = cos(ro);
 
-  for (j=1;j<=E->sphere.caps_per_proc;j++)   {
      ii = E->sphere.capid[CPPR];
      full_rotate_mesh(E,dircos,CPPR,ii);
-     }
 
   if (E->control.verbose) {
       for (lev=E->mesh.levmin;lev<=E->mesh.levmax;lev++)   {
           fprintf(E->fp_out,"output_coordinates after rotation %d \n",lev);
-          for (j=1;j<=E->sphere.caps_per_proc;j++)
               for (i=1;i<=E->lmesh.NNO[lev];i++)
                   if(i%E->lmesh.NOZ[lev]==1)
                       fprintf(E->fp_out,"%d %d %g %g %g\n",CPPR,i,E->SX[lev][CPPR][1][i],E->SX[lev][CPPR][2][i],E->SX[lev][CPPR][3][i]);
@@ -214,7 +208,6 @@ void full_node_locations(E)
 #ifdef ALLOW_ELLIPTICAL
   /* spherical or elliptical, correct theta to theta_g for local surface-normal theta  */
   for (lev=E->mesh.levmin;lev<=E->mesh.levmax;lev++)
-    for (j=1;j<=E->sphere.caps_per_proc;j++)
       for (i=1;i<=E->lmesh.NNO[lev];i++)  {
 	tg = theta_g(E->SX[lev][CPPR][1][i],E);
 	E->SinCos[lev][CPPR][0][i] = sin(tg); /*  */
@@ -225,17 +218,13 @@ void full_node_locations(E)
 #else
   /* spherical */
   for (lev=E->mesh.levmin;lev<=E->mesh.levmax;lev++)
-    for (j=1;j<=E->sphere.caps_per_proc;j++)
       for (i=1;i<=E->lmesh.NNO[lev];i++)  {
 	E->SinCos[lev][CPPR][0][i] = sin(E->SX[lev][CPPR][1][i]); /* sin(theta) */
 	E->SinCos[lev][CPPR][1][i] = sin(E->SX[lev][CPPR][2][i]); /* sin(phi) */
 	E->SinCos[lev][CPPR][2][i] = cos(E->SX[lev][CPPR][1][i]); /* cos(theta) */
 	E->SinCos[lev][CPPR][3][i] = cos(E->SX[lev][CPPR][2][i]); /* cos(phi) */
       }
-
 #endif
-
-  return;
 }
 
 
@@ -251,14 +240,11 @@ void full_construct_boundary( struct All_variables *E)
 
   /* boundary = top + bottom */
   int max_size = 2*E->lmesh.elx*E->lmesh.ely + 1;
-  for(m=1;m<=E->sphere.caps_per_proc;m++) {
     E->boundary.element[CPPR] = (int *)malloc(max_size*sizeof(int));
 
     for(d=1; d<=dims; d++)
       E->boundary.normal[CPPR][d] = (int *)malloc(max_size*sizeof(int));
-  }
 
-  for(m=1;m<=E->sphere.caps_per_proc;m++) {
     count = 1;
     for(k=1; k<=E->lmesh.ely; k++)
       for(j=1; j<=E->lmesh.elx; j++) {
@@ -285,5 +271,4 @@ void full_construct_boundary( struct All_variables *E)
       } /* end for i, j, k */
 
     E->boundary.nel = count - 1;
-  } /* end for m */
 }