[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->trace.ilatersize as part of caps_per_proc_removal (d8844d5)

[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 d8844d5c2457a7a6df5a1875eaeefc3a0db79aa2
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 24 12:24:19 2014 -0700

    Changed the shape of E->trace.ilatersize as part of caps_per_proc_removal


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

d8844d5c2457a7a6df5a1875eaeefc3a0db79aa2
 lib/Regional_tracer_advection.c |  8 ++++----
 lib/Tracer_setup.c              | 18 +++++++++---------
 lib/tracer_defs.h               |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index 83c5fda..417c44d 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -835,12 +835,12 @@ static void put_found_tracers(struct All_variables *E, int recv_size, double *re
 
         }
         else {
-            if (E->trace.ilatersize[CPPR]==0) {
+            if (E->trace.ilatersize==0) {
 
-                E->trace.ilatersize[CPPR]=E->trace.max_ntracers/5;
+                E->trace.ilatersize=E->trace.max_ntracers/5;
 
                 for (kk=0;kk<E->trace.number_of_tracer_quantities;kk++) {
-                    if ((E->trace.rlater[CPPR][kk]=(double *)malloc(E->trace.ilatersize[CPPR]*sizeof(double)))==NULL) {
+                    if ((E->trace.rlater[CPPR][kk]=(double *)malloc(E->trace.ilatersize*sizeof(double)))==NULL) {
                         fprintf(E->trace.fpt,"AKM(put_found_tracers)-no memory (%d)\n",kk);
                         fflush(E->trace.fpt);
                         exit(10);
@@ -851,7 +851,7 @@ static void put_found_tracers(struct All_variables *E, int recv_size, double *re
             E->trace.ilater[CPPR]++;
             ilast = E->trace.ilater[CPPR];
 
-            if (E->trace.ilater[CPPR] > (E->trace.ilatersize[CPPR]-5))
+            if (E->trace.ilater[CPPR] > (E->trace.ilatersize-5))
                 expand_later_array(E);
 
             for (pp=0; pp<E->trace.number_of_tracer_quantities; pp++)
diff --git a/lib/Tracer_setup.c b/lib/Tracer_setup.c
index 0998e0b..9434538 100644
--- a/lib/Tracer_setup.c
+++ b/lib/Tracer_setup.c
@@ -563,7 +563,7 @@ static void find_tracers(struct All_variables *E)
 
         /* initialize arrays and statistical counters */
 
-        E->trace.ilater[CPPR]=E->trace.ilatersize[CPPR]=0;
+        E->trace.ilater[CPPR]=E->trace.ilatersize=0;
 
         E->trace.istat1=0;
         for (kk=0;kk<=4;kk++) {
@@ -628,7 +628,7 @@ static void find_tracers(struct All_variables *E)
 
     /* Free later arrays */
 
-    if (E->trace.ilatersize[CPPR]>0) {
+    if (E->trace.ilatersize>0) {
         for (kk=0;kk<=((E->trace.number_of_tracer_quantities)-1);kk++) {
             free(E->trace.rlater[CPPR][kk]);
         }
@@ -1523,12 +1523,12 @@ static void put_away_later(struct All_variables *E, int it)
     /* The first tracer in initiates memory allocation. */
     /* Memory is freed after parallel communications    */
 
-    if (E->trace.ilatersize[CPPR]==0) {
+    if (E->trace.ilatersize==0) {
 
-        E->trace.ilatersize[CPPR]=E->trace.max_ntracers/5;
+        E->trace.ilatersize=E->trace.max_ntracers/5;
 
         for (kk=0;kk<=((E->trace.number_of_tracer_quantities)-1);kk++) {
-            if ((E->trace.rlater[CPPR][kk]=(double *)malloc(E->trace.ilatersize[CPPR]*sizeof(double)))==NULL) {
+            if ((E->trace.rlater[CPPR][kk]=(double *)malloc(E->trace.ilatersize*sizeof(double)))==NULL) {
                 fprintf(E->trace.fpt,"AKM(put_away_later)-no memory (%d)\n",kk);
                 fflush(E->trace.fpt);
                 exit(10);
@@ -1541,7 +1541,7 @@ static void put_away_later(struct All_variables *E, int it)
 
     E->trace.ilater[CPPR]++;
 
-    if (E->trace.ilater[CPPR] >= (E->trace.ilatersize[CPPR]-5)) expand_later_array(E);
+    if (E->trace.ilater[CPPR] >= (E->trace.ilatersize-5)) expand_later_array(E);
 
     /* stack basic and extra quantities together (basic first) */
 
@@ -1566,7 +1566,7 @@ void expand_later_array(struct All_variables *E)
 
     icushion=100;
 
-    inewsize=E->trace.ilatersize[CPPR]+E->trace.ilatersize[CPPR]/5+icushion;
+    inewsize=E->trace.ilatersize+E->trace.ilatersize/5+icushion;
 
     for (kk=0;kk<=((E->trace.number_of_tracer_quantities)-1);kk++) {
         if ((E->trace.rlater[CPPR][kk]=(double *)realloc(E->trace.rlater[CPPR][kk],inewsize*sizeof(double)))==NULL) {
@@ -1577,9 +1577,9 @@ void expand_later_array(struct All_variables *E)
     }
 
     fprintf(E->trace.fpt,"Expanding physical memory of rlater to %d from %d\n",
-            inewsize,E->trace.ilatersize[CPPR]);
+            inewsize,E->trace.ilatersize);
 
-    E->trace.ilatersize[CPPR]=inewsize;
+    E->trace.ilatersize=inewsize;
 }
 
 
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index 77e6ef7..d1eb41f 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -60,7 +60,7 @@ struct TRACE{
 
     int number_of_tracers;
 
-    int ilatersize[13];
+    int ilatersize;
     int ilater[13];
     double *rlater[13][100];