[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->Node_map as part of caps_per_proc_removal (c3d1c0d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:14:00 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit c3d1c0d3bf82905e0edcbabf095f0b0bf53e4f0e
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 13:36:34 2014 -0700
Changed the shape of E->Node_map as part of caps_per_proc_removal
>---------------------------------------------------------------
c3d1c0d3bf82905e0edcbabf095f0b0bf53e4f0e
lib/Construct_arrays.c | 18 +++++++++---------
lib/Element_calculations.c | 2 +-
lib/General_matrix_functions.c | 2 +-
lib/global_defs.h | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index fe3e6ef..08ccaf8 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -255,17 +255,17 @@ void construct_node_maps(E)
nox = E->lmesh.NOX[lev];
max_eqn = 14*dims; // Is this 14 supposed to be NCS?
matrix = max_eqn*nno;
- E->Node_map[lev][CPPR]=(int *) malloc (matrix*sizeof(int));
+ E->Node_map[lev]=(int *) malloc (matrix*sizeof(int));
for(i=0;i<matrix;i++)
- E->Node_map[lev][CPPR][i] = neq; /* neq indicates an invalid eqn # */
+ E->Node_map[lev][i] = neq; /* neq indicates an invalid eqn # */
for (ii=1;ii<=noy;ii++)
for (jj=1;jj<=nox;jj++)
for (kk=1;kk<=noz;kk++) {
nn = kk + (jj-1)*noz+ (ii-1)*noxz;
for(doff=1;doff<=dims;doff++)
- E->Node_map[lev][CPPR][(nn-1)*max_eqn+doff-1] = E->ID[lev][nn].doff[doff];
+ E->Node_map[lev][(nn-1)*max_eqn+doff-1] = E->ID[lev][nn].doff[doff];
ia = 0;
is=1; ie=dims2;
@@ -284,7 +284,7 @@ void construct_node_maps(E)
if (ja<nn) {
ia++;
for (doff=1;doff<=dims;doff++)
- E->Node_map[lev][CPPR][(nn-1)*max_eqn+ia*dims+doff-1]=E->ID[lev][ja].doff[doff];
+ E->Node_map[lev][(nn-1)*max_eqn+ia*dims+doff-1]=E->ID[lev][ja].doff[doff];
}
}
}
@@ -299,7 +299,7 @@ void construct_node_maps(E)
fprintf(E->fp_out, "output Node_map lev=%d m=%d\n", lev, CPPR);
fprintf(E->fp_out, "neq=%d nno=%d max_eqn=%d matrix=%d\n", neq, nno, max_eqn, matrix);
for(i=0;i<matrix;i++)
- fprintf(E->fp_out, "%d %d\n", i, E->Node_map[lev][CPPR][i]);
+ fprintf(E->fp_out, "%d %d\n", i, E->Node_map[lev][i]);
}
}
}
@@ -384,7 +384,7 @@ void construct_node_ks(E)
found=0;
for(k=0;k<max_eqn;k++)
- if(E->Node_map[level][CPPR][loc0+k] == eqn1) { /* found, index next equation */
+ if(E->Node_map[level][loc0+k] == eqn1) { /* found, index next equation */
index=k;
found++;
break;
@@ -400,7 +400,7 @@ void construct_node_ks(E)
found=0;
for(k=0;k<max_eqn;k++)
- if(E->Node_map[level][CPPR][loc0+k] == eqn2) { /* found, index next equation */
+ if(E->Node_map[level][loc0+k] == eqn2) { /* found, index next equation */
index=k;
found++;
break;
@@ -416,7 +416,7 @@ void construct_node_ks(E)
found=0;
for(k=0;k<max_eqn;k++)
- if(E->Node_map[level][CPPR][loc0+k] == eqn3) { /* found, index next equation */
+ if(E->Node_map[level][loc0+k] == eqn3) { /* found, index next equation */
index=k;
found++;
break;
@@ -469,7 +469,7 @@ void rebuild_BI_on_boundary(E)
eqn2=E->ID[level][i].doff[2];
eqn3=E->ID[level][i].doff[3];
- C=E->Node_map[level][CPPR] + (i-1)*max_eqn;
+ C=E->Node_map[level] + (i-1)*max_eqn;
B1=E->Eqn_k1[level][CPPR]+(i-1)*max_eqn;
B2=E->Eqn_k2[level][CPPR]+(i-1)*max_eqn;
B3=E->Eqn_k3[level][CPPR]+(i-1)*max_eqn;
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 8ecf759..61a226a 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -535,7 +535,7 @@ void n_assemble_del2_u(E,u,Au,level,strip_bcs)
U2 = u[eqn2];
U3 = u[eqn3];
- C=E->Node_map[level][CPPR] + (e-1)*max_eqn;
+ C=E->Node_map[level] + (e-1)*max_eqn;
B1=E->Eqn_k1[level][CPPR]+(e-1)*max_eqn;
B2=E->Eqn_k2[level][CPPR]+(e-1)*max_eqn;
B3=E->Eqn_k3[level][CPPR]+(e-1)*max_eqn;
diff --git a/lib/General_matrix_functions.c b/lib/General_matrix_functions.c
index 2ffa85d..9bc826c 100644
--- a/lib/General_matrix_functions.c
+++ b/lib/General_matrix_functions.c
@@ -483,7 +483,7 @@ void gauss_seidel(E,d0,F,Ad,acc,cycles,level,guess)
eqn1=E->ID[level][i].doff[1];
eqn2=E->ID[level][i].doff[2];
eqn3=E->ID[level][i].doff[3];
- C=E->Node_map[level][CPPR]+(i-1)*max_eqn;
+ C=E->Node_map[level]+(i-1)*max_eqn;
B1=E->Eqn_k1[level][CPPR]+(i-1)*max_eqn;
B2=E->Eqn_k2[level][CPPR]+(i-1)*max_eqn;
B3=E->Eqn_k3[level][CPPR]+(i-1)*max_eqn;
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 4f57784..8a12388 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -820,7 +820,7 @@ struct All_variables {
higher_precision *Eqn_k1[MAX_LEVELS][NCS],*Eqn_k2[MAX_LEVELS][NCS],*Eqn_k3[MAX_LEVELS][NCS];
- int *Node_map [MAX_LEVELS][NCS];
+ int *Node_map [MAX_LEVELS];
double *BI[MAX_LEVELS],*BPI[MAX_LEVELS];
More information about the CIG-COMMITS
mailing list