Changeset 12495

Timestamp:

06/21/12 10:14:12 (13 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk-jpl/src/c

Files:

• Container/DataSet.cpp (modified) (4 diffs)
• Container/Inputs.cpp (modified) (2 diffs)
• modules/DakotaResponsesx/DakotaResponsesx.cpp (modified) (2 diffs)
• modules/Dakotax/DescriptorIndex.cpp (modified) (3 diffs)
• modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (modified) (1 diff)
• modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (1 diff)
• modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (modified) (1 diff)
• modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (modified) (1 diff)
• modules/MeshProfileIntersectionx/ElementSegment.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateDataSets.cpp (modified) (1 diff)
• modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (modified) (1 diff)
• modules/NodeConnectivityx/NodeConnectivityx.cpp (modified) (1 diff)
• modules/Responsex/Responsex.cpp (modified) (1 diff)
• modules/Solverx/SolverxPetsc.cpp (modified) (1 diff)
• objects/Bamg/Mesh.cpp (modified) (1 diff)
• objects/DofIndexing.cpp (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (7 diffs)
• objects/Elements/Tria.cpp (modified) (8 diffs)
• objects/Hook.cpp (modified) (2 diffs)
• objects/Inputs/BoolInput.cpp (modified) (3 diffs)
• objects/Inputs/DoubleInput.cpp (modified) (3 diffs)
• objects/Inputs/IntInput.cpp (modified) (5 diffs)
• objects/IoModel.cpp (modified) (13 diffs)
• objects/Loads/Riftfront.cpp (modified) (9 diffs)
• objects/Materials/Matice.cpp (modified) (1 diff)
• objects/Numerics/ElementMatrix.cpp (modified) (2 diffs)
• shared/Alloc/alloc.cpp (modified) (1 diff)
• shared/Numerics/GaussPoints.cpp (modified) (1 diff)
• shared/Numerics/IsInputConverged.cpp (modified) (1 diff)
• shared/Numerics/Synchronize.sh (modified) (1 diff)
• shared/Numerics/UnitConversion.cpp (modified) (1 diff)
• shared/String/DescriptorIndex.cpp (modified) (3 diffs)
• shared/Threads/LaunchThread.cpp (modified) (1 diff)
• toolkits/plapack/patches/PlapackInvertMatrix.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Container/DataSet.cpp

@@ -133 +133 @@
         vector<Object*>::iterator object;
 
-        if(this==NULL)_error2_(" trying to echo a NULL dataset");
+        if(this==NULL)_error2_("trying to echo a NULL dataset");
 
         _printf_(true,"DataSet echo: %i objects\n",objects.size());
@@ -150 +150 @@
         vector<Object*>::iterator object;
 
-        if(this==NULL)_error2_(" trying to echo a NULL dataset");
+        if(this==NULL)_error2_("trying to echo a NULL dataset");
 
         _printf_(true,"DataSet echo: %i objects\n",objects.size());
@@ -194 +194 @@
 
         _assert_(this);
-        if(!sorted)_error2_(" trying to binary search on a non-sorted dataset!");
+        if(!sorted)_error2_("trying to binary search on a non-sorted dataset!");
 
         /*Carry out a binary search on the sorted_ids: */
@@ -259 +259 @@
         /*Only sort if we are not already sorted: */
         if(!sorted){
-                _error2_(" not implemented yet!");
-        }
-}
-/*}}}*/
+                _error2_("not implemented yet!");
+        }
+}
+/*}}}*/

issm/trunk-jpl/src/c/Container/Inputs.cpp

@@ -213 +213 @@
 
         /*some checks: */
-        if(!constrain_input) _error2_(" input " << EnumToStringx(constrain_enum) << " could not be found!");
+        if(!constrain_input) _error2_("input " << EnumToStringx(constrain_enum) << " could not be found!");
 
         /*Apply ContrainMin: */
@@ -416 +416 @@
 
         /*some checks: */
-        if(!xinput) _error2_(" input " << EnumToStringx(MeshXEnum) << " could not be found!");
-        if(!yinput) _error2_(" input " << EnumToStringx(MeshYEnum) << " could not be found!");
+        if(!xinput) _error2_("input " << EnumToStringx(MeshXEnum) << " could not be found!");
+        if(!yinput) _error2_("input " << EnumToStringx(MeshYEnum) << " could not be found!");
 
         /*Apply AXPY: */

issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp

@@ -86 +86 @@
                 }
                 else if (flag==NodalEnum){
-                        _error2_(" nodal response functions not supported yet!");
+                        _error2_("nodal response functions not supported yet!");
 
                         /*increment response_pointer :*/
@@ -104 +104 @@
                         }
                 }
-                else _error2_(" flag type " << flag << " not supported yet for response analysis");
+                else _error2_("flag type " << flag << " not supported yet for response analysis");
         }
 

issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp

@@ -23 +23 @@
         /*retrieve first token, separated by underscore: */
         pch = strtok (descriptor,"_");
-        if(!pch)_error2_(" descriptor " << descriptor << " is not correctly formatted!");
+        if(!pch)_error2_("descriptor " << descriptor << " is not correctly formatted!");
 
         if (strncmp(pch,"scaled",6)==0){
                 /*we have a scaled variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" scaled descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("scaled descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
 
@@ -44 +44 @@
                 /*we have an indexed variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" indexed descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
                 /*now recover  the index: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" indexed descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!");
                 sscanf(pch,"%i",pindex);
                 return IndexedEnum;
@@ -55 +55 @@
                 /*we have an indexed variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" nodal descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
                 /*now recover  the index: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" nodal descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
                 sscanf(pch,"%i",pindex);
                 return NodalEnum;

issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp

@@ -32 +32 @@
         }
         else{
-                _error2_(" vector type: " << EnumToStringx(type) << " not supported yet!");
+                _error2_("vector type: " << EnumToStringx(type) << " not supported yet!");
         }
 

issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp

@@ -95 +95 @@
                 }
                 else if (strncmp(descriptor,"indexed_",8)==0){
-                        _error2_(" indexed variables not supported yet!");
+                        _error2_("indexed variables not supported yet!");
                 }
                 else if (strncmp(descriptor,"nodal_",8)==0){
-                        _error2_(" nodal variables not supported yet!");
+                        _error2_("nodal variables not supported yet!");
                 }
                 else{

issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp

@@ -59 +59 @@
 
         if((numcontours) && (interpolation_type==2)){
-                _error2_(" element interpolation_type with contours not supported yet!");
+                _error2_("element interpolation_type with contours not supported yet!");
         }
 

issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp

@@ -38 +38 @@
         fid=iomodel->SetFilePointerToData(&code, &vector_layout,vector_enum);
 
-        if(code!=7)_error2_(" expecting a IssmDouble vector for constraints with enum " << EnumToStringx(vector_enum));
-        if(vector_layout!=1)_error2_(" expecting a nodal vector for constraints with enum " << EnumToStringx(vector_enum));
+        if(code!=7)_error2_("expecting a IssmDouble vector for constraints with enum " << EnumToStringx(vector_enum));
+        if(vector_layout!=1)_error2_("expecting a nodal vector for constraints with enum " << EnumToStringx(vector_enum));
 
         /*Fetch vector:*/

issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp

@@ -38 +38 @@
         if(    (edge1==IntersectEnum) && (edge2==IntersectEnum) && (edge3==IntersectEnum)   ){
                 /*This case is impossible: */
-                _error2_(" error: a line cannot go through 3 different vertices!");
+                _error2_("error: a line cannot go through 3 different vertices!");
         }
         else if(    ((edge1==IntersectEnum) && (edge2==IntersectEnum)) || ((edge2==IntersectEnum) && (edge3==IntersectEnum)) || ((edge3==IntersectEnum) && (edge1==IntersectEnum))   ){

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp

@@ -124 +124 @@
 
                 default:
-                        _error2_(" analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!");
+                        _error2_("analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!");
         }
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp

@@ -153 +153 @@
                         /*Fetch the mass flux segments necessary to compute the mass fluxes.  Build a DoubleMatArrayParam object out of them: */ 
                         iomodel->FetchData(&array,&mdims_array,&ndims_array,&qmu_mass_flux_num_profiles,QmuMassFluxSegmentsEnum);
-                        if(qmu_mass_flux_num_profiles==0)_error2_(" qmu_mass_flux_num_profiles is 0, when MassFlux computations were requested!");
+                        if(qmu_mass_flux_num_profiles==0)_error2_("qmu_mass_flux_num_profiles is 0, when MassFlux computations were requested!");
 
                         /*Go through segments, and extract those that belong to this cpu: */

issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp

@@ -71 +71 @@
          * warn the user to increase the connectivity width: */
         for(i=0;i<nods;i++){
-                if (*(connectivity+width*i+maxels)>maxels)_error2_(" max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table");
+                if (*(connectivity+width*i+maxels)>maxels)_error2_("max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table");
         }
 

issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp

@@ -46 +46 @@
                 case VelEnum:ElementResponsex(responses, elements,nodes, vertices, loads, materials, parameters,VelEnum,process_units); break;
                 case FrictionCoefficientEnum:NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters,process_units); break;
