[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->trace.ielement as part of caps_per_proc_removal (56451d9)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:13:18 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 56451d90ed06d49993844dc2ddaed8f841e24392
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 12:22:32 2014 -0700
Changed the shape of E->trace.ielement as part of caps_per_proc_removal
>---------------------------------------------------------------
56451d90ed06d49993844dc2ddaed8f841e24392
lib/Checkpoints.c | 4 ++--
lib/Full_tracer_advection.c | 2 +-
lib/Regional_tracer_advection.c | 2 +-
lib/Tracer_setup.c | 20 ++++++++++----------
lib/tracer_defs.h | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/lib/Checkpoints.c b/lib/Checkpoints.c
index a400b34..aa1713b 100644
--- a/lib/Checkpoints.c
+++ b/lib/Checkpoints.c
@@ -268,7 +268,7 @@ static void tracer_checkpoint(struct All_variables *E, FILE *fp)
fwrite(E->trace.extraq[i], sizeof(double),
E->trace.ntracers+1, fp);
}
- fwrite(E->trace.ielement[CPPR], sizeof(int),
+ fwrite(E->trace.ielement, sizeof(int),
E->trace.ntracers+1, fp);
}
@@ -327,7 +327,7 @@ static void read_tracer_checkpoint(struct All_variables *E, FILE *fp)
fread(E->trace.extraq[i], sizeof(double),
E->trace.ntracers+1, fp);
}
- fread(E->trace.ielement[CPPR], sizeof(int),
+ fread(E->trace.ielement, sizeof(int),
E->trace.ntracers+1, fp);
/* init E->trace.ntracer_flavor */
diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index 46bdcd2..7b7f466 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -745,7 +745,7 @@ void full_lost_souls(struct All_variables *E)
exit(10);
}
- E->trace.ielement[CPPR][E->trace.ntracers]=iel;
+ E->trace.ielement[E->trace.ntracers]=iel;
}
if(E->control.verbose){
diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index bcc2dc5..83c5fda 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -831,7 +831,7 @@ static void put_found_tracers(struct All_variables *E, int recv_size, double *re
exit(10);
}
- E->trace.ielement[CPPR][ilast] = iel;
+ E->trace.ielement[ilast] = iel;
}
else {
diff --git a/lib/Tracer_setup.c b/lib/Tracer_setup.c
index c699868..0998e0b 100644
--- a/lib/Tracer_setup.c
+++ b/lib/Tracer_setup.c
@@ -393,7 +393,7 @@ static void predict_tracers(struct All_variables *E)
y0=E->trace.basicq[4][kk];
z0=E->trace.basicq[5][kk];
- nelem=E->trace.ielement[CPPR][kk];
+ nelem=E->trace.ielement[kk];
(E->trace.get_velocity)(E,nelem,theta0,phi0,rad0,velocity_vector);
x_pred=x0+velocity_vector[1]*dt;
@@ -493,7 +493,7 @@ static void correct_tracers(struct All_variables *E)
Vy0=E->trace.basicq[10][kk];
Vz0=E->trace.basicq[11][kk];
- nelem=E->trace.ielement[CPPR][kk];
+ nelem=E->trace.ielement[kk];
(E->trace.get_velocity)(E,nelem,theta_pred,phi_pred,rad_pred,velocity_vector);
@@ -587,11 +587,11 @@ static void find_tracers(struct All_variables *E)
y=E->trace.basicq[4][it];
z=E->trace.basicq[5][it];
- iprevious_element=E->trace.ielement[CPPR][it];
+ iprevious_element=E->trace.ielement[it];
iel=(E->trace.iget_element)(E,iprevious_element,x,y,z,theta,phi,rad);
- E->trace.ielement[CPPR][it]=iel;
+ E->trace.ielement[it]=iel;
if (iel == -99) {
/* tracer is inside other processors */
@@ -666,7 +666,7 @@ void count_tracers_of_flavors(struct All_variables *E)
/* Fill arrays */
for (kk=1; kk<=numtracers; kk++) {
- e = E->trace.ielement[CPPR][kk];
+ e = E->trace.ielement[kk];
flavor = E->trace.extraq[0][kk];
E->trace.ntracer_flavor[CPPR][flavor][e]++;
}
@@ -1356,13 +1356,13 @@ void allocate_tracer_arrays(struct All_variables *E, int number_of_tracers)
/* make tracer arrays */
- if ((E->trace.ielement[CPPR]=(int *) malloc(E->trace.max_ntracers*sizeof(int)))==NULL) {
+ if ((E->trace.ielement=(int *) malloc(E->trace.max_ntracers*sizeof(int)))==NULL) {
fprintf(E->trace.fpt,"ERROR(make tracer array)-no memory 1a\n");
fflush(E->trace.fpt);
exit(10);
}
for (kk=1;kk<E->trace.max_ntracers;kk++)
- E->trace.ielement[CPPR][kk]=-99;
+ E->trace.ielement[kk]=-99;
for (kk=0;kk<E->trace.number_of_basic_quantities;kk++) {
@@ -1415,7 +1415,7 @@ void expand_tracer_arrays(struct All_variables *E)
inewsize=E->trace.max_ntracers+E->trace.max_ntracers/5+icushion;
- if ((E->trace.ielement[CPPR]=(int *)realloc(E->trace.ielement[CPPR],inewsize*sizeof(int)))==NULL) {
+ if ((E->trace.ielement=(int *)realloc(E->trace.ielement,inewsize*sizeof(int)))==NULL) {
fprintf(E->trace.fpt,"ERROR(expand tracer arrays )-no memory (ielement)\n");
fflush(E->trace.fpt);
exit(10);
@@ -1475,7 +1475,7 @@ static void reduce_tracer_arrays(struct All_variables *E)
}
- if ((E->trace.ielement[CPPR]=(int *)realloc(E->trace.ielement[CPPR],inewsize*sizeof(int)))==NULL) {
+ if ((E->trace.ielement=(int *)realloc(E->trace.ielement,inewsize*sizeof(int)))==NULL) {
fprintf(E->trace.fpt,"ERROR(reduce tracer arrays )-no memory (ielement)\n");
fflush(E->trace.fpt);
exit(10);
@@ -1595,7 +1595,7 @@ static void eject_tracer(struct All_variables *E, int it)
/* put last tracer in ejected tracer position */
- E->trace.ielement[CPPR][it]=E->trace.ielement[CPPR][ilast_tracer];
+ E->trace.ielement[it]=E->trace.ielement[ilast_tracer];
for (kk=0;kk<=((E->trace.number_of_basic_quantities)-1);kk++)
E->trace.basicq[kk][it]=E->trace.basicq[kk][ilast_tracer];
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index 587b284..77e6ef7 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -56,7 +56,7 @@ struct TRACE{
int ntracers;
int max_ntracers;
- int *ielement[13];
+ int *ielement;
int number_of_tracers;
More information about the CIG-COMMITS
mailing list