[cig-commits] [commit] rajesh-petsc-schur: Removed caps_per_proc for loops from Full_read_input_from_files.c (a8f126b)

[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 a8f126b270b288fe1681b0d92ea6e836d0a000fd
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 16 15:51:37 2014 -0700

    Removed caps_per_proc for loops from Full_read_input_from_files.c


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

a8f126b270b288fe1681b0d92ea6e836d0a000fd
 lib/Full_read_input_from_files.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/Full_read_input_from_files.c b/lib/Full_read_input_from_files.c
index 808fecb..a4eac8a 100644
--- a/lib/Full_read_input_from_files.c
+++ b/lib/Full_read_input_from_files.c
@@ -90,7 +90,6 @@ void full_read_input_files_for_timesteps(E,action,output)
       pos_age = 1;
     }
 
-    for (m=1;m<=E->sphere.caps_per_proc;m++)  {
       cap = E->sphere.capid[CPPR] - 1;  /* capid: 1-12 */
 
       switch (action) { /* set up files to open */
@@ -319,10 +318,9 @@ void full_read_input_files_for_timesteps(E,action,output)
         LL2 = (int*) malloc ((emax+1)*sizeof(int));
 
 
-        for(m=1;m<=E->sphere.caps_per_proc;m++)
           for (el=1; el<=elx*ely*elz; el++)  {
             nodea = E->ien[CPPR][el].node[2];
-            llayer = layers(E,m,nodea);
+            llayer = layers(E,CPPR,nodea);
             if (llayer)  { /* for layers:1-lithosphere,2-upper, 3-trans, and 4-lower mantle */
               E->mat[CPPR][el] = llayer;
               fprintf(stderr,"\nINSIDE llayer=%d",llayer);
@@ -342,7 +340,6 @@ void full_read_input_files_for_timesteps(E,action,output)
           fclose(fp1);
           fclose(fp2);
 
-          for (m=1;m<=E->sphere.caps_per_proc;m++) {
             for (k=1;k<=ely;k++)   {
               for (i=1;i<=elx;i++)   {
                 for (j=1;j<=elz;j++)  {
@@ -355,7 +352,6 @@ void full_read_input_files_for_timesteps(E,action,output)
                 }     /* end for j  */
               }     /*  end for i */
             }     /*  end for k  */
-          }     /*  end for m  */
 
          free ((void *) VIP1);
          free ((void *) VIP2);
@@ -418,9 +414,6 @@ void full_read_input_files_for_timesteps(E,action,output)
 	break;
 
       } /* end switch */
-    } /* end for m */
 
     fflush(E->fp);
-
-    return;
 }