Index: /issm/trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 12495) @@ -133,5 +133,5 @@ vector::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,5 +150,5 @@ vector::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,5 +194,5 @@ _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,6 +259,6 @@ /*Only sort if we are not already sorted: */ if(!sorted){ - _error2_(" not implemented yet!"); - } -} -/*}}}*/ + _error2_("not implemented yet!"); + } +} +/*}}}*/ Index: /issm/trunk-jpl/src/c/Container/Inputs.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 12495) @@ -213,5 +213,5 @@ /*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,6 +416,6 @@ /*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: */ Index: /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 12495) @@ -86,5 +86,5 @@ } else if (flag==NodalEnum){ - _error2_(" nodal response functions not supported yet!"); + _error2_("nodal response functions not supported yet!"); /*increment response_pointer :*/ @@ -104,5 +104,5 @@ } } - else _error2_(" flag type " << flag << " not supported yet for response analysis"); + else _error2_("flag type " << flag << " not supported yet for response analysis"); } Index: /issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp (revision 12495) @@ -23,10 +23,10 @@ /*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,9 +44,9 @@ /*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,9 +55,9 @@ /*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; Index: /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 12495) @@ -32,5 +32,5 @@ } else{ - _error2_(" vector type: " << EnumToStringx(type) << " not supported yet!"); + _error2_("vector type: " << EnumToStringx(type) << " not supported yet!"); } Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 12495) @@ -95,8 +95,8 @@ } 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{ Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 12495) @@ -59,5 +59,5 @@ if((numcontours) && (interpolation_type==2)){ - _error2_(" element interpolation_type with contours not supported yet!"); + _error2_("element interpolation_type with contours not supported yet!"); } Index: /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 12495) @@ -38,6 +38,6 @@ 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:*/ Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp (revision 12495) @@ -38,5 +38,5 @@ 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)) ){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 12495) @@ -124,5 +124,5 @@ default: - _error2_(" analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!"); + _error2_("analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!"); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 12495) @@ -153,5 +153,5 @@ /*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: */ Index: /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 12495) @@ -71,5 +71,5 @@ * warn the user to increase the connectivity width: */ for(i=0;imaxels)_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"); } Index: /issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp (revision 12495) @@ -46,7 +46,7 @@ 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 } Index: /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 12495) @@ -136,5 +136,5 @@ /*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:*/ Index: /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp (revision 12495) @@ -5529,5 +5529,5 @@ } 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 Index: /issm/trunk-jpl/src/c/objects/DofIndexing.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12495) @@ -143,5 +143,5 @@ 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!"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12495) @@ -1133,5 +1133,5 @@ /*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,6 +1153,6 @@ 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,5 +1186,5 @@ 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,5 +1268,5 @@ 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,5 +1464,5 @@ /*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,10 +1894,10 @@ /*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,10 +5622,10 @@ /*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!"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12495) @@ -1232,5 +1232,5 @@ /*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,6 +1252,6 @@ 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,5 +1282,5 @@ 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,5 +1312,5 @@ /*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,10 +1634,10 @@ /*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,5 +1657,5 @@ 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,5 +1739,5 @@ 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,10 +5433,10 @@ /*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!"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Hook.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Hook.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Hook.cpp (revision 12495) @@ -185,5 +185,5 @@ 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,5 +194,5 @@ /*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: */ Index: /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12495) @@ -112,20 +112,20 @@ /*}}}*/ /*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,5 +184,5 @@ void BoolInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_(" not supporte yet!"); + _error2_("not supporte yet!"); } @@ -191,5 +191,5 @@ void BoolInput::GetValuesPtr(IssmPDouble** pvalues,int* pnum_values){ - _error2_(" not supported yet!"); + _error2_("not supported yet!"); } Index: /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12495) @@ -132,8 +132,8 @@ /*}}}*/ /*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,5 +253,5 @@ void DoubleInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_(" not supporte yet!"); + _error2_("not supporte yet!"); } @@ -260,5 +260,5 @@ void DoubleInput::GetValuesPtr(IssmPDouble** pvalues,int* pnum_values){ - _error2_(" not supported yet!"); + _error2_("not supported yet!"); } Index: /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12495) @@ -99,5 +99,5 @@ ElementResult* IntInput::SpawnResult(int step, IssmPDouble time){ - _error2_(" not supported yet!"); + _error2_("not supported yet!"); } @@ -106,5 +106,5 @@ /*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,14 +119,14 @@ /*}}}*/ /*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,5 +182,5 @@ void IntInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_(" not supporte yet!"); + _error2_("not supporte yet!"); } @@ -189,5 +189,5 @@ void IntInput::GetValuesPtr(IssmPDouble** pvalues,int* pnum_values){ - _error2_(" not supported yet!"); + _error2_("not supported yet!"); } Index: /issm/trunk-jpl/src/c/objects/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/IoModel.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/IoModel.cpp (revision 12495) @@ -266,5 +266,5 @@ 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,5 +277,5 @@ 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,5 +288,5 @@ 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,5 +299,5 @@ 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,5 +309,5 @@ /*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,5 +457,5 @@ /*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,5 +487,5 @@ /*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,5 +518,5 @@ /*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,5 +550,5 @@ /*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,5 +564,5 @@ /*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,5 +732,5 @@ /*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,5 +747,5 @@ 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,5 +758,5 @@ /*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_ Index: /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12495) @@ -397,5 +397,5 @@ /*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,5 +410,5 @@ 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,5 +488,5 @@ /*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,9 +504,9 @@ 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,5 +585,5 @@ /*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,5 +706,5 @@ /*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,5 +751,5 @@ /*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,5 +794,5 @@ /*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,5 +844,5 @@ /*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: */ Index: /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12495) @@ -750,5 +750,5 @@ #endif else{ - _error2_(" Mesh type not supported yet!"); + _error2_("Mesh type not supported yet!"); } Index: /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (revision 12495) @@ -295,5 +295,5 @@ } else{ - _error2_(" non dofsymmetrical matrix AddToGlobal routine not support yet!"); + _error2_("non dofsymmetrical matrix AddToGlobal routine not support yet!"); } @@ -332,5 +332,5 @@ } else{ - _error2_(" non dofsymmetrical matrix AddToGlobal routine not support yet!"); + _error2_("non dofsymmetrical matrix AddToGlobal routine not support yet!"); } Index: /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 12495) @@ -31,5 +31,5 @@ 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: */ Index: /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 12495) @@ -1670,5 +1670,5 @@ if (iter >= MAX_GAUS_ITER) { xDelete(work); - _error2_(" Max iterations exceeded for l=" << MAX_GAUS_ITER); + _error2_("Max iterations exceeded for l=" << MAX_GAUS_ITER); } } Index: /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp (revision 12495) @@ -53,5 +53,5 @@ 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:*/ Index: /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 12494) +++ /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 12495) @@ -135,5 +135,5 @@ 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; Index: /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 12494) +++ /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 12495) @@ -29,5 +29,5 @@ if(direction_enum==IuToExtEnum) for(i=0;i