Changeset 17295

Timestamp:

02/18/14 14:50:58 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix windows compile

File:

• issm/trunk-jpl/src/c/shared/FSanalyticals/FSanalytical3.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/shared/FSanalyticals/FSanalytical3.cpp

@@ -46 +46 @@
 IssmDouble fx5(IssmDouble x,IssmDouble y,IssmDouble z){   
         IssmDouble functionx;
-        int p=2;
-        int q=2;
+        IssmDouble p=2;
+        IssmDouble q=2;
 
         functionx = 4*pow(PI, 2)*pow(p, 2)*(cos(PI*p*x) - 1)*sin(PI*p*y)*sin(PI*p*z) + 2*pow(PI, 2)*pow(p, 2)*sin(PI*p*y)*sin(PI*p*z)*cos(PI*p*x) + PI*q*sin(PI*q*y)*sin(PI*q*z)*cos(PI*q*x);
@@ -55 +55 @@
 IssmDouble fy5(IssmDouble x,IssmDouble y,IssmDouble z){   
         IssmDouble functiony;
-        int p=2;
-        int q=2;
+        IssmDouble p=2;
+        IssmDouble q=2;
 
         functiony =  -2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*y) - 1)*sin(PI*p*x)*sin(PI*p*z) - pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*z)*cos(PI*p*y) + PI*q*sin(PI*q*x)*sin(PI*q*z)*cos(PI*q*y);
@@ -64 +64 @@
 IssmDouble fz5(IssmDouble x,IssmDouble y,IssmDouble z){   
         IssmDouble functionz;
-        int p=2;
-        int q=2;
+        IssmDouble p=2;
+        IssmDouble q=2;
 
         functionz =  -2*pow(PI, 2)*pow(p, 2)*(cos(PI*p*z) - 1)*sin(PI*p*x)*sin(PI*p*y) - pow(PI, 2)*pow(p, 2)*sin(PI*p*x)*sin(PI*p*y)*cos(PI*p*z) + PI*q*sin(PI*q*x)*sin(PI*q*y)*cos(PI*q*z);