[cig-commits] commit: Add in p residual correction

[Mercurial]

changeset:   43:f82ffcbde572
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Feb 08 13:37:12 2012 -0800
files:       main.cxx
description:
Add in p residual correction


diff -r 0043685f41a2 -r f82ffcbde572 main.cxx
--- a/main.cxx	Wed Feb 08 13:18:40 2012 -0800
+++ b/main.cxx	Wed Feb 08 13:37:12 2012 -0800
@@ -322,23 +322,23 @@ int main()
                                     }
                                 }
 
-                                  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";
+                                  // 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";
 
                             }
 
@@ -396,22 +396,22 @@ int main()
                     if(x+h/2>middle && x-h/2<middle)
                       {
                         double dx=(x>middle) ? (middle-(x-h/2)) : (middle-(x+h/2));
-                        double zx_jump=vx[j+1];
-                        double dzx_x_jump=dvy_y[j];
+                        double zx_jump=eta_jump*vx[j+1];
+                        double dzx_x_jump=eta_jump*dvy_y[j];
 
-                        double dzx_x_correction=eta_jump*(zx_jump + dx*dzx_x_jump)/h;
-                        // dzx_x-=eta_jump*(zx_jump + dx*dzx_x_jump)/h;
+                        double dzx_x_correction=(zx_jump + dx*dzx_x_jump)/h;
+                        dzx_x-=dzx_x_correction;
 
-                        // if(j==N/4)
+                        // if(j==Ny/8)
                         // std::cout << "dzx_x "
                         //           << i << " "
                         //           << j << " "
                         //           << x << " "
                         //           << dzx_x << " "
-                        //           << dzx_x_correction << " "
-                        //           << dzx_x-dzx_x_correction << " "
-                        //           << zx_jump/h << " "
-                        //           << dx*dzx_x_jump/h << " "
+                        //           // << dzx_x_correction << " "
+                        //           // << dzx_x-dzx_x_correction << " "
+                        //           // << zx_jump/h << " "
+                        //           // << dx*dzx_x_jump/h << " "
                         //           << (zx[i+3][j]-zx[i+2][j])/h << " "
                         //           << (zx[i+2][j]-zx[i+1][j])/h << " "
                         //           << (zx[i+1][j]-zx[i][j])/h << " "