[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->trace.deltheta as part of caps_per_proc_removal (cd22b69)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:13:43 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit cd22b69a8c6342e0b4885a82a523ac2d7ffe4bb3
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 13:18:15 2014 -0700
Changed the shape of E->trace.deltheta as part of caps_per_proc_removal
>---------------------------------------------------------------
cd22b69a8c6342e0b4885a82a523ac2d7ffe4bb3
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 a9b7d16..e3f0bdd 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -105,9 +105,9 @@ void full_tracer_input(struct All_variables *E)
/* (later, in make_regular_grid, will adjust and distribute to caps */
E->trace.deltheta=1.0;
- E->trace.delphi[0]=1.0;
+ E->trace.delphi=1.0;
input_double("regular_grid_deltheta",&(E->trace.deltheta),"1.0",m);
- input_double("regular_grid_delphi",&(E->trace.delphi[0]),"1.0",m);
+ input_double("regular_grid_delphi",&(E->trace.delphi),"1.0",m);
/* Analytical Test Function */
@@ -1342,7 +1342,7 @@ static void make_regular_grid(struct All_variables *E)
/* Convert input data from degrees to radians */
deltheta=E->trace.deltheta*M_PI/180.0;
- delphi=E->trace.delphi[0]*M_PI/180.0;
+ delphi=E->trace.delphi*M_PI/180.0;
/* Adjust deltheta and delphi to fit a uniform number of regular elements */
@@ -1367,7 +1367,7 @@ static void make_regular_grid(struct All_variables *E)
/* fill global variables */
E->trace.deltheta=deltheta;
- E->trace.delphi[CPPR]=delphi;
+ E->trace.delphi=delphi;
E->trace.numtheta=numtheta;
E->trace.numphi=numphi;
E->trace.thetamax[CPPR]=thetamax;
@@ -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,E->trace.delphi[0]);
+ E->trace.deltheta,E->trace.delphi);
@@ -2757,7 +2757,7 @@ static int iget_regel(struct All_variables *E,
*ntheta=idum+1;
rdum=phi-E->trace.phimin[CPPR];
- idum=rdum/E->trace.delphi[CPPR];
+ idum=rdum/E->trace.delphi;
*nphi=idum+1;
iregel=*ntheta+(*nphi-1)*E->trace.numtheta;
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index 94b5861..43f30ef 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -116,7 +116,7 @@ struct TRACE{
unsigned int numregel;
unsigned int numregnodes;
double deltheta;
- double delphi[13];
+ double delphi;
double thetamax[13];
double thetamin[13];
double phimax[13];
More information about the CIG-COMMITS
mailing list