changeset: 34:5ff9d2d33d51
user: Walter Landry <wlandry at caltech.edu>
date: Wed Feb 08 01:34:46 2012 -0800
files: main.cxx
description:
Add correction to dzy_xy
diff -r 39d15ef50cb2 -r 5ff9d2d33d51 main.cxx
--- a/main.cxx Wed Feb 08 01:18:14 2012 -0800
+++ b/main.cxx Wed Feb 08 01:34:46 2012 -0800
@@ -44,7 +44,7 @@ int main()
double Resid_p[N][N], Resid_x[N+1][N], Resid_y[N][N+1];
double dzx_x_correction, dzx_xx_correction, dzx_yx_correction,
- dzy_xx_correction, dzy_xy_correction, dp_x_correction;
+ dzy_xx_correction, dzy_xy_correction;
for(int iteration=0;iteration<max_iterations;++iteration)
{
@@ -245,35 +245,48 @@ int main()
if(x+h/2>middle && x-h/2<middle)
{
- dx=(x>middle) ? ((x-h/2)-middle) : ((x+h/2)-middle);
+ dx=(x>middle) ? ((x-h/2)-middle)
+ : ((x+h/2)-middle);
double dp_x_jump=2*dvx_yy[j]*eta_jump;
- dp_x_correction=(p_jump + dx*dp_x_jump)/h;
dp_x-=(p_jump + dx*dp_x_jump)/h;
- if(j<3)
- std::cout << "p "
+ // if(j<3)
+ // std::cout << "p "
+ // << i << " "
+ // << j << " "
+ // << x << " "
+ // << dp_x << " "
+
+ // << (p[i+3][j]-p[i+2][j])/h << " "
+ // << (p[i+2][j]-p[i+1][j])/h << " "
+ // << (p[i+1][j]-p[i][j])/h << " "
+ // << (p[i][j]-p[i-1][j])/h << " "
+ // << (p[i-1][j]-p[i-2][j])/h << " "
+ // << (p[i-2][j]-p[i-3][j])/h << " "
+ // << "\n";
+
+
+ dzy_xy-=
+ eta_jump*(dvy_y[j] - dx*dvx_yy[j])/h;
+ dzy_xy_correction=eta_jump*(dvy_y[j] - dx*dvx_yy[j])/h;
+ if(j==N/4)
+ std::cout << "dzy_xy "
<< i << " "
<< j << " "
<< x << " "
- << dp_x << " "
- << p_jump << " "
- << dp_x_jump << " "
- // << dp_fixed << " "
- << p[i+1][j] << " "
- << p[i][j] << " "
- << p[i-1][j] << " "
+ << dzy_xy << " "
+ // << dzy_xy_correction << " "
+ // << dzy_xy - dzy_xy_correction << " "
- << (p[i+3][j]-p[i+2][j])/h << " "
- << (p[i+2][j]-p[i+1][j])/h << " "
- << (p[i+1][j]-p[i][j])/h << " "
- << (p[i][j]-p[i-1][j])/h << " "
- << (p[i-1][j]-p[i-2][j])/h << " "
- << (p[i-2][j]-p[i-3][j])/h << " "
+ << ((zy[i+2][j+1] - zy[i+1][j+1])
+ - (zy[i+2][j] - zy[i+1][j]))/(h*h) << " "
+ << ((zy[i+1][j+1] - zy[i][j+1])
+ - (zy[i+1][j] - zy[i][j]))/(h*h) << " "
+ << ((zy[i][j+1] - zy[i-1][j+1])
+ - (zy[i][j] - zy[i-1][j]))/(h*h) << " "
+ << ((zy[i-1][j+1] - zy[i-2][j+1])
+ - (zy[i-1][j] - zy[i-2][j]))/(h*h) << " "
<< "\n";
-
-
- dzy_xy_correction=eta_jump*h*(dvy_y[j] - dx*dvx_yy[j])/(h*h);
- // dzy_xy-=eta_jump*h*(dvy_y[j] - dx*dvx_yy[j])/(h*h);
}
}
}
@@ -291,7 +304,7 @@ int main()
Resid_x[i][j]=Rx;
// zx[i][j]-=theta_mom*Rx/dRx_dzx;
- Resid_x[i][j]=dp_x;
+ Resid_x[i][j]=dzy_xy;
}
}
}