[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->trace.deltheta as part of caps_per_proc_removal (dc28a2f)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Sep 24 15:24:11 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/980de677d7efb78fdd5c41fd4b35a9283a2d251f...b86b2dd00f2bd13fb282a2eb9169871be4b1e923
>---------------------------------------------------------------
commit dc28a2f3d0cdaca97b9413ef1c09ee6ab631f514
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 13:17:14 2014 -0700
Changed the shape of E->trace.deltheta as part of caps_per_proc_removal
>---------------------------------------------------------------
dc28a2f3d0cdaca97b9413ef1c09ee6ab631f514
lib/Full_tracer_advection.c | 12 ++++++------
lib/tracer_defs.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index 62c8401..a9b7d16 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -104,9 +104,9 @@ void full_tracer_input(struct All_variables *E)
/* (first fill uniform del[0] value) */
/* (later, in make_regular_grid, will adjust and distribute to caps */
- E->trace.deltheta[0]=1.0;
+ E->trace.deltheta=1.0;
E->trace.delphi[0]=1.0;
- input_double("regular_grid_deltheta",&(E->trace.deltheta[0]),"1.0",m);
+ input_double("regular_grid_deltheta",&(E->trace.deltheta),"1.0",m);
input_double("regular_grid_delphi",&(E->trace.delphi[0]),"1.0",m);
@@ -1341,7 +1341,7 @@ static void make_regular_grid(struct All_variables *E)
/* Convert input data from degrees to radians */
- deltheta=E->trace.deltheta[0]*M_PI/180.0;
+ deltheta=E->trace.deltheta*M_PI/180.0;
delphi=E->trace.delphi[0]*M_PI/180.0;
@@ -1366,7 +1366,7 @@ static void make_regular_grid(struct All_variables *E)
/* fill global variables */
- E->trace.deltheta[CPPR]=deltheta;
+ E->trace.deltheta=deltheta;
E->trace.delphi[CPPR]=delphi;
E->trace.numtheta=numtheta;
E->trace.numphi=numphi;
@@ -1898,7 +1898,7 @@ static void write_trace_instructions(struct All_variables *E)
/* regular grid stuff */
fprintf(E->trace.fpt,"Regular Grid-> deltheta: %f delphi: %f\n",
- E->trace.deltheta[0],E->trace.delphi[0]);
+ E->trace.deltheta,E->trace.delphi[0]);
@@ -2753,7 +2753,7 @@ static int iget_regel(struct All_variables *E,
/* get ntheta, nphi on regular mesh */
rdum=theta-E->trace.thetamin[CPPR];
- idum=rdum/E->trace.deltheta[CPPR];
+ idum=rdum/E->trace.deltheta;
*ntheta=idum+1;
rdum=phi-E->trace.phimin[CPPR];
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index c84c1d4..94b5861 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -115,7 +115,7 @@ struct TRACE{
int numphi;
unsigned int numregel;
unsigned int numregnodes;
- double deltheta[13];
+ double deltheta;
double delphi[13];
double thetamax[13];
double thetamin[13];
More information about the CIG-COMMITS
mailing list