[cig-commits] [commit] rajesh-petsc-schur: Corrected the signature of Solver.exchange_id_d, full_exchange_id_d, regional_exchange_id_d (fbbed82)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:10:51 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit fbbed82dc2b8fbb35cfc4d751a4151748e774fd4
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Fri Sep 19 10:36:58 2014 -0700
Corrected the signature of Solver.exchange_id_d, full_exchange_id_d, regional_exchange_id_d
>---------------------------------------------------------------
fbbed82dc2b8fbb35cfc4d751a4151748e774fd4
lib/Full_parallel_related.c | 12 ++++++------
lib/Full_solver.c | 2 +-
lib/Regional_parallel_related.c | 6 +++---
lib/Regional_solver.c | 2 +-
lib/prototypes.h | 4 ++--
lib/solver.h | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/Full_parallel_related.c b/lib/Full_parallel_related.c
index 5f45aa2..eff5cc3 100644
--- a/lib/Full_parallel_related.c
+++ b/lib/Full_parallel_related.c
@@ -853,7 +853,7 @@ static void line_eqn_node_to_pass(E,lev,npass,num_node,offset,stride)
void full_exchange_id_d(E, U, lev)
struct All_variables *E;
- double **U;
+ double *U;
int lev;
{
@@ -883,7 +883,7 @@ void full_exchange_id_d(E, U, lev)
for (k=1;k<=E->parallel.TNUM_PASS[lev][CPPR];k++) {
for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++) {
- S[k][j-1] = U[CPPR][ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ];
+ S[k][j-1] = U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ];
}
if (E->parallel.PROCESSOR[lev][CPPR].pass[k] != E->parallel.me &&
@@ -906,7 +906,7 @@ void full_exchange_id_d(E, U, lev)
}
else {
for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++)
- U[CPPR][ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += S[k][j-1];
+ U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += S[k][j-1];
}
} /* for k */
@@ -917,7 +917,7 @@ void full_exchange_id_d(E, U, lev)
if (E->parallel.PROCESSOR[lev][CPPR].pass[k] != E->parallel.me &&
E->parallel.PROCESSOR[lev][CPPR].pass[k] != -1) {
for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++)
- U[CPPR][ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += R[k][j-1];
+ U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += R[k][j-1];
}
}
@@ -928,7 +928,7 @@ void full_exchange_id_d(E, U, lev)
kk = k + E->sphere.max_connections;
for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[kk];j++)
- SV[jj++] = U[CPPR][ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[kk] ];
+ SV[jj++] = U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[kk] ];
MPI_Sendrecv(SV, E->parallel.NUM_NEQz[lev].pass[k], MPI_DOUBLE,
E->parallel.PROCESSORz[lev].pass[k], 1,
@@ -938,7 +938,7 @@ void full_exchange_id_d(E, U, lev)
jj = 0;
for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[kk];j++)
- U[CPPR][ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[kk] ] += RV[jj++];
+ U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[kk] ] += RV[jj++];
}
for (k=1;k<=E->parallel.TNUM_PASS[lev][CPPR];k++) {
diff --git a/lib/Full_solver.c b/lib/Full_solver.c
index 2ee831c..46621cb 100644
--- a/lib/Full_solver.c
+++ b/lib/Full_solver.c
@@ -49,7 +49,7 @@ void full_parallel_domain_decomp0(struct All_variables *);
void full_parallel_domain_boundary_nodes(struct All_variables *);
void full_parallel_communication_routs_v(struct All_variables *);
void full_parallel_communication_routs_s(struct All_variables *);
-void full_exchange_id_d(struct All_variables *, double **, int);
+void full_exchange_id_d(struct All_variables *, double *, int);
/* Read_input_from_files.c */
void full_read_input_files_for_timesteps(struct All_variables *, int, int);
diff --git a/lib/Regional_parallel_related.c b/lib/Regional_parallel_related.c
index cf50bc2..f3b9b03 100644
--- a/lib/Regional_parallel_related.c
+++ b/lib/Regional_parallel_related.c
@@ -699,7 +699,7 @@ void regional_parallel_communication_routs_s(E)
void regional_exchange_id_d(E, U, lev)
struct All_variables *E;
- double **U;
+ double *U;
int lev;
{
@@ -718,7 +718,7 @@ void regional_exchange_id_d(E, U, lev)
for (k=1;k<=E->parallel.TNUM_PASS[lev][CPPR];k++) {
for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++)
- S[k][j-1] = U[CPPR][ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ];
+ S[k][j-1] = U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ];
MPI_Sendrecv(S[k],E->parallel.NUM_NEQ[lev][CPPR].pass[k],MPI_DOUBLE,
E->parallel.PROCESSOR[lev][CPPR].pass[k],1,
@@ -727,7 +727,7 @@ void regional_exchange_id_d(E, U, lev)
E->parallel.world,&status);
for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++)
- U[CPPR][ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += R[k][j-1];
+ U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += R[k][j-1];
} /* for k */
diff --git a/lib/Regional_solver.c b/lib/Regional_solver.c
index bd1e055..44e68a7 100644
--- a/lib/Regional_solver.c
+++ b/lib/Regional_solver.c
@@ -49,7 +49,7 @@ void regional_parallel_domain_decomp0(struct All_variables *);
void regional_parallel_domain_boundary_nodes(struct All_variables *);
void regional_parallel_communication_routs_v(struct All_variables *);
void regional_parallel_communication_routs_s(struct All_variables *);
-void regional_exchange_id_d(struct All_variables *, double **, int);
+void regional_exchange_id_d(struct All_variables *, double *, int);
/* Read_input_from_files.c */
void regional_read_input_files_for_timesteps(struct All_variables *, int, int);
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 03f341c..5962ef3 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -139,7 +139,7 @@ void full_parallel_domain_decomp0(struct All_variables *);
void full_parallel_domain_boundary_nodes(struct All_variables *);
void full_parallel_communication_routs_v(struct All_variables *);
void full_parallel_communication_routs_s(struct All_variables *);
-void full_exchange_id_d(struct All_variables *, double **, int);
+void full_exchange_id_d(struct All_variables *, double *, int);
void full_exchange_snode_f(struct All_variables *, float **, float **, int);
/* Full_read_input_from_files.c */
void full_read_input_files_for_timesteps(struct All_variables *, int, int);
@@ -416,7 +416,7 @@ void regional_parallel_domain_decomp0(struct All_variables *);
void regional_parallel_domain_boundary_nodes(struct All_variables *);
void regional_parallel_communication_routs_v(struct All_variables *);
void regional_parallel_communication_routs_s(struct All_variables *);
-void regional_exchange_id_d(struct All_variables *, double **, int);
+void regional_exchange_id_d(struct All_variables *, double *, int);
void regional_exchange_snode_f(struct All_variables *, float **, float **, int);
/* Regional_read_input_from_files.c */
void regional_read_input_files_for_timesteps(struct All_variables *, int, int);
diff --git a/lib/solver.h b/lib/solver.h
index 7793556..c792a61 100644
--- a/lib/solver.h
+++ b/lib/solver.h
@@ -53,7 +53,7 @@ struct Solver {
void (*parallel_domain_boundary_nodes)(struct All_variables *);
void (*parallel_communication_routs_v)(struct All_variables *);
void (*parallel_communication_routs_s)(struct All_variables *);
- void (*exchange_id_d)(struct All_variables *, double **, int);
+ void (*exchange_id_d)(struct All_variables *, double *, int);
/* Read_input_from_files.c */
void (*read_input_files_for_timesteps)(struct All_variables *, int, int);
More information about the CIG-COMMITS
mailing list