[cig-commits] commit: Minor reorg of compute_v_on_interface

[Mercurial]

changeset:   28:5366956fdeb5
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Feb 07 03:31:22 2012 -0800
files:       compute_v_on_interface.cxx
description:
Minor reorg of compute_v_on_interface


diff -r bdb505cb7635 -r 5366956fdeb5 compute_v_on_interface.cxx
--- a/compute_v_on_interface.cxx	Tue Feb 07 03:28:44 2012 -0800
+++ b/compute_v_on_interface.cxx	Tue Feb 07 03:31:22 2012 -0800
@@ -44,21 +44,6 @@ void compute_v_on_interface(double zx[N+
 
         vx[j]=low*(1-dx) + high*dx;
       }
-
-    gsl_interp_accel *vx_accel=gsl_interp_accel_alloc ();
-    gsl_spline *vx_spline=gsl_spline_alloc(gsl_interp_cspline, N);
-    gsl_spline_init(vx_spline, y_x, vx, N);
-
-    dvx_y[0]=0;
-    dvx_y[N]=0;
-    for(int i=1;i<N;++i)
-      dvx_y[i]=gsl_spline_eval_deriv(vx_spline,y_y[i],vx_accel);
-
-    for(int i=0;i<N;++i)
-      dvx_yy[i]=gsl_spline_eval_deriv2(vx_spline,y_x[i],vx_accel);
-
-    gsl_spline_free(vx_spline);
-    gsl_interp_accel_free(vx_accel);            
   }
   {
     int i(middle/h-0.5);
@@ -78,19 +63,37 @@ void compute_v_on_interface(double zx[N+
 
         vy[j]=low*(1-dx) + high*dx;
       }
-    gsl_interp_accel *vy_accel=gsl_interp_accel_alloc ();
-    gsl_spline *vy_spline=gsl_spline_alloc(gsl_interp_cspline, N+1);
-    gsl_spline_init(vy_spline, y_y, vy, N+1);
+  }
 
-    dvy_y[0]=0;
-    dvy_y[N]=0;
-    for(int i=1;i<N+1;++i)
-      dvy_y[i]=gsl_spline_eval_deriv(vy_spline,y_x[i],vy_accel);
+  /* Compute dvx_dy, dvx_dyy */
+  gsl_interp_accel *vx_accel=gsl_interp_accel_alloc ();
+  gsl_spline *vx_spline=gsl_spline_alloc(gsl_interp_cspline, N);
+  gsl_spline_init(vx_spline, y_x, vx, N);
 
-    for(int i=0;i<N;++i)
-      dvy_yy[i]=gsl_spline_eval_deriv2(vy_spline,y_y[i],vy_accel);
+  dvx_y[0]=0;
+  dvx_y[N]=0;
+  for(int i=1;i<N;++i)
+    dvx_y[i]=gsl_spline_eval_deriv(vx_spline,y_y[i],vx_accel);
 
-    gsl_spline_free(vy_spline);
-    gsl_interp_accel_free(vy_accel);            
-  }
+  for(int i=0;i<N;++i)
+    dvx_yy[i]=gsl_spline_eval_deriv2(vx_spline,y_x[i],vx_accel);
+
+  gsl_spline_free(vx_spline);
+  gsl_interp_accel_free(vx_accel);            
+
+  /* Compute dvy_dy, dvy_dyy */
+  gsl_interp_accel *vy_accel=gsl_interp_accel_alloc ();
+  gsl_spline *vy_spline=gsl_spline_alloc(gsl_interp_cspline, N+1);
+  gsl_spline_init(vy_spline, y_y, vy, N+1);
+
+  dvy_y[0]=0;
+  dvy_y[N]=0;
+  for(int i=1;i<N+1;++i)
+    dvy_y[i]=gsl_spline_eval_deriv(vy_spline,y_x[i],vy_accel);
+
+  for(int i=0;i<N;++i)
+    dvy_yy[i]=gsl_spline_eval_deriv2(vy_spline,y_y[i],vy_accel);
+
+  gsl_spline_free(vy_spline);
+  gsl_interp_accel_free(vy_accel);            
 }