[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->trace.ilater as part of caps_per_proc_removal (67ef905)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:13:22 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 67ef905ba3fa9774e873d9a293176d10a41f0172
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 12:33:45 2014 -0700
Changed the shape of E->trace.ilater as part of caps_per_proc_removal
>---------------------------------------------------------------
67ef905ba3fa9774e873d9a293176d10a41f0172
lib/Full_tracer_advection.c | 6 +++---
lib/Regional_tracer_advection.c | 26 +++++++++++++-------------
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 7b7f466..f6c75aa 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -311,7 +311,7 @@ void full_lost_souls(struct All_variables *E)
fprintf(E->trace.fpt, "Entering lost_souls()\n");
- E->trace.istat_isend=E->trace.ilater[CPPR];
+ E->trace.istat_isend=E->trace.ilater;
/** debug **
for (kk=1; kk<=E->trace.istat_isend; kk++) {
fprintf(E->trace.fpt, "tracer#=%d xx=(%g,%g,%g)\n", kk,
@@ -326,7 +326,7 @@ void full_lost_souls(struct All_variables *E)
/* initialize isend and ireceive */
/* # of neighbors in the horizontal plane */
- isize[CPPR]=E->trace.ilater[CPPR]*E->trace.number_of_tracer_quantities;
+ isize[CPPR]=E->trace.ilater*E->trace.number_of_tracer_quantities;
for (kk=0;kk<=num_ngb;kk++) isend[CPPR][kk]=0;
for (kk=0;kk<=num_ngb;kk++) ireceive[CPPR][kk]=0;
@@ -786,7 +786,7 @@ static void full_put_lost_tracers(struct All_variables *E,
/* transfer tracers from rlater to send */
- numtracers=E->trace.ilater[CPPR];
+ numtracers=E->trace.ilater;
for (kk=1;kk<=numtracers;kk++) {
rad=E->trace.rlater[CPPR][2][kk];
diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index 417c44d..d35d25e 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -550,7 +550,7 @@ void regional_lost_souls(struct All_variables *E)
double CPU_time0();
double begin_time = CPU_time0();
- E->trace.istat_isend = E->trace.ilater[CPPR];
+ E->trace.istat_isend = E->trace.ilater;
/* the bounding box */
for (d=0; d<E->mesh.nsd; d++) {
@@ -572,7 +572,7 @@ void regional_lost_souls(struct All_variables *E)
}
/* Allocate Maximum Memory to Send Arrays */
- max_send_size = max(2*E->trace.ilater[CPPR], E->trace.ntracers/100);
+ max_send_size = max(2*E->trace.ilater, E->trace.ntracers/100);
itemp_size = max_send_size * E->trace.number_of_tracer_quantities;
if ((send[0] = (double *)malloc(itemp_size*sizeof(double)))
@@ -590,7 +590,7 @@ void regional_lost_souls(struct All_variables *E)
for (d=0; d<E->mesh.nsd; d++) {
- int original_size = E->trace.ilater[CPPR];
+ int original_size = E->trace.ilater;
int idb;
int kk = 1;
int isend[2], irecv[2];
@@ -598,7 +598,7 @@ void regional_lost_souls(struct All_variables *E)
/* move out-of-bound tracers to send array */
- while (kk<=E->trace.ilater[CPPR]) {
+ while (kk<=E->trace.ilater) {
double coord;
/* Is the tracer within the bounds in the d-th dimension */
@@ -649,10 +649,10 @@ void regional_lost_souls(struct All_variables *E)
/* check the total # of tracers is conserved */
- if ((isend[0] + isend[1] + E->trace.ilater[CPPR]) != original_size) {
+ if ((isend[0] + isend[1] + E->trace.ilater) != original_size) {
fprintf(E->trace.fpt, "original_size: %d, rlater_size: %d, "
"send_size: %d\n",
- original_size, E->trace.ilater[CPPR], kk);
+ original_size, E->trace.ilater, kk);
}
/* Send info to other processors regarding number of send tracers */
@@ -728,9 +728,9 @@ void regional_lost_souls(struct All_variables *E)
/* rlater should be empty by now */
- if (E->trace.ilater[CPPR] > 0) {
+ if (E->trace.ilater > 0) {
fprintf(E->trace.fpt, "Error(regional_lost_souls) lost tracers\n");
- for (kk=1; kk<=E->trace.ilater[CPPR]; kk++) {
+ 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],
@@ -767,11 +767,11 @@ static void put_lost_tracers(struct All_variables *E,
(*send_size)++;
/* eject the tracer from rlater */
- ilast_tracer = E->trace.ilater[CPPR];
+ 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.ilater[CPPR]--;
+ E->trace.ilater--;
}
@@ -848,10 +848,10 @@ static void put_found_tracers(struct All_variables *E, int recv_size, double *re
}
} /* end first particle initiating memory allocation */
- E->trace.ilater[CPPR]++;
- ilast = E->trace.ilater[CPPR];
+ E->trace.ilater++;
+ ilast = E->trace.ilater;
- if (E->trace.ilater[CPPR] > (E->trace.ilatersize-5))
+ if (E->trace.ilater > (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 9434538..00115a4 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=0;
+ E->trace.ilater=E->trace.ilatersize=0;
E->trace.istat1=0;
for (kk=0;kk<=4;kk++) {
@@ -1539,17 +1539,17 @@ static void put_away_later(struct All_variables *E, int it)
/* Put tracer in later array */
- E->trace.ilater[CPPR]++;
+ E->trace.ilater++;
- if (E->trace.ilater[CPPR] >= (E->trace.ilatersize-5)) expand_later_array(E);
+ if (E->trace.ilater >= (E->trace.ilatersize-5)) expand_later_array(E);
/* 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[CPPR]]=E->trace.basicq[kk][it];
+ E->trace.rlater[CPPR][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[CPPR]]=E->trace.extraq[kk][it];
+ E->trace.rlater[CPPR][E->trace.number_of_basic_quantities+kk][E->trace.ilater]=E->trace.extraq[kk][it];
}
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index d1eb41f..4ca51b4 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -61,7 +61,7 @@ struct TRACE{
int number_of_tracers;
int ilatersize;
- int ilater[13];
+ int ilater;
double *rlater[13][100];
/* tracer flavors */
More information about the CIG-COMMITS
mailing list