-                default: _error2_(" response descriptor \"" << response_descriptor << "\" not supported yet!"); break;
+                default: _error2_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break;
                 #else
-                default: _error2_(" ISSM was not compiled with responses capabilities, exiting!");
+                default: _error2_("ISSM was not compiled with responses capabilities, exiting!");
                 #endif
         }

issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp

@@ -136 +136 @@
         /*Check convergence*/
         KSPGetIterationNumber(ksp,&iteration_number);
-        if (iteration_number<0) _error2_(" Solver diverged at iteration number: " << -iteration_number);
+        if (iteration_number<0) _error2_("Solver diverged at iteration number: " << -iteration_number);
 
         /*Free resources:*/

issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp

@@ -5529 +5529 @@
                                                         }
                                                         if (!ee.adj[k1]) {
-                                                                _error2_(" adj edge " << BTh.GetId(ee) << ", nbe=" << nbe << ", Gh.vertices=" << Gh.vertices);
+                                                                _error2_("adj edge " << BTh.GetId(ee) << ", nbe=" << nbe << ", Gh.vertices=" << Gh.vertices);
                                                         }
                                                         pe = ee.adj[k1]; // next edge

issm/trunk-jpl/src/c/objects/DofIndexing.cpp

@@ -143 +143 @@
                 else this->sdoflist=NULL;
         }
-        else _error2_(" set of enum type " << EnumToStringx(setenum) << " not supported yet!");
+        else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
 }
 /*}}}*/

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

@@ -1133 +1133 @@
         /*Make a copy of the original input: */
         input=(Input*)this->inputs->GetInput(enum_type);
-        if(!input)_error2_(" could not find old input with enum: " << EnumToStringx(enum_type));
+        if(!input)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
 
         /*ArtificialNoise: */
@@ -1153 +1153 @@
                 new_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+0]);
                 old_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+1]);
-                if(!new_inputs[i])_error2_(" could not find input with enum " << EnumToStringx(enums[2*i+0]));
-                if(!old_inputs[i])_error2_(" could not find input with enum " << EnumToStringx(enums[2*i+0]));
+                if(!new_inputs[i])_error2_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
+                if(!old_inputs[i])_error2_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
         }
 
@@ -1186 +1186 @@
                 this->inputs->AddInput(new DoubleInput(name,(IssmDouble)scalar));
         }
-        else _error2_(" could not recognize nature of vector from code " << code);
+        else _error2_("could not recognize nature of vector from code " << code);
 
 }
@@ -1268 +1268 @@
                                 this->inputs->AddInput(new DoubleInput(vector_enum,(IssmDouble)vector[index]));
                         }
