[cig-commits] commit: Remove compute_dv_yy since is it not used anymore.
Mercurial
hg at geodynamics.org
Tue Mar 20 14:53:54 PDT 2012
changeset: 100:b98a93816ad6
user: Walter Landry <wlandry at caltech.edu>
date: Tue Mar 20 13:41:38 2012 -0700
files: compute_v_on_interface/compute_v_on_interface.cxx
description:
Remove compute_dv_yy since is it not used anymore.
diff -r cf2d88c6eb97 -r b98a93816ad6 compute_v_on_interface/compute_v_on_interface.cxx
--- a/compute_v_on_interface/compute_v_on_interface.cxx Tue Mar 20 13:21:02 2012 -0700
+++ b/compute_v_on_interface/compute_v_on_interface.cxx Tue Mar 20 13:41:38 2012 -0700
@@ -7,46 +7,6 @@
#include "../compute_v_on_interface.hxx"
#include "vel.hxx"
-template<int ny>
-double compute_dv_yy(const double z[][ny],
- const double log_eta[][ny], const double &dx,
- const int i, const int j)
-{
- double dv_yy_p;
- if(j==0)
- {
- dv_yy_p=(vel(z,log_eta,i+1,j+1) - vel(z,log_eta,i+1,j))/(h*h);
- }
- else if(j==ny-1)
- {
- dv_yy_p=(-vel(z,log_eta,i+1,j) + vel(z,log_eta,i+1,j-1))/(h*h);
- }
- else
- {
- dv_yy_p=(vel(z,log_eta,i+1,j+1) - 2*vel(z,log_eta,i+1,j)
- + vel(z,log_eta,i+1,j-1))/(h*h);
- }
-
- double dv_yy_m;
- if(j==0)
- {
- dv_yy_m=(vel(z,log_eta,i,j+1) - vel(z,log_eta,i,j))/(h*h);
- }
- else if(j==ny-1)
- {
- dv_yy_m=(-vel(z,log_eta,i,j) + vel(z,log_eta,i,j-1))/(h*h);
- }
- else
- {
- dv_yy_m=(vel(z,log_eta,i,j+1) - 2*vel(z,log_eta,i,j)
- + vel(z,log_eta,i,j-1))/(h*h);
- }
-
- double eta_p(exp(log_eta[i+1][j])), eta_m(exp(log_eta[i][j]));
-
- return (dv_yy_p*eta_p*eta_p + dv_yy_m*eta_m*eta_m)/(eta_m*eta_m + eta_p*eta_p);
-}
-
template<int ny>
double compute_dv_y(const double z[][ny],
const double log_eta[][ny],
@@ -182,12 +142,12 @@ void compute_v_on_interface(const double
tangent(0)=-norm(1);
tangent(1)=norm(0);
- // double length=1/std::max(std::abs(norm(0)),std::abs(norm(1)));
-
FTensor::Tensor1<double,2> ddv_dv_temp;
compute_dv_dtt(zx,zy,log_etax,log_etay,distx,disty,pos,
norm,tangent,i,j,ddv,ddv_dv_temp);
+ // double length=1/std::max(std::abs(norm(0)),std::abs(norm(1)));
+
// FTensor::Tensor1<double,2> pos_p, pos_pp, pos_m, pos_mm;
// pos_p(a)=pos(a)+length*norm(a);
// pos_pp(a)=pos(a)+2*norm(a)*length;
More information about the CIG-COMMITS
mailing list