changeset: 42:0043685f41a2
user: Walter Landry <wlandry at caltech.edu>
date: Wed Feb 08 13:18:40 2012 -0800
files: main.cxx
description:
Clean up and change max_iterations to 1
diff -r 37df131d70b5 -r 0043685f41a2 main.cxx
--- a/main.cxx Wed Feb 08 12:20:45 2012 -0800
+++ b/main.cxx Wed Feb 08 13:18:40 2012 -0800
@@ -31,7 +31,7 @@ int main()
/* Initial conditions */
- const int max_iterations=2;
+ const int max_iterations=1;
int n_sweeps=1;
const double theta_mom=1.0;
const double theta_c=1.0;
@@ -286,39 +286,14 @@ int main()
dzy_xx_correction*=-1;
dzy_xx+=dzy_xx_correction;
- if(j==Ny/8)
- std::cout << "dzy_xx "
- << i << " "
- << j << " "
- << x << " "
- // << middle << " "
- // << h << " "
- << dx << " "
- << dzy_xx << " "
- // << dzy_xx + dzy_xx_correction << " "
- // << dzy_xx + zy_jump/(h*h) - dx*dzy_x_jump/(h*h)
- // + dx*dx*dzy_xx_jump/(2*h*h) << " "
- // << zy_jump/(h*h) << " "
- // << dx*dzy_x_jump/(h*h) << " "
- << dx*dx*dzy_xx_jump/(2*h*h) << " "
- // << dzy_xx + dzy_xx_correction << " "
- << (zy[i+2][j] - 2*zy[i+3][j] + zy[i+4][j])/(h*h) << " "
- << (zy[i+1][j] - 2*zy[i+2][j] + zy[i+3][j])/(h*h) << " "
- << (zy[i][j] - 2*zy[i+1][j] + zy[i+2][j])/(h*h) << " "
- << (zy[i-1][j] - 2*zy[i][j] + zy[i+1][j])/(h*h) << " "
- << (zy[i-2][j] - 2*zy[i-1][j] + zy[i][j])/(h*h) << " "
- << (zy[i-3][j] - 2*zy[i-2][j] + zy[i-1][j])/(h*h) << " "
- << (zy[i-4][j] - 2*zy[i-3][j] + zy[i-2][j])/(h*h) << " "
- << "\n";
-
-
if(x+h/2>middle && x-h/2<middle)
{
dx=(x>middle) ? ((x-h/2)-middle)
: ((x+h/2)-middle);
- double dzx_yx_correction=eta_jump*(dvx_y[j] + dx*dvy_yy[j])/h;
- // dzx_yx-=eta_jump*(dvx_y[j] + dx*dvy_yy[j])/h;
- // if(j==Ny/4)
+ double dzx_yx_correction=
+ eta_jump*(dvx_y[j] - dx*dvy_yy[j])/h;
+ dzx_yx-=dzx_yx_correction;
+ // if(j==Ny/8)
// std::cout << "dzx_yx "
// << i << " "
// << j << " "
@@ -328,9 +303,9 @@ int main()
// // << ((x+h/2)-middle)/dx << " "
// // << dzx_yx << " "
// // << dzx_yx_correction << " "
- // << eta_jump*dvx_y[j]/h << " "
- // << eta_jump*dx*dvy_yy[j]/h << " "
- // << dzx_yx - dzx_yx_correction << " "
+ // // << eta_jump*dvx_y[j]/h << " "
+ // // << eta_jump*dx*dvy_yy[j]/h << " "
+ // << dzx_yx << " "
// << ((zx[i+3][j] - zx[i+3][j-1])
// - (zx[i+2][j] - zx[i+2][j-1]))/(h*h) << " "
// << ((zx[i+2][j] - zx[i+2][j-1])
@@ -346,6 +321,25 @@ int main()
// << "\n";
}
}
+
+ if(j==Ny/8 && (x-2*h<middle && x+2*h>middle))
+ std::cout << "Ry "
+ << i << " "
+ << j << " "
+ << x << " "
+ << middle << " "
+ << 2*dzy_yy + dzy_xx + dzx_yx
+ + 2*(dlog_etayy*zy[i][j] + dlog_etay*dzy_y)
+ + dlog_etaxx*zy[i][j] + dlog_etax*dzy_x
+ + dlog_etayx*zx_avg + dlog_etay*dzx_x
+ - dp_y - fy[i][j] << " "
+ << 2*dzy_yy << " "
+ << dzy_xx << " "
+ << dzx_yx << " "
+ << dp_y << " "
+ << fy[i][j] << " "
+ << "\n";
+
}
/* Compute the residual and update zy */
@@ -360,8 +354,6 @@ int main()
Resid_y[i][j]=Ry;
// zy[i][j]-=theta_mom*Ry/dRy_dzy;
-
- Resid_y[i][j]=dzy_xx;
}
}
}