Changeset 17938

Timestamp:

05/05/14 16:42:19 (11 years ago)

Author:

cborstad

Message:

CHG: return zero friction if velocity magnitude is calculated as zero instead of raising error, useful for Weertman sliding law

File:

• issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

@@ -94 +94 @@
         }
 
-        /*Checks that s-1>0 if v=0*/
-        if(vmag==0. && (s-1.)<0.) _error_("velocity is 0 and (s-1)=" << (s-1.) << "<0, alpha2 is Inf");
-
-        alpha2=drag_coefficient*drag_coefficient*pow(Neff,r)*pow(vmag,(s-1.));
+        /*Check to prevent dividing by zero if vmag==0*/
+        if(vmag==0. && (s-1.)<0.) alpha2=0.;
+        else alpha2=drag_coefficient*drag_coefficient*pow(Neff,r)*pow(vmag,(s-1.));
         _assert_(!xIsNan<IssmDouble>(alpha2));
 
@@ -159 +158 @@
         }
 
-        /*Checks that s-1>0 if v=0*/
-        if(vmag==0. && (s-1.)<0.) _error_("velocity is 0 and (s-1)=" << (s-1.) << "<0, alpha2 is Inf");
-
-        alpha_complement=pow(Neff,r)*pow(vmag,(s-1));_assert_(!xIsNan<IssmDouble>(alpha_complement));
+        /*Check to prevent dividing by zero if vmag==0*/
+        if(vmag==0. && (s-1.)<0.) alpha_complement=0.;
+        else alpha_complement=pow(Neff,r)*pow(vmag,(s-1));_assert_(!xIsNan<IssmDouble>(alpha_complement));
 
         /*Assign output pointers:*/