[cig-commits] commit: Clean up some warnings
Mercurial
hg at geodynamics.org
Fri Feb 10 16:00:40 PST 2012
changeset: 39:54b516de9219
user: Walter Landry <wlandry at caltech.edu>
date: Wed Feb 08 04:23:49 2012 -0800
files: compute_v_on_interface.cxx initial.cxx main.cxx
description:
Clean up some warnings
diff -r 64a0cffd165e -r 54b516de9219 compute_v_on_interface.cxx
--- a/compute_v_on_interface.cxx Wed Feb 08 04:22:31 2012 -0800
+++ b/compute_v_on_interface.cxx Wed Feb 08 04:23:49 2012 -0800
@@ -43,12 +43,6 @@ void compute_v_on_interface(double zx[Nx
/* vx, dvx_y, dvx_yy */
for(int j=0;j<Ny;++j)
{
- double low1=(zx[i][j]*exp(-log_etax[i][j])*(dx+1)
- - zx[i-1][j]*exp(-log_etax[i-1][j])*dx);
-
- double high1=(zx[i+1][j]*exp(-log_etax[i+1][j])*(2-dx)
- - zx[i+2][j]*exp(-log_etax[i+2][j])*(1-dx));
-
double low=interpolate_v(zx,log_etax,i-1,j,h,(1+dx)*h);
double high=interpolate_v(zx,log_etax,i+2,j,h,(-2+dx)*h);
@@ -73,12 +67,6 @@ void compute_v_on_interface(double zx[Nx
/* vy, dvy_y, dvy_yy */
for(int j=0;j<Ny+1;++j)
{
- double low1=(zy[i][j]*exp(-log_etay[i][j])*(dx+1)
- - zy[i-1][j]*exp(-log_etay[i-1][j])*dx);
-
- double high1=(zy[i+1][j]*exp(-log_etay[i+1][j])*(2-dx)
- - zy[i+2][j]*exp(-log_etay[i+2][j])*(1-dx));
-
double low=interpolate_v(zy,log_etay,i-1,j,h,h*(dx+1));
double high=interpolate_v(zy,log_etay,i+2,j,h,h*(-2+dx));
@@ -101,7 +89,6 @@ void compute_v_on_interface(double zx[Nx
const double relax=0.25;
const double tolerance=1e-8;
double error=0;
- // for(int ii=0;ii<100;++ii)
do
{
error=0;
diff -r 64a0cffd165e -r 54b516de9219 initial.cxx
--- a/initial.cxx Wed Feb 08 04:22:31 2012 -0800
+++ b/initial.cxx Wed Feb 08 04:23:49 2012 -0800
@@ -84,7 +84,7 @@ void initial(const Model &model, double
sign=-1;
}
const double csh(std::cosh(kx)), cs(std::cos(kx)),
- snh(std::sinh(kx)), sn(std::sin(kx));
+ snh(std::sinh(kx));
double tau_xx=2*pi*(-v*eta*kx*snh + tau_eta*eta*(csh-kx*snh)
- sign*kx*snh*rho/2);
@@ -137,25 +137,11 @@ void initial(const Model &model, double
eta=max_eta;
sign=-1;
}
- const double csh(std::cosh(kx)), cs(std::cos(kx)),
- snh(std::sinh(kx)), sn(std::sin(kx));
+ const double csh(std::cosh(kx)), snh(std::sinh(kx)),
+ sn(std::sin(kx));
zx[i][j]=(tau_eta*snh - (v+tau_eta)*kx*csh
- sign*rho*(kx*csh/2 - sn/2)/eta)
*std::cos(pi*y)*eta;
-
-
- double tau_xz=std::sin(pi*y)*(-v*eta*(snh + kx*csh) - tau_eta*eta*kx*csh
- - sign*(snh + kx*csh)*rho/2);
-
- double dvx_z=pi*std::sin(pi*y)*(eta*(v*kx*csh + tau_eta*(-snh + kx*csh))
- + sign*(kx*csh - sn)*rho/2);
-
- double dvz_x=pi*std::sin(pi*y)*(eta*(v*(2*snh + kx*csh) + tau_eta*(snh + kx*csh))
- + sign*(sn + 2*snh + kx*csh)*rho/2);
-
- double zy=(v*csh + (v+tau_eta)*kx*snh
- - sign*rho*(cs - csh - kx*snh)/(2*eta))
- *std::sin(pi*y)*eta;
}
break;
case Model::sinker:
@@ -231,7 +217,7 @@ void initial(const Model &model, double
sign=-1;
}
const double csh(std::cosh(kx)), cs(std::cos(kx)),
- snh(std::sinh(kx)), sn(std::sin(kx));
+ snh(std::sinh(kx));
zy[i][j]=(v*csh + (v+tau_eta)*kx*snh
- sign*rho*(cs - csh - kx*snh)/(2*eta))
*std::sin(pi*y)*eta;
diff -r 64a0cffd165e -r 54b516de9219 main.cxx
--- a/main.cxx Wed Feb 08 04:22:31 2012 -0800
+++ b/main.cxx Wed Feb 08 04:23:49 2012 -0800
@@ -54,10 +54,8 @@ int main()
vy[Ny+1], dvy_y[Ny], dvy_yy[Ny+1];
if(model==Model::solCx)
- {
- compute_v_on_interface(zx,zy,log_etax,log_etay,vx,dvx_y,dvx_yy,
- vy,dvy_y,dvy_yy);
- }
+ compute_v_on_interface(zx,zy,log_etax,log_etay,vx,dvx_y,dvx_yy,
+ vy,dvy_y,dvy_yy);
/* Smoothing sweeps */
@@ -78,7 +76,7 @@ int main()
{
/* Do the finite difference parts */
- const double x(i*h), y((j+0.5)*h);
+ const double x(i*h);
/* Derivatives of z */
double dzx_xx=
@@ -120,7 +118,8 @@ int main()
double dlog_etaxx=
((log_etay[i][j+1] + log_etay[i][j])/2
- 2*log_etax[i][j]
- + (log_etay[i-1][j+1] + log_etay[i-1][j])/2)/(h*h/4);
+ + (log_etay[i-1][j+1] + log_etay[i-1][j])/2)
+ /(h*h/4);
double dlog_etax=
((log_etay[i][j+1] + log_etay[i][j])/2
- (log_etay[i-1][j+1] + log_etay[i-1][j])/2)/h;
@@ -149,46 +148,20 @@ int main()
if(x-h<middle && x+h>middle)
{
- double dx=(x>middle) ? (middle-(x-h)) : (middle-(x+h));
+ double dx=(x>middle) ? (middle-(x-h))
+ : (middle-(x+h));
double zx_jump=eta_jump*vx[j+1];
double dzx_x_jump=eta_jump*dvy_y[j];
double p_jump=-2*dvy_y[j]*eta_jump;
double dp_x_jump=2*dvx_yy[j]*eta_jump;
double dzx_xx_jump=
-dvx_yy[j]*eta_jump + dp_x_jump;
- dzx_xx_correction=-(zx_jump + dx*dzx_x_jump + dx*dx*dzx_xx_jump/2)/(h*h);
+ dzx_xx_correction=
+ -(zx_jump + dx*dzx_x_jump
+ + dx*dx*dzx_xx_jump/2)/(h*h);
if(x>middle)
dzx_xx_correction*=-1;
-
dzx_xx+=dzx_xx_correction;
- // dzx_xx-=eta_jump*(zx_jump + dx*dzx_x_jump + dx*dx*dzx_xx_jump/2)/(h*h);
-
- if(j==Ny/8)
- std::cout << "dzx_xx "
- << i << " "
- << j << " "
- << x << " "
- << dzx_xx << " "
- // << dzx_xx_correction << " "
- // << zx_jump/(h*h) << " "
- // << dx*dzx_x_jump/(h*h) << " "
- // << (dx*dx*dzx_xx_jump/2)/(h*h) << " "
-
- // << -dvx_yy[j]*eta_jump << " "
- // << dp_x_jump << " "
-
- // << dzx_xx + zx_jump/(h*h) << " "
- // << dzx_xx + zx_jump/(h*h) + dx*dzx_x_jump/(h*h) << " "
- // << dzx_xx + zx_jump/(h*h) + dx*dzx_x_jump/(h*h) + (dx*dx*dzx_xx_jump/2)/(h*h) << " "
-
- // << dzx_xx + dzx_xx_correction << " "
-
- << (zx[i+3][j]-2*zx[i+2][j]+zx[i+1][j])/(h*h) << " "
- << (zx[i+2][j]-2*zx[i+1][j]+zx[i][j])/(h*h) << " "
- << (zx[i+1][j]-2*zx[i][j]+zx[i-1][j])/(h*h) << " "
- << (zx[i][j]-2*zx[i-1][j]+zx[i-2][j])/(h*h) << " "
- << (zx[i-1][j]-2*zx[i-2][j]+zx[i-3][j])/(h*h) << " "
- << "\n";
if(x+h/2>middle && x-h/2<middle)
{
@@ -214,8 +187,6 @@ int main()
Resid_x[i][j]=Rx;
// zx[i][j]-=theta_mom*Rx/dRx_dzx;
-
- // Resid_x[i][j]=dzx_xx;
}
}
}
@@ -241,7 +212,8 @@ int main()
/* Do the finite difference parts */
/* Derivatives of z */
- double dzy_yy=(zy[i][j-1] - 2*zy[i][j] + zy[i][j+1])/(h*h);
+ double dzy_yy=
+ (zy[i][j-1] - 2*zy[i][j] + zy[i][j+1])/(h*h);
double dzx_yx=((zx[i+1][j] - zx[i+1][j-1])
- (zx[i][j] - zx[i][j-1]))/(h*h);
@@ -263,7 +235,8 @@ int main()
}
else
{
- dzy_xx=(zy[i-1][j] - 2*zy[i][j] + zy[i+1][j])/(h*h);
+ dzy_xx=
+ (zy[i-1][j] - 2*zy[i][j] + zy[i+1][j])/(h*h);
dzy_x=(zy[i+1][j] - zy[i-1][j])/(2*h);
}
@@ -274,7 +247,8 @@ int main()
double dlog_etayy=
((log_etax[i+1][j] + log_etax[i][j])/2
- 2*log_etay[i][j]
- + (log_etax[i+1][j-1] + log_etax[i][j-1])/2)/(h*h/4);
+ + (log_etax[i+1][j-1] + log_etax[i][j-1])/2)
+ /(h*h/4);
double dlog_etay=
((log_etax[i+1][j] + log_etax[i][j])/2
- (log_etax[i+1][j-1] + log_etax[i][j-1])/2)/h;
@@ -298,22 +272,24 @@ int main()
/* Now do the jump conditions */
if(model==Model::solCx)
{
- double x((i+0.5)*h), y(j*h);
+ double x((i+0.5)*h);
dlog_etayy=dlog_etay=dlog_etaxx=dlog_etax=
dlog_etayx=0;
if(x-h<middle && x+h>middle)
{
- double dx=(x>middle) ? (x+h-middle) : (middle-(x-h));
- double zy_jump=vy[j];
- double dzy_x_jump=-dvx_y[j];
- double dzy_xx_jump=-dvy_yy[j];
- dzy_xx_correction=eta_jump*(zy_jump + dx*dzy_x_jump + dx*dx*dzy_xx_jump/2)/(h*h);
- // dzy_xx-=eta_jump*(zy_jump + dx*dzy_x_jump + dx*dx*dzy_xx_jump/2)/(h*h);
+ double dx=(x>middle) ? (middle-(x-h))
+ : (middle-(x+h));
+ double zy_jump=eta_jump*vy[j];
+ double dzy_x_jump=-eta_jump*dvx_y[j];
+ double dzy_xx_jump=-eta_jump*dvy_yy[j];
+ dzy_xx_correction=(zy_jump + dx*dzy_x_jump + dx*dx*dzy_xx_jump/2)/(h*h);
+ // dzy_xx-=(zy_jump + dx*dzy_x_jump + dx*dx*dzy_xx_jump/2)/(h*h);
- if(dx>h/2)
+ if(x+h/2>middle && x-h/2<middle)
{
- dx-=h/2;
+ dx=(x>middle) ? ((x-h/2)-middle)
+ : ((x+h/2)-middle);
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;
}
@@ -366,7 +342,7 @@ int main()
double zy_avg=(zy[i][j+1] + zy[i][j])/2;
/* Apply the jump condition */
- double x((i+0.5)*h), y((j+0.5)*h);
+ double x((i+0.5)*h);
if(model==Model::solCx)
{
dlog_etax=dlog_etay=dlog_etaxx=dlog_etayy=0;
More information about the CIG-COMMITS
mailing list