[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->trace.numtheta as part of caps_per_proc_removal (18abf75)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Sep 24 15:24:02 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/980de677d7efb78fdd5c41fd4b35a9283a2d251f...b86b2dd00f2bd13fb282a2eb9169871be4b1e923
>---------------------------------------------------------------
commit 18abf756c54f1f24b057c72d96ed49449569c7f3
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 13:09:09 2014 -0700
Changed the shape of E->trace.numtheta as part of caps_per_proc_removal
>---------------------------------------------------------------
18abf756c54f1f24b057c72d96ed49449569c7f3
lib/Full_tracer_advection.c | 10 +++++-----
lib/tracer_defs.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index a9fd694..33c3f40 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -1368,7 +1368,7 @@ static void make_regular_grid(struct All_variables *E)
E->trace.deltheta[CPPR]=deltheta;
E->trace.delphi[CPPR]=delphi;
- E->trace.numtheta[CPPR]=numtheta;
+ E->trace.numtheta=numtheta;
E->trace.numphi[CPPR]=numphi;
E->trace.thetamax[CPPR]=thetamax;
E->trace.thetamin[CPPR]=thetamin;
@@ -1646,7 +1646,7 @@ static void make_regular_grid(struct All_variables *E)
}
}
- numtheta=E->trace.numtheta[CPPR];
+ numtheta=E->trace.numtheta;
numphi=E->trace.numphi[CPPR];
for (nphi=1;nphi<=numphi;nphi++)
@@ -1669,8 +1669,8 @@ static void make_regular_grid(struct All_variables *E)
iregnode[1]=iregel+(nphi-1);
iregnode[2]=iregel+nphi;
- iregnode[3]=iregel+nphi+E->trace.numtheta[CPPR]+1;
- iregnode[4]=iregel+nphi+E->trace.numtheta[CPPR];
+ iregnode[3]=iregel+nphi+E->trace.numtheta+1;
+ iregnode[4]=iregel+nphi+E->trace.numtheta;
for (kk=1;kk<=4;kk++)
{
@@ -2760,7 +2760,7 @@ static int iget_regel(struct All_variables *E,
idum=rdum/E->trace.delphi[CPPR];
*nphi=idum+1;
- iregel=*ntheta+(*nphi-1)*E->trace.numtheta[CPPR];
+ iregel=*ntheta+(*nphi-1)*E->trace.numtheta;
/* check range to be sure */
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index a4e5d69..6ef227a 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -111,7 +111,7 @@ struct TRACE{
/*********************/
/* regular mesh parameters */
- int numtheta[13];
+ int numtheta;
int numphi[13];
unsigned int numregel[13];
unsigned int numregnodes[13];
More information about the CIG-COMMITS
mailing list