Changeset 1439 for issm/trunk/src/c/objects/Matice.cpp

Timestamp:

07/30/09 14:53:37 (16 years ago)

Author:

Eric.Larour

Message:

All changes necessary to carry out compilation under windows intel platforms

File:

• issm/trunk/src/c/objects/Matice.cpp (modified) (9 diffs)

issm/trunk/src/c/objects/Matice.cpp

@@ -161 +161 @@
         else{
                 if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0)){
-                        viscosity=pow(10,14);
+                        viscosity=pow((double)10,(double)14);
                 }
                 else{
@@ -173 +173 @@
                         if(A==0){
                                 /*Maxiviscositym viscosity for 0 shear areas: */
-                                viscosity=4.5*pow(10,17);
+                                viscosity=4.5*pow((double)10,(double)17);
                         }
                         else{
@@ -229 +229 @@
                 if(A==0){
                         /*Maximum viscosity_complement for 0 shear areas: */
-                        viscosity_complement=4.5*pow(10,17);
+                        viscosity_complement=4.5*pow((double)10,(double)17);
                 }
                 else{
@@ -238 +238 @@
         }
         else{
-                viscosity_complement=4.5*pow(10,17);
+                viscosity_complement=4.5*pow((double)10,(double)17);
         }
                 
@@ -282 +282 @@
                 if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && 
                                 (epsilon[3]==0) && (epsilon[4]==0)){
-                        viscosity3d=pow(10,14);
+                        viscosity3d=pow((double)10,(double)14);
                 }
                 else{
@@ -297 +297 @@
                         if(A==0){
                                 /*Maxiviscosity3dm viscosity for 0 shear areas: */
-                                viscosity3d=4.5*pow(10,17);
+                                viscosity3d=4.5*pow((double)10,(double)17);
                         }
                         else{
@@ -341 +341 @@
         double eps0;
 
-        eps0=pow(10,-27);
+        eps0=pow((double)10,(double)-27);
         
         if (n==1){
@@ -350 +350 @@
                 if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && 
                                 (epsilon[3]==0) && (epsilon[4]==0) && (epsilon[5]==0)){
-                        viscosity3d=pow(10,14);
+                        viscosity3d=pow((double)10,(double)14);
                 }
                 else{
@@ -366 +366 @@
                         if(A==0){
                                 /*Maxiviscosity3dm viscosity for 0 shear areas: */
-                                viscosity3d=4.5*pow(10,17);
+                                viscosity3d=4.5*pow((double)10,(double)17);
                         }
                         else{