Changeset 12994

Timestamp:

08/13/12 09:04:53 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving _error_ to _error2_

Location:

issm/trunk-jpl/src/c/classes/objects

Files:

• ElementResults/DoubleElementResult.cpp (modified) (1 diff)
• Elements/Penta.cpp (modified) (1 diff)
• Elements/Tria.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp

@@ -129 +129 @@
 void DoubleElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
 
-        _error_("cannot return vector on vertices");
+        _error2_("cannot return vector on vertices");
 } /*}}}*/
 /*FUNCTION DoubleElementResult::GetElementVectorFromResults{{{1*/

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

@@ -1157 +1157 @@
         ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset);
         if(elementresult->InstanceEnum()!=enum_in){
-                _error_("Results of offset %i is %s, when %s was expected",offset,EnumToStringx(elementresult->InstanceEnum()),EnumToStringx(enum_in));
+                _error2_("Results of offset "<<offset<<" is "<<EnumToStringx(elementresult->InstanceEnum())<<" when "<<EnumToStringx(enum_in)<<" was expected");
         }  
         if(interp==P1Enum){

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -1266 +1266 @@
         ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset);
         if(elementresult->InstanceEnum()!=enum_in){
-                _error_("Results of offset %i is %s, when %s was expected",offset,EnumToStringx(elementresult->InstanceEnum()),EnumToStringx(enum_in));
+                _error2_("Results of offset "<<offset<<" is "<<EnumToStringx(elementresult->InstanceEnum())<<" when "<<EnumToStringx(enum_in)<<" was expected");
         }
         if(interp==P1Enum){