Changeset 6412 for issm/trunk/src/c/objects/Loads/Friction.cpp

Timestamp:

10/25/10 08:57:04 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved ISSMERROR to _error_, ISSMASSERT to _assert_ and ISSMPRINTF to _printf_

File:

• issm/trunk/src/c/objects/Loads/Friction.cpp (modified) (4 diffs)

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

@@ -108 +108 @@
                 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
         }
-        else ISSMERROR("element_type %s not supported yet",element_type);
+        else _error_("element_type %s not supported yet",element_type);
 
         alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1));
@@ -169 +169 @@
                 vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
         }
-        else ISSMERROR("element_type %s not supported yet",element_type);
+        else _error_("element_type %s not supported yet",element_type);
 
         alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1));
@@ -239 +239 @@
 
         Input* input=inputs->GetInput(enum_type);
-        if(!input) ISSMERROR("input %s not found",EnumToString(enum_type));
+        if(!input) _error_("input %s not found",EnumToString(enum_type));
         input->GetParameterValue(pvalue,gauss);
 
@@ -248 +248 @@
 
         Input* input=inputs->GetInput(enum_type);
-        if(!input) ISSMERROR("input %s not found",EnumToString(enum_type));
+        if(!input) _error_("input %s not found",EnumToString(enum_type));
         input->GetParameterValue(pvalue,gauss);