[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->trace.numregel as part of caps_per_proc_removal (28a6052)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Sep 24 15:24:06 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/980de677d7efb78fdd5c41fd4b35a9283a2d251f...b86b2dd00f2bd13fb282a2eb9169871be4b1e923
>---------------------------------------------------------------
commit 28a605292990436223784ed4c55e4c7134419a8e
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 13:12:16 2014 -0700
Changed the shape of E->trace.numregel as part of caps_per_proc_removal
>---------------------------------------------------------------
28a605292990436223784ed4c55e4c7134419a8e
lib/Full_tracer_advection.c | 8 ++++----
lib/tracer_defs.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index a5adfea..c7f8420 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -1374,7 +1374,7 @@ static void make_regular_grid(struct All_variables *E)
E->trace.thetamin[CPPR]=thetamin;
E->trace.phimax[CPPR]=phimax;
E->trace.phimin[CPPR]=phimin;
- E->trace.numregel[CPPR]=numregel;
+ E->trace.numregel=numregel;
E->trace.numregnodes[CPPR]=numregnodes;
if ( ((1.0*numregel)/(1.0*E->lmesh.elx*E->lmesh.ely)) < 0.5 )
@@ -1634,7 +1634,7 @@ static void make_regular_grid(struct All_variables *E)
/* and the rest are not (-99). */
/* ichoice>1 Multiple elements to check */
- numregel= E->trace.numregel[CPPR];
+ numregel= E->trace.numregel;
for (pp=0;pp<=4;pp++)
{
@@ -1788,7 +1788,7 @@ static void make_regular_grid(struct All_variables *E)
/* testing */
- for (kk=1;kk<=E->trace.numregel[CPPR];kk++)
+ for (kk=1;kk<=E->trace.numregel;kk++)
{
if ((E->trace.regtoel[CPPR][0][kk]<-1)||(E->trace.regtoel[CPPR][0][kk]>4))
{
@@ -2764,7 +2764,7 @@ static int iget_regel(struct All_variables *E,
/* check range to be sure */
- if (iregel>E->trace.numregel[CPPR]) return -99;
+ if (iregel>E->trace.numregel) return -99;
if (iregel<1) return -99;
return iregel;
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index 69ae9af..f001ac5 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -113,7 +113,7 @@ struct TRACE{
/* regular mesh parameters */
int numtheta;
int numphi;
- unsigned int numregel[13];
+ unsigned int numregel;
unsigned int numregnodes[13];
double deltheta[13];
double delphi[13];
More information about the CIG-COMMITS
mailing list