[cig-commits] commit: Change Interface::pos[] to Interface::dd_pos[].

[Mercurial]

changeset:   151:f5a306bd419e
user:        Walter Landry <wlandry at caltech.edu>
date:        Sun Apr 08 17:37:14 2012 -0700
files:       compute_coefficients/Interface.hxx compute_coefficients/Interface/Interface.cxx compute_coefficients/compute_Cxyz.cxx
description:
Change Interface::pos[] to Interface::dd_pos[].


diff -r 597cdfd1cf51 -r f5a306bd419e compute_coefficients/Interface.hxx
--- a/compute_coefficients/Interface.hxx	Fri Apr 06 10:28:49 2012 -0700
+++ b/compute_coefficients/Interface.hxx	Sun Apr 08 17:37:14 2012 -0700
@@ -9,8 +9,9 @@ class Interface
 class Interface
 {
 public:
-  FTensor::Tensor1<double,2> grid_pos, pos[2], corner_pos[2][2],
-    anticorner_pos[2];
+  FTensor::Tensor1<double,2> grid_pos, dd_pos[2], corner_pos[2][2],
+    anticorner_pos[2], dd_norm[2], corner_norm[2][2], anticorner_norm[2],
+    dd_tangent[2], corner_tangent[2][2], anticorner_tangent[2];
   bool intersect_dd[2], intersect_sides[2], intersect_corner[2][2],
     intersect_anticorner[2][2];
   bool intersect_dp;
diff -r 597cdfd1cf51 -r f5a306bd419e compute_coefficients/Interface/Interface.cxx
--- a/compute_coefficients/Interface/Interface.cxx	Fri Apr 06 10:28:49 2012 -0700
+++ b/compute_coefficients/Interface/Interface.cxx	Sun Apr 08 17:37:14 2012 -0700
@@ -21,6 +21,8 @@ Interface::Interface(const int &d, const
     {
       intersect_dd[0]=sign(distx[i][j])!=sign(distx[i+1][j])
         || sign(distx[i][j])!=sign(distx[i-1][j]);
+      // intersect_dd[0]=(i!=Nx-1 && sign(distx[i][j])!=sign(distx[i+1][j]))
+      //   || (i!=1 && sign(distx[i][j])!=sign(distx[i-1][j]));
       intersect_dd[1]=false;
       if(j!=Ny-1)
         {
@@ -36,27 +38,27 @@ Interface::Interface(const int &d, const
       intersect_dp=(sign(disty[i][j] + disty[i][j+1])
                     !=sign(disty[i-1][j] + disty[i-1][j+1]));
 
-      /* TODO This will have an error in the position of the interface
-         of O(h^2).  Need to correctt for curvature. */
+      /* TODO: This will have an error in the position of the interface
+         of O(h^2).  Need to correct for curvature. */
       double delta;
       if(intersect_dd[0])
         {
-          pos[0](1)=grid_pos(1);
+          dd_pos[0](1)=grid_pos(1);
           if(sign(distx[i][j])!=sign(distx[i+1][j]))
             delta=distx[i+1][j]-distx[i][j];
           else
             delta=distx[i][j]-distx[i-1][j];
 
-          pos[0](0)=grid_pos(0)-distx[i][j]*h/delta;
+          dd_pos[0](0)=grid_pos(0)-distx[i][j]*h/delta;
         }
       if(intersect_dd[1])
         {
-          pos[1](0)=grid_pos(0);
+          dd_pos[1](0)=grid_pos(0);
           if(j!=Ny-1 && sign(distx[i][j])!=sign(distx[i][j+1]))
             delta=distx[i][j+1]-distx[i][j];
           else
             delta=distx[i][j]-distx[i][j-1];
-          pos[1](1)=grid_pos(1)-distx[i][j]*h/delta;
+          dd_pos[1](1)=grid_pos(1)-distx[i][j]*h/delta;
         }
 
       compute_xy(i-1,j,distx[i][j],disty);
@@ -76,6 +78,8 @@ Interface::Interface(const int &d, const
         }
       intersect_dd[1]=sign(disty[i][j])!=sign(disty[i][j+1])
         || sign(disty[i][j-1])!=sign(disty[i][j]);
+      // intersect_dd[1]=(j!=Ny-1 && sign(disty[i][j])!=sign(disty[i][j+1]))
+      //   || (j!=1 && sign(disty[i][j-1])!=sign(disty[i][j]));
 
       intersect_dp=(sign(distx[i][j] + distx[i+1][j])
                     !=sign(distx[i][j-1] + distx[i+1][j-1]));
@@ -84,22 +88,22 @@ Interface::Interface(const int &d, const
       double delta;
       if(intersect_dd[0])
         {
-          pos[0](1)=grid_pos(1);
+          dd_pos[0](1)=grid_pos(1);
           if(i!=Ny-1 && sign(disty[i][j])!=sign(disty[i+1][j]))
             delta=disty[i+1][j]-disty[i][j];
           else
             delta=disty[i][j]-disty[i-1][j];
 
-          pos[0](0)=grid_pos(0)-disty[i][j]*h/delta;
+          dd_pos[0](0)=grid_pos(0)-disty[i][j]*h/delta;
         }
       if(intersect_dd[1])
         {
-          pos[1](0)=grid_pos(0);
+          dd_pos[1](0)=grid_pos(0);
           if(sign(disty[i][j])!=sign(disty[i][j+1]))
             delta=disty[i][j+1]-disty[i][j];
           else
             delta=disty[i][j]-disty[i][j-1];
-          pos[1](1)=grid_pos(1)-disty[i][j]*h/delta;
+          dd_pos[1](1)=grid_pos(1)-disty[i][j]*h/delta;
         }
 
       compute_xy(i,j-1,disty[i][j],distx);
diff -r 597cdfd1cf51 -r f5a306bd419e compute_coefficients/compute_Cxyz.cxx
--- a/compute_coefficients/compute_Cxyz.cxx	Fri Apr 06 10:28:49 2012 -0700
+++ b/compute_coefficients/compute_Cxyz.cxx	Sun Apr 08 17:37:14 2012 -0700
@@ -59,12 +59,12 @@ void compute_Cxyz(const double zx[Nx+1][
           FTensor::Tensor1<double,2> v, dv, ddv;
           FTensor::Tensor2<double,2,2> nt_to_xy;
           compute_v_on_interface(zx,zy,log_etax,log_etay,distx,disty,
-                                 interface.pos[dd],d,
+                                 interface.dd_pos[dd],d,
                                  v,dv,ddv,nt_to_xy);
 
-          int sgn(sign(pos(dd) - interface.pos[dd](dd)));
+          int sgn(sign(pos(dd) - interface.dd_pos[dd](dd)));
           FTensor::Tensor1<double,2> dx(0,0);
-          dx(dd)=pos(dd) - interface.pos[dd](dd) - h*sgn;
+          dx(dd)=pos(dd) - interface.dd_pos[dd](dd) - h*sgn;
           FTensor::Tensor1<double,2> z_jump;
           FTensor::Tensor2<double,2,2> dz_jump;
           FTensor::Tensor3_christof<double,2,2> ddz_jump;
@@ -141,7 +141,7 @@ void compute_Cxyz(const double zx[Nx+1][
 
           if(d==dd && interface.intersect_dp)
             {
-              dx(dd)=pos(dd) - interface.pos[dd](dd) - (h/2)*sgn;
+              dx(dd)=pos(dd) - interface.dd_pos[dd](dd) - (h/2)*sgn;
               C+=sgn*(p_jump + dp_jump(a)*dx(a))/h;
             }
 
@@ -151,7 +151,7 @@ void compute_Cxyz(const double zx[Nx+1][
               FTensor::Tensor1<int,2> dir2(0,0), dir3(0,0);
               dir2((d+1)%2)=1;
               dir3((dd+1)%2)=1;
-              dx(dd)=pos(dd) - interface.pos[dd](dd) - (h/2)*sgn;
+              dx(dd)=pos(dd) - interface.dd_pos[dd](dd) - (h/2)*sgn;
 
               C+=-sgn*(dz_jump(a,b)*dir2(a)*dir3(b)
                        + ddz_jump(a,b,c)*dir2(a)*dir3(b)*dx(c))/h;