Changeset 12493 for issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp

Timestamp:

06/21/12 10:02:29 (13 years ago)

Author:

Mathieu Morlighem

Message:

replaced all _error_ to _error2_

File:

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

issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp

@@ -455 +455 @@
                 case ControlInputEnum:{
                         ControlInput* cont_input=(ControlInput*)xinput;
-                        if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error_("not supported yet");
+                        if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error2_("not supported yet");
                         PentaP1Input* cast_input=(PentaP1Input*)cont_input->values;
                         for(i=0;i<numnodes;i++)this->values[i]=this->values[i]+scalar*(cast_input->values[i]);}
                         return;
                 default:
-                        _error_("not implemented yet");
+                        _error2_("not implemented yet");
         }
 
@@ -495 +495 @@
 
         /*Check that input provided is a thickness*/
-        if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is %s)",EnumToStringx(thickness_input->InstanceEnum()));
+        if (thickness_input->InstanceEnum()!=ThicknessEnum) _error2_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
 
         /*Get Thickness value pointer*/
@@ -511 +511 @@
 
                 default:
-                        _error_("not implemented yet");
+                        _error2_("not implemented yet");
         }
 }
@@ -529 +529 @@
 
         /*Check that inputB is of the same type*/
-        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum()));
+        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
         xinputB=(PentaP1Input*)inputB;
 
@@ -560 +560 @@
 
         /*Check that inputB is of the same type*/
-        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum()));
+        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
         xinputB=(PentaP1Input*)inputB;
 
@@ -591 +591 @@
 
         /*Check that inputB is of the same type*/
-        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum()));
+        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
         xinputB=(PentaP1Input*)inputB;