Changeset 15739

Timestamp:

08/07/13 10:41:03 (12 years ago)

Author:

utke

Message:

CHG explicit promotion of literal constants to (active) floats is unnecessary; they should stay just as constants (which without qualifier have double precision) for the mantissa while retaining the exponent as an integer may execute faster (compiler dependent);
I discussed this with Eric

File:

• issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (modified) (12 diffs)

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -241 +241 @@
         else{
                 if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0)){
-                        viscosity=0.5*pow((IssmDouble)10,(IssmDouble)14);
+                        viscosity=0.5*pow(10.,14);
                 }
                 else{
@@ -253 +253 @@
                         if(A==0){
                                 /*Maxiviscositym viscosity for 0 shear areas: */
-                                viscosity=2.5*pow(10.,17.);
+                                viscosity=2.5*pow(10.,17);
                         }
                         else{
@@ -308 +308 @@
                 if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && 
                                 (epsilon[3]==0) && (epsilon[4]==0)){
-                        viscosity3d=0.5*pow((IssmDouble)10,(IssmDouble)14);
+                        viscosity3d=0.5*pow(10.,14);
                 }
                 else{
@@ -323 +323 @@
                         if(A==0){
                                 /*Maxiviscosity3dm viscosity for 0 shear areas: */
-                                viscosity3d=2.25*pow((IssmDouble)10,(IssmDouble)17);
+                                viscosity3d=2.25*pow(10.,17);
                         }
                         else{
@@ -369 +369 @@
 
         /*Get B and n*/
-        eps0=pow((IssmDouble)10,(IssmDouble)-27);
+        eps0=pow(10.,-27);
         B=GetB();
         n=GetN();
@@ -380 +380 @@
                 if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && 
                                 (epsilon[3]==0) && (epsilon[4]==0) && (epsilon[5]==0)){
-                        viscosity3d=0.5*pow((IssmDouble)10,(IssmDouble)14);
+                        viscosity3d=0.5*pow(10.,14);
                 }
                 else{
@@ -396 +396 @@
                         if(A==0){
                                 /*Maxiviscosity3dm viscosity for 0 shear areas: */
-                                viscosity3d=2.25*pow((IssmDouble)10,(IssmDouble)17);
+                                viscosity3d=2.25*pow(10.,17);
                         }
                         else{
@@ -449 +449 @@
                 if(A==0){
                         /*Maximum viscosity_complement for 0 shear areas: */
-                        viscosity_complement=2.25*pow((IssmDouble)10,(IssmDouble)17);
+                        viscosity_complement=2.25*pow(10.,17);
                 }
                 else{
@@ -458 +458 @@
         }
         else{
-                viscosity_complement=4.5*pow((IssmDouble)10,(IssmDouble)17);
+                viscosity_complement=4.5*pow(10.,17);
         }
 
@@ -486 +486 @@
         if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && 
                                 (epsilon[3]==0) && (epsilon[4]==0)){
-                mu_prime=0.5*pow((IssmDouble)10,(IssmDouble)14);
+                mu_prime=0.5*pow(10.,14);
         }
         else{
@@ -520 +520 @@
         if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0) && 
                                 (epsilon[3]==0) && (epsilon[4]==0) && (epsilon[5]==0)){
-                mu_prime=0.5*pow((IssmDouble)10,(IssmDouble)14);
+                mu_prime=0.5*pow(10.,14);
         }
         else{
@@ -554 +554 @@
 
         if((epsilon[0]==0) && (epsilon[1]==0) && (epsilon[2]==0)){
-                mu_prime=0.5*pow((IssmDouble)10,(IssmDouble)14);
+                mu_prime=0.5*pow(10.,14);
         }
         else{