Changeset 12483

Timestamp:

06/20/12 15:03:28 (13 years ago)

Author:

utke

Message:

example for replacing _error_ with _error2_ such that the printing
becomes agnostic to the variable type (see e.g. "s" being adouble or
double)) and one doesn't
have to introduce two different variants to appease the C formatting

File:

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

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

@@ -107 +107 @@
                 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
         }
-        else _error_("element_type %s not supported yet",element_type);
+        else _error2_("element_type "<< element_type << " not supported yet");
 
         /*Checks that s-1>0 if v=0*/
-        if(vmag==0 && (s-1)<0) _error_("velocity is 0 ans (s-1)=%g<0, alpha_complement is Inf",s-1);
+        if(vmag==0 && (s-1)<0) _error2_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
 
         alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1));
@@ -171 +171 @@
                 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
         }
-        else _error_("element_type %s not supported yet",element_type);
+        else _error2_("element_type "<< element_type << " not supported yet");
 
         /*Checks that s-1>0 if v=0*/
-        if(vmag==0 && (s-1)<0) _error_("velocity is 0 ans (s-1)=%g<0, alpha_complement is Inf",s-1);
+        if(vmag==0 && (s-1)<0) _error2_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
 
         alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1));
@@ -238 +238 @@
                 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
         }
-        else _error_("element_type %s not supported yet",element_type);
+        else _error2_("element_type "<< element_type << " not supported yet");
 
         /*Checks that s-1>0 if v=0*/
-        if(vmag==0 && (s-1)<0) _error_("velocity is 0 ans (s-1)=%g<0, alpha_complement is Inf",s-1);
+        if(vmag==0 && (s-1)<0) _error2_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
 
         alpha_complement=pow(Neff,r)*pow(vmag,(s-1));            _assert_(!isnan(alpha_complement));
@@ -304 +304 @@
                 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
         }
-        else _error_("element_type %s not supported yet",element_type);
+        else _error2_("element_type "<< element_type << " not supported yet");
 
         /*Checks that s-1>0 if v=0*/
-        if(vmag==0 && (s-1)<0) _error_("velocity is 0 ans (s-1)=%g<0, alpha_complement is Inf",s-1);
+        if(vmag==0 && (s-1)<0) _error2_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
 
         alpha_complement=pow(Neff,r)*pow(vmag,(s-1));            _assert_(!isnan(alpha_complement));
@@ -319 +319 @@
 
         Input* input=inputs->GetInput(enum_type);
-        if(!input) _error_("input %s not found",EnumToStringx(enum_type));
+        if(!input) _error2_("input " << EnumToStringx(enum_type) << " not found");
         input->GetInputValue(pvalue,gauss);
 
@@ -328 +328 @@
 
         Input* input=inputs->GetInput(enum_type);
-        if(!input) _error_("input %s not found",EnumToStringx(enum_type));
+        if(!input) _error2_("input " << EnumToStringx(enum_type) << " not found");
         input->GetInputValue(pvalue,gauss);