CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed variable hy to hiny to foil IBM system variable hy

Browse Source
This commit is contained in:
vhenson 1999-05-12 18:35:02 +00:00
parent 4de4091c41
commit b6827761b0
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
seq_linear_solvers/pamg/driver.c
View File

@ -941,7 +941,7 @@ BuildDifConv( int argc,
int P, Q, R; int P, Q, R;
double cx, cy, cz; double cx, cy, cz;
double ax, ay, az; double ax, ay, az;
double hx,hy,hz; double hinx,hiny,hinz;
#if 0 #if 0
hypre_ParCSRMatrix *A; hypre_ParCSRMatrix *A;
@ -973,9 +973,9 @@ BuildDifConv( int argc,
ny = 10; ny = 10;
nz = 10; nz = 10;
hx = 1.0/(nx+1); hinx = 1.0/(nx+1);
hy = 1.0/(ny+1); hiny = 1.0/(ny+1);
hz = 1.0/(nz+1); hinz = 1.0/(nz+1);
P = 1; P = 1;
Q = num_procs; Q = num_procs;
@ -1070,25 +1070,25 @@ BuildDifConv( int argc,
values = hypre_CTAlloc(double, 7); values = hypre_CTAlloc(double, 7);
values[1] = -cx/(hx*hx); values[1] = -cx/(hinx*hinx);
values[2] = -cy/(hy*hy); values[2] = -cy/(hiny*hiny);
values[3] = -cz/(hz*hz); values[3] = -cz/(hinz*hinz);
values[4] = -cx/(hx*hx) + ax/hx; values[4] = -cx/(hinx*hinx) + ax/hinx;
values[5] = -cy/(hy*hy) + ay/hy; values[5] = -cy/(hiny*hiny) + ay/hiny;
values[6] = -cz/(hz*hz) + az/hz; values[6] = -cz/(hinz*hinz) + az/hinz;
values[0] = 0.0; values[0] = 0.0;
if (nx > 1) if (nx > 1)
{ {
values[0] += 2.0*cx/(hx*hx) - 1.0*ax/hx; values[0] += 2.0*cx/(hinx*hinx) - 1.0*ax/hinx;
} }
if (ny > 1) if (ny > 1)
{ {
values[0] += 2.0*cy/(hy*hy) - 1.0*ay/hy; values[0] += 2.0*cy/(hiny*hiny) - 1.0*ay/hiny;
} }
if (nz > 1) if (nz > 1)
{ {
values[0] += 2.0*cz/(hz*hz) - 1.0*az/hz; values[0] += 2.0*cz/(hinz*hinz) - 1.0*az/hinz;
} }
A = hypre_GenerateDifConv(nx, ny, nz, P, Q, R, values); A = hypre_GenerateDifConv(nx, ny, nz, P, Q, R, values);

26
seq_ls/pamg/driver.c
View File

@ -941,7 +941,7 @@ BuildDifConv( int argc,
int P, Q, R; int P, Q, R;
double cx, cy, cz; double cx, cy, cz;
double ax, ay, az; double ax, ay, az;
double hx,hy,hz; double hinx,hiny,hinz;
#if 0 #if 0
hypre_ParCSRMatrix *A; hypre_ParCSRMatrix *A;
@ -973,9 +973,9 @@ BuildDifConv( int argc,
ny = 10; ny = 10;
nz = 10; nz = 10;
hx = 1.0/(nx+1); hinx = 1.0/(nx+1);
hy = 1.0/(ny+1); hiny = 1.0/(ny+1);
hz = 1.0/(nz+1); hinz = 1.0/(nz+1);
P = 1; P = 1;
Q = num_procs; Q = num_procs;
@ -1070,25 +1070,25 @@ BuildDifConv( int argc,
values = hypre_CTAlloc(double, 7); values = hypre_CTAlloc(double, 7);
values[1] = -cx/(hx*hx); values[1] = -cx/(hinx*hinx);
values[2] = -cy/(hy*hy); values[2] = -cy/(hiny*hiny);
values[3] = -cz/(hz*hz); values[3] = -cz/(hinz*hinz);
values[4] = -cx/(hx*hx) + ax/hx; values[4] = -cx/(hinx*hinx) + ax/hinx;
values[5] = -cy/(hy*hy) + ay/hy; values[5] = -cy/(hiny*hiny) + ay/hiny;
values[6] = -cz/(hz*hz) + az/hz; values[6] = -cz/(hinz*hinz) + az/hinz;
values[0] = 0.0; values[0] = 0.0;
if (nx > 1) if (nx > 1)
{ {
values[0] += 2.0*cx/(hx*hx) - 1.0*ax/hx; values[0] += 2.0*cx/(hinx*hinx) - 1.0*ax/hinx;
} }
if (ny > 1) if (ny > 1)
{ {
values[0] += 2.0*cy/(hy*hy) - 1.0*ay/hy; values[0] += 2.0*cy/(hiny*hiny) - 1.0*ay/hiny;
} }
if (nz > 1) if (nz > 1)
{ {
values[0] += 2.0*cz/(hz*hz) - 1.0*az/hz; values[0] += 2.0*cz/(hinz*hinz) - 1.0*az/hinz;
} }
A = hypre_GenerateDifConv(nx, ny, nz, P, Q, R, values); A = hypre_GenerateDifConv(nx, ny, nz, P, Q, R, values);