Changeset 7907

Timestamp:

04/14/11 13:36:04 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added error message in case v=0 and s-1<0

Location:

issm/trunk/src/c

Files:

• modules/Orthx/Orthx.cpp (modified) (1 diff)
• objects/Loads/Friction.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/Orthx/Orthx.cpp

@@ -21 +21 @@
         if(oldgradj){
                 VecNorm(oldgradj,NORM_2,&norm_old);
+                _assert_(norm_old!=0); 
                 VecDot(newgradj,oldgradj,&dot_product);
+                _assert_(dot_product!=NAN); 
                 VecAXPY(newgradj, -dot_product/pow(norm_old,2), oldgradj);
         }

issm/trunk/src/c/objects/Loads/Friction.cpp

@@ -111 +111 @@
 
         alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1));
+        _assert_(!isnan(alpha2));
 
         /*Assign output pointers:*/
@@ -172 +173 @@
 
         alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1));
+        _assert_(!isnan(alpha2));
 
         /*Assign output pointers:*/
@@ -228 +230 @@
         vmag=sqrt(pow(vx,2)+pow(vy,2));
 
+        /*Checks*/
+        if(vmag==0 && (s-1)<0) _error_("velocity is 0 ans (s-1)=%g<0, alpha_complement is Inf",s-1);
+
         alpha_complement=pow(Neff,r)*pow(vmag,(s-1));
+        _assert_(!isnan(alpha_complement));
 
         /*Assign output pointers:*/