-                        else _error2_(" could not recognize nature of vector from code " << code);
+                        else _error2_("could not recognize nature of vector from code " << code);
                 }
                 else {
@@ -1464 +1464 @@
         /*Make a copy of the original input: */
         input=(Input*)this->inputs->GetInput(enum_type);
-        if(!input)_error2_(" could not find old input with enum: " << EnumToStringx(enum_type));
+        if(!input)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
 
         /*Scale: */
@@ -1894 +1894 @@
 /*FUNCTION Penta::InputUpdateFromVector(int* vector, int name, int type);{{{*/
 void  Penta::InputUpdateFromVector(int* vector, int name, int type){
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 }
 /*}}}*/
 /*FUNCTION Penta::InputUpdateFromVector(bool* vector, int name, int type);{{{*/
 void  Penta::InputUpdateFromVector(bool* vector, int name, int type){
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 }
 /*}}}*/
@@ -5622 +5622 @@
 /*FUNCTION Penta::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/
 void  Penta::InputUpdateFromVectorDakota(int* vector, int name, int type){
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 }
 /*}}}*/
 /*FUNCTION Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/
 void  Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type){
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 }
 /*}}}*/

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

@@ -1232 +1232 @@
         /*Make a copy of the original input: */
         input=(Input*)this->inputs->GetInput(enum_type);
-        if(!input)_error2_(" could not find old input with enum: " << EnumToStringx(enum_type));
+        if(!input)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
 
         /*ArtificialNoise: */
@@ -1252 +1252 @@
                 new_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+0]);
                 old_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+1]);
-                if(!new_inputs[i])_error2_(" could not find input with enum " << EnumToStringx(enums[2*i+0]));
-                if(!old_inputs[i])_error2_(" could not find input with enum " << EnumToStringx(enums[2*i+0]));
+                if(!new_inputs[i])_error2_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
+                if(!old_inputs[i])_error2_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
         }
 
@@ -1282 +1282 @@
         else
          _error2_("object " << EnumToStringx(object_enum) << " not supported yet");
-        if(!oldinput)_error2_(" could not find old input with enum: " << EnumToStringx(enum_type));
+        if(!oldinput)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
         newinput=(Input*)oldinput->copy();
 
@@ -1312 +1312 @@
         /*Make a copy of the original input: */
         input=(Input*)this->inputs->GetInput(enum_type);
-        if(!input)_error2_(" could not find old input with enum: " << EnumToStringx(enum_type));
+        if(!input)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
 
         /*Scale: */
@@ -1634 +1634 @@
 /*FUNCTION Tria::InputUpdateFromVector(int* vector, int name, int type);{{{*/
 void  Tria::InputUpdateFromVector(int* vector, int name, int type){
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 }
 /*}}}*/
 /*FUNCTION Tria::InputUpdateFromVector(bool* vector, int name, int type);{{{*/
 void  Tria::InputUpdateFromVector(bool* vector, int name, int type){
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 }
 /*}}}*/
@@ -1657 +1657 @@
                 this->inputs->AddInput(new DoubleInput(name,(int)scalar));
         }
-        else _error2_(" could not recognize nature of vector from code " << code);
+        else _error2_("could not recognize nature of vector from code " << code);
 
 }
@@ -1739 +1739 @@
                                 this->inputs->AddInput(new DoubleInput(vector_enum,(IssmDouble)vector[index]));
                         }
