Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15741) @@ -3938,6 +3938,6 @@ /*Build K: */ GetElementSizes(&hx,&hy,&hz); - vel=sqrt(pow(vx,2.)+pow(vy,2.)+pow(vz,2.))+1.e-14; - h=sqrt( pow(hx*vx/vel,2.) + pow(hy*vy/vel,2.) + pow(hz*vz/vel,2.)); + vel=sqrt(vx*vx + vy*vy + vz*vz)+1.e-14; + h=sqrt( pow(hx*vx/vel,2) + pow(hy*vy/vel,2) + pow(hz*vz/vel,2)); K[0][0]=h/(2*vel)*vx*vx; K[0][1]=h/(2*vel)*vx*vy; K[0][2]=h/(2*vel)*vx*vz; K[1][0]=h/(2*vel)*vy*vx; K[1][1]=h/(2*vel)*vy*vy; K[1][2]=h/(2*vel)*vy*vz; @@ -4167,6 +4167,6 @@ /*Build K: */ GetElementSizes(&hx,&hy,&hz); - vel=sqrt(pow(vx,2.)+pow(vy,2.)+pow(vz,2.))+1.e-14; - h=sqrt( pow(hx*vx/vel,2.) + pow(hy*vy/vel,2.) + pow(hz*vz/vel,2.)); + vel=sqrt(vx*vx + vy*vy + vz*vz)+1.e-14; + h=sqrt( pow(hx*vx/vel,2) + pow(hy*vy/vel,2) + pow(hz*vz/vel,2)); K[0][0]=h/(2*vel)*fabs(vx*vx); K[0][1]=h/(2*vel)*fabs(vx*vy); K[0][2]=h/(2*vel)*fabs(vx*vz); @@ -8496,5 +8496,5 @@ /*Deal with lower surface*/ if(IsOnBed()){ - constant_part=-1.58*pow(10.,-10.)*rho_ice*gravity*thickness; + constant_part=-1.58*1.e-10*rho_ice*gravity*thickness; ub=constant_part*slope[0]; vb=constant_part*slope[1]; Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 15741) @@ -1874,6 +1874,6 @@ /*Jdet = (Area of the trapezoid)/(Area trapezoid ref) with AreaRef = 4*/ /*Area of a trabezoid = altitude * (base1 + base2)/2 */ - *Jdet= pow(pow(x2-x1,2.) + pow(y2-y1,2.),0.5) * (z4-z1 + z3-z2)/8; - if(*Jdet<0) _error_("negative jacobian determinant!"); + *Jdet= sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1)) * (z4-z1 + z3-z2)/8.; + if(*Jdet<0.) _error_("negative jacobian determinant!"); } Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15741) @@ -3321,6 +3321,6 @@ constant_part=-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.)); - ub=-1.58*pow(10.,-10.)*rho_ice*gravity*thickness*slope[0]; - vb=-1.58*pow(10.,-10.)*rho_ice*gravity*thickness*slope[1]; + ub=-1.58*1.e-10*rho_ice*gravity*thickness*slope[0]; + vb=-1.58*1.e-10*rho_ice*gravity*thickness*slope[1]; pe->values[2*i+0]=(ub-2.*pow(rho_ice*gravity,n)*pow(slope2,((n-1.)/2.))*pow(thickness,n)/(pow(B,n)*(n+1))*slope[0])/connectivity; @@ -4429,5 +4429,5 @@ /*Tikhonov regularization: J = 1/2 ((dp/dx)^2 + (dp/dy)^2) */ - Jelem+=weight*1/2*(pow(dp[0],2.)+pow(dp[1],2.))*Jdet*gauss->weight; + Jelem+=weight*1/2*(dp[0]*dp[0] + dp[1]*dp[1])*Jdet*gauss->weight; } Index: /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp (revision 15741) @@ -65,5 +65,5 @@ /*Calculate length*/ - h=sqrt(pow(deltax,2.)+pow(deltay,2.)); + h=sqrt(deltax*deltax + deltay*deltay); /*If h is too small, return sill*/ @@ -82,5 +82,5 @@ /*Calculate length*/ - h=sqrt(pow(deltax,2.)+pow(deltay,2.)); + h=sqrt(deltax*deltax + deltay*deltay); /*return semi-variogram*/ Index: /issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp (revision 15741) @@ -65,5 +65,5 @@ /*Calculate length square*/ - h2=pow(deltax,2.)+pow(deltay,2.); + h2=deltax*deltax + deltay*deltay; /*If h is too small, return sill*/ @@ -83,5 +83,5 @@ /*Calculate length square*/ - h2=pow(deltax,2.)+pow(deltay,2.); + h2=deltax*deltax + deltay*deltay; /*return semi-variogram*/ Index: /issm/trunk-jpl/src/c/classes/kriging/Observations.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/Observations.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/kriging/Observations.cpp (revision 15741) @@ -563,5 +563,5 @@ observation2=dynamic_cast(this->GetObjectByOffset(j)); - distance=sqrt(pow(observation1->x - observation2->x,2.) + pow(observation1->y - observation2->y,2.)); + distance=sqrt(pow(observation1->x - observation2->x,2) + pow(observation1->y - observation2->y,2)); if(distance>x[n-1]) continue; @@ -570,5 +570,5 @@ if(index<0) index = 0; - gamma[index] += 1./2.*pow(observation1->value - observation2->value,2.); + gamma[index] += 1./2.*pow(observation1->value - observation2->value,2); counter[index] += 1.; } Index: /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp (revision 15741) @@ -66,5 +66,5 @@ /*Calculate length square*/ - h=sqrt(pow(deltax,2.)+pow(deltay,2.)); + h=sqrt(deltax*deltax + deltay*deltay); /*return covariance*/ @@ -80,5 +80,5 @@ /*Calculate length square*/ - h=sqrt(pow(deltax,2.)+pow(deltay,2.)); + h=sqrt(deltax*deltax + deltay*deltay); /*return semi-variogram*/ Index: /issm/trunk-jpl/src/c/classes/kriging/Quadtree.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/Quadtree.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/kriging/Quadtree.cpp (revision 15741) @@ -230,7 +230,7 @@ if(box && box->nbitems==4){ index = 0; - length = pow(box->obs[0]->x - x,2.) + pow(box->obs[0]->y - y,2.); + length = pow(box->obs[0]->x - x,2) + pow(box->obs[0]->y - y,2); for(int i=1;i<4;i++){ - length2 = pow(box->obs[i]->x - x,2.) + pow(box->obs[i]->y - y,2.); + length2 = pow(box->obs[i]->x - x,2) + pow(box->obs[i]->y - y,2); if(length2nbitems>0){ index = box->obs[0]->index; - length = pow(box->obs[0]->x - x,2.) + pow(box->obs[0]->y - y,2.); + length = pow(box->obs[0]->x - x,2) + pow(box->obs[0]->y - y,2); for(int i=1;inbitems;i++){ - length2 = pow(box->obs[i]->x - x,2.) + pow(box->obs[i]->y - y,2.); + length2 = pow(box->obs[i]->x - x,2) + pow(box->obs[i]->y - y,2); if(length2obs[i]->index; Index: /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp (revision 15741) @@ -65,9 +65,9 @@ /*Calculate length square*/ - h=sqrt(pow(deltax,2.)+pow(deltay,2.)); + h=sqrt(deltax*deltax + deltay*deltay); /*return covariance*/ if(h<=range) - cova = (sill-nugget)*(1 - (3*h)/(2*range) + pow(h,3.)/(2*pow(range,3.)) ); + cova = (sill-nugget)*(1 - (3*h)/(2*range) + pow(h,3)/(2*pow(range,3)) ); else cova = 0.; @@ -82,9 +82,9 @@ /*Calculate length square*/ - h=sqrt(pow(deltax,2.)+pow(deltay,2.)); + h=sqrt(deltax*deltax + deltay*deltay); /*return semi-variogram*/ if(h<=range) - gamma = (sill-nugget)*( (3*h)/(2*range) - pow(h,3.)/(2*pow(range,3.)) ) + nugget; + gamma = (sill-nugget)*( (3*h)/(2*range) - pow(h,3)/(2*pow(range,3)) ) + nugget; else gamma = sill; Index: /issm/trunk-jpl/src/c/shared/Elements/Arrhenius.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/Arrhenius.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/shared/Elements/Arrhenius.cpp (revision 15741) @@ -26,5 +26,5 @@ /*Some physical constants (Payne2000)*/ - IssmDouble beta=8.66*pow(10.,-4.); + IssmDouble beta=8.66*1.e-4; IssmDouble R=8.314; @@ -39,8 +39,8 @@ /*Get A*/ if(Tstar<263.15){ - A=3.61*pow(10.,-13.) * exp( -6.*pow(10.,4.)/(R*Tstar)); + A=3.61e-13*exp( -6.e+4/(R*Tstar)); } else{ - A=1.73*pow(10., 3.) * exp(-13.9*pow(10.,4.)/(R*Tstar)); + A=1.73e+3 *exp(-13.9e+4/(R*Tstar)); } Index: /issm/trunk-jpl/src/c/shared/LatLong/Ll2xyx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/LatLong/Ll2xyx.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/shared/LatLong/Ll2xyx.cpp (revision 15741) @@ -58,5 +58,5 @@ cde = 57.29577951; /* Radius of the earth in meters */ - re = 6378.273*pow(10.,3.); + re = 6378.273*1.e3; /* Eccentricity of the Hughes ellipsoid squared */ ex2 = 0.006693883; @@ -77,5 +77,5 @@ sl = slat*PI/180.; tc = tan(PI/4.-sl/2.)/pow(((1.-ex*sin(sl))/(1.+ex*sin(sl))),(ex/2.)); - mc = cos(sl)/sqrt(1.0-ex2*(pow(sin(sl),2.))); + mc = cos(sl)/sqrt(1.0-ex2*(pow(sin(sl),2))); rho = re*mc*T/tc; } Index: /issm/trunk-jpl/src/c/shared/LatLong/Xy2llx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/LatLong/Xy2llx.cpp (revision 15740) +++ /issm/trunk-jpl/src/c/shared/LatLong/Xy2llx.cpp (revision 15741) @@ -59,5 +59,5 @@ cde = 57.29577951; /* Radius of the earth in meters */ - re = 6378.273*pow(10.,3.); + re = 6378.273e+3; /* Eccentricity of the Hughes ellipsoid squared */ ex2 = 0.006693883; @@ -68,6 +68,6 @@ for(i=0; i