[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->trace.rlater as part of caps_per_proc_removal (14249ee)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:13:24 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 14249ee3fff9bbe7833bd98cc2b77a54d65c310e
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 12:36:21 2014 -0700
Changed the shape of E->trace.rlater as part of caps_per_proc_removal
>---------------------------------------------------------------
14249ee3fff9bbe7833bd98cc2b77a54d65c310e
lib/Full_tracer_advection.c | 16 ++++++++--------
lib/Regional_tracer_advection.c | 16 ++++++++--------
lib/Tracer_setup.c | 10 +++++-----
lib/tracer_defs.h | 2 +-
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index f6c75aa..a9fd694 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -315,9 +315,9 @@ void full_lost_souls(struct All_variables *E)
/** debug **
for (kk=1; kk<=E->trace.istat_isend; kk++) {
fprintf(E->trace.fpt, "tracer#=%d xx=(%g,%g,%g)\n", kk,
- E->trace.rlater[CPPR][0][kk],
- E->trace.rlater[CPPR][1][kk],
- E->trace.rlater[CPPR][2][kk]);
+ E->trace.rlater[0][kk],
+ E->trace.rlater[1][kk],
+ E->trace.rlater[2][kk]);
}
fflush(E->trace.fpt);
*/
@@ -789,10 +789,10 @@ static void full_put_lost_tracers(struct All_variables *E,
numtracers=E->trace.ilater;
for (kk=1;kk<=numtracers;kk++) {
- rad=E->trace.rlater[CPPR][2][kk];
- x=E->trace.rlater[CPPR][3][kk];
- y=E->trace.rlater[CPPR][4][kk];
- z=E->trace.rlater[CPPR][5][kk];
+ rad=E->trace.rlater[2][kk];
+ x=E->trace.rlater[3][kk];
+ y=E->trace.rlater[4][kk];
+ z=E->trace.rlater[5][kk];
/* first check same cap if nprocz>1 */
@@ -833,7 +833,7 @@ static void full_put_lost_tracers(struct All_variables *E,
for (pp=0;pp<=(E->trace.number_of_tracer_quantities-1);pp++) {
ipos=isend_position+pp;
- send[CPPR][ithatcap][ipos]=E->trace.rlater[CPPR][pp][kk];
+ send[CPPR][ithatcap][ipos]=E->trace.rlater[pp][kk];
}
} /* end kk, assigning tracers */
diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index d35d25e..4e026e2 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -602,7 +602,7 @@ void regional_lost_souls(struct All_variables *E)
double coord;
/* Is the tracer within the bounds in the d-th dimension */
- coord = E->trace.rlater[CPPR][d][kk];
+ coord = E->trace.rlater[d][kk];
if (coord < bounds[d][0]) {
put_lost_tracers(E, &(isend[0]), send[0], kk);
@@ -732,9 +732,9 @@ void regional_lost_souls(struct All_variables *E)
fprintf(E->trace.fpt, "Error(regional_lost_souls) lost tracers\n");
for (kk=1; kk<=E->trace.ilater; kk++) {
fprintf(E->trace.fpt, "lost #%d xx=(%e, %e, %e)\n", kk,
- E->trace.rlater[CPPR][0][kk],
- E->trace.rlater[CPPR][1][kk],
- E->trace.rlater[CPPR][2][kk]);
+ E->trace.rlater[0][kk],
+ E->trace.rlater[1][kk],
+ E->trace.rlater[2][kk]);
}
fflush(E->trace.fpt);
exit(10);
@@ -762,14 +762,14 @@ static void put_lost_tracers(struct All_variables *E,
for (pp=0; pp<E->trace.number_of_tracer_quantities; pp++) {
ipos = isend_position + pp;
- send[ipos] = E->trace.rlater[CPPR][pp][kk];
+ send[ipos] = E->trace.rlater[pp][kk];
}
(*send_size)++;
/* eject the tracer from rlater */
ilast_tracer = E->trace.ilater;
for (pp=0; pp<E->trace.number_of_tracer_quantities; pp++) {
- E->trace.rlater[CPPR][pp][kk] = E->trace.rlater[CPPR][pp][ilast_tracer];
+ E->trace.rlater[pp][kk] = E->trace.rlater[pp][ilast_tracer];
}
E->trace.ilater--;
}
@@ -840,7 +840,7 @@ static void put_found_tracers(struct All_variables *E, int recv_size, double *re
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*sizeof(double)))==NULL) {
+ if ((E->trace.rlater[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);
@@ -855,7 +855,7 @@ static void put_found_tracers(struct All_variables *E, int recv_size, double *re
expand_later_array(E);
for (pp=0; pp<E->trace.number_of_tracer_quantities; pp++)
- E->trace.rlater[CPPR][pp][ilast] = recv[ipos+pp];
+ E->trace.rlater[pp][ilast] = recv[ipos+pp];
} /* end of if-else */
} /* end of for kk */
}
diff --git a/lib/Tracer_setup.c b/lib/Tracer_setup.c
index 00115a4..5e4cae3 100644
--- a/lib/Tracer_setup.c
+++ b/lib/Tracer_setup.c
@@ -630,7 +630,7 @@ static void find_tracers(struct All_variables *E)
if (E->trace.ilatersize>0) {
for (kk=0;kk<=((E->trace.number_of_tracer_quantities)-1);kk++) {
- free(E->trace.rlater[CPPR][kk]);
+ free(E->trace.rlater[kk]);
}
}
@@ -1528,7 +1528,7 @@ static void put_away_later(struct All_variables *E, int it)
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*sizeof(double)))==NULL) {
+ if ((E->trace.rlater[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);
@@ -1546,10 +1546,10 @@ static void put_away_later(struct All_variables *E, int it)
/* stack basic and extra quantities together (basic first) */
for (kk=0;kk<=((E->trace.number_of_basic_quantities)-1);kk++)
- E->trace.rlater[CPPR][kk][E->trace.ilater]=E->trace.basicq[kk][it];
+ E->trace.rlater[kk][E->trace.ilater]=E->trace.basicq[kk][it];
for (kk=0;kk<=((E->trace.number_of_extra_quantities)-1);kk++)
- E->trace.rlater[CPPR][E->trace.number_of_basic_quantities+kk][E->trace.ilater]=E->trace.extraq[kk][it];
+ E->trace.rlater[E->trace.number_of_basic_quantities+kk][E->trace.ilater]=E->trace.extraq[kk][it];
}
@@ -1569,7 +1569,7 @@ void expand_later_array(struct All_variables *E)
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) {
+ if ((E->trace.rlater[kk]=(double *)realloc(E->trace.rlater[kk],inewsize*sizeof(double)))==NULL) {
fprintf(E->trace.fpt,"AKM(expand later array )-no memory (%d)\n",kk);
fflush(E->trace.fpt);
exit(10);
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index 4ca51b4..58d021a 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -62,7 +62,7 @@ struct TRACE{
int ilatersize;
int ilater;
- double *rlater[13][100];
+ double *rlater[100];
/* tracer flavors */
int nflavors;
More information about the CIG-COMMITS
mailing list