-                        else _error2_(" could not recognize nature of vector from code " << code);
+                        else _error2_("could not recognize nature of vector from code " << code);
                 }
                 else {
@@ -5433 +5433 @@
 /*FUNCTION Tria::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/
 void  Tria::InputUpdateFromVectorDakota(int* vector, int name, int type){
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 }
 /*}}}*/
 /*FUNCTION Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/
 void  Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type){
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Hook.cpp

@@ -185 +185 @@
                         this->objects[i]=(Object*)dataset->GetObjectById(this->offsets+i,this->ids[i]); //remember the offset for later on.
                         /*check the id is correct!: */
-                        if (this->objects[i]->Id()!=this->ids[i]) _error2_(" wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << "  in resolved pointer!");
+                        if (this->objects[i]->Id()!=this->ids[i]) _error2_("wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << "  in resolved pointer!");
                 }
         }
@@ -194 +194 @@
         
         /*first, check that we only have one T object in our object list: */
-        if (this->num!=1) _error2_(" trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n");
+        if (this->num!=1) _error2_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n");
 
         /*check NULL: */

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

@@ -112 +112 @@
 /*}}}*/
 /*FUNCTION BoolInput::GetInputValue(int* pvalue){{{*/
-void BoolInput::GetInputValue(int* pvalue){_error2_(" not supported yet!");}
+void BoolInput::GetInputValue(int* pvalue){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION BoolInput::GetInputValue(IssmPDouble* pvalue){{{*/
-void BoolInput::GetInputValue(IssmPDouble* pvalue){_error2_(" not supported yet!");}
+void BoolInput::GetInputValue(IssmPDouble* pvalue){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION BoolInput::GetInputValue(IssmPDouble* pvalue,GaussTria* gauss){{{*/
-void BoolInput::GetInputValue(IssmPDouble* pvalue,GaussTria* gauss){_error2_(" not supported yet!");}
+void BoolInput::GetInputValue(IssmPDouble* pvalue,GaussTria* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION BoolInput::GetInputValue(IssmPDouble* pvalue,GaussPenta* gauss){{{*/
-void BoolInput::GetInputValue(IssmPDouble* pvalue,GaussPenta* gauss){_error2_(" not supported yet!");}
+void BoolInput::GetInputValue(IssmPDouble* pvalue,GaussPenta* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION BoolInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){{{*/
-void BoolInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){_error2_(" not supported yet!");}
+void BoolInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION BoolInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){{{*/
-void BoolInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){_error2_(" not supported yet!");}
+void BoolInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION BoolInput::ChangeEnum{{{*/
@@ -184 +184 @@
 void BoolInput::GetVectorFromInputs(Vector* vector,int* doflist){
 
-        _error2_(" not supporte yet!");
+        _error2_("not supporte yet!");
 
 }
@@ -191 +191 @@
 void BoolInput::GetValuesPtr(IssmPDouble** pvalues,int* pnum_values){
 
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 
 }

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

@@ -132 +132 @@
 /*}}}*/
 /*FUNCTION DoubleInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){{{*/
-void DoubleInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){_error2_(" not supported yet!");}
+void DoubleInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION DoubleInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){{{*/
-void DoubleInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){_error2_(" not supported yet!");}
+void DoubleInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION DoubleInput::GetVxStrainRate2d(IssmPDouble* epsilonvx,IssmPDouble* xyz_list, GaussTria* gauss){{{*/
@@ -253 +253 @@
 void DoubleInput::GetVectorFromInputs(Vector* vector,int* doflist){
 
-        _error2_(" not supporte yet!");
+        _error2_("not supporte yet!");
 
 }
@@ -260 +260 @@
 void DoubleInput::GetValuesPtr(IssmPDouble** pvalues,int* pnum_values){
 
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 
 }

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

@@ -99 +99 @@
 ElementResult* IntInput::SpawnResult(int step, IssmPDouble time){
         
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 
 }
@@ -106 +106 @@
 /*Object functions*/
 /*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{*/
-void IntInput::GetInputValue(bool* pvalue){_error2_(" not supported yet!");}
+void IntInput::GetInputValue(bool* pvalue){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION IntInput::GetInputValue(int* pvalue){{{*/
@@ -119 +119 @@
 /*}}}*/
 /*FUNCTION IntInput::GetInputValue(IssmPDouble* pvalue,GaussTria* gauss){{{*/
-void IntInput::GetInputValue(IssmPDouble* pvalue,GaussTria* gauss){_error2_(" not supported yet!");}
+void IntInput::GetInputValue(IssmPDouble* pvalue,GaussTria* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION IntInput::GetInputValue(IssmPDouble* pvalue,GaussPenta* gauss){{{*/
-void IntInput::GetInputValue(IssmPDouble* pvalue,GaussPenta* gauss){_error2_(" not supported yet!");}
+void IntInput::GetInputValue(IssmPDouble* pvalue,GaussPenta* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION IntInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){{{*/
-void IntInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){_error2_(" not supported yet!");}
+void IntInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION IntInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){{{*/
-void IntInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){_error2_(" not supported yet!");}
+void IntInput::GetInputDerivativeValue(IssmPDouble* derivativevalues, IssmPDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");}
 /*}}}*/
 /*FUNCTION IntInput::ChangeEnum{{{*/
@@ -182 +182 @@
 void IntInput::GetVectorFromInputs(Vector* vector,int* doflist){
 
-        _error2_(" not supporte yet!");
+        _error2_("not supporte yet!");
 
 }
@@ -189 +189 @@
 void IntInput::GetValuesPtr(IssmPDouble** pvalues,int* pnum_values){
 
-        _error2_(" not supported yet!");
+        _error2_("not supported yet!");
 
 }

issm/trunk-jpl/src/c/objects/IoModel.cpp

@@ -266 +266 @@
                                         case 1: 
                                                 /*Read the boolean and broadcast it to other cpus:*/
-                                                if(fread(&booleanint,sizeof(int),1,this->fid)!=1) _error2_(" could not read boolean ");
+                                                if(fread(&booleanint,sizeof(int),1,this->fid)!=1) _error2_("could not read boolean ");
                                                 #ifdef _HAVE_MPI_
                                                 MPI_Bcast(&booleanint,1,MPI_INT,0,MPI_COMM_WORLD); 
@@ -277 +277 @@
                                         case 2:
                                                 /*Read the integer and broadcast it to other cpus:*/
-                                                if(fread(&integer,sizeof(int),1,this->fid)!=1) _error2_(" could not read integer ");
+                                                if(fread(&integer,sizeof(int),1,this->fid)!=1) _error2_("could not read integer ");
                                                 #ifdef _HAVE_MPI_
                                                 MPI_Bcast(&integer,1,MPI_INT,0,MPI_COMM_WORLD); 
@@ -288 +288 @@
                                         case 3:
                                                 /*Read the scalar and broadcast it to other cpus:*/
-                                                if(fread(&scalar,sizeof(IssmPDouble),1,this->fid)!=1) _error2_(" could not read scalar ");
+                                                if(fread(&scalar,sizeof(IssmPDouble),1,this->fid)!=1) _error2_("could not read scalar ");
                                                 #ifdef _HAVE_MPI_
                                                 MPI_Bcast(&scalar,1,MPI_DOUBLE,0,MPI_COMM_WORLD); 
@@ -299 +299 @@
                                         case 4: 
                                                 /*We have to read a string from disk. First read the dimensions of the string, then the string: */
-                                                if(fread(&string_size,sizeof(int),1,this->fid)!=1) _error2_(" could not read length of string ");
+                                                if(fread(&string_size,sizeof(int),1,this->fid)!=1) _error2_("could not read length of string ");
                                                 #ifdef _HAVE_MPI_
                                                 MPI_Bcast(&string_size,1,MPI_INT,0,MPI_COMM_WORLD); 
@@ -309 +309 @@
 
                                                         /*Read string, then broadcast: */
-                                                        if(fread(string,string_size*sizeof(char),1,this->fid)!=1)_error2_("  could not read string ");
+                                                        if(fread(string,string_size*sizeof(char),1,this->fid)!=1)_error2_(" could not read string ");
                                                         #ifdef _HAVE_MPI_
                                                         MPI_Bcast(string,string_size,MPI_CHAR,0,MPI_COMM_WORLD); 
@@ -457 +457 @@
         /*We have to read a boolean from disk. */
         if(my_rank==0){  
-                if(fread(&booleanint,sizeof(int),1,fid)!=1) _error2_(" could not read boolean ");
+                if(fread(&booleanint,sizeof(int),1,fid)!=1) _error2_("could not read boolean ");
         }
         #ifdef _HAVE_MPI_
@@ -487 +487 @@
         /*We have to read a integer from disk. First read the dimensions of the integer, then the integer: */
         if(my_rank==0){  
-                if(fread(&integer,sizeof(int),1,fid)!=1) _error2_(" could not read integer ");
+                if(fread(&integer,sizeof(int),1,fid)!=1) _error2_("could not read integer ");
         }
 
@@ -518 +518 @@
         /*We have to read a scalar from disk. First read the dimensions of the scalar, then the scalar: */
         if(my_rank==0){
-                if(fread(&scalar,sizeof(IssmPDouble),1,fid)!=1)_error2_(" could not read scalar ");
+                if(fread(&scalar,sizeof(IssmPDouble),1,fid)!=1)_error2_("could not read scalar ");
         }
         #ifdef _HAVE_MPI_
@@ -550 +550 @@
         /*We have to read a string from disk. First read the dimensions of the string, then the string: */
         if(my_rank==0){  
-                if(fread(&string_size,sizeof(int),1,fid)!=1) _error2_(" could not read length of string ");
+                if(fread(&string_size,sizeof(int),1,fid)!=1) _error2_("could not read length of string ");
         }
 
@@ -564 +564 @@
                 /*Read string on node 0, then broadcast: */
                 if(my_rank==0){  
-                        if(fread(string,string_size*sizeof(char),1,fid)!=1)_error2_("  could not read string ");
+                        if(fread(string,string_size*sizeof(char),1,fid)!=1)_error2_(" could not read string ");
                 }
                 #ifdef _HAVE_MPI_
@@ -732 +732 @@
         /*We have to read a bunch of strings from disk. First read the number of strings, and allocate: */
         if(my_rank==0){  
-                if(fread(&numstrings,sizeof(int),1,fid)!=1) _error2_(" could not read length of string array");
+                if(fread(&numstrings,sizeof(int),1,fid)!=1) _error2_("could not read length of string array");
         }
         #ifdef _HAVE_MPI_
@@ -747 +747 @@
                         
                         if(my_rank==0){  
-                                if(fread(&string_size,sizeof(int),1,fid)!=1) _error2_(" could not read length of string ");
+                                if(fread(&string_size,sizeof(int),1,fid)!=1) _error2_("could not read length of string ");
                         }
                         #ifdef _HAVE_MPI_
@@ -758 +758 @@
                                 /*Read string on node 0, then broadcast: */
                                 if(my_rank==0){  
-                                        if(fread(string,string_size*sizeof(char),1,fid)!=1)_error2_("  could not read string ");
+                                        if(fread(string,string_size*sizeof(char),1,fid)!=1)_error2_(" could not read string ");
                                 }
                                 #ifdef _HAVE_MPI_

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

@@ -397 +397 @@
 
         /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_(" only Tria element allowed for Riftfront load!");
+        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
         tria1=(Tria*)elements[0];
         tria2=(Tria*)elements[1];
@@ -410 +410 @@
         tria1->GetInputValue(&h[0],nodes[0],ThicknessEnum);
         tria2->GetInputValue(&h[1],nodes[1],ThicknessEnum);
-        if (h[0]!=h[1])_error2_(" different thicknesses not supported for rift fronts");
+        if (h[0]!=h[1])_error2_("different thicknesses not supported for rift fronts");
         thickness=h[0];
 
@@ -488 +488 @@
 
         /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_(" only Tria element allowed for Riftfront load!");
+        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
         tria1=(Tria*)elements[0];
         tria2=(Tria*)elements[1];
@@ -504 +504 @@
         tria1->GetInputValue(&h[0],nodes[0],ThicknessEnum);
         tria2->GetInputValue(&h[1],nodes[1],ThicknessEnum);
-        if (h[0]!=h[1])_error2_(" different thicknesses not supported for rift fronts");
+        if (h[0]!=h[1])_error2_("different thicknesses not supported for rift fronts");
         thickness=h[0];
         tria1->GetInputValue(&b[0],nodes[0],BedEnum);
         tria2->GetInputValue(&b[1],nodes[1],BedEnum);
-        if (b[0]!=b[1])_error2_(" different beds not supported for rift fronts");
+        if (b[0]!=b[1])_error2_("different beds not supported for rift fronts");
         bed=b[0];
 
@@ -585 +585 @@
 
         /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_(" only Tria element allowed for Riftfront load!");
+        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
 
         /*recover elements on both side of rift: */
@@ -706 +706 @@
 
         /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_(" only Tria element allowed for Riftfront load!");
+        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
 
         /*recover elements on both side of rift: */
@@ -751 +751 @@
 
         /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_(" only Tria element allowed for Riftfront load!");
+        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
 
         /*recover elements on both side of rift: */
@@ -794 +794 @@
 
         /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_(" only Tria element allowed for Riftfront load!");
+        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
 
         /*recover elements on both side of rift: */
@@ -844 +844 @@
 
         /*enum of element? */
-        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_(" only Tria element allowed for Riftfront load!");
+        if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
 
         /*recover elements on both side of rift: */

issm/trunk-jpl/src/c/objects/Materials/Matice.cpp

@@ -750 +750 @@
         #endif
         else{
-                _error2_(" Mesh type not supported yet!");
+                _error2_("Mesh type not supported yet!");
         }
 

issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp

@@ -295 +295 @@
         }
         else{
-                _error2_(" non dofsymmetrical matrix AddToGlobal routine not support yet!");
+                _error2_("non dofsymmetrical matrix AddToGlobal routine not support yet!");
         }
 
@@ -332 +332 @@
         }
         else{
-                _error2_(" non dofsymmetrical matrix AddToGlobal routine not support yet!");
+                _error2_("non dofsymmetrical matrix AddToGlobal routine not support yet!");
         }
 

issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp

@@ -31 +31 @@
         void* memptr=NULL;
 
-        if(!size)_error2_(" attempting to 0 size allocation!");
+        if(!size)_error2_("attempting to 0 size allocation!");
 
         /* Use the c library to do the allocation: */

issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp

@@ -1670 +1670 @@
                 if (iter >= MAX_GAUS_ITER) {
                         xDelete<IssmPDouble>(work);
-                        _error2_(" Max iterations exceeded for l=" << MAX_GAUS_ITER);
+                        _error2_("Max iterations exceeded for l=" << MAX_GAUS_ITER);
                 }
         }

issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp

@@ -53 +53 @@
                 else eps=0;
         }
-        else _error2_(" convergence criterion " << EnumToStringx(criterion_enum) << " not supported yet!");
+        else _error2_("convergence criterion " << EnumToStringx(criterion_enum) << " not supported yet!");
 
         /*Assign output pointers:*/

issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh

@@ -135 +135 @@
 void SetVerbosityLevel(int level){
 
-        if(level<0) _error_("vebosity level should be a positive integer (user provided %i)",level);
+        if(level<0) _error2_("vebosity level should be a positive integer (user provided " << level << ")");
 
         verbositylevel = level;

issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp

@@ -29 +29 @@
         if(direction_enum==IuToExtEnum) for(i=0;i<numvalues;i++)values[i]=values[i]*scale; 
         else if(direction_enum==ExtToIuEnum) for(i=0;i<numvalues;i++)values[i]=values[i]/scale; 
-        else _error2_(" wrong direction for unit conversion, either IuToExtEnum or ExtToIuEnum. ");
+        else _error2_("wrong direction for unit conversion, either IuToExtEnum or ExtToIuEnum. ");
 
 }

issm/trunk-jpl/src/c/shared/String/DescriptorIndex.cpp

@@ -23 +23 @@
         /*retrieve first token, separated by underscore: */
         pch = strtok (descriptor,"_");
-        if(!pch)_error2_(" descriptor " << descriptor << " is not correctly formatted!");
+        if(!pch)_error2_("descriptor " << descriptor << " is not correctly formatted!");
 
         if (strncmp(pch,"scaled",6)==0){
                 /*we have a scaled variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" scaled descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("scaled descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
 
@@ -44 +44 @@
                 /*we have an indexed variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" indexed descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
                 /*now recover  the index: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" indexed descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!");
                 sscanf(pch,"%i",pindex);
                 return IndexedEnum;
@@ -55 +55 @@
                 /*we have an indexed variable. recover the root: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" nodal descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
                 memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
                 /*now recover  the index: */
                 pch = strtok (NULL, "_");
-                if(!pch)_error2_(" nodal descriptor " << descriptor << " is not correctly formatted!");
+                if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
                 sscanf(pch,"%i",pindex);
                 return NodalEnum;

issm/trunk-jpl/src/c/shared/Threads/LaunchThread.cpp

@@ -44 +44 @@
 
                 if(pthread_create(threads+i,NULL,function,(void*)(handles+i))){
-                        _error2_(" pthread_create error");
+                        _error2_("pthread_create error");
                 }
         }
         for(i=0;i<num_threads;i++){
                 if(pthread_join(threads[i],(void**)&status)){
-                        _error2_(" pthread_join error");
+                        _error2_("pthread_join error");
                 }
         }

issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp

@@ -51 +51 @@
 
         /*Some dimensions checks: */
-        if (mA!=nA) _error2_(" trying to take the invert of a non-square matrix!");
+        if (mA!=nA) _error2_("trying to take the invert of a non-square matrix!");
 
         /* Set default Plapack parameters */