Changeset 13036


Ignore:
Timestamp:
08/14/12 16:58:21 (13 years ago)
Author:
Mathieu Morlighem
Message:

CHG: renaming _error2_ _error_

Location:
issm/trunk-jpl/src
Files:
282 edited

Legend:

Unmodified
Added
Removed

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

    r12832 r13036  
    133133        vector<Object*>::iterator object;
    134134
    135         if(this==NULL)_error2_("trying to echo a NULL dataset");
     135        if(this==NULL)_error_("trying to echo a NULL dataset");
    136136
    137137        _pprintLine_("DataSet echo: " << objects.size() << " objects");
    … …  
    150150        vector<Object*>::iterator object;
    151151
    152         if(this==NULL)_error2_("trying to echo a NULL dataset");
     152        if(this==NULL)_error_("trying to echo a NULL dataset");
    153153
    154154        _pprintLine_("DataSet echo: " << objects.size() << " objects");
    … …  
    194194
    195195        _assert_(this);
    196         if(!sorted)_error2_("trying to binary search on a non-sorted dataset!");
     196        if(!sorted)_error_("trying to binary search on a non-sorted dataset!");
    197197
    198198        /*Carry out a binary search on the sorted_ids: */
    199199        if(!binary_search(&id_offset,eid, sorted_ids,objects.size())){
    200                 _error2_("could not find object with id " << eid << " in DataSet " << EnumToStringx(enum_type));
     200                _error_("could not find object with id " << eid << " in DataSet " << EnumToStringx(enum_type));
    201201        }
    202202
    … …  
    259259        /*Only sort if we are not already sorted: */
    260260        if(!sorted){
    261                 _error2_("not implemented yet!");
    262         }
    263 }
    264 /*}}}*/
     261                _error_("not implemented yet!");
     262        }
     263}
     264/*}}}*/

  • issm/trunk-jpl/src/c/Container/Elements.cpp

    r12704 r13036  
    203203                /*see what the first element of this partition has in stock (this is common to all partitions)*/
    204204                if(my_rank==minrank){
    205                         if(this->Size()==0) _error2_("Cannot write results because there is no element??");
     205                        if(this->Size()==0) _error_("Cannot write results because there is no element??");
    206206                        Element* element=(Element*)this->GetObjectByOffset(0);
    207207                        element->ListResultsInfo(&resultsenums,&resultssizes,&resultstimes,&resultssteps,&numberofresults);
    … …  
    232232                        if(resultssizes[i]==P1Enum)      vectorsize=numberofvertices;
    233233                        else if(resultssizes[i]==P0Enum) vectorsize=numberofelements;
    234                         else _error2_("Unkown result size: " << EnumToStringx(resultssizes[i]));
     234                        else _error_("Unkown result size: " << EnumToStringx(resultssizes[i]));
    235235                        vector=new Vector(vectorsize);
    236236

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

    r12495 r13036  
    5757                /*we could not find an input with the correct enum type. No defaults values were provided,
    5858                 * error out: */
    59                 _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
     59                _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
    6060        }
    6161
    … …  
    8585                /*we could not find an input with the correct enum type. No defaults values were provided,
    8686                 * error out: */
    87                 _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
     87                _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
    8888        }
    8989
    … …  
    113113                /*we could not find an input with the correct enum type. No defaults values were provided,
    114114                 * error out: */
    115                 _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
     115                _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
    116116        }
    117117
    … …  
    141141                /*we could not find an input with the correct enum type. No defaults values were provided,
    142142                 * error out: */
    143                 _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
     143                _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
    144144        }
    145145
    … …  
    213213
    214214        /*some checks: */
    215         if(!constrain_input) _error2_("input " << EnumToStringx(constrain_enum) << " could not be found!");
     215        if(!constrain_input) _error_("input " << EnumToStringx(constrain_enum) << " could not be found!");
    216216
    217217        /*Apply ContrainMin: */
    … …  
    254254        }
    255255        else{
    256                 _error2_("Input " << EnumToStringx(enumtype) << " not found");
     256                _error_("Input " << EnumToStringx(enumtype) << " not found");
    257257        }
    258258
    … …  
    275275        }
    276276        else{
    277                 _error2_("Input " << EnumToStringx(enumtype) << " not found");
     277                _error_("Input " << EnumToStringx(enumtype) << " not found");
    278278        }
    279279
    … …  
    296296        }
    297297        else{
    298                 _error2_("Input " << EnumToStringx(enumtype) << " not found");
     298                _error_("Input " << EnumToStringx(enumtype) << " not found");
    299299        }
    300300
    … …  
    317317        }
    318318        else{
    319                 _error2_("Input " << EnumToStringx(enumtype) << " not found");
     319                _error_("Input " << EnumToStringx(enumtype) << " not found");
    320320        }
    321321
    … …  
    369369        /*Make a copy of the original input: */
    370370        original=(Input*)this->GetInput(original_enum);
    371         if(!original)_error2_("could not find input with enum: " << EnumToStringx(original_enum));
     371        if(!original)_error_("could not find input with enum: " << EnumToStringx(original_enum));
    372372        copy=(Input*)original->copy();
    373373
    … …  
    416416
    417417        /*some checks: */
    418         if(!xinput) _error2_("input " << EnumToStringx(MeshXEnum) << " could not be found!");
    419         if(!yinput) _error2_("input " << EnumToStringx(MeshYEnum) << " could not be found!");
     418        if(!xinput) _error_("input " << EnumToStringx(MeshXEnum) << " could not be found!");
     419        if(!yinput) _error_("input " << EnumToStringx(MeshYEnum) << " could not be found!");
    420420
    421421        /*Apply AXPY: */

  • issm/trunk-jpl/src/c/Container/Observations.cpp

    r12902 r13036  
    5858        options->Get(&maxtrimming,"maxtrimming",+1.e+21);
    5959        options->Get(&minspacing,"minspacing",0.01);
    60         if(minspacing<=0) _error2_("minspacing must > 0");
     60        if(minspacing<=0) _error_("minspacing must > 0");
    6161
    6262        /*Get Minimum box size*/
    6363        if(options->GetOption("boxlength")){
    6464                options->Get(&minlength,"boxlength");
    65                 if(minlength<=0)_error2_("boxlength should be a positive number");
     65                if(minlength<=0)_error_("boxlength should be a positive number");
    6666                maxdepth=int(log(max(xmax-xmin,ymax-ymin)/minlength +1)/log(2.0));
    6767        }
    … …  
    383383        SolverxSeq(&GinvZ, Gamma,obs,n_obs);    // Gamma^-1 Z
    384384#else
    385         _error2_("GSL is required");
     385        _error_("GSL is required");
    386386#endif
    387387

  • issm/trunk-jpl/src/c/Container/Options.cpp

    r12493 r13036  
    4747
    4848        /*Also, check the option name*/
    49         if(!in_option->name) _error2_("input option has an empty name");
    50         if(strchr(in_option->name,'.')) _error2_("Option \"" << in_option->name << "\" has a protected character \".\"");
    51         if(strchr(in_option->name,'[')) _error2_("Option \"" << in_option->name << "\" has a protected character \"[\"");
    52         if(strchr(in_option->name,']')) _error2_("Option \"" << in_option->name << "\" has a protected character \"]\"");
     49        if(!in_option->name) _error_("input option has an empty name");
     50        if(strchr(in_option->name,'.')) _error_("Option \"" << in_option->name << "\" has a protected character \".\"");
     51        if(strchr(in_option->name,'[')) _error_("Option \"" << in_option->name << "\" has a protected character \"[\"");
     52        if(strchr(in_option->name,']')) _error_("Option \"" << in_option->name << "\" has a protected character \"]\"");
    5353
    5454        /*Finally, check that no option of the same name already exists in the dataset*/
    … …  
    5757                option=(Option*)(*object);
    5858                if (!strcmp(option->name,in_option->name)){
    59                         _error2_("Options \"" << in_option->name << "\" found multiple times");
     59                        _error_("Options \"" << in_option->name << "\" found multiple times");
    6060                        break;
    6161                }
    … …  
    8383        /*Else, the Option does not exist, no default provided*/
    8484        else{
    85                 _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
     85                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
    8686        }
    8787}
    … …  
    121121        /*Else, the Option does not exist, no default provided*/
    122122        else{
    123                 _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
     123                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
    124124        }
    125125}
    … …  
    159159        /*Else, the Option does not exist, no default provided*/
    160160        else{
    161                 _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
     161                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
    162162        }
    163163}
    … …  
    199199        /*Else, the Option does not exist, no default provided*/
    200200        else{
    201                 _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
     201                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
    202202        }
    203203
    … …  
    264264                /*Else: not supported*/
    265265                else{
    266                         _error2_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
     266                        _error_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
    267267                }
    268268        }
    … …  
    290290        /*Else, the Option does not exist, no default provided*/
    291291        else{
    292                 _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
     292                _error_("option of name \"" << name << "\" not found, and no default value has been provided");
    293293        }
    294294}
    … …  
    324324                                /*Else: not supported*/
    325325                                else{
    326                                         _error2_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
     326                                        _error_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
    327327                                }
    328328                        }

  • issm/trunk-jpl/src/c/Container/Parameters.cpp

    r12746 r13036  
    6565                }
    6666        }
    67         _error2_("could not find parameter " << EnumToStringx(enum_type));
     67        _error_("could not find parameter " << EnumToStringx(enum_type));
    6868}
    6969/*}}}*/
    … …  
    8282                }
    8383        }
    84         _error2_("could not find parameter " << EnumToStringx(enum_type));
     84        _error_("could not find parameter " << EnumToStringx(enum_type));
    8585}
    8686/*}}}*/
    … …  
    9999                }
    100100        }
    101         _error2_("could not find parameter " << EnumToStringx(enum_type));
     101        _error_("could not find parameter " << EnumToStringx(enum_type));
    102102}
    103103/*}}}*/
    … …  
    116116                }
    117117        }
    118         _error2_("could not find parameter " << EnumToStringx(enum_type));
     118        _error_("could not find parameter " << EnumToStringx(enum_type));
    119119}
    120120/*}}}*/
    … …  
    133133                }
    134134        }
    135         _error2_("could not find parameter " << EnumToStringx(enum_type));
     135        _error_("could not find parameter " << EnumToStringx(enum_type));
    136136
    137137}
    … …  
    151151                }
    152152        }
    153         _error2_("could not find parameter " << EnumToStringx(enum_type));
     153        _error_("could not find parameter " << EnumToStringx(enum_type));
    154154
    155155}
    … …  
    169169                }
    170170        }
    171         _error2_("could not find parameter " << EnumToStringx(enum_type));
     171        _error_("could not find parameter " << EnumToStringx(enum_type));
    172172
    173173}
    … …  
    187187                }
    188188        }
    189         _error2_("could not find parameter " << EnumToStringx(enum_type));
     189        _error_("could not find parameter " << EnumToStringx(enum_type));
    190190
    191191}
    … …  
    205205                }
    206206        }
    207         _error2_("could not find parameter " << EnumToStringx(enum_type));
     207        _error_("could not find parameter " << EnumToStringx(enum_type));
    208208
    209209}
    … …  
    223223                }
    224224        }
    225         _error2_("could not find parameter " << EnumToStringx(enum_type));
     225        _error_("could not find parameter " << EnumToStringx(enum_type));
    226226
    227227}
    … …  
    241241                }
    242242        }
    243         _error2_("could not find parameter " << EnumToStringx(enum_type));
     243        _error_("could not find parameter " << EnumToStringx(enum_type));
    244244}
    245245/*}}}*/
    … …  
    258258                }
    259259        }
    260         _error2_("could not find parameter " << EnumToStringx(enum_type));
     260        _error_("could not find parameter " << EnumToStringx(enum_type));
    261261
    262262}
    … …  
    276276                }
    277277        }
    278         _error2_("could not find parameter " << EnumToStringx(enum_type));
     278        _error_("could not find parameter " << EnumToStringx(enum_type));
    279279
    280280}
    … …  
    294294                }
    295295        }
    296         _error2_("could not find parameter " << EnumToStringx(enum_type));
     296        _error_("could not find parameter " << EnumToStringx(enum_type));
    297297}
    298298/*}}}*/

  • issm/trunk-jpl/src/c/classes/DofIndexing.cpp

    r12832 r13036  
    143143                else this->sdoflist=NULL;
    144144        }
    145         else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     145        else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    146146}
    147147/*}}}*/

  • issm/trunk-jpl/src/c/classes/FemModel.cpp

    r12832 r13036  
    129129        }
    130130        if(found!=-1) analysis_counter=found;
    131         else _error2_("Could not find alias for analysis_type " << EnumToStringx(configuration_type) << " in list of FemModel analyses");
     131        else _error_("Could not find alias for analysis_type " << EnumToStringx(configuration_type) << " in list of FemModel analyses");
    132132
    133133        /*Now, plug analysis_counter and analysis_type inside the parameters: */

  • issm/trunk-jpl/src/c/classes/Hook.cpp

    r12832 r13036  
    185185                        this->objects[i]=(Object*)dataset->GetObjectById(this->offsets+i,this->ids[i]); //remember the offset for later on.
    186186                        /*check the id is correct!: */
    187                         if (this->objects[i]->Id()!=this->ids[i]) _error2_("wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << "  in resolved pointer!");
     187                        if (this->objects[i]->Id()!=this->ids[i]) _error_("wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << "  in resolved pointer!");
    188188                }
    189189        }
    … …  
    194194       
    195195        /*first, check that we only have one T object in our object list: */
    196         if (this->num!=1) _error2_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n");
     196        if (this->num!=1) _error_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n");
    197197
    198198        /*check NULL: */
    199         if (this->objects==NULL) _error2_("hook is not pointing to any object, objects pointer is NULL");
     199        if (this->objects==NULL) _error_("hook is not pointing to any object, objects pointer is NULL");
    200200
    201201        return *objects;
    … …  
    246246
    247247        /*Else, check that we are requesting a half of num*/
    248         if (numindices>this->num) _error2_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects");
     248        if (numindices>this->num) _error_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects");
    249249
    250250        /*go pickup the correct objects, ids and offsets :*/
    251251        output->num=numindices;
    252         if(output->num<1) _error2_("Trying to spawn an empty ElementProperties!");
     252        if(output->num<1) _error_("Trying to spawn an empty ElementProperties!");
    253253
    254254        output->objects=xNew<Object*>(output->num);

  • issm/trunk-jpl/src/c/classes/IoModel.cpp

    r12832 r13036  
    110110                /*Get first Enum*/
    111111                if(fread(&record_enum,sizeof(int),1,this->fid)==0){
    112                         _error2_("Marshalled file is empty");
     112                        _error_("Marshalled file is empty");
    113113                }
    114114                else{
    … …  
    128128                                _printLine_("=========================================================================");
    129129                                _printLine_("");
    130                                 _error2_("Enums not consistent (See error message above)");
     130                                _error_("Enums not consistent (See error message above)");
    131131                        }
    132132                }
    … …  
    177177        /*Find constant*/
    178178        Param* param=(Param*)this->constants->FindParamObject(constant_enum);
    179         if(!param) _error2_("Constant " << EnumToStringx(constant_enum) << " not found in iomodel");
     179        if(!param) _error_("Constant " << EnumToStringx(constant_enum) << " not found in iomodel");
    180180
    181181        return (Param*)param->copy();
    … …  
    266266                                        case 1:
    267267                                                /*Read the boolean and broadcast it to other cpus:*/
    268                                                 if(fread(&booleanint,sizeof(int),1,this->fid)!=1) _error2_("could not read boolean ");
     268                                                if(fread(&booleanint,sizeof(int),1,this->fid)!=1) _error_("could not read boolean ");
    269269                                                #ifdef _HAVE_MPI_
    270270                                                MPI_Bcast(&booleanint,1,MPI_INT,0,MPI_COMM_WORLD);
    … …  
    277277                                        case 2:
    278278                                                /*Read the integer and broadcast it to other cpus:*/
    279                                                 if(fread(&integer,sizeof(int),1,this->fid)!=1) _error2_("could not read integer ");
     279                                                if(fread(&integer,sizeof(int),1,this->fid)!=1) _error_("could not read integer ");
    280280                                                #ifdef _HAVE_MPI_
    281281                                                MPI_Bcast(&integer,1,MPI_INT,0,MPI_COMM_WORLD);
    … …  
    288288                                        case 3:
    289289                                                /*Read the scalar and broadcast it to other cpus:*/
    290                                                 if(fread(&scalar,sizeof(IssmPDouble),1,this->fid)!=1) _error2_("could not read scalar ");
     290                                                if(fread(&scalar,sizeof(IssmPDouble),1,this->fid)!=1) _error_("could not read scalar ");
    291291                                                #ifdef _HAVE_MPI_
    292292                                                MPI_Bcast(&scalar,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
    … …  
    299299                                        case 4:
    300300                                                /*We have to read a string from disk. First read the dimensions of the string, then the string: */
    301                                                 if(fread(&string_size,sizeof(int),1,this->fid)!=1) _error2_("could not read length of string ");
     301                                                if(fread(&string_size,sizeof(int),1,this->fid)!=1) _error_("could not read length of string ");
    302302                                                #ifdef _HAVE_MPI_
    303303                                                MPI_Bcast(&string_size,1,MPI_INT,0,MPI_COMM_WORLD);
    … …  
    309309
    310310                                                        /*Read string, then broadcast: */
    311                                                         if(fread(string,string_size*sizeof(char),1,this->fid)!=1)_error2_(" could not read string ");
     311                                                        if(fread(string,string_size*sizeof(char),1,this->fid)!=1)_error_(" could not read string ");
    312312                                                        #ifdef _HAVE_MPI_
    313313                                                        MPI_Bcast(string,string_size,MPI_CHAR,0,MPI_COMM_WORLD);
    … …  
    360360
    361361                                        default:
    362                                                 _error2_("unknown record type:" << record_code);
     362                                                _error_("unknown record type:" << record_code);
    363363                                                break;;
    364364                                }
    … …  
    428428
    429429                                default:
    430                                         _error2_("unknown record type:" << record_code);
     430                                        _error_("unknown record type:" << record_code);
    431431                                        break;;
    432432                                }
    … …  
    453453        fid=this->SetFilePointerToData(&code,NULL,data_enum);
    454454
    455         if(code!=1)_error2_("expecting a boolean for enum " << EnumToStringx(data_enum));
     455        if(code!=1)_error_("expecting a boolean for enum " << EnumToStringx(data_enum));
    456456       
    457457        /*We have to read a boolean from disk. */
    458458        if(my_rank==0){ 
    459                 if(fread(&booleanint,sizeof(int),1,fid)!=1) _error2_("could not read boolean ");
     459                if(fread(&booleanint,sizeof(int),1,fid)!=1) _error_("could not read boolean ");
    460460        }
    461461        #ifdef _HAVE_MPI_
    … …  
    482482        fid=this->SetFilePointerToData(&code,NULL,data_enum);
    483483       
    484         if(code!=2)_error2_("expecting an integer for enum " << EnumToStringx(data_enum));
     484        if(code!=2)_error_("expecting an integer for enum " << EnumToStringx(data_enum));
    485485       
    486486        /*We have to read a integer from disk. First read the dimensions of the integer, then the integer: */
    487487        if(my_rank==0){ 
    488                 if(fread(&integer,sizeof(int),1,fid)!=1) _error2_("could not read integer ");
     488                if(fread(&integer,sizeof(int),1,fid)!=1) _error_("could not read integer ");
    489489        }
    490490
    … …  
    512512        fid=this->SetFilePointerToData(&code,NULL,data_enum);
    513513       
    514         if(code!=3)_error2_("expecting a IssmDouble for enum " << EnumToStringx(data_enum));
     514        if(code!=3)_error_("expecting a IssmDouble for enum " << EnumToStringx(data_enum));
    515515       
    516516        /*We have to read a scalar from disk. First read the dimensions of the scalar, then the scalar: */
    517517        if(my_rank==0){
    518                 if(fread(&scalar,sizeof(IssmPDouble),1,fid)!=1)_error2_("could not read scalar ");
     518                if(fread(&scalar,sizeof(IssmPDouble),1,fid)!=1)_error_("could not read scalar ");
    519519        }
    520520        #ifdef _HAVE_MPI_
    … …  
    542542        fid=this->SetFilePointerToData(&code,NULL,data_enum);
    543543       
    544         if(code!=4)_error2_("expecting a string for enum " << EnumToStringx(data_enum));
     544        if(code!=4)_error_("expecting a string for enum " << EnumToStringx(data_enum));
    545545       
    546546        /*Now fetch: */
    … …  
    548548        /*We have to read a string from disk. First read the dimensions of the string, then the string: */
    549549        if(my_rank==0){ 
    550                 if(fread(&string_size,sizeof(int),1,fid)!=1) _error2_("could not read length of string ");
     550                if(fread(&string_size,sizeof(int),1,fid)!=1) _error_("could not read length of string ");
    551551        }
    552552
    … …  
    562562                /*Read string on node 0, then broadcast: */
    563563                if(my_rank==0){ 
    564                         if(fread(string,string_size*sizeof(char),1,fid)!=1)_error2_(" could not read string ");
     564                        if(fread(string,string_size*sizeof(char),1,fid)!=1)_error_(" could not read string ");
    565565                }
    566566                #ifdef _HAVE_MPI_
    … …  
    596596        fid=this->SetFilePointerToData(&code,&vector_type,data_enum);
    597597
    598         if((code!=5) && (code!=6) && (code!=7))_error2_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
     598        if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
    599599       
    600600        /*Now fetch: */
    … …  
    603603        /*numberofelements: */
    604604        if(my_rank==0){ 
    605                 if(fread(&M,sizeof(int),1,fid)!=1) _error2_("could not read number of rows for matrix ");
     605                if(fread(&M,sizeof(int),1,fid)!=1) _error_("could not read number of rows for matrix ");
    606606        }
    607607
    … …  
    611611
    612612        if(my_rank==0){ 
    613                 if(fread(&N,sizeof(int),1,fid)!=1) _error2_("could not read number of columns for matrix ");
     613                if(fread(&N,sizeof(int),1,fid)!=1) _error_("could not read number of columns for matrix ");
    614614        }
    615615        #ifdef _HAVE_MPI_
    … …  
    623623                /*Read matrix on node 0, then broadcast: */
    624624                if(my_rank==0){ 
    625                         if(fread(matrix,M*N*sizeof(IssmPDouble),1,fid)!=1) _error2_("could not read matrix ");
     625                        if(fread(matrix,M*N*sizeof(IssmPDouble),1,fid)!=1) _error_("could not read matrix ");
    626626                }
    627627               
    … …  
    667667        /*Set file pointer to beginning of the data: */
    668668        fid=this->SetFilePointerToData(&code,&vector_type,data_enum);
    669         if((code!=5) && (code!=6) && (code!=7))_error2_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
     669        if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
    670670       
    671671        /*Now fetch: */
    … …  
    674674        /*numberofelements: */
    675675        if(my_rank==0){ 
    676                 if(fread(&M,sizeof(int),1,fid)!=1) _error2_("could not read number of rows for matrix ");
     676                if(fread(&M,sizeof(int),1,fid)!=1) _error_("could not read number of rows for matrix ");
    677677        }
    678678        #ifdef _HAVE_MPI_
    … …  
    681681
    682682        if(my_rank==0){ 
    683                 if(fread(&N,sizeof(int),1,fid)!=1) _error2_("could not read number of columns for matrix ");
     683                if(fread(&N,sizeof(int),1,fid)!=1) _error_("could not read number of columns for matrix ");
    684684        }
    685685        #ifdef _HAVE_MPI_
    … …  
    693693                /*Read matrix on node 0, then broadcast: */
    694694                if(my_rank==0){ 
    695                         if(fread(matrix,M*N*sizeof(IssmPDouble),1,fid)!=1) _error2_("could not read matrix ");
     695                        if(fread(matrix,M*N*sizeof(IssmPDouble),1,fid)!=1) _error_("could not read matrix ");
    696696                }
    697697                #ifdef _HAVE_MPI_
    … …  
    729729        fid=this->SetFilePointerToData(&code,NULL,data_enum);
    730730       
    731         if(code!=9)_error2_("expecting a string array for enum " << EnumToStringx(data_enum));
     731        if(code!=9)_error_("expecting a string array for enum " << EnumToStringx(data_enum));
    732732       
    733733        /*We have to read a bunch of strings from disk. First read the number of strings, and allocate: */
    734734        if(my_rank==0){ 
    735                 if(fread(&numstrings,sizeof(int),1,fid)!=1) _error2_("could not read length of string array");
     735                if(fread(&numstrings,sizeof(int),1,fid)!=1) _error_("could not read length of string array");
    736736        }
    737737        #ifdef _HAVE_MPI_
    … …  
    748748                       
    749749                        if(my_rank==0){ 
    750                                 if(fread(&string_size,sizeof(int),1,fid)!=1) _error2_("could not read length of string ");
     750                                if(fread(&string_size,sizeof(int),1,fid)!=1) _error_("could not read length of string ");
    751751                        }
    752752                        #ifdef _HAVE_MPI_
    … …  
    759759                                /*Read string on node 0, then broadcast: */
    760760                                if(my_rank==0){ 
    761                                         if(fread(string,string_size*sizeof(char),1,fid)!=1)_error2_(" could not read string ");
     761                                        if(fread(string,string_size*sizeof(char),1,fid)!=1)_error_(" could not read string ");
    762762                                }
    763763                                #ifdef _HAVE_MPI_
    … …  
    800800        /*Set file pointer to beginning of the data: */
    801801        fid=this->SetFilePointerToData(&code,NULL,data_enum);
    802         if(code!=8)_error2_("expecting a IssmDouble mat array for enum " << EnumToStringx(data_enum));
     802        if(code!=8)_error_("expecting a IssmDouble mat array for enum " << EnumToStringx(data_enum));
    803803       
    804804        /*Now fetch: */
    805805        if(my_rank==0){ 
    806                 if(fread(&numrecords,sizeof(int),1,fid)!=1) _error2_("could not read number of records in matrix array ");
     806                if(fread(&numrecords,sizeof(int),1,fid)!=1) _error_("could not read number of records in matrix array ");
    807807        }
    808808        #ifdef _HAVE_MPI_
    … …  
    827827
    828828                        if(my_rank==0){ 
    829                                 if(fread(&M,sizeof(int),1,fid)!=1) _error2_("could not read number of rows in " << i << "th matrix of matrix array");
     829                                if(fread(&M,sizeof(int),1,fid)!=1) _error_("could not read number of rows in " << i << "th matrix of matrix array");
    830830                        }
    831831                        #ifdef _HAVE_MPI_
    … …  
    834834
    835835                        if(my_rank==0){ 
    836                                 if(fread(&N,sizeof(int),1,fid)!=1) _error2_("could not read number of columns in " << i << "th matrix of matrix array");
     836                                if(fread(&N,sizeof(int),1,fid)!=1) _error_("could not read number of columns in " << i << "th matrix of matrix array");
    837837                        }
    838838                        #ifdef _HAVE_MPI_
    … …  
    846846                                /*Read matrix on node 0, then broadcast: */
    847847                                if(my_rank==0){ 
    848                                         if(fread(matrix,M*N*sizeof(IssmPDouble),1,fid)!=1) _error2_("could not read matrix ");
     848                                        if(fread(matrix,M*N*sizeof(IssmPDouble),1,fid)!=1) _error_("could not read matrix ");
    849849                                }
    850850
    … …  
    912912                          }
    913913                default:
    914                           _error2_("Option of format " << code << " not supported yet");
     914                          _error_("Option of format " << code << " not supported yet");
    915915        }
    916916
    … …  
    941941                _assert_(dataenum<MaximumNumberOfEnums);
    942942                if(this->data[dataenum]){
    943                         _error2_("Info: trying to fetch " << EnumToStringx(dataenum) << " but previous pointer has not been freed (DeleteData has not been called)");
     943                        _error_("Info: trying to fetch " << EnumToStringx(dataenum) << " but previous pointer has not been freed (DeleteData has not been called)");
    944944                }
    945945                #endif
    … …  
    11411141                        break; /*}}}*/
    11421142                default: /*{{{*/
    1143                         _error2_("data code " << code << " not supported yet!");
     1143                        _error_("data code " << code << " not supported yet!");
    11441144                        break;
    11451145                        /*}}}*/
    … …  
    12321232#ifdef _HAVE_MPI_
    12331233        MPI_Bcast(&found,1,MPI_INT,0,MPI_COMM_WORLD);
    1234         if(!found)_error2_("could not find data with name" << " " << EnumToStringx(data_enum) << " ");
     1234        if(!found)_error_("could not find data with name" << " " << EnumToStringx(data_enum) << " ");
    12351235#endif
    12361236

  • issm/trunk-jpl/src/c/classes/bamg/BamgOpts.cpp

    r12821 r13036  
    6060        int i;
    6161
    62         if (this->anisomax<1) _error2_("'anisomax' option should be >=1");
    63         if (this->coeff==0) _error2_("'coeff' should be positive");
    64         if (this->errg<0) _error2_("'errg' option should be >0");
    65         if (this->gradation<1) _error2_("'gradation' option should be >=1");
    66         if (this->Hessiantype!=0  && this->Hessiantype!=1) _error2_("'Hessiantype' supported options are 0 and 1");
    67         if (this->maxnbv<3) _error2_("'maxnbv' option should be >3");
    68         if (this->maxsubdiv<=1) _error2_("'maxsubdiv' should be >1");
    69         if (this->Metrictype!=0   && this->Metrictype!=1 && this->Metrictype!=2) _error2_("'Metrictype' supported options are 0, 1 and 2");
    70         if (this->nbjacobi<=0) _error2_("'nbjacobi' option should be >0");
    71         if (this->nbsmooth<=0) _error2_("'nbsmooth' option should be >0");
     62        if (this->anisomax<1) _error_("'anisomax' option should be >=1");
     63        if (this->coeff==0) _error_("'coeff' should be positive");
     64        if (this->errg<0) _error_("'errg' option should be >0");
     65        if (this->gradation<1) _error_("'gradation' option should be >=1");
     66        if (this->Hessiantype!=0  && this->Hessiantype!=1) _error_("'Hessiantype' supported options are 0 and 1");
     67        if (this->maxnbv<3) _error_("'maxnbv' option should be >3");
     68        if (this->maxsubdiv<=1) _error_("'maxsubdiv' should be >1");
     69        if (this->Metrictype!=0   && this->Metrictype!=1 && this->Metrictype!=2) _error_("'Metrictype' supported options are 0, 1 and 2");
     70        if (this->nbjacobi<=0) _error_("'nbjacobi' option should be >0");
     71        if (this->nbsmooth<=0) _error_("'nbsmooth' option should be >0");
    7272
    73         if (this->Crack!=0  && this->Crack!=1) _error2_("'Crack' supported options are 0 and 1");
    74         if (this->KeepVertices!=0 && this->KeepVertices!=1) _error2_("'KeepVertices' supported options are 0 and 1");
    75         if (this->geometricalmetric!=0  && this->geometricalmetric!=1) _error2_("'geometricalmetric' supported options are 0 and 1");
     73        if (this->Crack!=0  && this->Crack!=1) _error_("'Crack' supported options are 0 and 1");
     74        if (this->KeepVertices!=0 && this->KeepVertices!=1) _error_("'KeepVertices' supported options are 0 and 1");
     75        if (this->geometricalmetric!=0  && this->geometricalmetric!=1) _error_("'geometricalmetric' supported options are 0 and 1");
    7676
    77         if (this->hmin<=0) _error2_("'hmin' option should be >0");
    78         if (this->hmax<=0 || this->hmax<this->hmin) _error2_("'hmax' option should be between 0 and hmin=" << this->hmin);
    79         if (this->hminVertices && this->hminVerticesSize[1]!=1) _error2_("'hminVertices' should be a column");
    80         if (this->hmaxVertices && this->hmaxVerticesSize[1]!=1) _error2_("'hmaxVertices' should be a column");
    81         if (this->hVertices && this->hVerticesSize[1]!=1) _error2_("'hVertices' should be a column");
    82         if (this->metric && (this->metricSize[1]!=1 && this->metricSize[1]!=3)) _error2_("'metric' should have either 1 (iso) or 3 (aniso) columns.");
     77        if (this->hmin<=0) _error_("'hmin' option should be >0");
     78        if (this->hmax<=0 || this->hmax<this->hmin) _error_("'hmax' option should be between 0 and hmin=" << this->hmin);
     79        if (this->hminVertices && this->hminVerticesSize[1]!=1) _error_("'hminVertices' should be a column");
     80        if (this->hmaxVertices && this->hmaxVerticesSize[1]!=1) _error_("'hmaxVertices' should be a column");
     81        if (this->hVertices && this->hVerticesSize[1]!=1) _error_("'hVertices' should be a column");
     82        if (this->metric && (this->metricSize[1]!=1 && this->metricSize[1]!=3)) _error_("'metric' should have either 1 (iso) or 3 (aniso) columns.");
    8383        if (this->field){
    84                 if (this->errSize[0]!=1 || this->errSize[1]!=this->fieldSize[1]) _error2_("'err' should be of size " << 1 << " x " << this->fieldSize[1]);
    85                 for (i=0;i<this->fieldSize[1];i++) {if (this->err[i]<=0) _error2_("'err' option should be >0");};
     84                if (this->errSize[0]!=1 || this->errSize[1]!=this->fieldSize[1]) _error_("'err' should be of size " << 1 << " x " << this->fieldSize[1]);
     85                for (i=0;i<this->fieldSize[1];i++) {if (this->err[i]<=0) _error_("'err' option should be >0");};
    8686        }
    8787

  • issm/trunk-jpl/src/c/classes/bamg/BamgQuadtree.h

    r12835 r13036  
    3131                                        };
    3232                                        /*Object functions*/
    33                                         void    Echo()       {_error2_("not implemented yet"); };
    34                                         void    DeepEcho()   {_error2_("not implemented yet"); };
    35                                         int     Id()         {_error2_("not implemented yet"); };
    36                                         int     MyRank()     {_error2_("not implemented yet"); };
    37                                         int     ObjectEnum() {_error2_("not implemented yet"); };
    38                                         Object *copy()       {_error2_("not implemented yet"); };
     33                                        void    Echo()       {_error_("not implemented yet"); };
     34                                        void    DeepEcho()   {_error_("not implemented yet"); };
     35                                        int     Id()         {_error_("not implemented yet"); };
     36                                        int     MyRank()     {_error_("not implemented yet"); };
     37                                        int     ObjectEnum() {_error_("not implemented yet"); };
     38                                        Object *copy()       {_error_("not implemented yet"); };
    3939                        };
    4040

  • issm/trunk-jpl/src/c/classes/bamg/BamgVertex.cpp

    r12821 r13036  
    7676                }
    7777                else{
    78                         _error2_("Metrictype " << Metrictype << " not supported yet (use 0,1 or 2(default))");
     78                        _error_("Metrictype " << Metrictype << " not supported yet (use 0,1 or 2(default))");
    7979                }
    8080
    … …  
    146146                        j = NextEdge[jc];
    147147                        if (k>=2000){
    148                                 _error2_("k>=2000 (Maximum number of iterations reached)");
     148                                _error_("k>=2000 (Maximum number of iterations reached)");
    149149                        }
    150150                } while ( tbegin != tria);
    … …  
    213213                                j = NextEdge[jc];
    214214                                if (k>=2000){
    215                                         _error2_("k>=2000");
     215                                        _error_("k>=2000");
    216216                                }
    217217                        }while ( tbegin != tria);

  • issm/trunk-jpl/src/c/classes/bamg/Edge.cpp

    r12821 r13036  
    4545
    4646                /*some shecks*/
    47                 if (!(adj[0]==&e || adj[1]==&e)){ _error2_("Intersection bug"); }
     47                if (!(adj[0]==&e || adj[1]==&e)){ _error_("Intersection bug"); }
    4848                _assert_(adj[0]==&e || adj[1]==&e);
    4949

  • issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp

    r12821 r13036  
    7676
    7777                //some checks
    78                 if (bamggeom->Vertices==NULL) _error2_("the domain provided does not contain any vertex");
    79                 if (bamggeom->Edges==NULL) _error2_("the domain provided does not contain any edge");
     78                if (bamggeom->Vertices==NULL) _error_("the domain provided does not contain any vertex");
     79                if (bamggeom->Edges==NULL) _error_("the domain provided does not contain any edge");
    8080
    8181                //Vertices
    8282                if (bamggeom->Vertices){
    8383                        if(verbose>5) _printLine_("      processing Vertices");
    84                         if (bamggeom->VerticesSize[1]!=3) _error2_("Vertices should have 3 columns");
     84                        if (bamggeom->VerticesSize[1]!=3) _error_("Vertices should have 3 columns");
    8585                        vertices = new GeomVertex[nbv];
    8686                        for (i=0;i<nbv;i++) {
    … …  
    115115                         */
    116116                        coefIcoor=(MaxICoor)/(Max(pmax.x-pmin.x,pmax.y-pmin.y));
    117                         if(coefIcoor<=0) _error2_("coefIcoor should be positive");
     117                        if(coefIcoor<=0) _error_("coefIcoor should be positive");
    118118                }
    119119                else{
    120                         _error2_("No BamgVertex provided");
     120                        _error_("No BamgVertex provided");
    121121                }
    122122
    … …  
    127127
    128128                        if(verbose>5) _printLine_("      processing Edges");
    129                         if (bamggeom->EdgesSize[1]!=3) _error2_("Edges should have 3 columns");
     129                        if (bamggeom->EdgesSize[1]!=3) _error_("Edges should have 3 columns");
    130130                        edges = new GeomEdge[nbe];
    131131
    … …  
    176176                }
    177177                else{
    178                         _error2_("No edges provided");
     178                        _error_("No edges provided");
    179179                }
    180180
    … …  
    206206                if (bamggeom->TangentAtEdges){
    207207                        if(verbose>5) _printString_("      processing TangentAtEdges");
    208                         if (bamggeom->TangentAtEdgesSize[1]!=4) _error2_("TangentAtEdges should have 4 columns");
     208                        if (bamggeom->TangentAtEdgesSize[1]!=4) _error_("TangentAtEdges should have 4 columns");
    209209                        int n,i,j,k;
    210210                        R2 tg;
    … …  
    216216                                tg.x=bamggeom->TangentAtEdges[k*4+2];
    217217                                tg.y=bamggeom->TangentAtEdges[k*4+3];
    218                                 if (i<0 || i>=nbe) _error2_("TangentAtEdges first index exceeds matrix dimension");
    219                                 if (j!=0 && j!=1)  _error2_("TangentAtEdges second index should be 1 or 2 only");
     218                                if (i<0 || i>=nbe) _error_("TangentAtEdges first index exceeds matrix dimension");
     219                                if (j!=0 && j!=1)  _error_("TangentAtEdges second index should be 1 or 2 only");
    220220                                edges[i].tg[j] = tg;
    221221                        }
    … …  
    225225                if(bamggeom->Corners){
    226226                        if(verbose>5) _printString_("      processing Corners");
    227                         if (bamggeom->CornersSize[1]!=1) _error2_("Corners should have 1 column");
     227                        if (bamggeom->CornersSize[1]!=1) _error_("Corners should have 1 column");
    228228                        n=bamggeom->CornersSize[0];
    229229                        for (i=0;i<n;i++) {     
    230230                                j=(int)bamggeom->Corners[i]-1; //for C indexing
    231                                 if (j>nbv-1 || j<0) _error2_("Bad corner definition: should in [0 " << nbv << "]");
     231                                if (j>nbv-1 || j<0) _error_("Bad corner definition: should in [0 " << nbv << "]");
    232232                                /*Required => at the same time SetRequired and SetCorner*/
    233233                                vertices[j].SetCorner();
    … …  
    239239                if(bamggeom->RequiredVertices){
    240240                        if(verbose>5) _printLine_("      processing RequiredVertices");
    241                         if (bamggeom->RequiredVerticesSize[1]!=1) _error2_("RequiredVertices should have 1 column");
     241                        if (bamggeom->RequiredVerticesSize[1]!=1) _error_("RequiredVertices should have 1 column");
    242242                        n=bamggeom->RequiredVerticesSize[0];
    243243                        for (i=0;i<n;i++) {     
    244244                                j=(int)bamggeom->RequiredVertices[i]-1; //for C indexing
    245                                 if (j>nbv-1 || j<0) _error2_("Bad RequiredVerticess  definition: should in [0 " << nbv << "]");
     245                                if (j>nbv-1 || j<0) _error_("Bad RequiredVerticess  definition: should in [0 " << nbv << "]");
    246246                                vertices[j].SetRequired();
    247247                        }
    … …  
    251251                if(bamggeom->RequiredEdges){
    252252                        if(verbose>5) _printLine_("      processing RequiredEdges");
    253                         if (bamggeom->RequiredEdgesSize[1]!=1) _error2_("RequiredEdges should have 1 column");
     253                        if (bamggeom->RequiredEdgesSize[1]!=1) _error_("RequiredEdges should have 1 column");
    254254                        n=bamggeom->RequiredEdgesSize[0];
    255255                        for (i=0;i<n;i++) {     
    256256                                j=(int)bamggeom->RequiredEdges[i]-1; //for C indexing
    257                                 if (j>nbe-1 || j<0) _error2_("Bad RequiredEdges definition: should in [0 " << nbe << "]");
     257                                if (j>nbe-1 || j<0) _error_("Bad RequiredEdges definition: should in [0 " << nbe << "]");
    258258                                edges[j].SetRequired(); 
    259259                        }
    … …  
    263263                if(bamggeom->SubDomains){
    264264                        if(verbose>5) _printLine_("      processing SubDomains");
    265                         if (bamggeom->SubDomainsSize[1]!=4) _error2_("SubDomains should have 4 columns");
     265                        if (bamggeom->SubDomainsSize[1]!=4) _error_("SubDomains should have 4 columns");
    266266                        nbsubdomains=bamggeom->SubDomainsSize[0];
    267267                        subdomains = new GeomSubDomain[nbsubdomains];
    … …  
    271271                                i2=(int)bamggeom->SubDomains[i*4+2];
    272272                                i3=(int)bamggeom->SubDomains[i*4+3];
    273                                 if (i0!=2) _error2_("Bad Subdomain definition: first number should be 2 (for Edges)");
    274                                 if (i1>nbe || i1<=0) _error2_("Bad Subdomain definition: second number should in [1 " << nbe << "] (edge number)");
     273                                if (i0!=2) _error_("Bad Subdomain definition: first number should be 2 (for Edges)");
     274                                if (i1>nbe || i1<=0) _error_("Bad Subdomain definition: second number should in [1 " << nbe << "] (edge number)");
    275275                                subdomains[i].edge=edges + (i1-1);
    276276                                subdomains[i].direction = (int) i2;
    … …  
    532532                                delete [] head_v;
    533533                                delete [] eangle;
    534                                 _error2_("two points of the geometry are very closed to each other (see reference numbers above)");
     534                                _error_("two points of the geometry are very closed to each other (see reference numbers above)");
    535535                        }
    536536
    … …  
    610610                                delete [] head_v;
    611611                                delete [] eangle;
    612                                 _error2_("Length of edge " << i << " is 0");
     612                                _error_("Length of edge " << i << " is 0");
    613613                        }
    614614                        //compute angle in [-Pi Pi]
    … …  
    704704                                long i1 = n1/2 ,j1=n1%2;
    705705
    706                                 if( edges[i1].v[j1] != edges[i].v[j]) _error2_("Problem while processing edges: check the edge list");
     706                                if( edges[i1].v[j1] != edges[i].v[j]) _error_("Problem while processing edges: check the edge list");
    707707
    708708                                edges[i1].Adj[j1] = edges + i;
    … …  
    831831                GeomEdge* on=e.GeomEdgeHook;
    832832                if (!on){
    833                         _error2_("ProjectOnCurve error message: edge provided should be on geometry");
     833                        _error_("ProjectOnCurve error message: edge provided should be on geometry");
    834834                }
    835835                if (!e[0].GeomEdgeHook ||  !e[1].GeomEdgeHook){
    836                         _error2_("ProjectOnCurve error message: at least one of the vertex of the edge provided is not on geometry");
     836                        _error_("ProjectOnCurve error message: at least one of the vertex of the edge provided is not on geometry");
    837837                }
    838838
    … …  
    875875                                        _printLine_(" 2)  code bug : be sure that we call   Mesh::SetVertexFieldOn() before");
    876876                                        _printLine_("To solve the problem do a coarsening of the geometrical mesh or change the constant value of mxe (dangerous)");
    877                                         _error2_("see above");
     877                                        _error_("see above");
    878878                                }
    879879                                NbTry++;
    … …  
    895895                                _printLine_(" 2)  code bug : be sure that we call   Mesh::SetVertexFieldOn() before");
    896896                                _printLine_("To solve the problem do a coarsening of the geometrical mesh or change the constant value of mxe (dangerous)");
    897                                 _error2_("see above");
     897                                _error_("see above");
    898898                        }
    899899                        GeomEdge* tmpge = eg1;

  • issm/trunk-jpl/src/c/classes/bamg/ListofIntersectionTriangles.cpp

    r12821 r13036  
    3838                // check Size
    3939                if (Size<=0){
    40                         _error2_("Size<=0");
     40                        _error_("Size<=0");
    4141                }
    4242
    … …  
    268268                                k=(*t)(0) ?  ((  (*t)(1) ? ( (*t)(2) ? -1 : 2) : 1  )) : 0;
    269269                                if (k<0){
    270                                         _error2_("k<0");
     270                                        _error_("k<0");
    271271                                }
    272272                                ocut = OppositeEdge[k];
    … …  
    312312                                double dij = detj-deti;
    313313                                if (i+j+k != 0 + 1 +2){
    314                                         _error2_("i+j+k != 0 + 1 +2");
     314                                        _error_("i+j+k != 0 + 1 +2");
    315315                                }
    316316                                ba[j] =  detj/dij;
    … …  
    384384                                        }
    385385                                        else {
    386                                                 _error2_("Bug Split Edge");
     386                                                _error_("Bug Split Edge");
    387387                                        }
    388388                                }

  • issm/trunk-jpl/src/c/classes/bamg/ListofIntersectionTriangles.h

    r12821 r13036  
    3434                                        double c01=lEnd-lBegin, c0=(lEnd-s)/c01, c1=(s-lBegin)/c01;
    3535                                        if (lBegin>s || s>lEnd){
    36                                                 _error2_("lBegin>s || s>lEnd");
     36                                                _error_("lBegin>s || s>lEnd");
    3737                                        }
    3838                                        return e->F(sBegin*c0+sEnd*c1);

  • issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp

    r12934 r13036  
    117117                          delete [] kk;
    118118                          delete [] refv;
    119                           _error2_("imaxnbv != nbv");
     119                          _error_("imaxnbv != nbv");
    120120                  }
    121121                  for (i=0;i<Tho.nbt;i++)
    … …  
    128128                                if (i0<0 || i1<0 || i2<0){
    129129                                        delete [] refv;
    130                                         _error2_("i0<0 || i1<0 || i2< 0");
     130                                        _error_("i0<0 || i1<0 || i2< 0");
    131131                                }
    132132                                if (i0>=Tho.nbv || i1>=Tho.nbv || i2>=Tho.nbv){
    133                                         _error2_("i0>=Tho.nbv || i1>=Tho.nbv || i2>=Tho.nbv");
     133                                        _error_("i0>=Tho.nbv || i1>=Tho.nbv || i2>=Tho.nbv");
    134134                                }
    135135                                triangles[nbt] = Triangle(this,kk[i0],kk[i1],kk[i2]);
    … …  
    138138                          }
    139139                  if (kt!=nbt){
    140                           _error2_("kt!=nbt");
     140                          _error_("kt!=nbt");
    141141                  }
    142142                  if (nbt==0 && nbv==0) {
    143                           _error2_("All triangles have been removed");
     143                          _error_("All triangles have been removed");
    144144                  }
    145145                  delete [] kk;
    … …  
    153153
    154154                  if (!nbsubdomains){
    155                           _error2_("nbsubdomains==0");
     155                          _error_("nbsubdomains==0");
    156156                  }
    157157                  if (!subdomains[0].head || !subdomains[0].head->link){
    158                           _error2_("!subdomains[0].head || !subdomains[0].head->link");
     158                          _error_("!subdomains[0].head || !subdomains[0].head->link");
    159159                  }
    160160
    … …  
    323323                        }
    324324                }
    325                 if(isorphan) _error2_("Orphan found in mesh, see ids above");
     325                if(isorphan) _error_("Orphan found in mesh, see ids above");
    326326
    327327                /*Clean up*/
    … …  
    362362                }
    363363                else{
    364                         if(verbose>5) _error2_("no Vertices found in the initial mesh");
     364                        if(verbose>5) _error_("no Vertices found in the initial mesh");
    365365                }
    366366
    … …  
    380380                }
    381381                else{
    382                         if(verbose>5) _error2_("no Triangles found in the initial mesh");
     382                        if(verbose>5) _error_("no Triangles found in the initial mesh");
    383383                }
    384384
    … …  
    506506                                //Check value
    507507                                if(!(i>=0 && j>=0 && i<nbe && j<Gh.nbe)) {
    508                                         _error2_("ReadMesh error: EdgesOnGeomEdge edge provided (line " << i1+1 << ": [" << i+1 << " " << j+1 << "]) is incorrect (must be positive, [0<i<nbe=" << nbe << " 0<j<Gh.nbe=" << Gh.nbe << "]");
     508                                        _error_("ReadMesh error: EdgesOnGeomEdge edge provided (line " << i1+1 << ": [" << i+1 << " " << j+1 << "]) is incorrect (must be positive, [0<i<nbe=" << nbe << " 0<j<Gh.nbe=" << Gh.nbe << "]");
    509509                                }
    510510                                edges[i].GeomEdgeHook=Gh.edges+j;
    … …  
    522522                                head=(int)bamgmesh->SubDomains[i*3+1]-1;//C indexing
    523523                                direction=(int)bamgmesh->SubDomains[i*3+2];
    524                                 if (i3!=23) _error2_("Bad Subdomain definition: first number should be 3");
    525                                 if (head<0 || head>=nbt) _error2_("Bad Subdomain definition: head should in [1 " << nbt << "] (triangle number)");
     524                                if (i3!=23) _error_("Bad Subdomain definition: first number should be 3");
     525                                if (head<0 || head>=nbt) _error_("Bad Subdomain definition: head should in [1 " << nbt << "] (triangle number)");
    526526                                subdomains[i].head = triangles+head;
    527527                        }
    … …  
    567567                                for (j=0;j<3;j++){
    568568                                        int v=GetId(triangles[i][j]); //jth vertex of the ith triangle
    569                                         if (k>3*nbt-1 || k<0) _error2_("k = " << k << ", nbt = " << nbt);
     569                                        if (k>3*nbt-1 || k<0) _error_("k = " << k << ", nbt = " << nbt);
    570570                                        next_1[k]=head_1[v];
    571                                         if (v>nbv-1 || v<0)   _error2_("v = " << v << ", nbv = " << nbv);
     571                                        if (v>nbv-1 || v<0)   _error_("v = " << v << ", nbv = " << nbv);
    572572                                        head_1[v]=k++;
    573573                                        connectivitysize_1[v]+=1;
    … …  
    707707                                }
    708708                                if (!stop){
    709                                         _error2_("Element holding segment [" << i1+1 << " " << i2+1 << "] not found...");
     709                                        _error_("Element holding segment [" << i1+1 << " " << i2+1 << "] not found...");
    710710                                }
    711711                        }
    … …  
    805805                                const VertexOnGeom &v=VerticesOnGeomEdge[i];
    806806                                if (!v.OnGeomEdge()){
    807                                         _error2_("A vertices supposed to be OnGeomEdge is actually not");
     807                                        _error_("A vertices supposed to be OnGeomEdge is actually not");
    808808                                }
    809809                                bamgmesh->VerticesOnGeomEdge[i*3+0]=GetId((BamgVertex*)v)+1; //back to Matlab indexing
    … …  
    888888                        for (j=0;j<2;j++){
    889889                                int v=(int)bamgmesh->IssmEdges[i*i2+j]-1; //back to C indexing
    890                                 if (k>2*i1-1 || k<0) _error2_("Index exceed matrix dimensions (k=" << k << " not in [0 " << 2*i1-1 << "]");
     890                                if (k>2*i1-1 || k<0) _error_("Index exceed matrix dimensions (k=" << k << " not in [0 " << 2*i1-1 << "]");
    891891                                next_2[k]=head_2[v];
    892                                 if (v>nbv-1 || v<0)   _error2_("Index exceed matrix dimensions (v=" << v << " not in [0 " << nbv-1 << "])");
     892                                if (v>nbv-1 || v<0)   _error_("Index exceed matrix dimensions (v=" << v << " not in [0 " << nbv-1 << "])");
    893893                                head_2[v]=k++;
    894894                                connectivitysize_2[v]+=1;
    … …  
    10611061                //check that hmax is positive
    10621062                if (hmax<=0){
    1063                         _error2_("hmax<=0");
     1063                        _error_("hmax<=0");
    10641064                }
    10651065
    … …  
    10901090
    10911091                                if (ht<=0 || hn<=0){
    1092                                         _error2_("ht<=0 || hn<=0");
     1092                                        _error_("ht<=0 || hn<=0");
    10931093                                }
    10941094                                EigenMetric Vp(1/(ht*ht),1/(hn*hn),tg);
    … …  
    11151115                }
    11161116                else{
    1117                         _error2_("Hessiantype " << Hessiantype << " not supported yet (1->use Green formula, 0-> double P2 projection)");
     1117                        _error_("Hessiantype " << Hessiantype << " not supported yet (1->use Green formula, 0-> double P2 projection)");
    11181118                }
    11191119        }
    … …  
    11591159                //some checks
    11601160                if (( infvertexindex <0 ) && (detOld <0) ||  ( infvertexindex >=0  ) && (detOld >0) ){
    1161                         _error2_("inconsistent configuration (Contact ISSM developers)");
     1161                        _error_("inconsistent configuration (Contact ISSM developers)");
    11621162                }
    11631163
    … …  
    12011201                        }
    12021202                        else{
    1203                                 _error2_("Cannot add a vertex more than once. Check duplicates");
     1203                                _error_("Cannot add a vertex more than once. Check duplicates");
    12041204                        }
    12051205                }
    … …  
    12141214                tt[2]= &triangles[nbt++];
    12151215
    1216                 if (nbt>maxnbt) _error2_("Not enough triangles");
     1216                if (nbt>maxnbt) _error_("Not enough triangles");
    12171217
    12181218                *tt[1]=*tt[2]=*t;
    … …  
    12511251
    12521252                        if (!rswap) {
    1253                                 _error2_("swap the point s is on a edge");
     1253                                _error_("swap the point s is on a edge");
    12541254                        }
    12551255                }
    … …  
    13181318                //check that the mesh is not empty
    13191319                if (nbt<=0 || nbv <=0 ) {
    1320                         _error2_("nbt or nbv is negative (Mesh empty?)");
     1320                        _error_("nbt or nbv is negative (Mesh empty?)");
    13211321                }
    13221322
    … …  
    13401340                if (nbe !=  edge4->nb()){
    13411341                        delete [] st;
    1342                         _error2_("Some Double edge in the mesh, the number is " << nbe << ", nbe4=" << edge4->nb());
     1342                        _error_("Some Double edge in the mesh, the number is " << nbe << ", nbe4=" << edge4->nb());
    13431343                }
    13441344                //keep nbe in nbeold
    … …  
    13601360                                        //check that it is not an edge on boundary (should not already exist)
    13611361                                        if (triangles[i].TriangleAdj(j) || triangles[st[k]/3].TriangleAdj((int) (st[k]%3))){
    1362                                                 _error2_("problem in Geometry reconstruction: an edge on boundary is duplicated (double element?)");
     1362                                                _error_("problem in Geometry reconstruction: an edge on boundary is duplicated (double element?)");
    13631363                                        }
    13641364                                        //OK, the element is not on boundary, is belongs to 2 triangles -> build Adjacent triangles list
    … …  
    13781378                                        _printLine_("Edge " << (-st[k]+2)%3 << " of triangle " << (-st[k]+2)/3);
    13791379                                        _printLine_("Edge " << triangles[(-st[k]+2)/3].NuEdgeTriangleAdj((int)((-st[k]+2)%3)) << " of triangle " << GetId(triangles[(-st[k]+2)/3].TriangleAdj((int)((-st[k]+2)%3))));
    1380                                         _error2_("An edge belongs to more than 2 triangles");
     1380                                        _error_("An edge belongs to more than 2 triangles");
    13811381                                }       
    13821382                        }
    … …  
    14601460                        //check that we have been through all edges
    14611461                        if (k!=nbe){
    1462                                 _error2_("problem in edge construction process: k!=nbe (should not happen)");
     1462                                _error_("problem in edge construction process: k!=nbe (should not happen)");
    14631463                        }
    14641464                        //delete edgessave
    … …  
    15051505                                        //check that we have the correct vertex
    15061506                                        if (v!=edges[i0 ].v[j0]){
    1507                                                 _error2_("v!=edges[i0 ].v[j0]: this should not happen as the vertex belongs to this edge");
     1507                                                _error_("v!=edges[i0 ].v[j0]: this should not happen as the vertex belongs to this edge");
    15081508                                        }
    15091509
    … …  
    15221522                //check that nbsubdomains is empty
    15231523                if (nbsubdomains){
    1524                         _error2_("nbsubdomains should be 0");
     1524                        _error_("nbsubdomains should be 0");
    15251525                }
    15261526                nbsubdomains=0;
    … …  
    15911591                if (k!= nbsubdomains){
    15921592                        delete [] colorT;
    1593                         _error2_("k!= nbsubdomains");
     1593                        _error_("k!= nbsubdomains");
    15941594                }
    15951595                //delete colorT and st
    … …  
    16521652                if (Gh.coefIcoor<=0){
    16531653                        delete [] colorV;
    1654                         _error2_("Gh.coefIcoor<=0 in infered Geometry (this should not happen)");
     1654                        _error_("Gh.coefIcoor<=0 in infered Geometry (this should not happen)");
    16551655                }
    16561656
    … …  
    17051705                                delete [] len;
    17061706                                delete [] colorV;
    1707                                 _error2_("problem in Edge4 construction: k != i");
     1707                                _error_("problem in Edge4 construction: k != i");
    17081708                        }
    17091709                }
    … …  
    17341734                        }
    17351735                        else
    1736                          _error2_("%i should be >=0");
     1736                         _error_("%i should be >=0");
    17371737                  }
    17381738
    … …  
    17681768
    17691769                /*Check size*/
    1770                 if (bamgopts->fieldSize[0] != nbv) _error2_("'field' should have " << nbv << " rows");
     1770                if (bamgopts->fieldSize[0] != nbv) _error_("'field' should have " << nbv << " rows");
    17711771
    17721772                //initialization of some variables
    … …  
    19731973
    19741974                /*Check size*/
    1975                 if (bamgopts->fieldSize[0] != nbv) _error2_("'field' should have " << nbv << " rows");
     1975                if (bamgopts->fieldSize[0] != nbv) _error_("'field' should have " << nbv << " rows");
    19761976
    19771977                //initialization of some variables
    … …  
    22982298                                if (splitvertex[i1]==3 || splitvertex[i2]==3){
    22992299                                        delete [] splitvertex;
    2300                                         _error2_("Crossing rifts not supported yet");
     2300                                        _error_("Crossing rifts not supported yet");
    23012301                                }
    23022302                        }
    … …  
    23762376                                //_printLine_(element_renu[GetId(ta.t)] << " -> " << GetId((*ta.t)[0])+1 << " " << GetId((*ta.t)[1])+1 << " " << GetId((*ta.t)[2])+1 << ", edge [" << i1 << "->" << j1 << " " << i2 << "->" << j2 << "]");
    23772377                                ta = Next(ta).Adj();
    2378                                 if (count++>50) _error2_("Maximum number of iteration exceeded");
     2378                                if (count++>50) _error_("Maximum number of iteration exceeded");
    23792379                        }while ((tbegin != ta));
    23802380                }
    … …  
    23832383                for(i=0;i<NbCrackedEdges;i++){
    23842384                        if (Edgeflags[i]!=2){
    2385                                 _error2_("A problem occured: at least one crack edge (number " << i+1 << ") does not belong to 2 elements");
     2385                                _error_("A problem occured: at least one crack edge (number " << i+1 << ") does not belong to 2 elements");
    23862386                        }
    23872387                }
    … …  
    24332433                        }
    24342434                        if (k!=0) {
    2435                                 _error2_("there is " << k << " triangles of mes = 0");
     2435                                _error_("there is " << k << " triangles of mes = 0");
    24362436                        }
    24372437
    … …  
    24472447                                if (nbswp) nbfe++;
    24482448                                if ( nbswp < 0 && k < 5){
    2449                                         _error2_("Missing Edge " << i << ", v0=" << GetId(edges[i][0]) << ",v1=" << GetId(edges[i][1]));
     2449                                        _error_("Missing Edge " << i << ", v0=" << GetId(edges[i][0]) << ",v1=" << GetId(edges[i][1]));
    24502450                                }
    24512451                        }
    24522452
    24532453                        if (k!=0) {
    2454                                 _error2_("There are " << k << " lost edges, the boundary might be crossing");
     2454                                _error_("There are " << k << " lost edges, the boundary might be crossing");
    24552455                        }
    24562456                        for (int j=0;j<nbv;j++){
    … …  
    25342534                        if (nbt == nbtout ||  !NbSubDomTot) {
    25352535                                delete [] HeapArete;
    2536                                 _error2_("The boundary is not close: all triangles are outside");
     2536                                _error_("The boundary is not close: all triangles are outside");
    25372537                        }
    25382538
    … …  
    25722572                                                if (k!=nbsubdomains){
    25732573                                                        delete [] mark;
    2574                                                         _error2_("k!=nbsubdomains");
     2574                                                        _error_("k!=nbsubdomains");
    25752575                                                }
    25762576                                                if(OutSide)
    … …  
    26622662                                                         subdomains[i].head=t=ta;
    26632663                                                        if(t<triangles || t >= triangles+nbt || t->det < 0 || t->link == 0) {
    2664                                                                 _error2_("bad definition of SubSomain " << i);
     2664                                                                _error_("bad definition of SubSomain " << i);
    26652665                                                        }
    26662666                                                        long it = GetId(t);
    … …  
    26772677                                                                kkk++;
    26782678                                                                if (mark[GetId(tt)]>=0){
    2679                                                                         _error2_("mark[GetId(tt)]>=0");
     2679                                                                        _error_("mark[GetId(tt)]>=0");
    26802680                                                                }
    26812681                                                                mark[GetId(tt)]=i;
    … …  
    26862686                                                ta = Previous(Adj(ta));         
    26872687                                                if(t == (Triangle *) ta) {
    2688                                                         _error2_("bad definition of SubSomain " << i);
     2688                                                        _error_("bad definition of SubSomain " << i);
    26892689                                                }
    26902690                                        }
    … …  
    28482848                        //if i is higher than nbv, it means that all the determinants are 0,
    28492849                        //all vertices are aligned!
    2850                         if  (++i>=nbv) _error2_("all the vertices are aligned");
     2850                        if  (++i>=nbv) _error_("all the vertices are aligned");
    28512851                }
    28522852                // exchange i et 2 in "orderedvertices" so that
    … …  
    29842984                                long  j=vj.ReferenceNumber;
    29852985                                if (&vj!=orderedvertices[j]){
    2986                                         _error2_("&vj!= orderedvertices[j]");
     2986                                        _error_("&vj!= orderedvertices[j]");
    29872987                                }
    29882988                                if(i!=j){
    … …  
    29942994                                if (tcvj && !tcvj->link){
    29952995                                        tcvj->Echo();
    2996                                         _error2_("problem inserting point in InsertNewPoints (tcvj=" << tcvj << " and tcvj->link=" << tcvj->link << ")");
     2996                                        _error_("problem inserting point in InsertNewPoints (tcvj=" << tcvj << " and tcvj->link=" << tcvj->link << ")");
    29972997                                }
    29982998                                quadtree->Add(vj);
    … …  
    30263026
    30273027                if (!Gh.nbe){
    3028                         _error2_("!Gh.nbe");
     3028                        _error_("!Gh.nbe");
    30293029                }
    30303030                Edge **e= new (Edge* [Gh.nbe]);
    … …  
    30593059                        }
    30603060                }
    3061                 if(kk) _error2_("See above");
     3061                if(kk) _error_("See above");
    30623062
    30633063                return e;
    … …  
    32583258                                //check i
    32593259                                if (i<0 || i>=nbt ){
    3260                                         _error2_("Index problem in NewPoints (i=" << i << " not in [0 " << nbt-1 << "])");
     3260                                        _error_("Index problem in NewPoints (i=" << i << " not in [0 " << nbt-1 << "])");
    32613261                                }
    32623262                                //change first_np_or_next_t[i]
    … …  
    33093309                                        }
    33103310                                        if (ta.EdgeVertex(0)!=s){
    3311                                                 _error2_("ta.EdgeVertex(0)!=s");
     3311                                                _error_("ta.EdgeVertex(0)!=s");
    33123312                                        }
    33133313                                        ta = Next(Adj(ta));
    … …  
    33443344                }
    33453345                else {
    3346                         _error2_("ProjectOnCurve On BamgVertex " << BTh.GetId(vA) << " forget call to SetVertexFieldOnBTh");
     3346                        _error_("ProjectOnCurve On BamgVertex " << BTh.GetId(vA) << " forget call to SetVertexFieldOnBTh");
    33473347                }
    33483348
    … …  
    33553355                }
    33563356                else {
    3357                         _error2_("ProjectOnCurve On BamgVertex " << BTh.GetId(vB) << " forget call to SetVertexFieldOnBTh");
     3357                        _error_("ProjectOnCurve On BamgVertex " << BTh.GetId(vB) << " forget call to SetVertexFieldOnBTh");
    33583358                }
    33593359                Edge * e = &BhAB;
    33603360                if (!pA || !pB || !e){
    3361                         _error2_("!pA || !pB || !e");
     3361                        _error_("!pA || !pB || !e");
    33623362                }
    33633363                // be carefull the back ground edge e is on same geom edge
    … …  
    33653365                //check Is a background Mesh;   
    33663366                if (e<BTh.edges || e>=BTh.edges+BTh.nbe){
    3367                         _error2_("e<BTh.edges || e>=BTh.edges+BTh.nbe");
     3367                        _error_("e<BTh.edges || e>=BTh.edges+BTh.nbe");
    33683368                }
    33693369                // walk on BTh edge
    … …  
    33883388                  }
    33893389                else{ // do the search by walking
    3390                         _error2_("case not supported yet");
     3390                        _error_("case not supported yet");
    33913391                  }
    33923392
    … …  
    34523452
    34533453                  }
    3454                 _error2_("Big bug...");
     3454                _error_("Big bug...");
    34553455                return 0; // just for the compiler
    34563456        }                 
    … …  
    34933493        }
    34943494        if (kk != nbe){
    3495                 _error2_("There are " << kk-nbe << " double edges in the mesh");
     3495                _error_("There are " << kk-nbe << " double edges in the mesh");
    34963496        }
    34973497
    … …  
    35253525                        //An edge belongs to 2 triangles
    35263526                        else {
    3527                                 _error2_("The edge (" << GetId(triangles[i][VerticesOfTriangularEdge[j][0]]) << " , " << GetId(triangles[i][VerticesOfTriangularEdge[j][1]]) << ") belongs to more than 2 triangles");
     3527                                _error_("The edge (" << GetId(triangles[i][VerticesOfTriangularEdge[j][0]]) << " , " << GetId(triangles[i][VerticesOfTriangularEdge[j][1]]) << ") belongs to more than 2 triangles");
    35283528                        }
    35293529                }
    … …  
    35633563        }
    35643564        if(k) {
    3565                 _error2_(k << " boundary edges (from the geometry) are not defined as mesh edges");
     3565                _error_(k << " boundary edges (from the geometry) are not defined as mesh edges");
    35663566        }
    35673567
    … …  
    35903590        for (i=2;det(orderedvertices[0]->i,orderedvertices[1]->i,orderedvertices[i]->i)==0;)
    35913591         if  (++i>=nbvb) {
    3592                  _error2_("ReconstructExistingMesh: All the vertices are aligned");
     3592                 _error_("ReconstructExistingMesh: All the vertices are aligned");
    35933593         }
    35943594        //Move this vertex (i) to the 2d position in orderedvertices
    … …  
    36503650        }
    36513651        if(nbloss) {
    3652                 _error2_("we lost " << nbloss << " existing edges other " << knbe);
     3652                _error_("we lost " << nbloss << " existing edges other " << knbe);
    36533653        }
    36543654
    … …  
    37253725        subdomains = savesubdomains;
    37263726        if (k) {
    3727                 _error2_("number of triangles edges alone = " << k);
     3727                _error_("number of triangles edges alone = " << k);
    37283728        }
    37293729        FindSubDomain();
    … …  
    37553755
    37563756                                                _printLine_("This edge is on geometry and has no adjacent edge (open curve) and one of the tip is not required");
    3757                                                 _error2_("See above (might be cryptic...)");
     3757                                                _error_("See above (might be cryptic...)");
    37583758                                        }
    37593759                                }
    … …  
    37783778                        t=t0=subdomains[i].head;
    37793779                        if (!t0){ // not empty sub domain
    3780                                 _error2_("!t0");
     3780                                _error_("!t0");
    37813781                        }
    37823782                        do {
    37833783                                long kt = GetId(t);
    37843784                                if (kt<0 || kt >= nbt ){
    3785                                         _error2_("kt<0 || kt >= nbt");
     3785                                        _error_("kt<0 || kt >= nbt");
    37863786                                }
    37873787                                if (renu[kt]!=-1){
    3788                                         _error2_("renu[kt]!=-1");
     3788                                        _error_("renu[kt]!=-1");
    37893789                                }
    37903790                                renu[kt]=k++;
    … …  
    38033803                }
    38043804                if (k != nbt){
    3805                         _error2_("k != nbt");
     3805                        _error_("k != nbt");
    38063806                }
    38073807                // do the change on all the pointeur
    … …  
    39293929        coefIcoor= (MaxICoor)/(Max(pmax.x-pmin.x,pmax.y-pmin.y));
    39303930        if (coefIcoor<=0){
    3931                 _error2_("coefIcoor should be positive, a problem in the geometry is likely");
     3931                _error_("coefIcoor should be positive, a problem in the geometry is likely");
    39323932        }
    39333933
    … …  
    39653965        }
    39663966
    3967         if (number_of_errors) _error2_("Fatal error: some triangles have negative areas, see above");
     3967        if (number_of_errors) _error_("Fatal error: some triangles have negative areas, see above");
    39683968}
    39693969/*}}}*/
    … …  
    41464146                        register Triangle* t= vertices[i].t;
    41474147                        if (!t){
    4148                                 _error2_("!t");
     4148                                _error_("!t");
    41494149                        }
    41504150                        BamgVertex & vi = vertices[i];
    … …  
    41544154                                ta=Previous(Adj(ta));
    41554155                                if (vertices+i != ta.EdgeVertex(1)){
    4156                                         _error2_("vertices+i != ta.EdgeVertex(1)");
     4156                                        _error_("vertices+i != ta.EdgeVertex(1)");
    41574157                                }
    41584158                                BamgVertex & vj = *(ta.EdgeVertex(0));
    … …  
    41604160                                        j= &vj-vertices;
    41614161                                        if (j<0 || j >= nbv){
    4162                                                 _error2_("j<0 || j >= nbv");
     4162                                                _error_("j<0 || j >= nbv");
    41634163                                        }
    41644164                                        R2 Aij = (R2) vj - (R2) vi;
    … …  
    42844284                                        // the first PB is to now a background edge between the 2 vertices
    42854285                                        if (!edgesGtoB){
    4286                                                 _error2_("!edgesGtoB");
     4286                                                _error_("!edgesGtoB");
    42874287                                        }
    42884288                                        ong= ProjectOnCurve(*edgesGtoB[Gh.GetId(edges[i].GeomEdgeHook)],
    … …  
    43564356                        Triangle & t = triangles[i];
    43574357                        if (!t.link){
    4358                                 _error2_("!t.link");
     4358                                _error_("!t.link");
    43594359                        }
    43604360                        for(int j=0;j<3;j++)
    … …  
    43834383                                                                                ||   (cc=Area2( t[0].r , t[1].r , A.r    )) < 0.0)){
    43844384                                                        _printLine_(ke + nbvold << " not in triangle " << i << " In= " << !!t.link << " " << aa << " " << bb << " " << cc << " " << dd);
    4385                                                         _error2_("Number of triangles with P2 interpolation Problem");
     4385                                                        _error_("Number of triangles with P2 interpolation Problem");
    43864386                                                }
    43874387                                        }
    … …  
    43914391                                                                                ||   (cc=Area2( tt[0].r , tt[1].r , A.r     )) < 0)){
    43924392                                                        _printLine_(ke + nbvold << " not in triangle " << ii << " In= " << !!tt.link << " " << aa << " " << bb << " " << cc << " " << dd);
    4393                                                         _error2_("Number of triangles with P2 interpolation Problem");
     4393                                                        _error_("Number of triangles with P2 interpolation Problem");
    43944394                                                }
    43954395                                        }
    … …  
    44394439                                                  } // tt
    44404440                                                else
    4441                                                  _error2_("Bug...");
     4441                                                 _error_("Bug...");
    44424442                                          } // ke<0           
    44434443                                        else
    … …  
    44524452                          }
    44534453                        if (nbinvisible>=2){
    4454                                 _error2_("nbinvisible>=2");
     4454                                _error_("nbinvisible>=2");
    44554455                        }
    44564456                        switch (nbsplitedge) {
    … …  
    44644464                        }
    44654465                        if (ksplit[i]<40){
    4466                                 _error2_("ksplit[i]<40");
     4466                                _error_("ksplit[i]<40");
    44674467                        }
    44684468                  }
    … …  
    44814481                        int  ke=(int) (ksplit[i]%10);
    44824482                        if (kk>=7 || kk<=0){
    4483                                 _error2_("kk>=7 || kk<=0");
     4483                                _error_("kk>=7 || kk<=0");
    44844484                        }
    44854485
    … …  
    44984498
    44994499                        if (nbmkadj>=10){
    4500                                 _error2_("nbmkadj>=10");
     4500                                _error_("nbmkadj>=10");
    45014501                        }
    45024502                        // --------------------------
    … …  
    45164516                                                        t1=t0;
    45174517                                                        if (kedge[3*i+i0]<0){
    4518                                                                 _error2_("kedge[3*i+i0]<0");
     4518                                                                _error_("kedge[3*i+i0]<0");
    45194519                                                        }
    45204520                                                        BamgVertex * v3 = vertices + kedge[3*i+k0];
    … …  
    45324532                                                        t2=t1=t0;
    45334533                                                        if (kedge[3*i+k1]<0){
    4534                                                                 _error2_("kedge[3*i+k1]<0");
     4534                                                                _error_("kedge[3*i+k1]<0");
    45354535                                                        }
    45364536                                                        if (kedge[3*i+k2]<0){
    4537                                                                 _error2_("kedge[3*i+k2]<0");
     4537                                                                _error_("kedge[3*i+k2]<0");
    45384538                                                        }
    45394539
    … …  
    45594559                                                        t3=t2=t1=t0;
    45604560                                                        if (kedge[3*i+k0] <0 || kedge[3*i+k1]<0 || kedge[3*i+k2]<0){
    4561                                                                 _error2_("kedge[3*i+k0] <0 || kedge[3*i+k1]<0 || kedge[3*i+k2]<0");
     4561                                                                _error_("kedge[3*i+k0] <0 || kedge[3*i+k1]<0 || kedge[3*i+k2]<0");
    45624562                                                        }
    45634563                                                        BamgVertex * v12 = vertices + kedge[3*i+k0];
    … …  
    46334633                                }
    46344634                        if (nbmkadj>13){// 13 = 6 + 4 +
    4635                                 _error2_("nbmkadj>13");
     4635                                _error_("nbmkadj>13");
    46364636                        }
    46374637
    … …  
    47594759                        quadtree->Add(vi);
    47604760                        if (!tcvi || tcvi->det<0){// internal
    4761                                 _error2_("!tcvi || tcvi->det < 0");
     4761                                _error_("!tcvi || tcvi->det < 0");
    47624762                        }
    47634763                        AddVertex(vi,tcvi,det3);
    … …  
    48024802
    48034803                /*Check that the quadtree does exist*/
    4804                 if (!quadtree) _error2_("no starting triangle provided and no quadtree available");
     4804                if (!quadtree) _error_("no starting triangle provided and no quadtree available");
    48054805
    48064806                /*Call NearestVertex*/
    … …  
    48084808
    48094809                /*Check output (Vertex a)*/
    4810                 if (!a)    _error2_("problem while trying to find nearest vertex from a given point. No output found");
    4811                 if (!a->t) _error2_("no triangle is associated to vertex number " << GetId(a)+1 << " (orphan?)");
     4810                if (!a)    _error_("problem while trying to find nearest vertex from a given point. No output found");
     4811                if (!a->t) _error_("no triangle is associated to vertex number " << GetId(a)+1 << " (orphan?)");
    48124812                _assert_(a>=vertices && a<vertices+nbv);
    48134813
    … …  
    48444844
    48454845                /*Increase counter*/
    4846                 if (++counter>=10000) _error2_("Maximum number of iteration reached (threshold = " << counter << ").");
     4846                if (++counter>=10000) _error_("Maximum number of iteration reached (threshold = " << counter << ").");
    48474847
    48484848                j= OppositeVertex[jj];
    … …  
    49084908
    49094909                //check that the subdomain is not empty
    4910                 if (!t0){ _error2_("At least one subdomain is empty");}
     4910                if (!t0){ _error_("At least one subdomain is empty");}
    49114911
    49124912                //loop
    … …  
    49914991                //allocate
    49924992                VerticesOnGeomVertex = new VertexOnGeom[NbVerticesOnGeomVertex]; 
    4993                 if(NbVerticesOnGeomVertex >= maxnbv) _error2_("too many vertices on geometry: " << NbVerticesOnGeomVertex << " >= " << maxnbv);
     4993                if(NbVerticesOnGeomVertex >= maxnbv) _error_("too many vertices on geometry: " << NbVerticesOnGeomVertex << " >= " << maxnbv);
    49944994                _assert_(nbv==0);
    49954995                //Build VerticesOnGeomVertex
    … …  
    50805080                                                                NbNewPoints=0;
    50815081                                                                NbEdgeCurve=0;
    5082                                                                 if (nbvend>=maxnbv) _error2_("maximum number of vertices too low! Check the domain outline or increase maxnbv");
     5082                                                                if (nbvend>=maxnbv) _error_("maximum number of vertices too low! Check the domain outline or increase maxnbv");
    50835083                                                                lcurve =0;
    50845084                                                                s = lstep; //-1 initially, then length of each sub edge
    … …  
    53225322                printf("\n");
    53235323                if(NbVerticesOnGeomVertex >= maxnbv){
    5324                         _error2_("too many vertices on geometry: " << NbVerticesOnGeomVertex << " >= " << maxnbv);
     5324                        _error_("too many vertices on geometry: " << NbVerticesOnGeomVertex << " >= " << maxnbv);
    53255325                }
    53265326
    … …  
    53935393                if (bfind!=Gh.nbcurves){
    53945394                        delete [] bcurve;
    5395                         _error2_("problem generating number of curves (" << Gh.nbcurves << " found in the geometry but " << bfind << " curve found in the mesh)");
     5395                        _error_("problem generating number of curves (" << Gh.nbcurves << " found in the geometry but " << bfind << " curve found in the mesh)");
    53965396                }
    53975397
    … …  
    54925492                                                                        double se= (sNew-L0)/LAB;
    54935493                                                                        if (se<0 || se>=1.000000001){
    5494                                                                                 _error2_("Problem creating point on a boundary: se=" << se << " should be in [0 1]");
     5494                                                                                _error_("Problem creating point on a boundary: se=" << se << " should be in [0 1]");
    54955495                                                                        }
    54965496                                                                        se = abscisseInterpole(v0.m,v1.m,AB,se,1);
    54975497                                                                        if (se<0 || se>1){
    5498                                                                                 _error2_("Problem creating point on a boundary: se=" << se << " should be in [0 1]");
     5498                                                                                _error_("Problem creating point on a boundary: se=" << se << " should be in [0 1]");
    54995499                                                                        }
    55005500                                                                        se = k1         ? se : 1. - se;
    … …  
    55285528                                                        }
    55295529                                                        if (!ee.adj[k1]) {
    5530                                                                 _error2_("adj edge " << BTh.GetId(ee) << ", nbe=" << nbe << ", Gh.vertices=" << Gh.vertices);
     5530                                                                _error_("adj edge " << BTh.GetId(ee) << ", nbe=" << nbe << ", Gh.vertices=" << Gh.vertices);
    55315531                                                        }
    55325532                                                        pe = ee.adj[k1]; // next edge
    … …  
    55665566                        if(step==0){
    55675567                                if(nbv+NbOfNewPoints > maxnbv) {
    5568                                         _error2_("too many vertices on geometry: " << nbv+NbOfNewPoints << " >= " << maxnbv);
     5568                                        _error_("too many vertices on geometry: " << nbv+NbOfNewPoints << " >= " << maxnbv);
    55695569                                }
    55705570                                edges = new Edge[NbOfNewEdge];
    … …  
    56115611                int dir=0;
    56125612                if (k<0){
    5613                         _error2_("k<0");
     5613                        _error_("k<0");
    56145614                }
    56155615                int kkk=0; 
    … …  
    56195619                        kkk++;
    56205620                        if (kkk>=1000){
    5621                                 _error2_("kkk>=1000");
     5621                                _error_("kkk>=1000");
    56225622                        }
    56235623                        BamgVertex  &vI =  *edge.EdgeVertex(0);
    … …  
    56365636                                                        double IJ2 = IJ_IA + IJ_AJ;
    56375637                                                        if (IJ2==0){
    5638                                                                 _error2_("IJ2==0");
     5638                                                                _error_("IJ2==0");
    56395639                                                        }
    56405640                                                        a= IJ_AJ/IJ2;
    … …  
    56505650        int NbSwap =0;
    56515651        if (!a.t || !b.t){ // the 2 vertex is in a mesh
    5652                 _error2_("!a.t || !b.t");
     5652                _error_("!a.t || !b.t");
    56535653        }
    56545654        int k=0;
    … …  
    56675667                vbegin =v2;
    56685668                if (!v2){
    5669                         _error2_("!v2");
     5669                        _error_("!v2");
    56705670                }
    56715671                det2 = det(*v2,a,b);
    … …  
    56845684                        tc = Previous(tc);
    56855685                        if (!v1 || !v2){
    5686                                 _error2_("!v1 || !v2");
     5686                                _error_("!v1 || !v2");
    56875687                        }
    56885688                        Icoor2 detss = 0,l=0,ks;
    56895689                        while ((ks=SwapForForcingEdge(  va,  vb, tc, detss, det1,det2,NbSwap)))
    56905690                         if(l++ > 10000000) {
    5691                                  _error2_("Loop in forcing Egde, nb de swap=" << NbSwap << ", nb of try swap (" << l << ") too big");
     5691                                 _error_("Loop in forcing Egde, nb de swap=" << NbSwap << ", nb of try swap (" << l << ") too big");
    56925692                         }
    56935693                        BamgVertex *aa = tc.EdgeVertex(0), *bb = tc.EdgeVertex(1);
    … …  
    57085708                k++;
    57095709                if (k>=2000){
    5710                         _error2_("k>=2000");
     5710                        _error_("k>=2000");
    57115711                }
    57125712                if ( vbegin == v2 ) return -1;// error
    … …  
    57805780                short a1=tt1,a2=tt2;// les 2 numero de l arete dans les 2 triangles
    57815781                if ( a1<0 || a1>=3 ){
    5782                         _error2_("a1<0 || a1>=3");
     5782                        _error_("a1<0 || a1>=3");
    57835783                }
    57845784
    … …  
    57925792                Icoor2 detT = det1+det2;
    57935793                if ((det1<=0 ) || (det2<=0)){
    5794                         _error2_("(det1<=0 ) || (det2<=0)");
     5794                        _error_("(det1<=0 ) || (det2<=0)");
    57955795                }
    57965796                if ( (detsa>=0) || (detsb<=0) ){ // [a,b] cut infinite line va,bb
    5797                         _error2_("(detsa>=0) || (detsb<=0)");
     5797                        _error_("(detsa>=0) || (detsb<=0)");
    57985798                }
    57995799                Icoor2 ndet1 = bamg::det(s1,sa,s2);

  • issm/trunk-jpl/src/c/classes/bamg/Metric.cpp

    r12821 r13036  
    197197                // warning for optimisation S is in [0:0.5] not in [0:1]
    198198                if (i>=512){
    199                         _error2_("i>=512");
     199                        _error_("i>=512");
    200200                }
    201201                LastMetricInterpole.lab=l;
    … …  
    345345                }
    346346                if (r>1 || r<0){
    347                         _error2_("r>1 || r<0");
     347                        _error_("r>1 || r<0");
    348348                }
    349349                return r ;

  • issm/trunk-jpl/src/c/classes/bamg/SetOfE4.cpp

    r12821 r13036  
    5050                //check that nbax <=NbOfEdges
    5151                if (nbax <=NbOfEdges ) {
    52                         _error2_("SetOfEdges4::add overflow: NbOfEdges=" << NbOfEdges << " > nbax=" << nbax);
     52                        _error_("SetOfEdges4::add overflow: NbOfEdges=" << NbOfEdges << " > nbax=" << nbax);
    5353                }
    5454

  • issm/trunk-jpl/src/c/classes/bamg/SubDomain.cpp

    r12821 r13036  
    1616                *this = Th.subdomains[i];
    1717                if ( head-Th.triangles<0 || head-Th.triangles>=Th.nbt){
    18                         _error2_("head-Th.triangles<0 || head-Th.triangles>=Th.nbt");
     18                        _error_("head-Th.triangles<0 || head-Th.triangles>=Th.nbt");
    1919                }
    2020                head = ThNew.triangles + Th.GetId(head) ;
    2121                if (edge-Th.edges<0 || edge-Th.edges>=Th.nbe);{
    22                         _error2_("edge-Th.edges<0 || edge-Th.edges>=Th.nbe");
     22                        _error_("edge-Th.edges<0 || edge-Th.edges>=Th.nbe");
    2323                }
    2424                edge = ThNew.edges+ Th.GetId(edge);

  • issm/trunk-jpl/src/c/classes/bamg/Triangle.cpp

    r12821 r13036  
    1919                long nbv = Th->nbv;
    2020                if (i<0 || j<0 || k<0){
    21                         _error2_("i<0 || j<0 || k<0");
     21                        _error_("i<0 || j<0 || k<0");
    2222                }
    2323                if (i>=nbv || j>=nbv || k>=nbv){
    24                         _error2_("i>=nbv || j>=nbv || k>=nbv");
     24                        _error_("i>=nbv || j>=nbv || k>=nbv");
    2525                }
    2626                vertices[0]=v+i;
    … …  
    173173                        //check number of iterations
    174174                        if (k>=2000){
    175                                 _error2_("too many iteration in Triangle::FindBoundaryEdge (k>=2000)");
     175                                _error_("too many iteration in Triangle::FindBoundaryEdge (k>=2000)");
    176176                        }
    177177                } while (this!= t);
    … …  
    213213                do {
    214214                        while (t->swap(j,koption)){
    215                                 if (k>=20000) _error2_("k>=20000");
     215                                if (k>=20000) _error_("k>=20000");
    216216                                NbSwap++;
    217217                                k++;

  • issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp

    r12832 r13036  
    119119        }
    120120        else{
    121                 _error2_("Penta not supported yet");
     121                _error_("Penta not supported yet");
    122122        }
    123123
    … …  
    159159        }
    160160        else{
    161                 _error2_("Tria not supported yet");
     161                _error_("Tria not supported yet");
    162162        }
    163163
    … …  
    221221        }
    222222        else{
    223                 _error2_("Tria not supported yet (user provided indices " << index1 << " " << index2 << " " << index3 << " " << index4 << ")");
     223                _error_("Tria not supported yet (user provided indices " << index1 << " " << index2 << " " << index3 << " " << index4 << ")");
    224224        }
    225225
    … …  
    340340                        break;
    341341                default:
    342                         _error2_("vertex index should be in [0 5]");
     342                        _error_("vertex index should be in [0 5]");
    343343
    344344        }
    … …  
    359359        }
    360360        else{
    361                 _error2_("Tria not supported yet");
     361                _error_("Tria not supported yet");
    362362        }
    363363

  • issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp

    r12832 r13036  
    8080        }
    8181        else
    82          _error2_("The 2 indices provided are not supported yet (user provided " << index1 << " and " << index2 << ")");
     82         _error_("The 2 indices provided are not supported yet (user provided " << index1 << " and " << index2 << ")");
    8383
    8484        /*Initialize static fields as undefined*/
    … …  
    178178        }
    179179        else
    180          _error2_("The 2 indices provided are not supported yet (user provided " << index1 << " and " << index2 << ")");
     180         _error_("The 2 indices provided are not supported yet (user provided " << index1 << " and " << index2 << ")");
    181181
    182182}
    … …  
    241241                        break;
    242242                default:
    243                         _error2_("vertex index should be in [0 2]");
     243                        _error_("vertex index should be in [0 2]");
    244244
    245245        }

  • issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.cpp

    r12821 r13036  
    3939
    4040        /*Checks*/
    41         if(nugget==sill) _error2_("nugget and sill cannot be equal (constant semivariogram not allowed)");
     41        if(nugget==sill) _error_("nugget and sill cannot be equal (constant semivariogram not allowed)");
    4242}
    4343/*}}}*/

  • issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.h

    r12821 r13036  
    2323                /*Object virtual functions definitions*/
    2424                void  Echo();
    25                 void  DeepEcho(){_error2_("Not implemented yet");};
    26                 int   Id(){_error2_("Not implemented yet");};
    27                 int   MyRank(){_error2_("Not implemented yet");};
    28                 int   ObjectEnum(){_error2_("Not implemented yet");};
    29                 Object* copy(){_error2_("Not implemented yet");};
     25                void  DeepEcho(){_error_("Not implemented yet");};
     26                int   Id(){_error_("Not implemented yet");};
     27                int   MyRank(){_error_("Not implemented yet");};
     28                int   ObjectEnum(){_error_("Not implemented yet");};
     29                Object* copy(){_error_("Not implemented yet");};
    3030
    3131                /*Variogram functions*/

  • issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.cpp

    r12821 r13036  
    3939
    4040        /*Checks*/
    41         if(nugget==sill) _error2_("nugget and sill cannot be equal (constant semivariogram not allowed)");
     41        if(nugget==sill) _error_("nugget and sill cannot be equal (constant semivariogram not allowed)");
    4242}
    4343/*}}}*/

  • issm/trunk-jpl/src/c/classes/kriging/GaussianVariogram.h

    r12832 r13036  
    2424                /*Object virtual functions definitions*/
    2525                void  Echo();
    26                 void  DeepEcho(){_error2_("Not implemented yet");};
    27                 int   Id(){_error2_("Not implemented yet");};
    28                 int   MyRank(){_error2_("Not implemented yet");};
    29                 int   ObjectEnum(){_error2_("Not implemented yet");};
    30                 Object* copy(){_error2_("Not implemented yet");};
     26                void  DeepEcho(){_error_("Not implemented yet");};
     27                int   Id(){_error_("Not implemented yet");};
     28                int   MyRank(){_error_("Not implemented yet");};
     29                int   ObjectEnum(){_error_("Not implemented yet");};
     30                Object* copy(){_error_("Not implemented yet");};
    3131
    3232                /*Variogram functions*/

  • issm/trunk-jpl/src/c/classes/kriging/Observation.h

    r12832 r13036  
    2424                /*Object virtual functions definitions*/
    2525                void    Echo();
    26                 void    DeepEcho()  {_error2_("Not implemented yet"); };
    27                 int     Id()        {_error2_("Not implemented yet"); };
    28                 int     MyRank()    {_error2_("Not implemented yet"); };
    29                 int     ObjectEnum(){_error2_("Not implemented yet"); };
    30                 Object *copy()      {_error2_("Not implemented yet"); };
     26                void    DeepEcho()  {_error_("Not implemented yet"); };
     27                int     Id()        {_error_("Not implemented yet"); };
     28                int     MyRank()    {_error_("Not implemented yet"); };
     29                int     ObjectEnum(){_error_("Not implemented yet"); };
     30                Object *copy()      {_error_("Not implemented yet"); };
    3131
    3232                /*Management*/

  • issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.cpp

    r12821 r13036  
    3939
    4040        /*Checks*/
    41         if(power<=0 || power>=2) _error2_("power must be betwwen 0 and 2 (0 < power < 2)");
    42         if(slope<=0) _error2_("slope must be positive");
     41        if(power<=0 || power>=2) _error_("power must be betwwen 0 and 2 (0 < power < 2)");
     42        if(slope<=0) _error_("slope must be positive");
    4343}
    4444/*}}}*/

  • issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.h

    r12821 r13036  
    2323                /*Object virtual functions definitions*/
    2424                void  Echo();
    25                 void  DeepEcho(){_error2_("Not implemented yet");};
    26                 int   Id(){_error2_("Not implemented yet");};
    27                 int   MyRank(){_error2_("Not implemented yet");};
    28                 int   ObjectEnum(){_error2_("Not implemented yet");};
    29                 Object* copy(){_error2_("Not implemented yet");};
     25                void  DeepEcho(){_error_("Not implemented yet");};
     26                int   Id(){_error_("Not implemented yet");};
     27                int   MyRank(){_error_("Not implemented yet");};
     28                int   ObjectEnum(){_error_("Not implemented yet");};
     29                Object* copy(){_error_("Not implemented yet");};
    3030
    3131                /*Variogram functions*/

  • issm/trunk-jpl/src/c/classes/kriging/Quadtree.cpp

    r12821 r13036  
    8383/*FUNCTION Quadtree::Quadtree(){{{*/
    8484Quadtree::Quadtree(){
    85         _error2_("Constructor not supported");
     85        _error_("Constructor not supported");
    8686
    8787}
    … …  
    248248        }
    249249        else{
    250                 _error2_("Box is not full");
     250                _error_("Box is not full");
    251251        }
    252252}/*}}}*/
    … …  
    397397                        break;
    398398                default:
    399                         _error2_("Case " << index << " not supported");
     399                        _error_("Case " << index << " not supported");
    400400        }
    401401        newbox->length=master->length/2;
    … …  
    574574                        break;
    575575                default:
    576                         _error2_("Case " << this->IsWithinRange(x,y,range) << " not supported");
     576                        _error_("Case " << this->IsWithinRange(x,y,range) << " not supported");
    577577        }
    578578

  • issm/trunk-jpl/src/c/classes/kriging/Quadtree.h

    r12821 r13036  
    2727                                /*Object functions (Needed because the Quadtree uses a Container*/
    2828                                void    Echo();
    29                                 void    DeepEcho()  {_error2_("not implemented yet"); };
    30                                 int     Id()        {_error2_("not implemented yet"); };
    31                                 int     MyRank()    {_error2_("not implemented yet"); };
    32                                 int     ObjectEnum(){_error2_("not implemented yet"); };
    33                                 Object *copy()      {_error2_("not implemented yet"); };
     29                                void    DeepEcho()  {_error_("not implemented yet"); };
     30                                int     Id()        {_error_("not implemented yet"); };
     31                                int     MyRank()    {_error_("not implemented yet"); };
     32                                int     ObjectEnum(){_error_("not implemented yet"); };
     33                                Object *copy()      {_error_("not implemented yet"); };
    3434
    3535                                /*Methods*/

  • issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.cpp

    r12821 r13036  
    3939
    4040        /*Checks*/
    41         if(nugget==sill) _error2_("nugget and sill cannot be equal (constant semivariogram not allowed)");
     41        if(nugget==sill) _error_("nugget and sill cannot be equal (constant semivariogram not allowed)");
    4242}
    4343/*}}}*/

  • issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.h

    r12821 r13036  
    2323                /*Object virtual functions definitions*/
    2424                void  Echo();
    25                 void  DeepEcho(){_error2_("Not implemented yet");};
    26                 int   Id(){_error2_("Not implemented yet");};
    27                 int   MyRank(){_error2_("Not implemented yet");};
    28                 int   ObjectEnum(){_error2_("Not implemented yet");};
    29                 Object* copy(){_error2_("Not implemented yet");};
     25                void  DeepEcho(){_error_("Not implemented yet");};
     26                int   Id(){_error_("Not implemented yet");};
     27                int   MyRank(){_error_("Not implemented yet");};
     28                int   ObjectEnum(){_error_("Not implemented yet");};
     29                Object* copy(){_error_("Not implemented yet");};
    3030
    3131                /*Variogram functions*/

  • issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.cpp

    r12832 r13036  
    4747ElementMatrix::ElementMatrix(ElementMatrix* Ke){
    4848
    49         if(!Ke) _error2_("Input Element Matrix is a NULL pointer");
     49        if(!Ke) _error_("Input Element Matrix is a NULL pointer");
    5050        this->Init(Ke);
    5151        return;
    … …  
    6363        /*If one of the two matrix is NULL, we copy the other one*/
    6464        if(!Ke1 && !Ke2){
    65                 _error2_("Two input element matrices are NULL");
     65                _error_("Two input element matrices are NULL");
    6666        }
    6767        else if(!Ke1){
    … …  
    7575
    7676        /*General Case: Ke1 and Ke2 are not empty*/
    77         if(!Ke1->dofsymmetrical || !Ke2->dofsymmetrical) _error2_("merging 2 non dofsymmetrical matrices not implemented yet");
     77        if(!Ke1->dofsymmetrical || !Ke2->dofsymmetrical) _error_("merging 2 non dofsymmetrical matrices not implemented yet");
    7878
    7979        /*Initialize itransformation matrix Ke[P[i]] = Ke2[i]*/
    … …  
    295295        }
    296296        else{
    297                 _error2_("non dofsymmetrical matrix AddToGlobal routine not support yet!");
     297                _error_("non dofsymmetrical matrix AddToGlobal routine not support yet!");
    298298        }
    299299
    … …  
    332332        }
    333333        else{
    334                 _error2_("non dofsymmetrical matrix AddToGlobal routine not support yet!");
     334                _error_("non dofsymmetrical matrix AddToGlobal routine not support yet!");
    335335        }
    336336
    … …  
    343343        for (int i=0;i<this->nrows;i++){
    344344                for(int j=0;j<this->ncols;j++){
    345                         if (xIsNan<IssmDouble>(this->values[i*this->ncols+j])) _error2_("NaN found in Element Matrix");
    346                         if (fabs(this->values[i*this->ncols+j])>1.e+50) _error2_("Element Matrix values exceeds 1.e+50");
     345                        if (xIsNan<IssmDouble>(this->values[i*this->ncols+j])) _error_("NaN found in Element Matrix");
     346                        if (fabs(this->values[i*this->ncols+j])>1.e+50) _error_("Element Matrix values exceeds 1.e+50");
    347347                }
    348348        }
    … …  
    365365        /*Transpose indices*/
    366366        if(!dofsymmetrical){
    367                 _error2_("not supported yet");
     367                _error_("not supported yet");
    368368        }
    369369
    … …  
    488488        int i;
    489489
    490         if(this->nrows!=this->ncols)_error2_("need square matrix in input!");
     490        if(this->nrows!=this->ncols)_error_("need square matrix in input!");
    491491
    492492        for(i=0;i<this->nrows;i++){

  • issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp

    r12832 r13036  
    4242        /*If one of the two matrix is NULL, we copy the other one*/
    4343        if(!pe1 && !pe2){
    44                 _error2_("Two input element matrices are NULL");
     44                _error_("Two input element matrices are NULL");
    4545        }
    4646        else if(!pe1){
    … …  
    210210#ifdef _ISSM_DEBUG_
    211211        for (int i=0;i<this->nrows;i++){
    212                 if (xIsNan<IssmDouble>(this->values[i])) _error2_("NaN found in Element Vector");
    213                 if (fabs( this->values[i])>1.e+50) _error2_("Element Vector values exceeds 1.e+50");
     212                if (xIsNan<IssmDouble>(this->values[i])) _error_("NaN found in Element Vector");
     213                if (fabs( this->values[i])>1.e+50) _error_("Element Vector values exceeds 1.e+50");
    214214        }
    215215#endif

  • issm/trunk-jpl/src/c/classes/matrix/Matrix.cpp

    r12987 r13036  
    5151                this->pmatrix=new PetscMat(M,N);
    5252                #else
    53                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     53                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    5454                #endif
    5555        }
    … …  
    5757                this->smatrix=new SeqMat(M,N);
    5858        }
    59         else _error2_("Matrix type: " << type << " not supported yet!");
     59        else _error_("Matrix type: " << type << " not supported yet!");
    6060
    6161}
    … …  
    7474                this->pmatrix=new PetscMat(M,N,sparsity);
    7575                #else
    76                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     76                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    7777                #endif
    7878        }
    … …  
    8080                this->smatrix=new SeqMat(M,N,sparsity);
    8181        }
    82         else _error2_("Matrix type: " << type << " not supported yet!");
     82        else _error_("Matrix type: " << type << " not supported yet!");
    8383}
    8484/*}}}*/
    … …  
    9696                this->pmatrix=new PetscMat(serial_mat,M,N,sparsity);
    9797                #else
    98                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     98                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    9999                #endif
    100100        }
    … …  
    102102                this->smatrix=new SeqMat(serial_mat,M,N,sparsity);
    103103        }
    104         else _error2_("Matrix type: " << type << " not supported yet!");
     104        else _error_("Matrix type: " << type << " not supported yet!");
    105105       
    106106}
    … …  
    119119                this->pmatrix=new PetscMat(M,N,connectivity,numberofdofspernode);
    120120                #else
    121                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     121                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    122122                #endif
    123123        }
    … …  
    125125                this->smatrix=new SeqMat(M,N,connectivity,numberofdofspernode);
    126126        }
    127         else _error2_("Matrix type: " << type << " not supported yet!");
     127        else _error_("Matrix type: " << type << " not supported yet!");
    128128       
    129129}
    … …  
    136136                delete this->pmatrix;
    137137                #else
    138                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     138                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    139139                #endif
    140140        }
    … …  
    142142                delete this->smatrix;
    143143        }
    144         else _error2_("Matrix type: " << type << " not supported yet!");
     144        else _error_("Matrix type: " << type << " not supported yet!");
    145145
    146146}
    … …  
    159159                this->smatrix->Echo();
    160160        }
    161         else _error2_("Matrix type: " << type << " not supported yet!");
     161        else _error_("Matrix type: " << type << " not supported yet!");
    162162
    163163}
    … …  
    175175        }
    176176        else{
    177                 _error2_("Matrix type: " << type << " not supported yet!");
     177                _error_("Matrix type: " << type << " not supported yet!");
    178178        }
    179179}
    … …  
    192192                norm=this->smatrix->Norm(norm_type);
    193193        }
    194         else _error2_("Matrix type: " << type << " not supported yet!");
     194        else _error_("Matrix type: " << type << " not supported yet!");
    195195
    196196        return norm;
    … …  
    208208                this->smatrix->GetSize(pM,pN);
    209209        }
    210         else _error2_("Matrix type: " << type << " not supported yet!");
     210        else _error_("Matrix type: " << type << " not supported yet!");
    211211       
    212212}
    … …  
    223223                this->smatrix->GetLocalSize(pM,pN);
    224224        }
    225         else _error2_("Matrix type: " << type << " not supported yet!");
     225        else _error_("Matrix type: " << type << " not supported yet!");
    226226
    227227}
    … …  
    238238                this->smatrix->MatMult(X->svector,AX->svector);
    239239        }
    240         else _error2_("Matrix type: " << type << " not supported yet!");
     240        else _error_("Matrix type: " << type << " not supported yet!");
    241241
    242242}
    … …  
    257257                output->smatrix=this->smatrix->Duplicate();
    258258        }
    259         else _error2_("Matrix type: " << type << " not supported yet!");
     259        else _error_("Matrix type: " << type << " not supported yet!");
    260260       
    261261        return output;
    … …  
    275275                output=this->smatrix->ToSerial();
    276276        }
    277         else _error2_("Matrix type: " << type << " not supported yet!");
     277        else _error_("Matrix type: " << type << " not supported yet!");
    278278
    279279
    … …  
    292292                this->smatrix->SetValues(m,idxm,n,idxn,values,mode);
    293293        }
    294         else _error2_("Matrix type: " << type << " not supported yet!");
     294        else _error_("Matrix type: " << type << " not supported yet!");
    295295}
    296296/*}}}*/
    … …  
    307307        }
    308308        else{
    309                 _error2_("Matrix type: " << type << " not supported yet!");
    310         }
    311 
    312 }
    313 /*}}}*/
     309                _error_("Matrix type: " << type << " not supported yet!");
     310        }
     311
     312}
     313/*}}}*/

  • issm/trunk-jpl/src/c/classes/matrix/Vector.cpp

    r12910 r13036  
    5151                this->pvector=new PetscVec(M,fromlocalsize);
    5252                #else
    53                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     53                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    5454                #endif
    5555        }
    … …  
    5757                this->svector=new SeqVec(M,fromlocalsize);
    5858        }
    59         else _error2_("Vector type: " << type << " not supported yet!");
     59        else _error_("Vector type: " << type << " not supported yet!");
    6060
    6161}
    … …  
    8686                this->pvector=new PetscVec(serial_vec,M);
    8787                #else
    88                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     88                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    8989                #endif
    9090        }
    … …  
    9292                this->svector=new SeqVec(serial_vec,M);
    9393        }
    94         else _error2_("Vector type: " << type << " not supported yet!");
     94        else _error_("Vector type: " << type << " not supported yet!");
    9595
    9696}
    … …  
    103103                delete this->pvector;
    104104                #else
    105                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     105                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    106106                #endif
    107107        }
    … …  
    109109                delete this->svector;
    110110        }
    111         else _error2_("Vector type: " << type << " not supported yet!");
     111        else _error_("Vector type: " << type << " not supported yet!");
    112112}
    113113/*}}}*/
    … …  
    121121                this->pvector->Echo();
    122122                #else
    123                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     123                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    124124                #endif
    125125        }
    … …  
    127127                this->svector->Echo();
    128128        }
    129         else _error2_("Vector type: " << type << " not supported yet!");
     129        else _error_("Vector type: " << type << " not supported yet!");
    130130
    131131}
    … …  
    138138                this->pvector->Assemble();
    139139                #else
    140                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     140                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    141141                #endif
    142142        }
    … …  
    144144                this->svector->Assemble();
    145145        }
    146         else _error2_("Vector type: " << type << " not supported yet!");
     146        else _error_("Vector type: " << type << " not supported yet!");
    147147
    148148}
    … …  
    156156                this->pvector->SetValues(ssize,list,values,mode);
    157157                #else
    158                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     158                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    159159                #endif
    160160        }
    … …  
    162162                this->svector->SetValues(ssize,list,values,mode);
    163163        }
    164         else _error2_("Vector type: " << type << " not supported yet!");
     164        else _error_("Vector type: " << type << " not supported yet!");
    165165
    166166               
    … …  
    175175                this->pvector->SetValue(dof,value,mode);
    176176                #else
    177                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     177                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    178178                #endif
    179179        }
    … …  
    181181                this->svector->SetValue(dof,value,mode);
    182182        }
    183         else _error2_("Vector type: " << type << " not supported yet!");
     183        else _error_("Vector type: " << type << " not supported yet!");
    184184
    185185}
    … …  
    193193                this->pvector->GetValue(pvalue,dof);
    194194                #else
    195                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     195                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    196196                #endif
    197197        }
    … …  
    199199                this->svector->GetValue(pvalue,dof);
    200200        }
    201         else _error2_("Vector type: " << type << " not supported yet!");
     201        else _error_("Vector type: " << type << " not supported yet!");
    202202
    203203}
    … …  
    210210                this->pvector->GetSize(pM);
    211211                #else
    212                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     212                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    213213                #endif
    214214        }
    … …  
    216216                this->svector->GetSize(pM);
    217217        }
    218         else _error2_("Vector type: " << type << " not supported yet!");
     218        else _error_("Vector type: " << type << " not supported yet!");
    219219
    220220}
    … …  
    241241                this->pvector->GetLocalSize(pM);
    242242                #else
    243                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     243                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    244244                #endif
    245245        }
    … …  
    247247                this->svector->GetLocalSize(pM);
    248248        }
    249         else _error2_("Vector type: " << type << " not supported yet!");
     249        else _error_("Vector type: " << type << " not supported yet!");
    250250
    251251}
    … …  
    262262                output->pvector=this->pvector->Duplicate();
    263263                #else
    264                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     264                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    265265                #endif
    266266        }
    … …  
    269269                output->svector=this->svector->Duplicate();
    270270        }
    271         else _error2_("Vector type: " << type << " not supported yet!");
     271        else _error_("Vector type: " << type << " not supported yet!");
    272272
    273273        return output;
    … …  
    283283                this->pvector->Set(value);
    284284                #else
    285                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     285                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    286286                #endif
    287287        }
    … …  
    289289                this->svector->Set(value);
    290290        }
    291         else _error2_("Vector type: " << type << " not supported yet!");
     291        else _error_("Vector type: " << type << " not supported yet!");
    292292
    293293}
    … …  
    301301                this->pvector->AXPY(X->pvector,a);
    302302                #else
    303                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     303                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    304304                #endif
    305305        }
    … …  
    307307                this->svector->AXPY(X->svector,a);
    308308        }
    309         else _error2_("Vector type: " << type << " not supported yet!");
     309        else _error_("Vector type: " << type << " not supported yet!");
    310310
    311311}
    … …  
    319319                this->pvector->AYPX(X->pvector,a);
    320320                #else
    321                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     321                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    322322                #endif
    323323        }
    … …  
    325325                this->svector->AYPX(X->svector,a);
    326326        }
    327         else _error2_("Vector type: " << type << " not supported yet!");
     327        else _error_("Vector type: " << type << " not supported yet!");
    328328
    329329
    … …  
    339339                vec_serial=this->pvector->ToMPISerial();
    340340                #else
    341                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     341                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    342342                #endif
    343343        }
    … …  
    345345                vec_serial=this->svector->ToMPISerial();
    346346        }
    347         else _error2_("Vector type: " << type << " not supported yet!");
     347        else _error_("Vector type: " << type << " not supported yet!");
    348348
    349349        return vec_serial;
    … …  
    359359                this->pvector->Copy(to->pvector);
    360360                #else
    361                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     361                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    362362                #endif
    363363        }
    … …  
    365365                this->svector->Copy(to->svector);
    366366        }
    367         else _error2_("Vector type: " << type << " not supported yet!");
     367        else _error_("Vector type: " << type << " not supported yet!");
    368368
    369369
    … …  
    379379                norm=this->pvector->Norm(norm_type);
    380380                #else
    381                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     381                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    382382                #endif
    383383        }
    … …  
    385385                norm=this->svector->Norm(norm_type);
    386386        }
    387         else _error2_("Vector type: " << type << " not supported yet!");
     387        else _error_("Vector type: " << type << " not supported yet!");
    388388
    389389        return norm;
    … …  
    398398                this->pvector->Scale(scale_factor);
    399399                #else
    400                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     400                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    401401                #endif
    402402        }
    … …  
    404404                this->svector->Scale(scale_factor);
    405405        }
    406         else _error2_("Vector type: " << type << " not supported yet!");
     406        else _error_("Vector type: " << type << " not supported yet!");
    407407
    408408}
    … …  
    417417                dot=this->pvector->Dot(vector->pvector);
    418418                #else
    419                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     419                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    420420                #endif
    421421        }
    … …  
    423423                dot=this->svector->Dot(vector->svector);
    424424        }
    425         else _error2_("Vector type: " << type << " not supported yet!");
     425        else _error_("Vector type: " << type << " not supported yet!");
    426426
    427427        return dot;
    … …  
    436436                this->pvector->PointwiseDivide(x->pvector,y->pvector);
    437437                #else
    438                 _error2_("Petsc matrix format not usable, as Petsc has not been compiled!");
     438                _error_("Petsc matrix format not usable, as Petsc has not been compiled!");
    439439                #endif
    440440        }
    … …  
    442442                this->svector->PointwiseDivide(x->svector,y->svector);
    443443        }
    444         else _error2_("Vector type: " << type << " not supported yet!");
    445 
    446 }
    447 /*}}}*/
     444        else _error_("Vector type: " << type << " not supported yet!");
     445
     446}
     447/*}}}*/

  • issm/trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp

    r12832 r13036  
    146146                }
    147147
    148                 if(!found)_error2_("could not find time segment for constraint");
     148                if(!found)_error_("could not find time segment for constraint");
    149149
    150150                /*Apply or relax constraint: */

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

    r12832 r13036  
    128128void BoolElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
    129129
    130         _error2_("cannot return vector on vertices");
     130        _error_("cannot return vector on vertices");
    131131} /*}}}*/
    132132/*FUNCTION BoolElementResult::GetElementVectorFromResults{{{*/

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

    r12994 r13036  
    129129void DoubleElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
    130130
    131         _error2_("cannot return vector on vertices");
     131        _error_("cannot return vector on vertices");
    132132} /*}}}*/
    133133/*FUNCTION DoubleElementResult::GetElementVectorFromResults{{{1*/

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

    r12832 r13036  
    142142        IssmDouble data[6];
    143143
    144         if(numdofs!=6)_error2_("Result " << EnumToStringx(this->enum_type) << " is a PentaP1ElementResult and cannot write vector of " << numdofs << " dofs");
     144        if(numdofs!=6)_error_("Result " << EnumToStringx(this->enum_type) << " is a PentaP1ElementResult and cannot write vector of " << numdofs << " dofs");
    145145        for(int i=0;i<6;i++) data[i]=this->values[i]/(IssmDouble)connectivitylist[i];
    146146        vector->SetValues(numdofs,doflist,&data[0],ADD_VAL);
    … …  
    150150void PentaP1ElementResult::GetElementVectorFromResults(Vector* vector,int dof){
    151151
    152         _error2_("Result " << EnumToStringx(enum_type) << " is a PentaP1ElementResult and should not write vector of size numberofelemenrs");
     152        _error_("Result " << EnumToStringx(enum_type) << " is a PentaP1ElementResult and should not write vector of size numberofelemenrs");
    153153} /*}}}*/

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

    r12832 r13036  
    130130        IssmDouble data[3];
    131131
    132         if(numdofs!=3)_error2_("Result " << EnumToStringx(this->enum_type) << " is a TriaP1ElementResult and cannot write vector of " << numdofs << " dofs");
     132        if(numdofs!=3)_error_("Result " << EnumToStringx(this->enum_type) << " is a TriaP1ElementResult and cannot write vector of " << numdofs << " dofs");
    133133        for(int i=0;i<3;i++) data[i]=this->values[i]/(IssmDouble)connectivitylist[i];
    134134        vector->SetValues(numdofs,doflist,&data[0],ADD_VAL);
    … …  
    137137/*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{*/
    138138void TriaP1ElementResult::GetElementVectorFromResults(Vector* vector,int dof){
    139         _error2_("Result " << EnumToStringx(enum_type) << " is a TriaP1ElementResult and should not write vector of size numberofelemenrs");
     139        _error_("Result " << EnumToStringx(enum_type) << " is a TriaP1ElementResult and should not write vector of size numberofelemenrs");
    140140} /*}}}*/

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

    r12994 r13036  
    146146/*FUNCTION Penta::AverageOntoPartition {{{*/
    147147void  Penta::AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
    148         _error2_("Not supported yet!");
     148        _error_("Not supported yet!");
    149149}
    150150/*}}}*/
    … …  
    252252
    253253        /*Check analysis_types*/
    254         if (analysis_type!=DiagnosticHorizAnalysisEnum) _error2_("Not supported yet!");
    255         if (approximation!=StokesApproximationEnum) _error2_("Not supported yet!");
     254        if (analysis_type!=DiagnosticHorizAnalysisEnum) _error_("Not supported yet!");
     255        if (approximation!=StokesApproximationEnum) _error_("Not supported yet!");
    256256
    257257        /*retrieve some parameters: */
    … …  
    318318void  Penta::ComputeStrainRate(Vector* eps){
    319319
    320         _error2_("Not implemented yet");
     320        _error_("Not implemented yet");
    321321
    322322}
    … …  
    464464                #endif
    465465                default:
    466                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     466                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    467467        }
    468468
    … …  
    569569                #endif
    570570                default:
    571                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     571                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    572572        }
    573573
    … …  
    638638#endif
    639639                default:
    640                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     640                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    641641        }
    642642
    … …  
    888888                 return i;
    889889        }
    890         _error2_("Node provided not found among element nodes");
     890        _error_("Node provided not found among element nodes");
    891891
    892892}
    … …  
    901901        /*Recover input*/
    902902        Input* input=inputs->GetInput(enumtype);
    903         if (!input) _error2_("Input " << EnumToStringx(enumtype) << " not found in element");
     903        if (!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element");
    904904
    905905        /*Checks in debugging mode*/
    … …  
    950950
    951951        Input* input=inputs->GetInput(enumtype);
    952         if(!input) _error2_("No input of type " << EnumToStringx(enumtype) << " found in tria");
     952        if(!input) _error_("No input of type " << EnumToStringx(enumtype) << " found in tria");
    953953
    954954        GaussPenta* gauss=new GaussPenta();
    … …  
    10451045        #endif
    10461046        default:
    1047                 _error2_("analysis: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     1047                _error_("analysis: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    10481048        }
    10491049}
    … …  
    10851085        /*Check that both inputs have been found*/
    10861086        if (!vx_input || !vy_input){
    1087                 _error2_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n");
     1087                _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n");
    10881088        }
    10891089
    … …  
    11101110        /*Check that both inputs have been found*/
    11111111        if (!vx_input || !vy_input || !vz_input){
    1112                 _error2_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << ", vz: " << vz_input << "\n");
     1112                _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << ", vz: " << vz_input << "\n");
    11131113        }
    11141114
    … …  
    11451145        /*Get input (either in element or material)*/
    11461146        Input* input=inputs->GetInput(input_enum);
    1147         if(!input) _error2_("Input " << EnumToStringx(input_enum) << " not found in element");
     1147        if(!input) _error_("Input " << EnumToStringx(input_enum) << " not found in element");
    11481148
    11491149        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
    … …  
    11571157        ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset);
    11581158        if(elementresult->InstanceEnum()!=enum_in){
    1159                 _error2_("Results of offset "<<offset<<" is "<<EnumToStringx(elementresult->InstanceEnum())<<" when "<<EnumToStringx(enum_in)<<" was expected");
     1159                _error_("Results of offset "<<offset<<" is "<<EnumToStringx(elementresult->InstanceEnum())<<" when "<<EnumToStringx(enum_in)<<" was expected");
    11601160        } 
    11611161        if(interp==P1Enum){
    … …  
    12081208        /*Make a copy of the original input: */
    12091209        input=(Input*)this->inputs->GetInput(enum_type);
    1210         if(!input)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
     1210        if(!input)_error_("could not find old input with enum: " << EnumToStringx(enum_type));
    12111211
    12121212        /*ArtificialNoise: */
    … …  
    12281228                new_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+0]);
    12291229                old_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+1]);
    1230                 if(!new_inputs[i])_error2_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
    1231                 if(!old_inputs[i])_error2_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
     1230                if(!new_inputs[i])_error_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
     1231                if(!old_inputs[i])_error_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
    12321232        }
    12331233
    … …  
    12611261                this->inputs->AddInput(new DoubleInput(name,(IssmDouble)scalar));
    12621262        }
    1263         else _error2_("could not recognize nature of vector from code " << code);
     1263        else _error_("could not recognize nature of vector from code " << code);
    12641264
    12651265}
    … …  
    13271327                        this->inputs->AddInput(transientinput);
    13281328                }
    1329                 else _error2_("nodal vector is either numberofnodes (" << numberofvertices << "), or numberofnodes+1 long. Field provided is " << M << " long. Enum " << EnumToStringx(vector_enum));
     1329                else _error_("nodal vector is either numberofnodes (" << numberofvertices << "), or numberofnodes+1 long. Field provided is " << M << " long. Enum " << EnumToStringx(vector_enum));
    13301330        }
    13311331        else if(vector_type==2){ //element vector
    … …  
    13441344                                this->inputs->AddInput(new DoubleInput(vector_enum,(IssmDouble)vector[index]));
    13451345                        }
    1346                         else _error2_("could not recognize nature of vector from code " << code);
     1346                        else _error_("could not recognize nature of vector from code " << code);
    13471347                }
    13481348                else {
    1349                         _error2_("transient elementary inputs not supported yet!");
     1349                        _error_("transient elementary inputs not supported yet!");
    13501350                }
    13511351        }
    13521352        else{
    1353                 _error2_("Cannot add input for vector type " << vector_type << " (not supported)");
     1353                _error_("Cannot add input for vector type " << vector_type << " (not supported)");
    13541354        }
    13551355
    … …  
    13901390                 original_input=(Input*)penta->matice->inputs->GetInput(enum_type);
    13911391                else
    1392                  _error2_("object " << EnumToStringx(object_enum) << " not supported yet");
    1393                 if(!original_input) _error2_("could not find input with enum " << EnumToStringx(enum_type));
     1392                 _error_("object " << EnumToStringx(object_enum) << " not supported yet");
     1393                if(!original_input) _error_("could not find input with enum " << EnumToStringx(enum_type));
    13941394
    13951395                /*If first time, initialize total_integrated_input*/
    … …  
    14021402                         total_integrated_input=new DoubleInput(average_enum_type,0.0);
    14031403                        else
    1404                          _error2_("object " << EnumToStringx(original_input->ObjectEnum()) << " not supported yet");
     1404                         _error_("object " << EnumToStringx(original_input->ObjectEnum()) << " not supported yet");
    14051405                }
    14061406
    … …  
    14501450         this->matice->inputs->AddInput((Input*)depth_averaged_input);
    14511451        else
    1452          _error2_("object " << EnumToStringx(object_enum) << " not supported yet");
     1452         _error_("object " << EnumToStringx(object_enum) << " not supported yet");
    14531453}
    14541454/*}}}*/
    … …  
    14911491        }
    14921492        else{
    1493                 _error2_("object of type " << EnumToStringx(object_type) << " not supported yet");
     1493                _error_("object of type " << EnumToStringx(object_type) << " not supported yet");
    14941494        }
    14951495        for(i=0;i<num_inputs;i++){
    1496                 if(!base_inputs[i]) _error2_("could not find input with enum " << EnumToStringx(enum_type) << " in object " << EnumToStringx(object_type));
     1496                if(!base_inputs[i]) _error_("could not find input with enum " << EnumToStringx(enum_type) << " in object " << EnumToStringx(object_type));
    14971497                base_inputs[i]->Extrude();
    14981498        }
    … …  
    15211521                        }
    15221522                        else{
    1523                                 _error2_("object of type " << EnumToStringx(object_type) << " not supported yet");
     1523                                _error_("object of type " << EnumToStringx(object_type) << " not supported yet");
    15241524                        }
    15251525                }
    … …  
    15401540        /*Make a copy of the original input: */
    15411541        input=(Input*)this->inputs->GetInput(enum_type);
    1542         if(!input)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
     1542        if(!input)_error_("could not find old input with enum: " << EnumToStringx(enum_type));
    15431543
    15441544        /*Scale: */
    … …  
    15561556        if (enum_type==MaterialsRheologyBbarEnum) input=this->matice->inputs->GetInput(MaterialsRheologyBEnum);
    15571557        else input=this->inputs->GetInput(enum_type);
    1558         //if (!input) _error2_("Input " << EnumToStringx(enum_type) << " not found in penta->inputs"); why error out? if the requested input does not exist, we should still
     1558        //if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found in penta->inputs"); why error out? if the requested input does not exist, we should still
    15591559        //try and output whatever we can instead of just failing.
    15601560        if(!input)return;
    … …  
    16691669                                        /*Matice will take care of it*/ break;
    16701670                                default:
    1671                                         _error2_("Control " << EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]) << " not implemented yet");
     1671                                        _error_("Control " << EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]) << " not implemented yet");
    16721672                        }
    16731673                }
    … …  
    17021702                }
    17031703                else{
    1704                         _error2_("Approximation type " << EnumToStringx((int)*(iomodel->Data(FlowequationElementEquationEnum)+index)) << " not supported yet");
     1704                        _error_("Approximation type " << EnumToStringx((int)*(iomodel->Data(FlowequationElementEquationEnum)+index)) << " not supported yet");
    17051705                }
    17061706        }
    … …  
    17861786        #endif
    17871787        default:
    1788                 _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     1788                _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    17891789        }
    17901790}
    … …  
    18171817        for(i=0;i<numdof2d;i++){
    18181818                newthickness[i]=solution[doflist[i]];
    1819                 if(xIsNan<IssmDouble>(newthickness[i])) _error2_("NaN found in solution vector");
     1819                if(xIsNan<IssmDouble>(newthickness[i])) _error_("NaN found in solution vector");
    18201820                /*Constrain thickness to be at least 1m*/
    18211821                if(newthickness[i]<minthickness) newthickness[i]=minthickness;
    … …  
    18501850                                newbed[i]=oldbed[i]-rho_ice/rho_water*(newthickness[i]-oldthickness[i]); //bed = oldbed + di * dH
    18511851                        }
    1852                         else _error2_("Hydrostatic adjustment " << hydroadjustment << " (" << EnumToStringx(hydroadjustment) << ") not supported yet");
     1852                        else _error_("Hydrostatic adjustment " << hydroadjustment << " (" << EnumToStringx(hydroadjustment) << ") not supported yet");
    18531853                }
    18541854        }
    … …  
    18871887        for(int i=0;i<numdof;i++){
    18881888                values[i]=solution[doflist[i]];
    1889                 if(xIsNan<IssmDouble>(values[i])) _error2_("NaN found in solution vector");
     1889                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
    18901890        }
    18911891
    … …  
    19171917                values[i]         =solution[doflist[i]];
    19181918                values[i+numdof2d]=values[i];
    1919                 if(xIsNan<IssmDouble>(values[i])) _error2_("NaN found in solution vector");
     1919                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
    19201920        }
    19211921
    … …  
    19631963                default:
    19641964
    1965                         _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     1965                        _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    19661966        }
    19671967}
    … …  
    19691969/*FUNCTION Penta::InputUpdateFromVector(int* vector, int name, int type);{{{*/
    19701970void  Penta::InputUpdateFromVector(int* vector, int name, int type){
    1971         _error2_("not supported yet!");
     1971        _error_("not supported yet!");
    19721972}
    19731973/*}}}*/
    19741974/*FUNCTION Penta::InputUpdateFromVector(bool* vector, int name, int type);{{{*/
    19751975void  Penta::InputUpdateFromVector(bool* vector, int name, int type){
    1976         _error2_("not supported yet!");
     1976        _error_("not supported yet!");
    19771977}
    19781978/*}}}*/
    … …  
    25752575void  Penta::SetClone(int* minranks){
    25762576
    2577         _error2_("not implemented yet");
     2577        _error_("not implemented yet");
    25782578}
    25792579/*}}}*/
    … …  
    29422942                                this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,nodeinputs));
    29432943                        }
    2944                         else _error2_("temperature and waterfraction required for the enthalpy solution");
     2944                        else _error_("temperature and waterfraction required for the enthalpy solution");
    29452945                        break;
    29462946
    … …  
    30213021/*FUNCTION Penta::SmearFunction {{{*/
    30223022void  Penta::SmearFunction(Vector* smearedvector,IssmDouble (*WeightFunction)(IssmDouble distance,IssmDouble radius),IssmDouble radius){
    3023         _error2_("not implemented yet");
     3023        _error_("not implemented yet");
    30243024}
    30253025/*}}}*/
    … …  
    32393239                        *presponse=vel;
    32403240                default: 
    3241                         _error2_("Response type " << EnumToStringx(response_enum) << " not supported yet!");
     3241                        _error_("Response type " << EnumToStringx(response_enum) << " not supported yet!");
    32423242        }
    32433243
    … …  
    43144314
    43154315                /*Check solution*/
    4316                 if(xIsNan<IssmDouble>(values[i])) _error2_("NaN found in solution vector");
     4316                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
    43174317                //if(values[i]<0)      _printLine_("temperature < 0°K found in solution vector");
    43184318                //if(values[i]>275)    _printLine_("temperature > 275°K found in solution vector (Paterson's rheology associated is negative)");
    … …  
    43484348                                break;
    43494349                        default:
    4350                                 _error2_("Rheology law " << EnumToStringx(rheology_law) << " not supported yet");
     4350                                _error_("Rheology law " << EnumToStringx(rheology_law) << " not supported yet");
    43514351
    43524352                }
    … …  
    43844384
    43854385                /*Check solution*/
    4386                 if(xIsNan<IssmDouble>(values[i])) _error2_("NaN found in solution vector");
     4386                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
    43874387        }
    43884388
    … …  
    43974397                for(i=0;i<numdof;i++){
    43984398                        matpar->EnthalpyToThermal(&temperatures[i],&waterfraction[i],values[i],pressure[i]);
    4399                         if(waterfraction[i]<0) _error2_("Negative water fraction found in solution vector");
    4400                         //if(waterfraction[i]>1) _error2_("Water fraction >1 found in solution vector");
     4399                        if(waterfraction[i]<0) _error_("Negative water fraction found in solution vector");
     4400                        //if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector");
    44014401                }
    44024402                       
    … …  
    44264426                                break;
    44274427                        default:
    4428                                 _error2_("Rheology law " << EnumToStringx(rheology_law) << " not supported yet");
     4428                                _error_("Rheology law " << EnumToStringx(rheology_law) << " not supported yet");
    44294429
    44304430                }
    … …  
    44544454                input=inputs->GetInput(enum_type);
    44554455        }
    4456         if (!input) _error2_("Input " << EnumToStringx(enum_type) << " not found");
    4457         if (input->ObjectEnum()!=ControlInputEnum) _error2_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
     4456        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
     4457        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
    44584458
    44594459        GradientIndexing(&doflist1[0],control_index);
    … …  
    44724472                input=inputs->GetInput(enum_type);
    44734473        }
    4474         if (!input) _error2_("Input " << EnumToStringx(enum_type) << " not found");
    4475         if (input->ObjectEnum()!=ControlInputEnum) _error2_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
     4474        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
     4475        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
    44764476
    44774477        ((ControlInput*)input)->ScaleGradient(scale);
    … …  
    44914491                input=inputs->GetInput(enum_type);
    44924492        }
    4493         if (!input) _error2_("Input " << EnumToStringx(enum_type) << " not found");
    4494         if (input->ObjectEnum()!=ControlInputEnum) _error2_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
     4493        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
     4494        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
    44954495
    44964496        GradientIndexing(&doflist1[0],control_index);
    … …  
    45164516                        return NULL;
    45174517                default:
    4518                         _error2_("Approximation " << EnumToStringx(approximation) << " not supported yet");
     4518                        _error_("Approximation " << EnumToStringx(approximation) << " not supported yet");
    45194519        }
    45204520}
    … …  
    47064706                        return CreatePVectorAdjointStokes();
    47074707                default:
    4708                         _error2_("Approximation " << EnumToStringx(approximation) << " not supported yet");
     4708                        _error_("Approximation " << EnumToStringx(approximation) << " not supported yet");
    47094709        }
    47104710}
    … …  
    47954795                                        break;
    47964796                                default:
    4797                                         _error2_("approximation " << EnumToStringx(approximation) << " not supported yet");
     4797                                        _error_("approximation " << EnumToStringx(approximation) << " not supported yet");
    47984798                        }
    47994799                        break;
    … …  
    48154815                                        break;
    48164816                                default:
    4817                                         _error2_("approximation " << EnumToStringx(approximation) << " not supported yet");
     4817                                        _error_("approximation " << EnumToStringx(approximation) << " not supported yet");
    48184818                        }
    48194819                        break;
    48204820
    48214821                default:
    4822                         _error2_("control type " << EnumToStringx(control_type) << " not supported yet: ");
     4822                        _error_("control type " << EnumToStringx(control_type) << " not supported yet: ");
    48234823        }
    48244824
    … …  
    48524852                        break;
    48534853                default:
    4854                         _error2_("response " << EnumToStringx(responses[resp]) << " not supported yet");
     4854                        _error_("response " << EnumToStringx(responses[resp]) << " not supported yet");
    48554855        }
    48564856        xDelete<int>(responses);
    … …  
    51065106                }
    51075107
    5108                 if (input->ObjectEnum()!=ControlInputEnum) _error2_("input " << EnumToStringx(control_type[i]) << " is not a ControlInput");
     5108                if (input->ObjectEnum()!=ControlInputEnum) _error_("input " << EnumToStringx(control_type[i]) << " is not a ControlInput");
    51095109
    51105110                ((ControlInput*)input)->UpdateValue(scalar);
    … …  
    51495149
    51505150                /*Check solution*/
    5151                 if(xIsNan<IssmDouble>(lambdax[i])) _error2_("NaN found in solution vector");
    5152                 if(xIsNan<IssmDouble>(lambday[i])) _error2_("NaN found in solution vector");
    5153                 if(xIsNan<IssmDouble>(lambdaz[i])) _error2_("NaN found in solution vector");
    5154                 if(xIsNan<IssmDouble>(lambdap[i])) _error2_("NaN found in solution vector");
     5151                if(xIsNan<IssmDouble>(lambdax[i])) _error_("NaN found in solution vector");
     5152                if(xIsNan<IssmDouble>(lambday[i])) _error_("NaN found in solution vector");
     5153                if(xIsNan<IssmDouble>(lambdaz[i])) _error_("NaN found in solution vector");
     5154                if(xIsNan<IssmDouble>(lambdap[i])) _error_("NaN found in solution vector");
    51555155        }
    51565156
    … …  
    51885188
    51895189                /*Check solution*/
    5190                 if(xIsNan<IssmDouble>(lambdax[i]))       _error2_("NaN found in solution vector");
    5191                 if(xIsNan<IssmDouble>(lambday[i]))       _error2_("NaN found in solution vector");
     5190                if(xIsNan<IssmDouble>(lambdax[i]))       _error_("NaN found in solution vector");
     5191                if(xIsNan<IssmDouble>(lambday[i]))       _error_("NaN found in solution vector");
    51925192        }
    51935193
    … …  
    53905390IssmDouble Penta::ThicknessAbsGradient(bool process_units,int weight_index){
    53915391
    5392         _error2_("Not implemented yet");
     5392        _error_("Not implemented yet");
    53935393}
    53945394/*}}}*/
    … …  
    54055405        /*If on water, return 0: */
    54065406        if(IsOnWater())return 0;
    5407         _error2_("Not implemented yet");
     5407        _error_("Not implemented yet");
    54085408
    54095409        tria=(Tria*)SpawnTria(0,1,2);
    … …  
    54565456        /*Get input (either in element or material)*/
    54575457        Input* input=inputs->GetInput(control_enum);
    5458         if(!input) _error2_("Input " << EnumToStringx(control_enum) << " not found in element");
     5458        if(!input) _error_("Input " << EnumToStringx(control_enum) << " not found in element");
    54595459
    54605460        /*Check that it is a ControlInput*/
    54615461        if (input->ObjectEnum()!=ControlInputEnum){
    5462                 _error2_("input " << EnumToStringx(control_enum) << " is not a ControlInput");
     5462                _error_("input " << EnumToStringx(control_enum) << " is not a ControlInput");
    54635463        }
    54645464
    … …  
    54955495
    54965496        if (input->ObjectEnum()!=ControlInputEnum){
    5497                 _error2_("input " << EnumToStringx(control_enum) << " is not a ControlInput");
     5497                _error_("input " << EnumToStringx(control_enum) << " is not a ControlInput");
    54985498        }
    54995499
    … …  
    56015601
    56025602                default:
    5603                         _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     5603                        _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    56045604        }
    56055605
    … …  
    56085608/*FUNCTION Penta::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/
    56095609void  Penta::InputUpdateFromVectorDakota(int* vector, int name, int type){
    5610         _error2_("not supported yet!");
     5610        _error_("not supported yet!");
    56115611}
    56125612/*}}}*/
    56135613/*FUNCTION Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/
    56145614void  Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    5615         _error2_("not supported yet!");
     5615        _error_("not supported yet!");
    56165616}
    56175617/*}}}*/
    … …  
    56565656
    56575657                default:
    5658                         _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     5658                        _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    56595659        }
    56605660
    … …  
    62156215                        return CreateKMatrixDiagnosticPattynStokes();
    62166216                default:
    6217                         _error2_("Approximation " << EnumToStringx(approximation) << " not supported yet");
     6217                        _error_("Approximation " << EnumToStringx(approximation) << " not supported yet");
    62186218        }
    62196219}
    … …  
    63836383                        matice->GetViscosity3dStokes(&newviscosity,&epsilons[0]);
    63846384                }
    6385                 else _error2_("approximation " << approximation << " (" << EnumToStringx(approximation) << ") not supported yet");
     6385                else _error_("approximation " << approximation << " (" << EnumToStringx(approximation) << ") not supported yet");
    63866386
    63876387                D_scalar=2*newviscosity*gauss->weight*Jdet;
    … …  
    72067206                        return CreatePVectorDiagnosticPattynStokes();
    72077207                default:
    7208                         _error2_("Approximation " << EnumToStringx(approximation) << " not supported yet");
     7208                        _error_("Approximation " << EnumToStringx(approximation) << " not supported yet");
    72097209        }
    72107210}
    … …  
    77197719                        return NULL;
    77207720                default:
    7721                         _error2_("Approximation " << EnumToStringx(approximation) << " not supported yet");
     7721                        _error_("Approximation " << EnumToStringx(approximation) << " not supported yet");
    77227722        }
    77237723}
    … …  
    81148114
    81158115                /*Check solution*/
    8116                 if(xIsNan<IssmDouble>(vx[i])) _error2_("NaN found in solution vector");
    8117                 if(xIsNan<IssmDouble>(vy[i])) _error2_("NaN found in solution vector");
     8116                if(xIsNan<IssmDouble>(vx[i])) _error_("NaN found in solution vector");
     8117                if(xIsNan<IssmDouble>(vy[i])) _error_("NaN found in solution vector");
    81188118        }
    81198119
    … …  
    82128212
    82138213                /*Check solution*/
    8214                 if(xIsNan<IssmDouble>(vx[i])) _error2_("NaN found in solution vector");
    8215                 if(xIsNan<IssmDouble>(vy[i])) _error2_("NaN found in solution vector");
     8214                if(xIsNan<IssmDouble>(vx[i])) _error_("NaN found in solution vector");
     8215                if(xIsNan<IssmDouble>(vy[i])) _error_("NaN found in solution vector");
    82168216        }
    82178217
    … …  
    83008300
    83018301                /*Check solution*/
    8302                 if(xIsNan<IssmDouble>(vx[i]))       _error2_("NaN found in solution vector");
    8303                 if(xIsNan<IssmDouble>(vy[i]))       _error2_("NaN found in solution vector");
    8304                 if(xIsNan<IssmDouble>(vzstokes[i])) _error2_("NaN found in solution vector");
    8305                 if(xIsNan<IssmDouble>(pressure[i])) _error2_("NaN found in solution vector");
     8302                if(xIsNan<IssmDouble>(vx[i]))       _error_("NaN found in solution vector");
     8303                if(xIsNan<IssmDouble>(vy[i]))       _error_("NaN found in solution vector");
     8304                if(xIsNan<IssmDouble>(vzstokes[i])) _error_("NaN found in solution vector");
     8305                if(xIsNan<IssmDouble>(pressure[i])) _error_("NaN found in solution vector");
    83068306        }
    83078307
    … …  
    83108310        if (vzmacayeal_input){
    83118311                if (vzmacayeal_input->ObjectEnum()!=PentaP1InputEnum){
    8312                         _error2_("Cannot compute Vel as VzMacAyeal is of type " << EnumToStringx(vzmacayeal_input->ObjectEnum()));
     8312                        _error_("Cannot compute Vel as VzMacAyeal is of type " << EnumToStringx(vzmacayeal_input->ObjectEnum()));
    83138313                }
    83148314                GetInputListOnVertices(&vzmacayeal[0],VzMacAyealEnum);
    83158315        }
    83168316        else{
    8317                 _error2_("Cannot update solution as VzMacAyeal is not present");
     8317                _error_("Cannot update solution as VzMacAyeal is not present");
    83188318        }
    83198319
    … …  
    83798379
    83808380                /*Check solution*/
    8381                 if(xIsNan<IssmDouble>(vx[i])) _error2_("NaN found in solution vector");
    8382                 if(xIsNan<IssmDouble>(vy[i])) _error2_("NaN found in solution vector");
     8381                if(xIsNan<IssmDouble>(vx[i])) _error_("NaN found in solution vector");
     8382                if(xIsNan<IssmDouble>(vy[i])) _error_("NaN found in solution vector");
    83838383        }
    83848384
    … …  
    84688468
    84698469                /*Check solution*/
    8470                 if(xIsNan<IssmDouble>(vx[i]))       _error2_("NaN found in solution vector");
    8471                 if(xIsNan<IssmDouble>(vy[i]))       _error2_("NaN found in solution vector");
    8472                 if(xIsNan<IssmDouble>(vzstokes[i])) _error2_("NaN found in solution vector");
    8473                 if(xIsNan<IssmDouble>(pressure[i])) _error2_("NaN found in solution vector");
     8470                if(xIsNan<IssmDouble>(vx[i]))       _error_("NaN found in solution vector");
     8471                if(xIsNan<IssmDouble>(vy[i]))       _error_("NaN found in solution vector");
     8472                if(xIsNan<IssmDouble>(vzstokes[i])) _error_("NaN found in solution vector");
     8473                if(xIsNan<IssmDouble>(pressure[i])) _error_("NaN found in solution vector");
    84748474        }
    84758475
    … …  
    84788478        if (vzpattyn_input){
    84798479                if (vzpattyn_input->ObjectEnum()!=PentaP1InputEnum){
    8480                         _error2_("Cannot compute Vel as VzPattyn is of type " << EnumToStringx(vzpattyn_input->ObjectEnum()));
     8480                        _error_("Cannot compute Vel as VzPattyn is of type " << EnumToStringx(vzpattyn_input->ObjectEnum()));
    84818481                }
    84828482                GetInputListOnVertices(&vzpattyn[0],VzPattynEnum);
    84838483        }
    84848484        else{
    8485                 _error2_("Cannot update solution as VzPattyn is not present");
     8485                _error_("Cannot update solution as VzPattyn is not present");
    84868486        }
    84878487
    … …  
    85448544
    85458545                /*Check solution*/
    8546                 if(xIsNan<IssmDouble>(vx[i])) _error2_("NaN found in solution vector");
    8547                 if(xIsNan<IssmDouble>(vy[i])) _error2_("NaN found in solution vector");
     8546                if(xIsNan<IssmDouble>(vx[i])) _error_("NaN found in solution vector");
     8547                if(xIsNan<IssmDouble>(vy[i])) _error_("NaN found in solution vector");
    85488548        }
    85498549
    … …  
    86138613
    86148614                /*Check solution*/
    8615                 if(xIsNan<IssmDouble>(vz[i])) _error2_("NaN found in solution vector");
     8615                if(xIsNan<IssmDouble>(vz[i])) _error_("NaN found in solution vector");
    86168616        }
    86178617
    … …  
    86248624                Input* vzstokes_input=inputs->GetInput(VzStokesEnum);
    86258625                if (vzstokes_input){
    8626                         if (vzstokes_input->ObjectEnum()!=PentaP1InputEnum) _error2_("Cannot compute Vel as VzStokes is of type " << EnumToStringx(vzstokes_input->ObjectEnum()));
     8626                        if (vzstokes_input->ObjectEnum()!=PentaP1InputEnum) _error_("Cannot compute Vel as VzStokes is of type " << EnumToStringx(vzstokes_input->ObjectEnum()));
    86278627                        GetInputListOnVertices(&vzstokes[0],VzStokesEnum);
    86288628                }
    8629                 else _error2_("Cannot compute Vz as VzStokes in not present in PattynStokes element");
     8629                else _error_("Cannot compute Vz as VzStokes in not present in PattynStokes element");
    86308630                for(i=0;i<NUMVERTICES;i++){
    86318631                        vzpattyn[i]=vz[i];
    … …  
    86368636                Input* vzstokes_input=inputs->GetInput(VzStokesEnum);
    86378637                if (vzstokes_input){
    8638                         if (vzstokes_input->ObjectEnum()!=PentaP1InputEnum) _error2_("Cannot compute Vel as VzStokes is of type " << EnumToStringx(vzstokes_input->ObjectEnum()));
     8638                        if (vzstokes_input->ObjectEnum()!=PentaP1InputEnum) _error_("Cannot compute Vel as VzStokes is of type " << EnumToStringx(vzstokes_input->ObjectEnum()));
    86398639                        GetInputListOnVertices(&vzstokes[0],VzStokesEnum);
    86408640                }
    8641                 else _error2_("Cannot compute Vz as VzStokes in not present in MacAyealStokes element");
     8641                else _error_("Cannot compute Vz as VzStokes in not present in MacAyealStokes element");
    86428642                for(i=0;i<NUMVERTICES;i++){
    86438643                        vzmacayeal[i]=vz[i];
    … …  
    87118711
    87128712                /*Check solution*/
    8713                 if(xIsNan<IssmDouble>(vx[i]))       _error2_("NaN found in solution vector");
    8714                 if(xIsNan<IssmDouble>(vy[i]))       _error2_("NaN found in solution vector");
    8715                 if(xIsNan<IssmDouble>(vz[i]))       _error2_("NaN found in solution vector");
    8716                 if(xIsNan<IssmDouble>(pressure[i])) _error2_("NaN found in solution vector");
     8713                if(xIsNan<IssmDouble>(vx[i]))       _error_("NaN found in solution vector");
     8714                if(xIsNan<IssmDouble>(vy[i]))       _error_("NaN found in solution vector");
     8715                if(xIsNan<IssmDouble>(vz[i]))       _error_("NaN found in solution vector");
     8716                if(xIsNan<IssmDouble>(pressure[i])) _error_("NaN found in solution vector");
    87178717        }
    87188718

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

    r12927 r13036  
    162162                IssmDouble SurfaceAverageVelMisfit(bool process_units,int weight_index);
    163163                IssmDouble ThicknessAbsGradient(bool process_units,int weight_index);
    164                 IssmDouble ThicknessAlongGradient( bool process_units,int weight_index){_error2_("not supported");};
    165                 IssmDouble ThicknessAcrossGradient(bool process_units,int weight_index){_error2_("not supported");};
     164                IssmDouble ThicknessAlongGradient( bool process_units,int weight_index){_error_("not supported");};
     165                IssmDouble ThicknessAcrossGradient(bool process_units,int weight_index){_error_("not supported");};
    166166                void   InputControlUpdate(IssmDouble scalar,bool save_parameter);
    167167                #endif

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

    r12832 r13036  
    949949        /*Get Determinant*/
    950950        Matrix3x3Determinant(Jdet,&J[0][0]);
    951         if(*Jdet<0) _error2_("negative jacobian determinant!");
     951        if(*Jdet<0) _error_("negative jacobian determinant!");
    952952
    953953}
    … …  
    972972        /*Jdet = norm( AB ^ AC ) / (2 * area of the reference triangle), with areaRef=sqrt(3) */
    973973        *Jdet=SQRT3/6.0*pow(pow(((y2-y1)*(z3-z1)-(z2-z1)*(y3-y1)),2.0)+pow(((z2-z1)*(x3-x1)-(x2-x1)*(z3-z1)),2.0)+pow(((x2-x1)*(y3-y1)-(y2-y1)*(x3-x1)),2.0),0.5);
    974         if(*Jdet<0) _error2_("negative jacobian determinant!");
     974        if(*Jdet<0) _error_("negative jacobian determinant!");
    975975}
    976976/*}}}*/
    … …  
    990990
    991991        *Jdet=1.0/2.0*sqrt(pow(x2-x1,2.) + pow(y2-y1,2.) + pow(z2-z1,2.));
    992         if(*Jdet<0) _error2_("negative jacobian determinant!");
     992        if(*Jdet<0) _error_("negative jacobian determinant!");
    993993
    994994}
    … …  
    12261226        /*Area of a trabezoid = altitude * (base1 + base2)/2 */
    12271227        *Jdet= pow(pow(x2-x1,2.) + pow(y2-y1,2.),0.5) * (z4-z1 + z3-z2)/8;
    1228         if(*Jdet<0) _error2_("negative jacobian determinant!");
     1228        if(*Jdet<0) _error_("negative jacobian determinant!");
    12291229
    12301230}

  • issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.h

    r12494 r13036  
    5656                void GetLprimeStokesMacAyeal(IssmDouble* LprimeStokesMacAyeal, IssmDouble* xyz_list, GaussPenta* gauss);
    5757                void GetInputValue(IssmDouble* pvalue,IssmDouble* plist, GaussPenta* gauss);
    58                 void GetInputValue(IssmDouble* pvalue,IssmDouble* plist,GaussTria* gauss){_error2_("only PentaGauss are supported");};
     58                void GetInputValue(IssmDouble* pvalue,IssmDouble* plist,GaussTria* gauss){_error_("only PentaGauss are supported");};
    5959                void GetInputDerivativeValue(IssmDouble* pvalues, IssmDouble* plist,IssmDouble* xyz_list, GaussPenta* gauss);
    60                 void GetInputDerivativeValue(IssmDouble* pvalues, IssmDouble* plist,IssmDouble* xyz_list, GaussTria* gauss){_error2_("only PentaGauss are supported");};
     60                void GetInputDerivativeValue(IssmDouble* pvalues, IssmDouble* plist,IssmDouble* xyz_list, GaussTria* gauss){_error_("only PentaGauss are supported");};
    6161
    6262};

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

    r12994 r13036  
    214214                #endif
    215215                default:
    216                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     216                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    217217        }
    218218
    … …  
    277277                        return CreateKMatrixPrognostic_DG();
    278278                default:
    279                         _error2_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
     279                        _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
    280280        }
    281281
    … …  
    568568                #endif
    569569                default:
    570                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     570                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    571571        }
    572572
    … …  
    587587                        return CreatePVectorPrognostic_DG();
    588588                default:
    589                         _error2_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
     589                        _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
    590590        }
    591591}
    … …  
    763763#endif
    764764                default:
    765                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     765                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    766766        }
    767767
    … …  
    775775/*FUNCTION Tria::ComputeBasalStress {{{*/
    776776void  Tria::ComputeBasalStress(Vector* eps){
    777         _error2_("Not Implemented yet");
     777        _error_("Not Implemented yet");
    778778}
    779779/*}}}*/
    780780/*FUNCTION Tria::ComputeStrainRate {{{*/
    781781void  Tria::ComputeStrainRate(Vector* eps){
    782         _error2_("Not Implemented yet");
     782        _error_("Not Implemented yet");
    783783}
    784784/*}}}*/
    … …  
    10881088                 return i;
    10891089        }
    1090         _error2_("Node provided not found among element nodes");
     1090        _error_("Node provided not found among element nodes");
    10911091}
    10921092/*}}}*/
    … …  
    11001100        /*Recover input*/
    11011101        Input* input=inputs->GetInput(enumtype);
    1102         if (!input) _error2_("Input " << EnumToStringx(enumtype) << " not found in element");
     1102        if (!input) _error_("Input " << EnumToStringx(enumtype) << " not found in element");
    11031103
    11041104        /*Checks in debugging mode*/
    … …  
    11721172
    11731173        Input* input=inputs->GetInput(enumtype);
    1174         if(!input) _error2_("No input of type " << EnumToStringx(enumtype) << " found in tria");
     1174        if(!input) _error_("No input of type " << EnumToStringx(enumtype) << " found in tria");
    11751175
    11761176        GaussTria* gauss=new GaussTria();
    … …  
    12141214        #endif
    12151215        default:
    1216                 _error2_("analysis: " << EnumToStringx(analysis_type) << " not supported yet");
     1216                _error_("analysis: " << EnumToStringx(analysis_type) << " not supported yet");
    12171217        }
    12181218
    … …  
    12301230        /*Check that both inputs have been found*/
    12311231        if (!vx_input || !vy_input){
    1232                 _error2_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n");
     1232                _error_("Input missing. Here are the input pointers we have for vx: " << vx_input << ", vy: " << vy_input << "\n");
    12331233        }
    12341234
    … …  
    12541254        /*Get input (either in element or material)*/
    12551255        Input* input=inputs->GetInput(input_enum);
    1256         if(!input) _error2_("Input " << EnumToStringx(input_enum) << " not found in element");
     1256        if(!input) _error_("Input " << EnumToStringx(input_enum) << " not found in element");
    12571257
    12581258        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
    … …  
    12661266        ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(offset);
    12671267        if(elementresult->InstanceEnum()!=enum_in){
    1268                 _error2_("Results of offset "<<offset<<" is "<<EnumToStringx(elementresult->InstanceEnum())<<" when "<<EnumToStringx(enum_in)<<" was expected");
     1268                _error_("Results of offset "<<offset<<" is "<<EnumToStringx(elementresult->InstanceEnum())<<" when "<<EnumToStringx(enum_in)<<" was expected");
    12691269        }
    12701270        if(interp==P1Enum){
    … …  
    13041304        /*Make a copy of the original input: */
    13051305        input=(Input*)this->inputs->GetInput(enum_type);
    1306         if(!input)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
     1306        if(!input)_error_("could not find old input with enum: " << EnumToStringx(enum_type));
    13071307
    13081308        /*ArtificialNoise: */
    … …  
    13241324                new_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+0]);
    13251325                old_inputs[i]=(Input*)this->inputs->GetInput(enums[2*i+1]);
    1326                 if(!new_inputs[i])_error2_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
    1327                 if(!old_inputs[i])_error2_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
     1326                if(!new_inputs[i])_error_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
     1327                if(!old_inputs[i])_error_("could not find input with enum " << EnumToStringx(enums[2*i+0]));
    13281328        }
    13291329
    … …  
    13531353         oldinput=(Input*)this->matice->inputs->GetInput(enum_type);
    13541354        else
    1355          _error2_("object " << EnumToStringx(object_enum) << " not supported yet");
    1356         if(!oldinput)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
     1355         _error_("object " << EnumToStringx(object_enum) << " not supported yet");
     1356        if(!oldinput)_error_("could not find old input with enum: " << EnumToStringx(enum_type));
    13571357        newinput=(Input*)oldinput->copy();
    13581358
    … …  
    13661366         this->matice->inputs->AddInput((Input*)newinput);
    13671367        else
    1368          _error2_("object " << EnumToStringx(object_enum) << " not supported yet");
     1368         _error_("object " << EnumToStringx(object_enum) << " not supported yet");
    13691369}
    13701370/*}}}*/
    … …  
    13841384        /*Make a copy of the original input: */
    13851385        input=(Input*)this->inputs->GetInput(enum_type);
    1386         if(!input)_error2_("could not find old input with enum: " << EnumToStringx(enum_type));
     1386        if(!input)_error_("could not find old input with enum: " << EnumToStringx(enum_type));
    13871387
    13881388        /*Scale: */
    … …  
    13991399        if (enum_type==MaterialsRheologyBbarEnum) input=this->matice->inputs->GetInput(enum_type);
    14001400        else input=this->inputs->GetInput(enum_type);
    1401         //if (!input) _error2_("Input " << EnumToStringx(enum_type) << " not found in tria->inputs");
     1401        //if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found in tria->inputs");
    14021402        if(!input)return;
    14031403
    … …  
    15051505                                        /*Matice will take care of it*/ break;
    15061506                                default:
    1507                                         _error2_("Control " << EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]) << " not implemented yet");
     1507                                        _error_("Control " << EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]) << " not implemented yet");
    15081508                        }
    15091509                }
    … …  
    15771577                        break;
    15781578                default:
    1579                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     1579                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    15801580        }
    15811581}
    … …  
    15951595        for(int i=0;i<numdof;i++){
    15961596                values[i]=solution[doflist[i]];
    1597                 if(xIsNan<IssmDouble>(values[i])) _error2_("NaN found in solution vector");
     1597                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
    15981598        }
    15991599
    … …  
    16281628        for(i=0;i<numdof;i++){
    16291629                newthickness[i]=solution[doflist[i]];
    1630                 if(xIsNan<IssmDouble>(newthickness[i])) _error2_("NaN found in solution vector");
     1630                if(xIsNan<IssmDouble>(newthickness[i])) _error_("NaN found in solution vector");
    16311631                /*Constrain thickness to be at least 1m*/
    16321632                if(newthickness[i]<minthickness) newthickness[i]=minthickness;
    … …  
    16591659                                newbed[i]=oldbed[i]-rho_ice/rho_water*(newthickness[i]-oldthickness[i]); //bed = oldbed + di * dH
    16601660                        }
    1661                         else _error2_("Hydrostatic adjustment " << hydroadjustment << " (" << EnumToStringx(hydroadjustment) << ") not supported yet");
     1661                        else _error_("Hydrostatic adjustment " << hydroadjustment << " (" << EnumToStringx(hydroadjustment) << ") not supported yet");
    16621662                }
    16631663        }
    … …  
    17001700                }
    17011701                default:
    1702                         _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     1702                        _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    17031703        }
    17041704}
    … …  
    17061706/*FUNCTION Tria::InputUpdateFromVector(int* vector, int name, int type);{{{*/
    17071707void  Tria::InputUpdateFromVector(int* vector, int name, int type){
    1708         _error2_("not supported yet!");
     1708        _error_("not supported yet!");
    17091709}
    17101710/*}}}*/
    17111711/*FUNCTION Tria::InputUpdateFromVector(bool* vector, int name, int type);{{{*/
    17121712void  Tria::InputUpdateFromVector(bool* vector, int name, int type){
    1713         _error2_("not supported yet!");
     1713        _error_("not supported yet!");
    17141714}
    17151715/*}}}*/
    … …  
    17291729                this->inputs->AddInput(new DoubleInput(name,reCast<int>(scalar)));
    17301730        }
    1731         else _error2_("could not recognize nature of vector from code " << code);
     1731        else _error_("could not recognize nature of vector from code " << code);
    17321732
    17331733}
    … …  
    17951795                        this->inputs->AddInput(transientinput);
    17961796                }
    1797                 else _error2_("nodal vector is either numberofnodes or numberofnodes+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
     1797                else _error_("nodal vector is either numberofnodes or numberofnodes+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
    17981798        }
    17991799        else if(vector_type==2){ //element vector
    … …  
    18121812                                this->inputs->AddInput(new DoubleInput(vector_enum,vector[index]));
    18131813                        }
    1814                         else _error2_("could not recognize nature of vector from code " << code);
     1814                        else _error_("could not recognize nature of vector from code " << code);
    18151815                }
    18161816                else {
    1817                         _error2_("transient elementary inputs not supported yet!");
     1817                        _error_("transient elementary inputs not supported yet!");
    18181818                }
    18191819        }
    18201820        else{
    1821                 _error2_("Cannot add input for vector type " << vector_type << " (not supported)");
     1821                _error_("Cannot add input for vector type " << vector_type << " (not supported)");
    18221822        }
    18231823
    … …  
    22462246void  Tria::SetClone(int* minranks){
    22472247
    2248         _error2_("not implemented yet");
     2248        _error_("not implemented yet");
    22492249}
    22502250/*}}}*/
    22512251/*FUNCTION Tria::SmearFunction {{{*/
    22522252void  Tria::SmearFunction(Vector*  smearedvector,IssmDouble (*WeightFunction)(IssmDouble distance,IssmDouble radius),IssmDouble radius){
    2253         _error2_("not implemented yet");
     2253        _error_("not implemented yet");
    22542254
    22552255}
    … …  
    23982398        this->MaxAbsVy(&maxabsvy,false);
    23992399        #else
    2400                 _error2_("ISSM was not compiled with responses compiled in, exiting!");
     2400                _error_("ISSM was not compiled with responses compiled in, exiting!");
    24012401        #endif
    24022402
    … …  
    25912591
    25922592        /*First off, check that this segment belongs to this element: */
    2593         if ((int)*(segment+4)!=this->id)_error2_("error message: segment with id " << (int)*(segment+4) << " does not belong to element with id:" << this->id);
     2593        if ((int)*(segment+4)!=this->id)_error_("error message: segment with id " << (int)*(segment+4) << " does not belong to element with id:" << this->id);
    25942594
    25952595        /*Recover segment node locations: */
    … …  
    28102810                        *presponse=vel;
    28112811                default: 
    2812                         _error2_("Response type " << EnumToStringx(response_enum) << " not supported yet!");
     2812                        _error_("Response type " << EnumToStringx(response_enum) << " not supported yet!");
    28132813        }
    28142814
    … …  
    32973297
    32983298                /*Check solution*/
    3299                 if(xIsNan<IssmDouble>(vx[i])) _error2_("NaN found in solution vector");
    3300                 if(xIsNan<IssmDouble>(vy[i])) _error2_("NaN found in solution vector");
     3299                if(xIsNan<IssmDouble>(vx[i])) _error_("NaN found in solution vector");
     3300                if(xIsNan<IssmDouble>(vy[i])) _error_("NaN found in solution vector");
    33013301        }
    33023302
    … …  
    33573357
    33583358                /*Check solution*/
    3359                 if(xIsNan<IssmDouble>(vx[i])) _error2_("NaN found in solution vector");
    3360                 if(xIsNan<IssmDouble>(vy[i])) _error2_("NaN found in solution vector");
     3359                if(xIsNan<IssmDouble>(vx[i])) _error_("NaN found in solution vector");
     3360                if(xIsNan<IssmDouble>(vy[i])) _error_("NaN found in solution vector");
    33613361        }
    33623362
    … …  
    34133413
    34143414                if (input->ObjectEnum()!=ControlInputEnum){
    3415                         _error2_("input " << EnumToStringx(control_type[i]) << " is not a ControlInput");
     3415                        _error_("input " << EnumToStringx(control_type[i]) << " is not a ControlInput");
    34163416                }
    34173417
    … …  
    34383438                input=inputs->GetInput(enum_type);
    34393439        }
    3440         if (!input) _error2_("Input " << EnumToStringx(enum_type) << " not found");
    3441         if (input->ObjectEnum()!=ControlInputEnum) _error2_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
     3440        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
     3441        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
    34423442
    34433443        GradientIndexing(&doflist1[0],control_index);
    … …  
    34563456                input=inputs->GetInput(enum_type);
    34573457        }
    3458         if (!input) _error2_("Input " << EnumToStringx(enum_type) << " not found");
    3459         if (input->ObjectEnum()!=ControlInputEnum) _error2_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
     3458        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
     3459        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
    34603460
    34613461        ((ControlInput*)input)->ScaleGradient(scale);
    … …  
    34753475                input=inputs->GetInput(enum_type);
    34763476        }
    3477         if (!input) _error2_("Input " << EnumToStringx(enum_type) << " not found");
    3478         if (input->ObjectEnum()!=ControlInputEnum) _error2_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
     3477        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
     3478        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
    34793479
    34803480        GradientIndexing(&doflist1[0],control_index);
    … …  
    35103510                        break;
    35113511                default:
    3512                         _error2_("control type not supported yet: " << control_type);
     3512                        _error_("control type not supported yet: " << control_type);
    35133513        }
    35143514
    … …  
    35403540                        break;
    35413541                default:
    3542                         _error2_("response " << EnumToStringx(responses[resp]) << " not supported yet");
     3542                        _error_("response " << EnumToStringx(responses[resp]) << " not supported yet");
    35433543        }
    35443544
    … …  
    45214521                                break;
    45224522                        default:
    4523                                 _error2_("response " << EnumToStringx(responses[resp]) << " not supported yet");
     4523                                _error_("response " << EnumToStringx(responses[resp]) << " not supported yet");
    45244524                }
    45254525        }
    … …  
    47054705                                        break;
    47064706                                default:
    4707                                         _error2_("response " << EnumToStringx(responses[resp]) << " not supported yet");
     4707                                        _error_("response " << EnumToStringx(responses[resp]) << " not supported yet");
    47084708                        }
    47094709                }
    … …  
    48884888                                        break;
    48894889                                default:
    4890                                         _error2_("response " << EnumToStringx(responses[resp]) << " not supported yet");
     4890                                        _error_("response " << EnumToStringx(responses[resp]) << " not supported yet");
    48914891                        }
    48924892                }
    … …  
    49574957                        break;
    49584958                default:
    4959                         _error2_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
     4959                        _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
    49604960        }
    49614961
    … …  
    50585058
    50595059                /*Check solution*/
    5060                 if(xIsNan<IssmDouble>(lambdax[i])) _error2_("NaN found in solution vector");
    5061                 if(xIsNan<IssmDouble>(lambday[i])) _error2_("NaN found in solution vector");
     5060                if(xIsNan<IssmDouble>(lambdax[i])) _error_("NaN found in solution vector");
     5061                if(xIsNan<IssmDouble>(lambday[i])) _error_("NaN found in solution vector");
    50625062        }
    50635063
    … …  
    50895089        for(i=0;i<numdof;i++){
    50905090                lambda[i]=values[i];
    5091                 if(xIsNan<IssmDouble>(lambda[i])) _error2_("NaN found in solution vector");
     5091                if(xIsNan<IssmDouble>(lambda[i])) _error_("NaN found in solution vector");
    50925092        }
    50935093
    … …  
    51215121        /*Check that it is a ControlInput*/
    51225122        if (input->ObjectEnum()!=ControlInputEnum){
    5123                 _error2_("input " << EnumToStringx(control_enum) << " is not a ControlInput");
     5123                _error_("input " << EnumToStringx(control_enum) << " is not a ControlInput");
    51245124        }
    51255125
    … …  
    51555155
    51565156        if (input->ObjectEnum()!=ControlInputEnum){
    5157                 _error2_("input " << EnumToStringx(control_enum) << " is not a ControlInput");
     5157                _error_("input " << EnumToStringx(control_enum) << " is not a ControlInput");
    51585158        }
    51595159
    … …  
    54255425        for(i=0;i<numdof;i++){
    54265426                values[i]=solution[doflist[i]];
    5427                 if(xIsNan<IssmDouble>(values[i])) _error2_("NaN found in solution vector");
     5427                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
    54285428                if (values[i]<pow((IssmDouble)10,(IssmDouble)-10))values[i]=pow((IssmDouble)10,(IssmDouble)-10); //correcting the water column to positive values
    54295429 
    … …  
    55245524
    55255525                default:
    5526                         _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     5526                        _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    55275527        }
    55285528
    … …  
    55315531/*FUNCTION Tria::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/
    55325532void  Tria::InputUpdateFromVectorDakota(int* vector, int name, int type){
    5533         _error2_("not supported yet!");
     5533        _error_("not supported yet!");
    55345534}
    55355535/*}}}*/
    55365536/*FUNCTION Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/
    55375537void  Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type){
    5538         _error2_("not supported yet!");
     5538        _error_("not supported yet!");
    55395539}
    55405540/*}}}*/
    … …  
    55785578
    55795579                default:
    5580                         _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     5580                        _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    55815581        }
    55825582
    … …  
    55955595                        return CreateKMatrixBalancethickness_DG();
    55965596                default:
    5597                         _error2_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
     5597                        _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
    55985598        }
    55995599
    … …  
    57745774                        return CreatePVectorBalancethickness_DG();
    57755775                default:
    5776                         _error2_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
     5776                        _error_("Element type " << EnumToStringx(GetElementType()) << " not supported yet");
    57775777        }
    57785778}

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

    r12927 r13036  
    100100                void   InputToResult(int enum_type,int step,IssmDouble time);
    101101                void   DeleteResults(void);
    102                 void   MaterialUpdateFromTemperature(void){_error2_("not implemented yet");};
     102                void   MaterialUpdateFromTemperature(void){_error_("not implemented yet");};
    103103                void   MigrateGroundingLine(IssmDouble* oldfloating,IssmDouble* sheet_ungrounding);
    104104                int    NodalValue(IssmDouble* pvalue, int index, int natureofdataenum,bool process_units);
    … …  
    110110                void   PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes);
    111111                void   ProcessResultsUnits(void);
    112                 void   ResetCoordinateSystem(void){_error2_("not implemented yet");};
     112                void   ResetCoordinateSystem(void){_error_("not implemented yet");};
    113113                void     SmbGradients();
    114114                IssmDouble SurfaceArea(void);

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

    r12832 r13036  
    338338
    339339        *Jdet=1.0/2.0*sqrt(pow(x2-x1,2.) + pow(y2-y1,2.));
    340         if(*Jdet<0) _error2_("negative jacobian determinant!");
     340        if(*Jdet<0) _error_("negative jacobian determinant!");
    341341
    342342}
    … …  
    353353        /*Get Determinant*/
    354354        Matrix2x2Determinant(Jdet,&J[0][0]);
    355         if(*Jdet<0) _error2_("negative jacobian determinant!");
     355        if(*Jdet<0) _error_("negative jacobian determinant!");
    356356
    357357}
    … …  
    375375
    376376        *Jdet=SQRT3/6.0*pow(pow(((y2-y1)*(z3-z1)-(z2-z1)*(y3-y1)),2.0)+pow(((z2-z1)*(x3-x1)-(x2-x1)*(z3-z1)),2.0)+pow(((x2-x1)*(y3-y1)-(y2-y1)*(x3-x1)),2.0),0.5);
    377         if(*Jdet<0) _error2_("negative jacobian determinant!");
     377        if(*Jdet<0) _error_("negative jacobian determinant!");
    378378
    379379}

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

    r12832 r13036  
    112112/*}}}*/
    113113/*FUNCTION BoolInput::GetInputValue(int* pvalue){{{*/
    114 void BoolInput::GetInputValue(int* pvalue){_error2_("not supported yet!");}
     114void BoolInput::GetInputValue(int* pvalue){_error_("not supported yet!");}
    115115/*}}}*/
    116116/*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue){{{*/
    117 void BoolInput::GetInputValue(IssmDouble* pvalue){_error2_("not supported yet!");}
     117void BoolInput::GetInputValue(IssmDouble* pvalue){_error_("not supported yet!");}
    118118/*}}}*/
    119119/*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/
    120 void BoolInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not supported yet!");}
     120void BoolInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not supported yet!");}
    121121/*}}}*/
    122122/*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/
    123 void BoolInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not supported yet!");}
     123void BoolInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not supported yet!");}
    124124/*}}}*/
    125125/*FUNCTION BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/
    126 void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");}
     126void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");}
    127127/*}}}*/
    128128/*FUNCTION BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/
    129 void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");}
     129void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");}
    130130/*}}}*/
    131131/*FUNCTION BoolInput::ChangeEnum{{{*/
    … …  
    161161
    162162                default:
    163                         _error2_("not implemented yet");
     163                        _error_("not implemented yet");
    164164        }
    165165
    … …  
    176176void BoolInput::GetVectorFromInputs(Vector* vector,int* doflist){
    177177
    178         _error2_("not supporte yet!");
     178        _error_("not supporte yet!");
    179179
    180180}
    … …  
    183183void BoolInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){
    184184
    185         _error2_("not supported yet!");
     185        _error_("not supported yet!");
    186186
    187187}

  • issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h

    r12832 r13036  
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    39                 Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");};
    40                 Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");};
    41                 Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");};
     39                Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");};
     40                Input* PointwiseMin(Input* inputB){_error_("not implemented yet");};
     41                Input* PointwiseMax(Input* inputB){_error_("not implemented yet");};
    4242                ElementResult* SpawnResult(int step, IssmDouble time);
    4343                void Configure(Parameters* parameters);
    44                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
     44                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
    4545                /*}}}*/
    4646                /*numerics: {{{*/
    … …  
    5050                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
    5151                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
    52                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
    53                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");};
    54                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
    55                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
     52                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");};
     53                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");};
     54                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
     55                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
    5656                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss);
    5757                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss);
    58                 void GetInputAverage(IssmDouble* pvalue){_error2_("not implemented yet");};
    59                 void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    60                 void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    61                 void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    62                 void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    63                 void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    64                 void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    65                 void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
     58                void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");};
     59                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     60                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     61                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     62                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     63                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     64                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     65                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
    6666                void ChangeEnum(int newenumtype);
    6767                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters);
    68                 void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");};
    69                 IssmDouble InfinityNorm(void){_error2_("InfinityNorm not implemented for booleans");};
    70                 IssmDouble Max(void){_error2_("Max not implemented for booleans");};
    71                 IssmDouble MaxAbs(void){_error2_("Max not implemented for booleans");};
    72                 IssmDouble Min(void){_error2_("Min not implemented for booleans");};
    73                 IssmDouble MinAbs(void){_error2_("Min not implemented for booleans");};
     68                void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");};
     69                IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for booleans");};
     70                IssmDouble Max(void){_error_("Max not implemented for booleans");};
     71                IssmDouble MaxAbs(void){_error_("Max not implemented for booleans");};
     72                IssmDouble Min(void){_error_("Min not implemented for booleans");};
     73                IssmDouble MinAbs(void){_error_("Min not implemented for booleans");};
    7474                void Scale(IssmDouble scale_factor);
    75                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
     75                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
    7676                void AXPY(Input* xinput,IssmDouble scalar);
    77                 void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error2_("Constrain not implemented for booleans");};
     77                void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error_("Constrain not implemented for booleans");};
    7878                void Extrude(void);
    79                 void VerticallyIntegrate(Input* thickness_input){_error2_("not supported yet");};
     79                void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");};
    8080                void GetVectorFromInputs(Vector* vector,int* doflist);
    8181                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values);

  • issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp

    r12832 r13036  
    4848                        break;
    4949                default:
    50                         _error2_("Input of Enum " << EnumToStringx(enum_input) << " not supported yet by ControlInput");
     50                        _error_("Input of Enum " << EnumToStringx(enum_input) << " not supported yet by ControlInput");
    5151        }
    5252        gradient   =NULL;
    … …  
    152152/*FUNCTION ControlInput::ScaleGradient{{{*/
    153153void ControlInput::ScaleGradient(IssmDouble scaling_factor){
    154         if(!gradient) _error2_("Gradient of ControlInput " << EnumToStringx(enum_type) << " not found");
     154        if(!gradient) _error_("Gradient of ControlInput " << EnumToStringx(enum_type) << " not found");
    155155        gradient->Scale(scaling_factor);
    156156}/*}}}*/
    … …  
    170170                        break;
    171171                default:
    172                         _error2_("more than 3 controls not implemented yet (Gradient " << this->control_id << " was requested). EnumDefinitions.h needs to be updated.");
     172                        _error_("more than 3 controls not implemented yet (Gradient " << this->control_id << " was requested). EnumDefinitions.h needs to be updated.");
    173173        }
    174174
    … …  
    221221         }
    222222         else{
    223                  _error2_("Data " << data << " not supported yet");
     223                 _error_("Data " << data << " not supported yet");
    224224         }
    225225}/*}}}*/
    … …  
    258258/*FUNCTION ControlInput::SaveValue{{{*/
    259259void ControlInput::SaveValue(void){
    260         if(!values) _error2_("Values of " << EnumToStringx(this->enum_type) << " not found");
     260        if(!values) _error_("Values of " << EnumToStringx(this->enum_type) << " not found");
    261261
    262262        if(savedvalues) delete this->savedvalues;
    … …  
    265265/*FUNCTION ControlInput::UpdateValue{{{*/
    266266void ControlInput::UpdateValue(IssmDouble scalar){
    267         if(!gradient)    _error2_("Gradient of " << EnumToStringx(this->enum_type) << " not found");
    268         if(!savedvalues) _error2_("Values of " << EnumToStringx(this->enum_type) << " not found");
     267        if(!gradient)    _error_("Gradient of " << EnumToStringx(this->enum_type) << " not found");
     268        if(!savedvalues) _error_("Values of " << EnumToStringx(this->enum_type) << " not found");
    269269
    270270        if(values) delete this->values;

  • issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h

    r12832 r13036  
    4141                int    InstanceEnum();
    4242                Input* SpawnTriaInput(int* indices);
    43                 Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");};
    44                 Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");};
    45                 Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");};
     43                Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");};
     44                Input* PointwiseMin(Input* inputB){_error_("not implemented yet");};
     45                Input* PointwiseMax(Input* inputB){_error_("not implemented yet");};
    4646                ElementResult* SpawnResult(int step, IssmDouble time);
    47                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
     47                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
    4848                void Configure(Parameters* parameters);
    4949                /*}}}*/
    … …  
    5555                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
    5656                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
    57                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
    58                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");};
    59                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
    60                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
     57                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");};
     58                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");};
     59                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
     60                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
    6161                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss);
    6262                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss);
    6363                void GetInputAverage(IssmDouble* pvalue);
    64                 void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    65                 void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    66                 void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    67                 void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    68                 void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    69                 void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    70                 void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    71                 void ChangeEnum(int newenumtype){_error2_("not implemented yet");};
    72                 void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error2_("not implemented yet");};
    73                 void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");};
    74                 void Scale(IssmDouble scale_factor){_error2_("not implemented yet");};
    75                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
    76                 void AXPY(Input* xinput,IssmDouble scalar){_error2_("not implemented yet");};
     64                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     65                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     66                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     67                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     68                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     69                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     70                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     71                void ChangeEnum(int newenumtype){_error_("not implemented yet");};
     72                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error_("not implemented yet");};
     73                void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");};
     74                void Scale(IssmDouble scale_factor){_error_("not implemented yet");};
     75                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
     76                void AXPY(Input* xinput,IssmDouble scalar){_error_("not implemented yet");};
    7777                void Constrain(void);
    7878                void Constrain(IssmDouble min,IssmDouble max);
    79                 IssmDouble InfinityNorm(void){_error2_("not implemented yet");};
    80                 IssmDouble Max(void){_error2_("not implemented yet");};
    81                 IssmDouble MaxAbs(void){_error2_("not implemented yet");};
    82                 IssmDouble Min(void){_error2_("not implemented yet");};
    83                 IssmDouble MinAbs(void){_error2_("not implemented yet");};
     79                IssmDouble InfinityNorm(void){_error_("not implemented yet");};
     80                IssmDouble Max(void){_error_("not implemented yet");};
     81                IssmDouble MaxAbs(void){_error_("not implemented yet");};
     82                IssmDouble Min(void){_error_("not implemented yet");};
     83                IssmDouble MinAbs(void){_error_("not implemented yet");};
    8484                void Extrude(void);
    8585                void VerticallyIntegrate(Input* thickness_input);
    8686                void GetVectorFromInputs(Vector* vector,int* doflist,const char* data);
    8787                void GetVectorFromInputs(Vector* vector,int* doflist);
    88                 void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("not implemented yet");};
     88                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not implemented yet");};
    8989                ElementResult* SpawnGradient(int step, IssmDouble time);
    9090                void GetGradient(Vector* gradient_vec,int* doflist);

  • issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp

    r12832 r13036  
    115115
    116116        /*Get requested input within dataset*/
    117         if(index<0 || index > inputs->Size()-1) _error2_("index requested (" << index << ") exceeds dataset size (" << inputs->Size() << ")");
     117        if(index<0 || index > inputs->Size()-1) _error_("index requested (" << index << ") exceeds dataset size (" << inputs->Size() << ")");
    118118        Input* input=(Input*)this->inputs->GetObjectByOffset(index);
    119119       

  • issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h

    r12832 r13036  
    3737                int    InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    39                 Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");};
    40                 Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");};
    41                 Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");};
    42                 ElementResult* SpawnResult(int step, IssmDouble time){_error2_("not implemented yet");};
    43                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
     39                Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");};
     40                Input* PointwiseMin(Input* inputB){_error_("not implemented yet");};
     41                Input* PointwiseMax(Input* inputB){_error_("not implemented yet");};
     42                ElementResult* SpawnResult(int step, IssmDouble time){_error_("not implemented yet");};
     43                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    4646                /*numerics: {{{*/
    47                 void GetInputValue(bool* pvalue){_error2_("not implemented yet");};
    48                 void GetInputValue(int* pvalue){_error2_("not implemented yet");};
    49                 void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");};
    50                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not implemented yet");};
    51                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");};
    52                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
    53                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");};
     47                void GetInputValue(bool* pvalue){_error_("not implemented yet");};
     48                void GetInputValue(int* pvalue){_error_("not implemented yet");};
     49                void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");};
     50                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not implemented yet");};
     51                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not implemented yet");};
     52                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");};
     53                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");};
    5454                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index);
    55                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
    56                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    57                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    58                 void GetInputAverage(IssmDouble* pvalue){_error2_("not implemented yet");};
    59                 void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    60                 void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    61                 void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    62                 void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    63                 void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    64                 void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    65                 void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    66                 void ChangeEnum(int newenumtype){_error2_("not implemented yet");};
    67                 void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error2_("not implemented yet");};
    68                 void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");};
    69                 void Scale(IssmDouble scale_factor){_error2_("not implemented yet");};
    70                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
    71                 void AXPY(Input* xinput,IssmDouble scalar){_error2_("not implemented yet");};
    72                 void Constrain(void){_error2_("not implemented yet");};
    73                 void Constrain(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
    74                 IssmDouble InfinityNorm(void){_error2_("not implemented yet");};
    75                 IssmDouble Max(void){_error2_("not implemented yet");};
    76                 IssmDouble MaxAbs(void){_error2_("not implemented yet");};
    77                 IssmDouble Min(void){_error2_("not implemented yet");};
    78                 IssmDouble MinAbs(void){_error2_("not implemented yet");};
    79                 void Extrude(void){_error2_("not implemented yet");};
    80                 void VerticallyIntegrate(Input* thickness_input){_error2_("not implemented yet");};
    81                 void GetVectorFromInputs(Vector* vector,int* doflist){_error2_("not implemented yet");};
    82                 void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("not implemented yet");};
    83                 ElementResult* SpawnGradient(int step, IssmDouble time){_error2_("not implemented yet");};
    84                 void GetGradient(Vector* gradient_vec,int* doflist){_error2_("not implemented yet");};
    85                 void ScaleGradient(IssmDouble scale){_error2_("not implemented yet");};
    86                 void SetGradient(Input* gradient_in){_error2_("not implemented yet");};
    87                 void UpdateValue(IssmDouble scalar){_error2_("not implemented yet");};
    88                 void SaveValue(void){_error2_("not implemented yet");};
     55                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
     56                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     57                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     58                void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");};
     59                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     60                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     61                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     62                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     63                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     64                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     65                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     66                void ChangeEnum(int newenumtype){_error_("not implemented yet");};
     67                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error_("not implemented yet");};
     68                void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");};
     69                void Scale(IssmDouble scale_factor){_error_("not implemented yet");};
     70                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
     71                void AXPY(Input* xinput,IssmDouble scalar){_error_("not implemented yet");};
     72                void Constrain(void){_error_("not implemented yet");};
     73                void Constrain(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
     74                IssmDouble InfinityNorm(void){_error_("not implemented yet");};
     75                IssmDouble Max(void){_error_("not implemented yet");};
     76                IssmDouble MaxAbs(void){_error_("not implemented yet");};
     77                IssmDouble Min(void){_error_("not implemented yet");};
     78                IssmDouble MinAbs(void){_error_("not implemented yet");};
     79                void Extrude(void){_error_("not implemented yet");};
     80                void VerticallyIntegrate(Input* thickness_input){_error_("not implemented yet");};
     81                void GetVectorFromInputs(Vector* vector,int* doflist){_error_("not implemented yet");};
     82                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not implemented yet");};
     83                ElementResult* SpawnGradient(int step, IssmDouble time){_error_("not implemented yet");};
     84                void GetGradient(Vector* gradient_vec,int* doflist){_error_("not implemented yet");};
     85                void ScaleGradient(IssmDouble scale){_error_("not implemented yet");};
     86                void SetGradient(Input* gradient_in){_error_("not implemented yet");};
     87                void UpdateValue(IssmDouble scalar){_error_("not implemented yet");};
     88                void SaveValue(void){_error_("not implemented yet");};
    8989                /*}}}*/
    9090

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

    r12832 r13036  
    108108/*FUNCTION DoubleInput::GetInputValue(bool* pvalue) {{{*/
    109109void DoubleInput::GetInputValue(bool* pvalue){
    110         _error2_("Double input of enum " << EnumToStringx(enum_type) << " cannot return a boolean");
     110        _error_("Double input of enum " << EnumToStringx(enum_type) << " cannot return a boolean");
    111111
    112112}
    … …  
    114114/*FUNCTION DoubleInput::GetInputValue(int* pvalue){{{*/
    115115void DoubleInput::GetInputValue(int* pvalue){
    116         _error2_("Double input of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");
     116        _error_("Double input of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");
    117117
    118118}
    … …  
    132132/*}}}*/
    133133/*FUNCTION DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/
    134 void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");}
     134void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");}
    135135/*}}}*/
    136136/*FUNCTION DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/
    137 void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");}
     137void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");}
    138138/*}}}*/
    139139/*FUNCTION DoubleInput::GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){{{*/
    … …  
    217217
    218218                default:
    219                         _error2_("not implemented yet");
     219                        _error_("not implemented yet");
    220220        }
    221221
    … …  
    253253void DoubleInput::GetVectorFromInputs(Vector* vector,int* doflist){
    254254
    255         _error2_("not supporte yet!");
     255        _error_("not supporte yet!");
    256256
    257257}
    … …  
    260260void DoubleInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){
    261261
    262         _error2_("not supported yet!");
     262        _error_("not supported yet!");
    263263
    264264}
    … …  
    276276
    277277        /*Check that input provided is a thickness*/
    278         if (thickness_input->InstanceEnum()!=ThicknessEnum) _error2_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
     278        if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
    279279
    280280        /*vertically integrate depending on type:*/
    … …  
    287287
    288288                default:
    289                         _error2_("not implemented yet");
     289                        _error_("not implemented yet");
    290290        }
    291291}

  • issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h

    r12832 r13036  
    4040                Input* PointwiseMax(Input* inputB);
    4141                ElementResult* SpawnResult(int step, IssmDouble time);
    42                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
     42                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
    4343                void Configure(Parameters* parameters);
    4444                /*}}}*/
    … …  
    4949                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
    5050                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
    51                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
    52                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");};
    53                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
    54                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
     51                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");};
     52                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");};
     53                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
     54                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
    5555                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss);
    5656                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss);
    … …  
    6767                void ConstrainMin(IssmDouble minimum);
    6868                void Scale(IssmDouble scale_factor);
    69                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
     69                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
    7070                void AXPY(Input* xinput,IssmDouble scalar);
    7171                void Constrain(IssmDouble cm_min, IssmDouble cm_max);
    72                 IssmDouble InfinityNorm(void){_error2_("not implemented yet");};
     72                IssmDouble InfinityNorm(void){_error_("not implemented yet");};
    7373                IssmDouble Max(void);
    7474                IssmDouble MaxAbs(void);
    7575                IssmDouble Min(void);
    7676                IssmDouble MinAbs(void);
    77                 void Extrude(void){_error2_("not supported yet");};
     77                void Extrude(void){_error_("not supported yet");};
    7878                void VerticallyIntegrate(Input* thickness_input);
    7979                void GetVectorFromInputs(Vector* vector,int* doflist);

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

    r12832 r13036  
    9999ElementResult* IntInput::SpawnResult(int step, IssmDouble time){
    100100       
    101         _error2_("not supported yet!");
     101        _error_("not supported yet!");
    102102
    103103}
    … …  
    106106/*Object functions*/
    107107/*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{*/
    108 void IntInput::GetInputValue(bool* pvalue){_error2_("not supported yet!");}
     108void IntInput::GetInputValue(bool* pvalue){_error_("not supported yet!");}
    109109/*}}}*/
    110110/*FUNCTION IntInput::GetInputValue(int* pvalue){{{*/
    … …  
    115115/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue){{{*/
    116116void IntInput::GetInputValue(IssmDouble* pvalue){
    117         _error2_("IntInput cannot return a IssmDouble in parallel");
     117        _error_("IntInput cannot return a IssmDouble in parallel");
    118118}
    119119/*}}}*/
    120120/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/
    121 void IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not supported yet!");}
     121void IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not supported yet!");}
    122122/*}}}*/
    123123/*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/
    124 void IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not supported yet!");}
     124void IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not supported yet!");}
    125125/*}}}*/
    126126/*FUNCTION IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/
    127 void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");}
     127void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");}
    128128/*}}}*/
    129129/*FUNCTION IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/
    130 void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");}
     130void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");}
    131131/*}}}*/
    132132/*FUNCTION IntInput::ChangeEnum{{{*/
    … …  
    166166
    167167                default:
    168                         _error2_("not implemented yet");
     168                        _error_("not implemented yet");
    169169        }
    170170
    … …  
    182182void IntInput::GetVectorFromInputs(Vector* vector,int* doflist){
    183183
    184         _error2_("not supporte yet!");
     184        _error_("not supporte yet!");
    185185
    186186}
    … …  
    189189void IntInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){
    190190
    191         _error2_("not supported yet!");
     191        _error_("not supported yet!");
    192192
    193193}

  • issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.h

    r12832 r13036  
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    39                 Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");};
    40                 Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");};
    41                 Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");};
     39                Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");};
     40                Input* PointwiseMin(Input* inputB){_error_("not implemented yet");};
     41                Input* PointwiseMax(Input* inputB){_error_("not implemented yet");};
    4242                ElementResult* SpawnResult(int step, IssmDouble time);
    43                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
     43                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    … …  
    5050                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
    5151                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
    52                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
    53                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");};
    54                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
    55                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
     52                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");};
     53                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");};
     54                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
     55                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
    5656                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss);
    5757                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss);
    58                 void GetInputAverage(IssmDouble* pvalue){_error2_("not implemented yet");};
    59                 void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    60                 void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    61                 void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    62                 void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    63                 void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    64                 void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    65                 void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
     58                void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");};
     59                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     60                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     61                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     62                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     63                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     64                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     65                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
    6666                void ChangeEnum(int newenumtype);
    6767                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters);
    68                 void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");};
     68                void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");};
    6969                void Scale(IssmDouble scale_factor);
    70                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
     70                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
    7171                void AXPY(Input* xinput,IssmDouble scalar);
    7272                void Constrain(IssmDouble cm_min, IssmDouble cm_max);
    73                 IssmDouble InfinityNorm(void){_error2_("InfinityNorm not implemented for integers");};
    74                 IssmDouble Max(void){_error2_("Max not implemented for integers");};
    75                 IssmDouble MaxAbs(void){_error2_("Max not implemented for integers");};
    76                 IssmDouble Min(void){_error2_("Min not implemented for integers");};
    77                 IssmDouble MinAbs(void){_error2_("Min not implemented for integers");};
    78                 void Extrude(void){_error2_("not supported yet");};
    79                 void VerticallyIntegrate(Input* thickness_input){_error2_("not supported yet");};
     73                IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for integers");};
     74                IssmDouble Max(void){_error_("Max not implemented for integers");};
     75                IssmDouble MaxAbs(void){_error_("Max not implemented for integers");};
     76                IssmDouble Min(void){_error_("Min not implemented for integers");};
     77                IssmDouble MinAbs(void){_error_("Min not implemented for integers");};
     78                void Extrude(void){_error_("not supported yet");};
     79                void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");};
    8080                void GetVectorFromInputs(Vector* vector,int* doflist);
    8181                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values);

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

    r12832 r13036  
    455455                case ControlInputEnum:{
    456456                        ControlInput* cont_input=(ControlInput*)xinput;
    457                         if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error2_("not supported yet");
     457                        if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error_("not supported yet");
    458458                        PentaP1Input* cast_input=(PentaP1Input*)cont_input->values;
    459459                        for(i=0;i<numnodes;i++)this->values[i]=this->values[i]+scalar*(cast_input->values[i]);}
    460460                        return;
    461461                default:
    462                         _error2_("not implemented yet");
     462                        _error_("not implemented yet");
    463463        }
    464464
    … …  
    495495
    496496        /*Check that input provided is a thickness*/
    497         if (thickness_input->InstanceEnum()!=ThicknessEnum) _error2_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
     497        if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
    498498
    499499        /*Get Thickness value pointer*/
    … …  
    511511
    512512                default:
    513                         _error2_("not implemented yet");
     513                        _error_("not implemented yet");
    514514        }
    515515}
    … …  
    529529
    530530        /*Check that inputB is of the same type*/
    531         if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     531        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
    532532        xinputB=(PentaP1Input*)inputB;
    533533
    … …  
    560560
    561561        /*Check that inputB is of the same type*/
    562         if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     562        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
    563563        xinputB=(PentaP1Input*)inputB;
    564564
    … …  
    591591
    592592        /*Check that inputB is of the same type*/
    593         if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     593        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
    594594        xinputB=(PentaP1Input*)inputB;
    595595

  • issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h

    r12704 r13036  
    4141                Input* PointwiseMax(Input* inputB);
    4242                ElementResult* SpawnResult(int step, IssmDouble time);
    43                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
     43                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    4646                /*numerics: {{{*/
    47                 void GetInputValue(bool* pvalue){_error2_("not implemented yet");};
    48                 void GetInputValue(int* pvalue){_error2_("not implemented yet");};
    49                 void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");};
    50                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not implemented yet");};
     47                void GetInputValue(bool* pvalue){_error_("not implemented yet");};
     48                void GetInputValue(int* pvalue){_error_("not implemented yet");};
     49                void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");};
     50                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not implemented yet");};
    5151                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
    52                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
    53                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");};
    54                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
    55                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
    56                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
     52                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");};
     53                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");};
     54                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
     55                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
     56                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
    5757                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss);
    5858                void GetInputAverage(IssmDouble* pvalue);
    59                 void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    60                 void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
     59                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     60                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
    6161                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss);
    6262                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss);
    … …  
    6969                void ConstrainMin(IssmDouble minimum);
    7070                void Scale(IssmDouble scale_factor);
    71                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
     71                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
    7272                void AXPY(Input* xinput,IssmDouble scalar);
    7373                void Constrain(IssmDouble cm_min, IssmDouble cm_max);

  • issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp

    r12882 r13036  
    482482                }
    483483        }
    484         if(!found)_error2_("did not find time interval on which to interpolate forcing values!");
     484        if(!found)_error_("did not find time interval on which to interpolate forcing values!");
    485485
    486486        /*Assign output pointer*/

  • issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h

    r12882 r13036  
    4040                int    InstanceEnum();
    4141                Input* SpawnTriaInput(int* indices);
    42                 Input* PointwiseDivide(Input* forcingB){_error2_("not implemented yet");};
    43                 Input* PointwiseMin(Input* forcingB){_error2_("not implemented yet");};
    44                 Input* PointwiseMax(Input* forcingB){_error2_("not implemented yet");};
     42                Input* PointwiseDivide(Input* forcingB){_error_("not implemented yet");};
     43                Input* PointwiseMin(Input* forcingB){_error_("not implemented yet");};
     44                Input* PointwiseMax(Input* forcingB){_error_("not implemented yet");};
    4545                ElementResult* SpawnResult(int step, IssmDouble time);
    4646                void Configure(Parameters* parameters);
    4747                /*}}}*/
    4848                /*numerics: {{{*/
    49                 void GetInputValue(bool* pvalue){_error2_("not implemented yet");};
    50                 void GetInputValue(int* pvalue){_error2_("not implemented yet");};
    51                 void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");};
     49                void GetInputValue(bool* pvalue){_error_("not implemented yet");};
     50                void GetInputValue(int* pvalue){_error_("not implemented yet");};
     51                void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");};
    5252                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
    5353                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
    5454                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time);
    5555                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time);
    56                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
    57                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");};
     56                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
     57                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
    5858                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss);
    59                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
     59                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
    6060                void GetInputAverage(IssmDouble* pvalue);
    61                 void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    62                 void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");};
    63                 void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    64                 void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    65                 void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    66                 void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    67                 void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
     61                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     62                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");};
     63                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     64                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     65                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     66                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     67                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
    6868                void ChangeEnum(int newenumtype);
    6969
    7070                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters);
    71                 void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");};
    72                 void Scale(IssmDouble scale_factor){_error2_("not implemented yet");};
    73                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
    74                 void AXPY(Input* xforcing,IssmDouble scalar){_error2_("not implemented yet");};
    75                 void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error2_("not implemented yet");};
     71                void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");};
     72                void Scale(IssmDouble scale_factor){_error_("not implemented yet");};
     73                void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
     74                void AXPY(Input* xforcing,IssmDouble scalar){_error_("not implemented yet");};
     75                void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error_("not implemented yet");};
    7676                IssmDouble InfinityNorm(void);
    7777                IssmDouble Max(void);
    … …  
    8080                IssmDouble MinAbs(void);
    8181                void Extrude(void);
    82                 void VerticallyIntegrate(Input* thickness_forcing){_error2_("not supported yet");};
     82                void VerticallyIntegrate(Input* thickness_forcing){_error_("not supported yet");};
    8383                void GetVectorFromInputs(Vector* vector,int* doflist);
    84                 void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("not supported yet");};
    85       void GetTimeValues(IssmDouble* values,IssmDouble time){_error2_("not implemented yet");};
     84                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not supported yet");};
     85      void GetTimeValues(IssmDouble* values,IssmDouble time){_error_("not implemented yet");};
    8686                Input* GetTimeInput(IssmDouble time);
    8787                /*}}}*/

  • issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp

    r12832 r13036  
    323323
    324324                default :
    325                         _error2_("not implemented yet");
     325                        _error_("not implemented yet");
    326326        }
    327327
    … …  
    368368
    369369        /*Check that inputB is of the same type*/
    370         if (inputB->ObjectEnum()!=TriaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     370        if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
    371371        xinputB=(TriaP1Input*)inputB;
    372372
    … …  
    399399
    400400        /*Check that inputB is of the same type*/
    401         if (inputB->ObjectEnum()!=TriaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     401        if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
    402402        xinputB=(TriaP1Input*)inputB;
    403403

  • issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h

    r12704 r13036  
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    39                 Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");};
     39                Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");};
    4040                Input* PointwiseMin(Input* inputB);
    4141                Input* PointwiseMax(Input* inputB);
    4242                ElementResult* SpawnResult(int step, IssmDouble time);
    43                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
     43                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    4646                /*numerics: {{{*/
    47                 void GetInputValue(bool* pvalue){_error2_("not implemented yet");}
    48                 void GetInputValue(int* pvalue){_error2_("not implemented yet");}
    49                 void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");}
     47                void GetInputValue(bool* pvalue){_error_("not implemented yet");}
     48                void GetInputValue(int* pvalue){_error_("not implemented yet");}
     49                void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");}
    5050                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
    51                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");};
    52                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");};
    53                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");};
    54                 void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");};
    55                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int index){_error2_("not implemented yet");};
     51                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not implemented yet");};
     52                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");};
     53                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");};
     54                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");};
     55                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int index){_error_("not implemented yet");};
    5656                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss);
    57                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
     57                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
    5858                void GetInputAverage(IssmDouble* pvalue);
    5959                void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss);
    6060                void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss);
    61                 void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    62                 void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    63                 void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    64                 void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    65                 void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
     61                void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     62                void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     63                void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     64                void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     65                void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
    6666                void ChangeEnum(int newenumtype);
    6767
    … …  
    7777                IssmDouble Min(void);
    7878                IssmDouble MinAbs(void);
    79                 void Extrude(void){_error2_("not supported yet");};
    80                 void VerticallyIntegrate(Input* thickness_input){_error2_("not supported yet");};
     79                void Extrude(void){_error_("not supported yet");};
     80                void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");};
    8181                void GetVectorFromInputs(Vector* vector,int* doflist);
    8282                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values);

  • issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp

    r12916 r13036  
    259259
    260260        if (strncmp(&ktag[0],"<"        ,1) || strncmp(&ktag[strlen(ktag)-1],">",1))
    261                 _error2_("KMLFileTagName -- Missing tag delimiters in " << ktag << ".\n");
     261                _error_("KMLFileTagName -- Missing tag delimiters in " << ktag << ".\n");
    262262
    263263/*  strtok modifies ktag, so work on copy  */
    … …  
    355355                                                        NULL,NULL)) ||
    356356                (kstr[0] == '<'))
    357                 _error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");
     357                _error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");
    358358
    359359        sscanf(kstr,"%d",pival);
    … …  
    368368                        (kstr[1] != '/') ||
    369369                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
    370                   {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     370                  {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    371371                else
    372372                        xDelete<char>(kstr);
    … …  
    388388                                                        NULL,NULL)) ||
    389389                (kstr[0] == '<'))
    390           {_error2_("KMLFileTokenParse -- Missing bool field for " << ktag << ".\n");}
     390          {_error_("KMLFileTokenParse -- Missing bool field for " << ktag << ".\n");}
    391391
    392392        sscanf(kstr,"%d",&ival);
    … …  
    402402                        (kstr[1] != '/') ||
    403403                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
    404                   {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     404                  {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    405405                else
    406406                        xDelete<char>(kstr);
    … …  
    433433                                                        NULL,NULL)) ||
    434434                (kstr[0] == '<'))
    435                 _error2_("KMLFileTokenParse -- Missing string field for " << ktag << ".\n");
     435                _error_("KMLFileTokenParse -- Missing string field for " << ktag << ".\n");
    436436
    437437        if (!pstr) {
    … …  
    463463                        (kstr[1] != '/') ||
    464464                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
    465                   {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     465                  {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    466466                else
    467467                        xDelete<char>(kstr);
    … …  
    484484                                                        NULL,NULL)) ||
    485485                (kstr[0] == '<'))
    486           {_error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");}
     486          {_error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");}
    487487
    488488        sscanf(kstr,"%g",pfval);
    … …  
    497497                        (kstr[1] != '/') ||
    498498                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
    499                   {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     499                  {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    500500                else
    501501                        xDelete<char>(kstr);
    … …  
    518518                                                        NULL,NULL)) ||
    519519                (kstr[0] == '<'))
    520                 _error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");
     520                _error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");
    521521
    522522        sscanf(kstr,"%lg",pdval);
    … …  
    531531                        (kstr[1] != '/') ||
    532532                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
    533                   {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     533                  {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    534534                else
    535535                        xDelete<char>(kstr);
    … …  
    556556                                                        NULL,NULL)) ||
    557557                (kstr[0] == '<'))
    558                 _error2_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n");
     558                _error_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n");
    559559
    560560        if (!*pdval)
    … …  
    570570                i++;
    571571                if (maxlen && (maxlen < i+1))
    572                         _error2_("KMLFileTokenParse -- Double [m] field too short for " << ktag << ".\n");
     572                        _error_("KMLFileTokenParse -- Double [m] field too short for " << ktag << ".\n");
    573573                sscanf(ktok,"%lg",&((*pdval)[i]));
    574574                ktok=strtok(NULL,delim);
    … …  
    595595                        (kstr[1] != '/') ||
    596596                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
    597                   {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     597                  {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    598598                else
    599599                        xDelete<char>(kstr);
    … …  
    622622                                                        NULL,NULL)) ||
    623623                (kstr[0] == '<'))
    624                 _error2_("KMLFileTokenParse -- Missing double [m x n] field for " << ktag << ".\n");
     624                _error_("KMLFileTokenParse -- Missing double [m x n] field for " << ktag << ".\n");
    625625
    626626        if (!*pdval)
    … …  
    636636                i++;
    637637                if (maxlen && (maxlen*n < i+1))
    638                         _error2_("KMLFileTokenParse -- Double [m x n] field too short for " << ktag << ".\n");
     638                        _error_("KMLFileTokenParse -- Double [m x n] field too short for " << ktag << ".\n");
    639639                j=(j+1) % n;
    640640                sscanf(ktok,"%lg",&((*pdval)[i]));
    … …  
    665665                        (kstr[1] != '/') ||
    666666                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
    667                   {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     667                  {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    668668                else
    669669                        xDelete<char>(kstr);
    … …  
    712712                else if ((kstr[0] == '<') &&
    713713                                 (kstr[1] == '/')) {
    714                         _error2_("KMLFileTagSkip -- Unexpected closing tag " << kstr << ".\n");
     714                        _error_("KMLFileTagSkip -- Unexpected closing tag " << kstr << ".\n");
    715715                }
    716716
    … …  
    718718        }
    719719
    720         _error2_("KMLFileTokenParse -- Corresponding closing tag for " << ktag << " not found.\n");
     720        _error_("KMLFileTokenParse -- Corresponding closing tag for " << ktag << " not found.\n");
    721721
    722722        return(0);

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h

    r12832 r13036  
    3030                virtual void  DeepEcho();
    3131                virtual void  DeepEcho(const char* indent);
    32                 int   Id(){_error2_("Not implemented yet.");};
    33                 int   MyRank(){_error2_("Not implemented yet.");};
    34                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    35                 int   MarshallSize(){_error2_("Not implemented yet.");};
    36                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    37                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    38                 Object* copy(){_error2_("Not implemented yet.");};
     32                int   Id(){_error_("Not implemented yet.");};
     33                int   MyRank(){_error_("Not implemented yet.");};
     34                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     35                int   MarshallSize(){_error_("Not implemented yet.");};
     36                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     37                int   ObjectEnum(){_error_("Not implemented yet.");};
     38                Object* copy(){_error_("Not implemented yet.");};
    3939                /*}}}*/
    4040

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.cpp

    r12835 r13036  
    9393                return;
    9494        else if (!strncmp(kstr,"</",2))
    95           {_error2_("KML_ColorStyle::Read -- Unexpected closing tag " << kstr);}
     95          {_error_("KML_ColorStyle::Read -- Unexpected closing tag " << kstr);}
    9696        else if (strncmp(kstr,"<",1))
    97           {_error2_("KML_ColorStyle::Read -- Unexpected field \"" << kstr << "\"");}
     97          {_error_("KML_ColorStyle::Read -- Unexpected field \"" << kstr << "\"");}
    9898
    9999        else if (!strcmp(kstr,"<color>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h

    r12832 r13036  
    3535                void  Write(FILE* fid,const char* indent);
    3636                void  Read(FILE* fid,char* kstr);
    37                 int   Id(){_error2_("Not implemented yet.");};
    38                 int   MyRank(){_error2_("Not implemented yet.");};
    39                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    40                 int   MarshallSize(){_error2_("Not implemented yet.");};
    41                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    42                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    43                 Object* copy(){_error2_("Not implemented yet.");};
     37                int   Id(){_error_("Not implemented yet.");};
     38                int   MyRank(){_error_("Not implemented yet.");};
     39                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     40                int   MarshallSize(){_error_("Not implemented yet.");};
     41                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     42                int   ObjectEnum(){_error_("Not implemented yet.");};
     43                Object* copy(){_error_("Not implemented yet.");};
    4444                /*}}}*/
    4545

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Comment.h

    r12832 r13036  
    3030                virtual void  DeepEcho();
    3131                virtual void  DeepEcho(const char* indent);
    32                 int   Id(){_error2_("Not implemented yet.");};
    33                 int   MyRank(){_error2_("Not implemented yet.");};
    34                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    35                 int   MarshallSize(){_error2_("Not implemented yet.");};
    36                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    37                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    38                 Object* copy(){_error2_("Not implemented yet.");};
     32                int   Id(){_error_("Not implemented yet.");};
     33                int   MyRank(){_error_("Not implemented yet.");};
     34                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     35                int   MarshallSize(){_error_("Not implemented yet.");};
     36                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     37                int   ObjectEnum(){_error_("Not implemented yet.");};
     38                Object* copy(){_error_("Not implemented yet.");};
    3939                /*}}}*/
    4040

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.cpp

    r12915 r13036  
    120120        }
    121121        else if (!strncmp(kstr,"</",2))
    122           {_error2_("KML_Container::Read -- Unexpected closing tag " << kstr );}
     122          {_error_("KML_Container::Read -- Unexpected closing tag " << kstr );}
    123123        else if (strncmp(kstr,"<",1))
    124           {_error2_("KML_Container::Read -- Unexpected field \"" << kstr << "\"");}
     124          {_error_("KML_Container::Read -- Unexpected field \"" << kstr << "\"");}
    125125
    126126        else if (!strncmp(kstr,"<Placemark",10)) {

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.h

    r12832 r13036  
    3333                void  Read(FILE* fid,char* kstr);
    3434                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    35                 int   Id(){_error2_("Not implemented yet.");};
    36                 int   MyRank(){_error2_("Not implemented yet.");};
    37                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    38                 int   MarshallSize(){_error2_("Not implemented yet.");};
    39                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    40                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    41                 Object* copy(){_error2_("Not implemented yet.");};
     35                int   Id(){_error_("Not implemented yet.");};
     36                int   MyRank(){_error_("Not implemented yet.");};
     37                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     38                int   MarshallSize(){_error_("Not implemented yet.");};
     39                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     40                int   ObjectEnum(){_error_("Not implemented yet.");};
     41                Object* copy(){_error_("Not implemented yet.");};
    4242                /*}}}*/
    4343

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp

    r12915 r13036  
    106106                }
    107107                else if (!strncmp(kstri,"</",2))
    108                   {_error2_("KML_Document::Read -- Unexpected closing tag " << kstri << ".\n");}
     108                  {_error_("KML_Document::Read -- Unexpected closing tag " << kstri << ".\n");}
    109109                else if (strncmp(kstri,"<",1))
    110                   {_error2_("KML_Document::Read -- Unexpected field \"" << kstri << "\".\n");}
     110                  {_error_("KML_Document::Read -- Unexpected field \"" << kstri << "\".\n");}
    111111
    112112                else if (!strncmp(kstri,"<",1))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.h

    r12832 r13036  
    3030                void  Write(FILE* fid,const char* indent);
    3131                void  Read(FILE* fid,char* kstr);
    32                 int   Id(){_error2_("Not implemented yet.");};
    33                 int   MyRank(){_error2_("Not implemented yet.");};
    34                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    35                 int   MarshallSize(){_error2_("Not implemented yet.");};
    36                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    37                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    38                 Object* copy(){_error2_("Not implemented yet.");};
     32                int   Id(){_error_("Not implemented yet.");};
     33                int   MyRank(){_error_("Not implemented yet.");};
     34                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     35                int   MarshallSize(){_error_("Not implemented yet.");};
     36                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     37                int   ObjectEnum(){_error_("Not implemented yet.");};
     38                Object* copy(){_error_("Not implemented yet.");};
    3939                /*}}}*/
    4040

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.cpp

    r12835 r13036  
    149149                return;
    150150        else if (!strncmp(kstr,"</",2))
    151           {_error2_("KML_Feature::Read -- Unexpected closing tag " << kstr);}
     151          {_error_("KML_Feature::Read -- Unexpected closing tag " << kstr);}
    152152        else if (strncmp(kstr,"<",1))
    153           {_error2_("KML_Feature::Read -- Unexpected field \"" << kstr << "\"");}
     153          {_error_("KML_Feature::Read -- Unexpected field \"" << kstr << "\"");}
    154154
    155155        else if (!strncmp(kstr,"<Style", 6)) {

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Feature.h

    r12832 r13036  
    4444                void  Write(FILE* fid,const char* indent);
    4545                void  Read(FILE* fid,char* kstr);
    46                 int   Id(){_error2_("Not implemented yet.");};
    47                 int   MyRank(){_error2_("Not implemented yet.");};
    48                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    49                 int   MarshallSize(){_error2_("Not implemented yet.");};
    50                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    51                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    52                 Object* copy(){_error2_("Not implemented yet.");};
     46                int   Id(){_error_("Not implemented yet.");};
     47                int   MyRank(){_error_("Not implemented yet.");};
     48                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     49                int   MarshallSize(){_error_("Not implemented yet.");};
     50                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     51                int   ObjectEnum(){_error_("Not implemented yet.");};
     52                Object* copy(){_error_("Not implemented yet.");};
    5353                /*}}}*/
    5454

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_File.cpp

    r12915 r13036  
    107107                }
    108108                else if (!strncmp(kstri,"</",2))
    109                   {_error2_("KML_File::Read -- Unexpected closing tag " << kstri << ".");}
     109                  {_error_("KML_File::Read -- Unexpected closing tag " << kstri << ".");}
    110110                else if (strncmp(kstri,"<",1))
    111                   {_error2_("KML_File::Read -- Unexpected field \"" << kstri << "\"");}
     111                  {_error_("KML_File::Read -- Unexpected field \"" << kstri << "\"");}
    112112
    113113                else if (!strncmp(kstri,"<",1))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_File.h

    r12832 r13036  
    3131                void  Read(FILE* fid,char* kstr);
    3232                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    33                 int   Id(){_error2_("Not implemented yet.");};
    34                 int   MyRank(){_error2_("Not implemented yet.");};
    35                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    36                 int   MarshallSize(){_error2_("Not implemented yet.");};
    37                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    38                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    39                 Object* copy(){_error2_("Not implemented yet.");};
     33                int   Id(){_error_("Not implemented yet.");};
     34                int   MyRank(){_error_("Not implemented yet.");};
     35                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     36                int   MarshallSize(){_error_("Not implemented yet.");};
     37                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     38                int   ObjectEnum(){_error_("Not implemented yet.");};
     39                Object* copy(){_error_("Not implemented yet.");};
    4040                /*}}}*/
    4141

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.cpp

    r12915 r13036  
    106106                }
    107107                else if (!strncmp(kstri,"</",2))
    108                   {_error2_("KML_Folder::Read -- Unexpected closing tag " << kstri << ".\n");}
     108                  {_error_("KML_Folder::Read -- Unexpected closing tag " << kstri << ".\n");}
    109109                else if (strncmp(kstri,"<",1))
    110                   {_error2_("KML_Folder::Read -- Unexpected field \"" << kstri << "\".\n");}
     110                  {_error_("KML_Folder::Read -- Unexpected field \"" << kstri << "\".\n");}
    111111
    112112                else if (!strncmp(kstri,"<",1))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Folder.h

    r12832 r13036  
    3030                void  Write(FILE* fid,const char* indent);
    3131                void  Read(FILE* fid,char* kstr);
    32                 int   Id(){_error2_("Not implemented yet.");};
    33                 int   MyRank(){_error2_("Not implemented yet.");};
    34                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    35                 int   MarshallSize(){_error2_("Not implemented yet.");};
    36                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    37                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    38                 Object* copy(){_error2_("Not implemented yet.");};
     32                int   Id(){_error_("Not implemented yet.");};
     33                int   MyRank(){_error_("Not implemented yet.");};
     34                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     35                int   MarshallSize(){_error_("Not implemented yet.");};
     36                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     37                int   ObjectEnum(){_error_("Not implemented yet.");};
     38                Object* copy(){_error_("Not implemented yet.");};
    3939                /*}}}*/
    4040

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.cpp

    r12835 r13036  
    7979                return;
    8080        else if (!strncmp(kstr,"</",2))
    81           {_error2_("KML_Geometry::Read -- Unexpected closing tag " << kstr << ".\n");}
     81          {_error_("KML_Geometry::Read -- Unexpected closing tag " << kstr << ".\n");}
    8282        else if (strncmp(kstr,"<",1))
    83           {_error2_("KML_Geometry::Read -- Unexpected field \"" << kstr << "\".\n");}
     83          {_error_("KML_Geometry::Read -- Unexpected field \"" << kstr << "\".\n");}
    8484
    8585        else if (!strncmp(kstr,"<",1))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h

    r12832 r13036  
    2929                void  Write(FILE* fid,const char* indent);
    3030                void  Read(FILE* fid,char* kstr);
    31                 int   Id(){_error2_("Not implemented yet.");};
    32                 int   MyRank(){_error2_("Not implemented yet.");};
    33                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    34                 int   MarshallSize(){_error2_("Not implemented yet.");};
    35                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    36                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    37                 Object* copy(){_error2_("Not implemented yet.");};
     31                int   Id(){_error_("Not implemented yet.");};
     32                int   MyRank(){_error_("Not implemented yet.");};
     33                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     34                int   MarshallSize(){_error_("Not implemented yet.");};
     35                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     36                int   ObjectEnum(){_error_("Not implemented yet.");};
     37                Object* copy(){_error_("Not implemented yet.");};
    3838                /*}}}*/
    3939

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.cpp

    r12915 r13036  
    131131                }
    132132                else if (!strncmp(kstri,"</",2))
    133                   {_error2_("KML_GroundOverlay::Read -- Unexpected closing tag " << kstri << ".\n");}
     133                  {_error_("KML_GroundOverlay::Read -- Unexpected closing tag " << kstri << ".\n");}
    134134                else if (strncmp(kstri,"<",1))
    135                   {_error2_("KML_GroundOverlay::Read -- Unexpected field \"" << kstri << "\".\n");}
     135                  {_error_("KML_GroundOverlay::Read -- Unexpected field \"" << kstri << "\".\n");}
    136136
    137137                else if (!strcmp(kstri,"<altitude>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.h

    r12832 r13036  
    3636                void  Write(FILE* fid,const char* indent);
    3737                void  Read(FILE* fid,char* kstr);
    38                 int   Id(){_error2_("Not implemented yet.");};
    39                 int   MyRank(){_error2_("Not implemented yet.");};
    40                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    41                 int   MarshallSize(){_error2_("Not implemented yet.");};
    42                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    43                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    44                 Object* copy(){_error2_("Not implemented yet.");};
     38                int   Id(){_error_("Not implemented yet.");};
     39                int   MyRank(){_error_("Not implemented yet.");};
     40                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     41                int   MarshallSize(){_error_("Not implemented yet.");};
     42                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     43                int   ObjectEnum(){_error_("Not implemented yet.");};
     44                Object* copy(){_error_("Not implemented yet.");};
    4545                /*}}}*/
    4646

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.cpp

    r12915 r13036  
    145145                }
    146146                else if (!strncmp(kstri,"</",2))
    147                   {_error2_("KML_Icon::Read -- Unexpected closing tag " << kstri << ".\n");}
     147                  {_error_("KML_Icon::Read -- Unexpected closing tag " << kstri << ".\n");}
    148148                else if (strncmp(kstri,"<",1))
    149                   {_error2_("KML_Icon::Read -- Unexpected field \"" << kstri << "\".\n");}
     149                  {_error_("KML_Icon::Read -- Unexpected field \"" << kstri << "\".\n");}
    150150
    151151                else if (!strcmp(kstri,"<href>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.h

    r12832 r13036  
    4444                void  Write(FILE* fid,const char* indent);
    4545                void  Read(FILE* fid,char* kstr);
    46                 int   Id(){_error2_("Not implemented yet.");};
    47                 int   MyRank(){_error2_("Not implemented yet.");};
    48                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    49                 int   MarshallSize(){_error2_("Not implemented yet.");};
    50                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    51                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    52                 Object* copy(){_error2_("Not implemented yet.");};
     46                int   Id(){_error_("Not implemented yet.");};
     47                int   MyRank(){_error_("Not implemented yet.");};
     48                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     49                int   MarshallSize(){_error_("Not implemented yet.");};
     50                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     51                int   ObjectEnum(){_error_("Not implemented yet.");};
     52                Object* copy(){_error_("Not implemented yet.");};
    5353                /*}}}*/
    5454

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp

    r12915 r13036  
    121121                }
    122122                else if (!strncmp(kstri,"</",2))
    123                   {_error2_("KML_LatLonBox::Read -- Unexpected closing tag " << kstri << ".\n");}
     123                  {_error_("KML_LatLonBox::Read -- Unexpected closing tag " << kstri << ".\n");}
    124124                else if (strncmp(kstri,"<",1))
    125                   {_error2_("KML_LatLonBox::Read -- Unexpected field \"" << kstri << "\".\n");}
     125                  {_error_("KML_LatLonBox::Read -- Unexpected field \"" << kstri << "\".\n");}
    126126
    127127                else if (!strcmp(kstri,"<north>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h

    r12832 r13036  
    3535                void  Write(FILE* fid,const char* indent);
    3636                void  Read(FILE* fid,char* kstr);
    37                 int   Id(){_error2_("Not implemented yet.");};
    38                 int   MyRank(){_error2_("Not implemented yet.");};
    39                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    40                 int   MarshallSize(){_error2_("Not implemented yet.");};
    41                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    42                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    43                 Object* copy(){_error2_("Not implemented yet.");};
     37                int   Id(){_error_("Not implemented yet.");};
     38                int   MyRank(){_error_("Not implemented yet.");};
     39                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     40                int   MarshallSize(){_error_("Not implemented yet.");};
     41                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     42                int   ObjectEnum(){_error_("Not implemented yet.");};
     43                Object* copy(){_error_("Not implemented yet.");};
    4444                /*}}}*/
    4545

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.cpp

    r12915 r13036  
    141141                }
    142142                else if (!strncmp(kstri,"</",2))
    143                   {_error2_("KML_LineString::Read -- Unexpected closing tag " << kstri << ".\n");}
     143                  {_error_("KML_LineString::Read -- Unexpected closing tag " << kstri << ".\n");}
    144144                else if (strncmp(kstri,"<",1))
    145                   {_error2_("KML_LineString::Read -- Unexpected field \"" << kstri << "\".\n");}
     145                  {_error_("KML_LineString::Read -- Unexpected field \"" << kstri << "\".\n");}
    146146
    147147                else if (!strcmp(kstri,"<extrude>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.h

    r12832 r13036  
    3838                void  Read(FILE* fid,char* kstr);
    3939                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    40                 int   Id(){_error2_("Not implemented yet.");};
    41                 int   MyRank(){_error2_("Not implemented yet.");};
    42                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    43                 int   MarshallSize(){_error2_("Not implemented yet.");};
    44                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    45                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    46                 Object* copy(){_error2_("Not implemented yet.");};
     40                int   Id(){_error_("Not implemented yet.");};
     41                int   MyRank(){_error_("Not implemented yet.");};
     42                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     43                int   MarshallSize(){_error_("Not implemented yet.");};
     44                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     45                int   ObjectEnum(){_error_("Not implemented yet.");};
     46                Object* copy(){_error_("Not implemented yet.");};
    4747                /*}}}*/
    4848

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp

    r12915 r13036  
    113113                }
    114114                else if (!strncmp(kstri,"</",2))
    115                   {_error2_("KML_LineStyle::Read -- Unexpected closing tag " << kstri << ".\n");}
     115                  {_error_("KML_LineStyle::Read -- Unexpected closing tag " << kstri << ".\n");}
    116116                else if (strncmp(kstri,"<",1))
    117                   {_error2_("KML_LineStyle::Read -- Unexpected field \"" << kstri << "\".\n");}
     117                  {_error_("KML_LineStyle::Read -- Unexpected field \"" << kstri << "\".\n");}
    118118
    119119                else if (!strcmp(kstri,"<width>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.h

    r12832 r13036  
    3131                void  Write(FILE* fid,const char* indent);
    3232                void  Read(FILE* fid,char* kstr);
    33                 int   Id(){_error2_("Not implemented yet.");};
    34                 int   MyRank(){_error2_("Not implemented yet.");};
    35                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    36                 int   MarshallSize(){_error2_("Not implemented yet.");};
    37                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    38                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    39                 Object* copy(){_error2_("Not implemented yet.");};
     33                int   Id(){_error_("Not implemented yet.");};
     34                int   MyRank(){_error_("Not implemented yet.");};
     35                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     36                int   MarshallSize(){_error_("Not implemented yet.");};
     37                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     38                int   ObjectEnum(){_error_("Not implemented yet.");};
     39                Object* copy(){_error_("Not implemented yet.");};
    4040                /*}}}*/
    4141

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp

    r12915 r13036  
    139139                }
    140140                else if (!strncmp(kstri,"</",2))
    141                   {_error2_("KML_LinearRing::Read -- Unexpected closing tag " << kstri << ".\n");}
     141                  {_error_("KML_LinearRing::Read -- Unexpected closing tag " << kstri << ".\n");}
    142142                else if (strncmp(kstri,"<",1))
    143                   {_error2_("KML_LinearRing::Read -- Unexpected field \"" << kstri << "\".\n");}
     143                  {_error_("KML_LinearRing::Read -- Unexpected field \"" << kstri << "\".\n");}
    144144
    145145                else if (!strcmp(kstri,"<extrude>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h

    r12832 r13036  
    3838                void  Read(FILE* fid,char* kstr);
    3939                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    40                 int   Id(){_error2_("Not implemented yet.");};
    41                 int   MyRank(){_error2_("Not implemented yet.");};
    42                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    43                 int   MarshallSize(){_error2_("Not implemented yet.");};
    44                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    45                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    46                 Object* copy(){_error2_("Not implemented yet.");};
     40                int   Id(){_error_("Not implemented yet.");};
     41                int   MyRank(){_error_("Not implemented yet.");};
     42                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     43                int   MarshallSize(){_error_("Not implemented yet.");};
     44                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     45                int   ObjectEnum(){_error_("Not implemented yet.");};
     46                Object* copy(){_error_("Not implemented yet.");};
    4747                /*}}}*/
    4848

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.cpp

    r12915 r13036  
    140140                }
    141141                else if (!strncmp(kstri,"</",2))
    142                   {_error2_("KML_MultiGeometry::Read -- Unexpected closing tag " << kstri << ".\n");}
     142                  {_error_("KML_MultiGeometry::Read -- Unexpected closing tag " << kstri << ".\n");}
    143143                else if (strncmp(kstri,"<",1))
    144                   {_error2_("KML_MultiGeometry::Read -- Unexpected field \"" << kstri << "\".\n");}
     144                  {_error_("KML_MultiGeometry::Read -- Unexpected field \"" << kstri << "\".\n");}
    145145
    146146                else if (!strncmp(kstri,"<Point", 6)) {

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.h

    r12832 r13036  
    3434                void  Read(FILE* fid,char* kstr);
    3535                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    36                 int   Id(){_error2_("Not implemented yet.");};
    37                 int   MyRank(){_error2_("Not implemented yet.");};
    38                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    39                 int   MarshallSize(){_error2_("Not implemented yet.");};
    40                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    41                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    42                 Object* copy(){_error2_("Not implemented yet.");};
     36                int   Id(){_error_("Not implemented yet.");};
     37                int   MyRank(){_error_("Not implemented yet.");};
     38                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     39                int   MarshallSize(){_error_("Not implemented yet.");};
     40                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     41                int   ObjectEnum(){_error_("Not implemented yet.");};
     42                Object* copy(){_error_("Not implemented yet.");};
    4343                /*}}}*/
    4444

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.cpp

    r12915 r13036  
    146146                return;
    147147        else if (!strncmp(kstr,"</",2))
    148           {_error2_("KML_Object::Read -- Unexpected closing tag " << kstr << ".\n");}
     148          {_error_("KML_Object::Read -- Unexpected closing tag " << kstr << ".\n");}
    149149        else if (strncmp(kstr,"<",1))
    150           {_error2_("KML_Object::Read -- Unexpected field \"" << kstr << "\".\n");}
     150          {_error_("KML_Object::Read -- Unexpected field \"" << kstr << "\".\n");}
    151151
    152152        else if (!strncmp(kstr,"<Placemark",10)) {

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Object.h

    r12832 r13036  
    3131                virtual void  DeepEcho();
    3232                virtual void  DeepEcho(const char* indent);
    33                 int   Id(){_error2_("Not implemented yet.");};
    34                 int   MyRank(){_error2_("Not implemented yet.");};
    35                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    36                 int   MarshallSize(){_error2_("Not implemented yet.");};
    37                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    38                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    39                 Object* copy(){_error2_("Not implemented yet.");};
     33                int   Id(){_error_("Not implemented yet.");};
     34                int   MyRank(){_error_("Not implemented yet.");};
     35                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     36                int   MarshallSize(){_error_("Not implemented yet.");};
     37                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     38                int   ObjectEnum(){_error_("Not implemented yet.");};
     39                Object* copy(){_error_("Not implemented yet.");};
    4040                /*}}}*/
    4141

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.cpp

    r12915 r13036  
    110110        }
    111111        else if (!strncmp(kstr,"</",2))
    112           {_error2_("KML_Overlay::Read -- Unexpected closing tag " << kstr << ".\n");}
     112          {_error_("KML_Overlay::Read -- Unexpected closing tag " << kstr << ".\n");}
    113113        else if (strncmp(kstr,"<",1))
    114           {_error2_("KML_Overlay::Read -- Unexpected field \"" << kstr << "\".\n");}
     114          {_error_("KML_Overlay::Read -- Unexpected field \"" << kstr << "\".\n");}
    115115
    116116        else if (!strcmp(kstr,"<color>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Overlay.h

    r12832 r13036  
    3636                void  Write(FILE* fid,const char* indent);
    3737                void  Read(FILE* fid,char* kstr);
    38                 int   Id(){_error2_("Not implemented yet.");};
    39                 int   MyRank(){_error2_("Not implemented yet.");};
    40                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    41                 int   MarshallSize(){_error2_("Not implemented yet.");};
    42                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    43                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    44                 Object* copy(){_error2_("Not implemented yet.");};
     38                int   Id(){_error_("Not implemented yet.");};
     39                int   MyRank(){_error_("Not implemented yet.");};
     40                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     41                int   MarshallSize(){_error_("Not implemented yet.");};
     42                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     43                int   ObjectEnum(){_error_("Not implemented yet.");};
     44                Object* copy(){_error_("Not implemented yet.");};
    4545                /*}}}*/
    4646

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.cpp

    r12915 r13036  
    140140                }
    141141                else if (!strncmp(kstri,"</",2))
    142                   {_error2_("KML_Placemark::Read -- Unexpected closing tag " << kstri << ".\n");}
     142                  {_error_("KML_Placemark::Read -- Unexpected closing tag " << kstri << ".\n");}
    143143                else if (strncmp(kstri,"<",1))
    144                   {_error2_("KML_Placemark::Read -- Unexpected field \"" << kstri << "\".\n");}
     144                  {_error_("KML_Placemark::Read -- Unexpected field \"" << kstri << "\".\n");}
    145145
    146146                else if (!strncmp(kstri,"<Point", 6)) {

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h

    r12832 r13036  
    3434                void  Read(FILE* fid,char* kstr);
    3535                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    36                 int   Id(){_error2_("Not implemented yet.");};
    37                 int   MyRank(){_error2_("Not implemented yet.");};
    38                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    39                 int   MarshallSize(){_error2_("Not implemented yet.");};
    40                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    41                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    42                 Object* copy(){_error2_("Not implemented yet.");};
     36                int   Id(){_error_("Not implemented yet.");};
     37                int   MyRank(){_error_("Not implemented yet.");};
     38                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     39                int   MarshallSize(){_error_("Not implemented yet.");};
     40                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     41                int   ObjectEnum(){_error_("Not implemented yet.");};
     42                Object* copy(){_error_("Not implemented yet.");};
    4343                /*}}}*/
    4444

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.cpp

    r12915 r13036  
    126126                }
    127127                else if (!strncmp(kstri,"</",2))
    128                   {_error2_("KML_Point::Read -- Unexpected closing tag " << kstri << ".\n");}
     128                  {_error_("KML_Point::Read -- Unexpected closing tag " << kstri << ".\n");}
    129129                else if (strncmp(kstri,"<",1))
    130                   {_error2_("KML_Point::Read -- Unexpected field \"" << kstri << "\".\n");}
     130                  {_error_("KML_Point::Read -- Unexpected field \"" << kstri << "\".\n");}
    131131
    132132                else if (!strcmp(kstri,"<extrude>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.h

    r12832 r13036  
    3636                void  Read(FILE* fid,char* kstr);
    3737                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    38                 int   Id(){_error2_("Not implemented yet.");};
    39                 int   MyRank(){_error2_("Not implemented yet.");};
    40                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    41                 int   MarshallSize(){_error2_("Not implemented yet.");};
    42                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    43                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    44                 Object* copy(){_error2_("Not implemented yet.");};
     38                int   Id(){_error_("Not implemented yet.");};
     39                int   MyRank(){_error_("Not implemented yet.");};
     40                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     41                int   MarshallSize(){_error_("Not implemented yet.");};
     42                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     43                int   ObjectEnum(){_error_("Not implemented yet.");};
     44                Object* copy(){_error_("Not implemented yet.");};
    4545                /*}}}*/
    4646

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp

    r12915 r13036  
    117117                }
    118118                else if (!strncmp(kstri,"</",2))
    119                   {_error2_("KML_PolyStyle::Read -- Unexpected closing tag " << kstri << ".\n");}
     119                  {_error_("KML_PolyStyle::Read -- Unexpected closing tag " << kstri << ".\n");}
    120120                else if (strncmp(kstri,"<",1))
    121                   {_error2_("KML_PolyStyle::Read -- Unexpected field \"" << kstri << "\".\n");}
     121                  {_error_("KML_PolyStyle::Read -- Unexpected field \"" << kstri << "\".\n");}
    122122
    123123                else if (!strcmp(kstri,"<fill>"))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h

    r12832 r13036  
    3232                void  Write(FILE* fid,const char* indent);
    3333                void  Read(FILE* fid,char* kstr);
    34                 int   Id(){_error2_("Not implemented yet.");};
    35                 int   MyRank(){_error2_("Not implemented yet.");};
    36                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    37                 int   MarshallSize(){_error2_("Not implemented yet.");};
    38                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    39                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    40                 Object* copy(){_error2_("Not implemented yet.");};
     34                int   Id(){_error_("Not implemented yet.");};
     35                int   MyRank(){_error_("Not implemented yet.");};
     36                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     37                int   MarshallSize(){_error_("Not implemented yet.");};
     38                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     39                int   ObjectEnum(){_error_("Not implemented yet.");};
     40                Object* copy(){_error_("Not implemented yet.");};
    4141                /*}}}*/
    4242

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.cpp

    r12915 r13036  
    179179                }
    180180                else if (!strncmp(kstri,"</",2))
    181                   {_error2_("KML_Polygon::Read -- Unexpected closing tag " << kstri << ".\n");}
     181                  {_error_("KML_Polygon::Read -- Unexpected closing tag " << kstri << ".\n");}
    182182                else if (strncmp(kstri,"<",1))
    183                   {_error2_("KML_Polygon::Read -- Unexpected field \"" << kstri << "\".\n");}
     183                  {_error_("KML_Polygon::Read -- Unexpected field \"" << kstri << "\".\n");}
    184184
    185185                else if (!strcmp(kstri,"<extrude>"))
    … …  
    207207                                }
    208208                                else if (!strncmp(kstrj,"</",2))
    209                                   {_error2_("KML_Polygon::Read -- Unexpected closing tag " << kstrj << ".\n");}
     209                                  {_error_("KML_Polygon::Read -- Unexpected closing tag " << kstrj << ".\n");}
    210210                                else if (strncmp(kstrj,"<",1))
    211                                   {_error2_("KML_Polygon::Read -- Unexpected field \"" << kstrj << "\".\n");}
     211                                  {_error_("KML_Polygon::Read -- Unexpected field \"" << kstrj << "\".\n");}
    212212
    213213                                else if (!strncmp(kstrj,"<LinearRing",11)) {
    … …  
    234234                                }
    235235                                else if (!strncmp(kstrj,"</",2))
    236                                   {_error2_("KML_Polygon::Read -- Unexpected closing tag " << kstrj << ".\n");}
     236                                  {_error_("KML_Polygon::Read -- Unexpected closing tag " << kstrj << ".\n");}
    237237                                else if (strncmp(kstrj,"<",1))
    238                                   {_error2_("KML_Polygon::Read -- Unexpected field \"" << kstrj << "\".\n");}
     238                                  {_error_("KML_Polygon::Read -- Unexpected field \"" << kstrj << "\".\n");}
    239239
    240240                                else if (!strncmp(kstrj,"<LinearRing",11)) {

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h

    r12832 r13036  
    4040                void  Read(FILE* fid,char* kstr);
    4141                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    42                 int   Id(){_error2_("Not implemented yet.");};
    43                 int   MyRank(){_error2_("Not implemented yet.");};
    44                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    45                 int   MarshallSize(){_error2_("Not implemented yet.");};
    46                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    47                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    48                 Object* copy(){_error2_("Not implemented yet.");};
     42                int   Id(){_error_("Not implemented yet.");};
     43                int   MyRank(){_error_("Not implemented yet.");};
     44                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     45                int   MarshallSize(){_error_("Not implemented yet.");};
     46                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     47                int   ObjectEnum(){_error_("Not implemented yet.");};
     48                Object* copy(){_error_("Not implemented yet.");};
    4949                /*}}}*/
    5050

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp

    r12915 r13036  
    189189                }
    190190                else if (!strncmp(kstri,"</",2))
    191                   {_error2_("KML_Style::Read -- Unexpected closing tag " << kstri << ".\n");}
     191                  {_error_("KML_Style::Read -- Unexpected closing tag " << kstri << ".\n");}
    192192                else if (strncmp(kstri,"<",1))
    193                   {_error2_("KML_Style::Read -- Unexpected field \"" << kstri << "\".\n");}
     193                  {_error_("KML_Style::Read -- Unexpected field \"" << kstri << "\".\n");}
    194194
    195195//              else if (!strncmp(kstri,"<IconStyle",10)) {

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.h

    r12832 r13036  
    3838                void  Write(FILE* fid,const char* indent);
    3939                void  Read(FILE* fid,char* kstr);
    40                 int   Id(){_error2_("Not implemented yet.");};
    41                 int   MyRank(){_error2_("Not implemented yet.");};
    42                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    43                 int   MarshallSize(){_error2_("Not implemented yet.");};
    44                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    45                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    46                 Object* copy(){_error2_("Not implemented yet.");};
     40                int   Id(){_error_("Not implemented yet.");};
     41                int   MyRank(){_error_("Not implemented yet.");};
     42                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     43                int   MarshallSize(){_error_("Not implemented yet.");};
     44                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     45                int   ObjectEnum(){_error_("Not implemented yet.");};
     46                Object* copy(){_error_("Not implemented yet.");};
    4747                /*}}}*/
    4848

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp

    r12835 r13036  
    8383                return;
    8484        else if (!strncmp(kstr,"</",2))
    85           {_error2_("KML_StyleSelector::Read -- Unexpected closing tag " << kstr << ".\n");}
     85          {_error_("KML_StyleSelector::Read -- Unexpected closing tag " << kstr << ".\n");}
    8686        else if (strncmp(kstr,"<",1))
    87           {_error2_("KML_StyleSelector::Read -- Unexpected field \"" << kstr << "\".\n");}
     87          {_error_("KML_StyleSelector::Read -- Unexpected field \"" << kstr << "\".\n");}
    8888
    8989        else if (!strncmp(kstr,"<",1))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.h

    r12832 r13036  
    2929                void  Write(FILE* fid,const char* indent);
    3030                void  Read(FILE* fid,char* kstr);
    31                 int   Id(){_error2_("Not implemented yet.");};
    32                 int   MyRank(){_error2_("Not implemented yet.");};
    33                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    34                 int   MarshallSize(){_error2_("Not implemented yet.");};
    35                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    36                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    37                 Object* copy(){_error2_("Not implemented yet.");};
     31                int   Id(){_error_("Not implemented yet.");};
     32                int   MyRank(){_error_("Not implemented yet.");};
     33                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     34                int   MarshallSize(){_error_("Not implemented yet.");};
     35                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     36                int   ObjectEnum(){_error_("Not implemented yet.");};
     37                Object* copy(){_error_("Not implemented yet.");};
    3838                /*}}}*/
    3939

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.cpp

    r12835 r13036  
    8383                return;
    8484        else if (!strncmp(kstr,"</",2))
    85           {_error2_("KML_SubStyle::Read -- Unexpected closing tag " << kstr << ".\n");}
     85          {_error_("KML_SubStyle::Read -- Unexpected closing tag " << kstr << ".\n");}
    8686        else if (strncmp(kstr,"<",1))
    87           {_error2_("KML_SubStyle::Read -- Unexpected field \"" << kstr << "\".\n");}
     87          {_error_("KML_SubStyle::Read -- Unexpected field \"" << kstr << "\".\n");}
    8888
    8989        else if (!strncmp(kstr,"<",1))

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.h

    r12832 r13036  
    2929                void  Write(FILE* fid,const char* indent);
    3030                void  Read(FILE* fid,char* kstr);
    31                 int   Id(){_error2_("Not implemented yet.");};
    32                 int   MyRank(){_error2_("Not implemented yet.");};
    33                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    34                 int   MarshallSize(){_error2_("Not implemented yet.");};
    35                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    36                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    37                 Object* copy(){_error2_("Not implemented yet.");};
     31                int   Id(){_error_("Not implemented yet.");};
     32                int   MyRank(){_error_("Not implemented yet.");};
     33                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     34                int   MarshallSize(){_error_("Not implemented yet.");};
     35                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     36                int   ObjectEnum(){_error_("Not implemented yet.");};
     37                Object* copy(){_error_("Not implemented yet.");};
    3838                /*}}}*/
    3939

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.cpp

    r12915 r13036  
    160160                }
    161161                else if (!strncmp(kstri,"</",2))
    162                   {_error2_("KML_Unknown::Read -- Unexpected closing tag " << kstri << ".\n");}
     162                  {_error_("KML_Unknown::Read -- Unexpected closing tag " << kstri << ".\n");}
    163163
    164164                else if (strncmp(kstri,"<",1)) {

  • issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.h

    r12832 r13036  
    3232                void  Write(FILE* fid,const char* indent);
    3333                void  Read(FILE* fid,char* kstr);
    34                 int   Id(){_error2_("Not implemented yet.");};
    35                 int   MyRank(){_error2_("Not implemented yet.");};
    36                 void  Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    37                 int   MarshallSize(){_error2_("Not implemented yet.");};
    38                 void  Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");};
    39                 int   ObjectEnum(){_error2_("Not implemented yet.");};
    40                 Object* copy(){_error2_("Not implemented yet.");};
     34                int   Id(){_error_("Not implemented yet.");};
     35                int   MyRank(){_error_("Not implemented yet.");};
     36                void  Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     37                int   MarshallSize(){_error_("Not implemented yet.");};
     38                void  Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");};
     39                int   ObjectEnum(){_error_("Not implemented yet.");};
     40                Object* copy(){_error_("Not implemented yet.");};
    4141                /*}}}*/
    4242

  • issm/trunk-jpl/src/c/classes/objects/Loads/Friction.cpp

    r12832 r13036  
    107107                vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
    108108        }
    109         else _error2_("element_type "<< element_type << " not supported yet");
     109        else _error_("element_type "<< element_type << " not supported yet");
    110110
    111111        /*Checks that s-1>0 if v=0*/
    112         if(vmag==0 && (s-1)<0) _error2_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
     112        if(vmag==0 && (s-1)<0) _error_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
    113113
    114114        alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1));
    … …  
    171171                vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
    172172        }
    173         else _error2_("element_type "<< element_type << " not supported yet");
     173        else _error_("element_type "<< element_type << " not supported yet");
    174174
    175175        /*Checks that s-1>0 if v=0*/
    176         if(vmag==0 && (s-1)<0) _error2_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
     176        if(vmag==0 && (s-1)<0) _error_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
    177177
    178178        alpha2=pow(drag_coefficient,2)*pow(Neff,r)*pow(vmag,(s-1));
    … …  
    238238                vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
    239239        }
    240         else _error2_("element_type "<< element_type << " not supported yet");
     240        else _error_("element_type "<< element_type << " not supported yet");
    241241
    242242        /*Checks that s-1>0 if v=0*/
    243         if(vmag==0 && (s-1)<0) _error2_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
     243        if(vmag==0 && (s-1)<0) _error_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
    244244
    245245        alpha_complement=pow(Neff,r)*pow(vmag,(s-1));            _assert_(!xIsNan<IssmDouble>(alpha_complement));
    … …  
    304304                vmag=sqrt(pow(vx,2)+pow(vy,2)+pow(vz,2));
    305305        }
    306         else _error2_("element_type "<< element_type << " not supported yet");
     306        else _error_("element_type "<< element_type << " not supported yet");
    307307
    308308        /*Checks that s-1>0 if v=0*/
    309         if(vmag==0 && (s-1)<0) _error2_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
     309        if(vmag==0 && (s-1)<0) _error_("velocity is 0 and (s-1)=" << (s-1) << "<0, alpha_complement is Inf");
    310310
    311311        alpha_complement=pow(Neff,r)*pow(vmag,(s-1));            _assert_(!xIsNan<IssmDouble>(alpha_complement));
    … …  
    319319
    320320        Input* input=inputs->GetInput(enum_type);
    321         if(!input) _error2_("input " << EnumToStringx(enum_type) << " not found");
     321        if(!input) _error_("input " << EnumToStringx(enum_type) << " not found");
    322322        input->GetInputValue(pvalue,gauss);
    323323
    … …  
    328328
    329329        Input* input=inputs->GetInput(enum_type);
    330         if(!input) _error2_("input " << EnumToStringx(enum_type) << " not found");
     330        if(!input) _error_("input " << EnumToStringx(enum_type) << " not found");
    331331        input->GetInputValue(pvalue,gauss);
    332332

  • issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp

    r12832 r13036  
    8181                icefront_node_ids[3]=iomodel->nodecounter+reCast<int>(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+3));
    8282        }
    83         else _error2_("in_icefront_type " << EnumToStringx(in_icefront_type) << " not supported yet!");
     83        else _error_("in_icefront_type " << EnumToStringx(in_icefront_type) << " not supported yet!");
    8484
    8585        if (in_icefront_type==PattynIceFrontEnum || in_icefront_type==StokesIceFrontEnum)
    … …  
    263263                #endif
    264264                default:
    265                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     265                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    266266        }
    267267
    … …  
    379379            #endif
    380380                default:
    381                         _error2_("Icefront type " << EnumToStringx(type) << " not supported yet");
     381                        _error_("Icefront type " << EnumToStringx(type) << " not supported yet");
    382382        }
    383383}
    … …  
    441441                                break;
    442442                        default:
    443                                 _error2_("fill type " << EnumToStringx(fill) << " not supported yet");
     443                                _error_("fill type " << EnumToStringx(fill) << " not supported yet");
    444444                }
    445445                ice_pressure=1.0/2.0*gravity*rho_ice*pow(thickness,2);
    … …  
    564564                                break;
    565565                        default:
    566                                 _error2_("fill type " << EnumToStringx(fill) << " not supported yet");
     566                                _error_("fill type " << EnumToStringx(fill) << " not supported yet");
    567567                }
    568568                ice_pressure=rho_ice*gravity*(surface-z_g);
    … …  
    638638                                break;
    639639                        default:
    640                                 _error2_("fill type " << EnumToStringx(fill) << " not supported yet");
     640                                _error_("fill type " << EnumToStringx(fill) << " not supported yet");
    641641                }
    642642                air_pressure=0;

  • issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.h

    r12494 r13036  
    6464                void  InputUpdateFromConstant(bool constant, int name);
    6565                void  InputUpdateFromSolution(IssmDouble* solution);
    66                 void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");};
     66                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6767                /*}}}*/
    6868                /*Load virtual functions definitions: {{{*/

  • issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp

    r12832 r13036  
    270270                        break;
    271271                default:
    272                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     272                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    273273        }
    274274
    … …  
    300300                        break;
    301301                default:
    302                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     302                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    303303        }
    304304
    … …  
    347347                        return CreateKMatrixPrognosticBoundary();
    348348                default:
    349                         _error2_("type not supported yet");
     349                        _error_("type not supported yet");
    350350        }
    351351}
    … …  
    500500                        return CreateKMatrixBalancethicknessBoundary();
    501501                default:
    502                         _error2_("type not supported yet");
     502                        _error_("type not supported yet");
    503503        }
    504504}
    … …  
    651651                        return CreateKMatrixAdjointBalancethicknessBoundary();
    652652                default:
    653                         _error2_("type not supported yet");
     653                        _error_("type not supported yet");
    654654        }
    655655}
    … …  
    683683                        return CreatePVectorPrognosticBoundary();
    684684                default:
    685                         _error2_("type not supported yet");
     685                        _error_("type not supported yet");
    686686        }
    687687}
    … …  
    751751                vyaverage_input->GetInputValue(&vy,gauss);
    752752                spcthickness_input->GetInputValue(&thickness,gauss);
    753                 if(xIsNan<IssmDouble>(thickness)) _error2_("Cannot weakly apply constraint because NaN was provided");
     753                if(xIsNan<IssmDouble>(thickness)) _error_("Cannot weakly apply constraint because NaN was provided");
    754754
    755755                UdotN=vx*normal[0]+vy*normal[1];
    … …  
    777777                        return CreatePVectorBalancethicknessBoundary();
    778778                default:
    779                         _error2_("type not supported yet");
     779                        _error_("type not supported yet");
    780780        }
    781781}

  • issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.h

    r12494 r13036  
    5050                /*Update virtual functions resolution: {{{*/
    5151                void    InputUpdateFromVector(IssmDouble* vector, int name, int type){/*Do nothing*/}
    52                 void    InputUpdateFromVector(int* vector, int name, int type){_error2_("Not implemented yet!");}
    53                 void    InputUpdateFromVector(bool* vector, int name, int type){_error2_("Not implemented yet!");}
     52                void    InputUpdateFromVector(int* vector, int name, int type){_error_("Not implemented yet!");}
     53                void    InputUpdateFromVector(bool* vector, int name, int type){_error_("Not implemented yet!");}
    5454                void    InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){/*Do nothing*/}
    5555                void    InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){/*Do nothing*/}
    56                 void    InputUpdateFromVectorDakota(int* vector, int name, int type){_error2_("Not implemented yet!");}
    57                 void    InputUpdateFromVectorDakota(bool* vector, int name, int type){_error2_("Not implemented yet!");}
     56                void    InputUpdateFromVectorDakota(int* vector, int name, int type){_error_("Not implemented yet!");}
     57                void    InputUpdateFromVectorDakota(bool* vector, int name, int type){_error_("Not implemented yet!");}
    5858                void    InputUpdateFromConstant(IssmDouble constant, int name){/*Do nothing*/};
    5959                void    InputUpdateFromConstant(int constant, int name){/*Do nothing*/};
    60                 void    InputUpdateFromConstant(bool constant, int name){_error2_("Not implemented yet!");}
    61                 void    InputUpdateFromSolution(IssmDouble* solution){_error2_("Not implemented yet!");}
    62                 void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");};
     60                void    InputUpdateFromConstant(bool constant, int name){_error_("Not implemented yet!");}
     61                void    InputUpdateFromSolution(IssmDouble* solution){_error_("Not implemented yet!");}
     62                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6363                /*}}}*/
    6464                /*Load virtual functions definitions: {{{*/
    … …  
    6767                void  CreateKMatrix(Matrix* Kff, Matrix* Kfs);
    6868                void  CreatePVector(Vector* pf);
    69                 void  CreateJacobianMatrix(Matrix* Jff){_error2_("Not implemented yet");};
    70                 void  PenaltyCreateJacobianMatrix(Matrix* Jff,IssmDouble kmax){_error2_("Not implemented yet");};
     69                void  CreateJacobianMatrix(Matrix* Jff){_error_("Not implemented yet");};
     70                void  PenaltyCreateJacobianMatrix(Matrix* Jff,IssmDouble kmax){_error_("Not implemented yet");};
    7171                void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* kfs, IssmDouble kmax);
    7272                void  PenaltyCreatePVector(Vector* pf, IssmDouble kmax);

  • issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp

    r12832 r13036  
    239239                #endif
    240240                default:
    241                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     241                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    242242        }
    243243
    … …  
    271271                #endif
    272272                default:
    273                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     273                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    274274        }
    275275
    … …  
    379379        }
    380380        else{
    381                 _error2_("analysis: " << EnumToStringx(analysis_type) << " not supported yet");
     381                _error_("analysis: " << EnumToStringx(analysis_type) << " not supported yet");
    382382        }
    383383
    … …  
    616616/*FUNCTION Pengrid::UpdateInputs {{{*/
    617617void  Pengrid::UpdateInputs(IssmDouble* solution){
    618         _error2_("not supported yet!");
    619 }
    620 /*}}}*/
     618        _error_("not supported yet!");
     619}
     620/*}}}*/

  • issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.h

    r12494 r13036  
    6565                void  InputUpdateFromConstant(bool constant, int name);
    6666                void  InputUpdateFromSolution(IssmDouble* solution);
    67                 void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");};
     67                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6868                /*}}}*/
    6969                /*Load virtual functions definitions: {{{*/
    … …  
    7272                void  CreateKMatrix(Matrix* Kff, Matrix* Kfs);
    7373                void  CreatePVector(Vector* pf);
    74                 void  CreateJacobianMatrix(Matrix* Jff){_error2_("Not implemented yet");};
    75                 void  PenaltyCreateJacobianMatrix(Matrix* Jff,IssmDouble kmax){_error2_("Not implemented yet");};
     74                void  CreateJacobianMatrix(Matrix* Jff){_error_("Not implemented yet");};
     75                void  PenaltyCreateJacobianMatrix(Matrix* Jff,IssmDouble kmax){_error_("Not implemented yet");};
    7676                void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* kfs, IssmDouble kmax);
    7777                void  PenaltyCreatePVector(Vector* pf, IssmDouble kmax);

  • issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp

    r12832 r13036  
    172172                        break;
    173173                default:
    174                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     174                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    175175        }
    176176
    … …  
    244244                                case MacAyealApproximationEnum: return PenaltyCreateKMatrixDiagnosticMacAyealPattyn(kmax);
    245245                                case PattynApproximationEnum:   return PenaltyCreateKMatrixDiagnosticMacAyealPattyn(kmax);
    246                                 default: _error2_("not supported yet");
     246                                default: _error_("not supported yet");
    247247                        }
    248248                case PattynApproximationEnum:
    … …  
    250250                                case MacAyealApproximationEnum: return PenaltyCreateKMatrixDiagnosticMacAyealPattyn(kmax);
    251251                                case PattynApproximationEnum:   return PenaltyCreateKMatrixDiagnosticMacAyealPattyn(kmax);
    252                                 default: _error2_("not supported yet");
     252                                default: _error_("not supported yet");
    253253                        }
    254254                case StokesApproximationEnum:
    … …  
    256256                                case StokesApproximationEnum: return PenaltyCreateKMatrixDiagnosticStokes(kmax);
    257257                                case NoneApproximationEnum: return   PenaltyCreateKMatrixDiagnosticStokes(kmax);
    258                                 default: _error2_("not supported yet");
     258                                default: _error_("not supported yet");
    259259                        }
    260260                case NoneApproximationEnum:
    … …  
    262262                                case StokesApproximationEnum: return PenaltyCreateKMatrixDiagnosticStokes(kmax);
    263263                                case NoneApproximationEnum: return   PenaltyCreateKMatrixDiagnosticStokes(kmax);
    264                                 default: _error2_("not supported yet");
     264                                default: _error_("not supported yet");
    265265                        }
    266                 default: _error2_("not supported yet");
     266                default: _error_("not supported yet");
    267267        }
    268268}

  • issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.h

    r12494 r13036  
    4444                void  InputUpdateFromVector(int* vector, int name, int type);
    4545                void  InputUpdateFromVector(bool* vector, int name, int type);
    46                 void  InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrow, int ncols,int name, int type){_error2_("Not implemented yet!");}
    47                 void  InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){_error2_("Not implemented yet!");}
    48                 void  InputUpdateFromVectorDakota(int* vector, int name, int type){_error2_("Not implemented yet!");}
    49                 void  InputUpdateFromVectorDakota(bool* vector, int name, int type){_error2_("Not implemented yet!");}
     46                void  InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrow, int ncols,int name, int type){_error_("Not implemented yet!");}
     47                void  InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){_error_("Not implemented yet!");}
     48                void  InputUpdateFromVectorDakota(int* vector, int name, int type){_error_("Not implemented yet!");}
     49                void  InputUpdateFromVectorDakota(bool* vector, int name, int type){_error_("Not implemented yet!");}
    5050                void  InputUpdateFromConstant(IssmDouble constant, int name);
    5151                void  InputUpdateFromConstant(int constant, int name);
    5252                void  InputUpdateFromConstant(bool constant, int name);
    53                 void  InputUpdateFromSolution(IssmDouble* solution){_error2_("Not implemented yet!");}
    54                 void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");};
     53                void  InputUpdateFromSolution(IssmDouble* solution){_error_("Not implemented yet!");}
     54                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    5555                /*}}}*/
    5656                        /*Load virtual functions definitions: {{{*/

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

    r12832 r13036  
    276276
    277277        /*update input*/
    278         _error2_("not implemented yet");
     278        _error_("not implemented yet");
    279279        //this->inputs->AddInput(new DoubleInput(name,constant));
    280280
    … …  
    324324                        break;
    325325                default:
    326                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     326                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    327327        }
    328328
    … …  
    350350                        break;
    351351                default:
    352                         _error2_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
     352                        _error_("analysis " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not supported yet");
    353353        }
    354354
    … …  
    397397
    398398        /*enum of element? */
    399         if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
     399        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
    400400        tria1=(Tria*)elements[0];
    401401        tria2=(Tria*)elements[1];
    … …  
    410410        tria1->GetInputValue(&h[0],nodes[0],ThicknessEnum);
    411411        tria2->GetInputValue(&h[1],nodes[1],ThicknessEnum);
    412         if (h[0]!=h[1])_error2_("different thicknesses not supported for rift fronts");
     412        if (h[0]!=h[1])_error_("different thicknesses not supported for rift fronts");
    413413        thickness=h[0];
    414414
    … …  
    488488
    489489        /*enum of element? */
    490         if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
     490        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
    491491        tria1=(Tria*)elements[0];
    492492        tria2=(Tria*)elements[1];
    … …  
    504504        tria1->GetInputValue(&h[0],nodes[0],ThicknessEnum);
    505505        tria2->GetInputValue(&h[1],nodes[1],ThicknessEnum);
    506         if (h[0]!=h[1])_error2_("different thicknesses not supported for rift fronts");
     506        if (h[0]!=h[1])_error_("different thicknesses not supported for rift fronts");
    507507        thickness=h[0];
    508508        tria1->GetInputValue(&b[0],nodes[0],BedEnum);
    509509        tria2->GetInputValue(&b[1],nodes[1],BedEnum);
    510         if (b[0]!=b[1])_error2_("different beds not supported for rift fronts");
     510        if (b[0]!=b[1])_error_("different beds not supported for rift fronts");
    511511        bed=b[0];
    512512
    … …  
    536536        else if(fill==MelangeEnum){ //icefront finding itself against another icefront (pressure imbalance is fully compensated, ice vs ice)
    537537
    538                 if(!shelf) _error2_("fill type " << fill << " not supported on ice sheets yet.");
     538                if(!shelf) _error_("fill type " << fill << " not supported on ice sheets yet.");
    539539
    540540                pressure_litho=rho_ice*gravity*pow(thickness,(IssmDouble)2)/(IssmDouble)2;
    … …  
    546546        }
    547547        else{
    548                 _error2_("fill type " << fill << " not supported yet.");
     548                _error_("fill type " << fill << " not supported yet.");
    549549        }
    550550
    … …  
    585585
    586586        /*enum of element? */
    587         if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
     587        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
    588588
    589589        /*recover elements on both side of rift: */
    … …  
    706706
    707707        /*enum of element? */
    708         if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
     708        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
    709709
    710710        /*recover elements on both side of rift: */
    … …  
    751751
    752752        /*enum of element? */
    753         if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
     753        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
    754754
    755755        /*recover elements on both side of rift: */
    … …  
    794794
    795795        /*enum of element? */
    796         if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
     796        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
    797797
    798798        /*recover elements on both side of rift: */
    … …  
    844844
    845845        /*enum of element? */
    846         if(elements[0]->ObjectEnum()!=TriaEnum)_error2_("only Tria element allowed for Riftfront load!");
     846        if(elements[0]->ObjectEnum()!=TriaEnum)_error_("only Tria element allowed for Riftfront load!");
    847847
    848848        /*recover elements on both side of rift: */

  • issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.h

    r12494 r13036  
    6262                /*Update virtual functions resolution: {{{*/
    6363                void    InputUpdateFromVector(IssmDouble* vector, int name, int type);
    64                 void    InputUpdateFromVector(int* vector, int name, int type){_error2_("Not implemented yet!");}
    65                 void    InputUpdateFromVector(bool* vector, int name, int type){_error2_("Not implemented yet!");}
    66                 void    InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows,int ncols, int name, int type){_error2_("Not implemented yet!");}
    67                 void    InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){_error2_("Not implemented yet!");}
    68                 void    InputUpdateFromVectorDakota(int* vector, int name, int type){_error2_("Not implemented yet!");}
    69                 void    InputUpdateFromVectorDakota(bool* vector, int name, int type){_error2_("Not implemented yet!");}
     64                void    InputUpdateFromVector(int* vector, int name, int type){_error_("Not implemented yet!");}
     65                void    InputUpdateFromVector(bool* vector, int name, int type){_error_("Not implemented yet!");}
     66                void    InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows,int ncols, int name, int type){_error_("Not implemented yet!");}
     67                void    InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){_error_("Not implemented yet!");}
     68                void    InputUpdateFromVectorDakota(int* vector, int name, int type){_error_("Not implemented yet!");}
     69                void    InputUpdateFromVectorDakota(bool* vector, int name, int type){_error_("Not implemented yet!");}
    7070                void    InputUpdateFromConstant(IssmDouble constant, int name);
    71                 void    InputUpdateFromConstant(int constant, int name){_error2_("Not implemented yet!");}
     71                void    InputUpdateFromConstant(int constant, int name){_error_("Not implemented yet!");}
    7272                void    InputUpdateFromConstant(bool constant, int name);
    73                 void    InputUpdateFromSolution(IssmDouble* solution){_error2_("Not implemented yet!");}
    74                 void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");};
     73                void    InputUpdateFromSolution(IssmDouble* solution){_error_("Not implemented yet!");}
     74                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    7575                /*}}}*/
    7676                /*Load virtual functions definitions: {{{*/
    … …  
    7979                void  CreateKMatrix(Matrix* Kff, Matrix* Kfs);
    8080                void  CreatePVector(Vector* pf);
    81                 void  CreateJacobianMatrix(Matrix* Jff){_error2_("Not implemented yet");};
    82                 void  PenaltyCreateJacobianMatrix(Matrix* Jff,IssmDouble kmax){_error2_("Not implemented yet");};
     81                void  CreateJacobianMatrix(Matrix* Jff){_error_("Not implemented yet");};
     82                void  PenaltyCreateJacobianMatrix(Matrix* Jff,IssmDouble kmax){_error_("Not implemented yet");};
    8383                void  PenaltyCreateKMatrix(Matrix* Kff, Matrix* kfs, IssmDouble kmax);
    8484                void  PenaltyCreatePVector(Vector* pf, IssmDouble kmax);

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

    r12832 r13036  
    180180                        /*Get input (either in element or material)*/
    181181                        Input* input=inputs->GetInput(input_enum);
    182                         if(!input) _error2_("Input " << EnumToStringx(input_enum) << " not found in material");
     182                        if(!input) _error_("Input " << EnumToStringx(input_enum) << " not found in material");
    183183
    184184                        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
    … …  
    186186                        break;
    187187
    188                 default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
     188                default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
    189189        }
    190190}
    … …  
    246246
    247247        /*Checks in debugging mode*/
    248         if(viscosity<=0) _error2_("Negative viscosity");
     248        if(viscosity<=0) _error_("Negative viscosity");
    249249        _assert_(B>0);
    250250        _assert_(n>0);
    … …  
    317317
    318318        /*Checks in debugging mode*/
    319         if(viscosity3d<=0) _error2_("Negative viscosity");
     319        if(viscosity3d<=0) _error_("Negative viscosity");
    320320        _assert_(B>0);
    321321        _assert_(n>0);
    … …  
    389389
    390390        /*Checks in debugging mode*/
    391         if(viscosity3d<=0) _error2_("Negative viscosity");
     391        if(viscosity3d<=0) _error_("Negative viscosity");
    392392        _assert_(B>0);
    393393        _assert_(n>0);
    … …  
    550550                                        return;
    551551                                }
    552                                 default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
    553                         }
    554                 default: _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     552                                default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
     553                        }
     554                default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    555555        }
    556556}
    … …  
    608608                                        return;
    609609                                }
    610                                 default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
    611                         }
    612                 default: _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     610                                default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
     611                        }
     612                default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    613613        }
    614614
    … …  
    750750        #endif
    751751        else{
    752                 _error2_("Mesh type not supported yet!");
     752                _error_("Mesh type not supported yet!");
    753753        }
    754754

  • issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h

    r12494 r13036  
    6262                void   InputUpdateFromConstant(bool constant, int name);
    6363                void   InputUpdateFromSolution(IssmDouble* solution);
    64                 void   InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");};
     64                void   InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");};
    6565                /*}}}*/
    6666                /*Material virtual functions resolution: {{{*/
    67                 void   InputDuplicate(int original_enum,int new_enum){_error2_("not implemented yet");};
     67                void   InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");};
    6868                void   Configure(Elements* elements);
    6969                void   GetVectorFromInputs(Vector* vector,int input_enum){return;}

  • issm/trunk-jpl/src/c/classes/objects/Node.cpp

    r12832 r13036  
    7070
    7171        /*spc all nodes on water*/
    72         if (!iomodel->Data(MaskVertexonwaterEnum)) _error2_("iomodel->nodeonwater is NULL");
     72        if (!iomodel->Data(MaskVertexonwaterEnum)) _error_("iomodel->nodeonwater is NULL");
    7373        if (reCast<IssmBool>(iomodel->Data(MaskVertexonwaterEnum)[io_index])){
    7474                for(k=1;k<=gsize;k++){
    … …  
    114114        /*Diagnostic Hutter*/
    115115        if (analysis_type==DiagnosticHutterAnalysisEnum){
    116                 if (!iomodel->Data(FlowequationVertexEquationEnum)) _error2_("iomodel->vertices_type is NULL");
     116                if (!iomodel->Data(FlowequationVertexEquationEnum)) _error_("iomodel->vertices_type is NULL");
    117117                /*Constrain all nodes that are not Hutter*/
    118118                if (reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[io_index])!=HutterApproximationEnum){
    … …  
    230230                return indexing.sdoflist[dofindex];
    231231        }
    232         else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     232        else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    233233
    234234}
    … …  
    302302                        else for(i=0;i<this->indexing.ssize;i++) outdoflist[i]=indexing.sdoflist[i];
    303303                }
    304                 else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     304                else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    305305        }
    306306}
    … …  
    342342                        }
    343343                }
    344                 else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     344                else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    345345        }
    346346        else{
    … …  
    411411                        }
    412412                }
    413                 else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     413                else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    414414        }
    415415}
    … …  
    597597                else if (setenum==FsetEnum) numdofs=this->indexing.fsize;
    598598                else if (setenum==SsetEnum) numdofs=this->indexing.ssize;
    599                 else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     599                else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    600600        }
    601601        else{
    … …  
    627627                        else numdofs=this->indexing.ssize;
    628628                }
    629                 else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     629                else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    630630        }
    631631        return numdofs;
    … …  
    834834                }
    835835        }
    836         else _error2_("VecMerge can only merge from the s or f-set onto the g-set!");
     836        else _error_("VecMerge can only merge from the s or f-set onto the g-set!");
    837837
    838838        /*Free ressources:*/
    … …  
    880880                }
    881881        }
    882         else _error2_("VecReduce can only merge from the s or f-set onto the g-set!");
     882        else _error_("VecReduce can only merge from the s or f-set onto the g-set!");
    883883
    884884        /*Free ressources:*/
    … …  
    927927                dofcount+=this->indexing.ssize;
    928928        }
    929         else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     929        else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    930930
    931931
    … …  
    956956                for(i=0;i<this->indexing.ssize;i++) indexing.sdoflist[i]+=dofcount;
    957957        }
    958         else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     958        else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    959959}
    960960/*}}}*/
    … …  
    972972        else if(setenum==FsetEnum)for(j=0;j<this->indexing.fsize;j++)  *(truedofs+ncols*sid+j)=indexing.fdoflist[j];
    973973        else if(setenum==SsetEnum)for(j=0;j<this->indexing.ssize;j++)  *(truedofs+ncols*sid+j)=indexing.sdoflist[j];
    974         else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     974        else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    975975
    976976}
    … …  
    991991        else if(setenum==FsetEnum)for(j=0;j<this->indexing.fsize;j++) indexing.fdoflist[j]=*(alltruedofs+ncols*sid+j);
    992992        else if(setenum==SsetEnum)for(j=0;j<this->indexing.ssize;j++) indexing.sdoflist[j]=*(alltruedofs+ncols*sid+j);
    993         else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
     993        else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!");
    994994
    995995}

  • issm/trunk-jpl/src/c/classes/objects/Node.h

    r12832 r13036  
    4545                int   MyRank();
    4646                int   ObjectEnum();
    47                 Object* copy(){_error2_("Not implemented yet (similar to Elements)");};
     47                Object* copy(){_error_("Not implemented yet (similar to Elements)");};
    4848                /*}}}*/
    4949                /*Update virtual functions definitions: {{{*/
    … …  
    5959                void  InputUpdateFromConstant(int constant, int name);
    6060                void  InputUpdateFromConstant(bool constant, int name);
    61                 void  InputUpdateFromSolution(IssmDouble* solution){_error2_("Not implemented yet!");}
    62                 void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("Not implemented yet!");}
     61                void  InputUpdateFromSolution(IssmDouble* solution){_error_("Not implemented yet!");}
     62                void  InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("Not implemented yet!");}
    6363                /*}}}*/
    6464                /*Node numerical routines {{{*/

  • issm/trunk-jpl/src/c/classes/objects/Options/Option.h

    r12832 r13036  
    3131                virtual void  DeepEcho();
    3232                virtual void  DeepEcho(char* indent);
    33                 int   Id(){_error2_("Not implemented yet");};
    34                 int   MyRank(){_error2_("Not implemented yet");};
     33                int   Id(){_error_("Not implemented yet");};
     34                int   MyRank(){_error_("Not implemented yet");};
    3535                int   ObjectEnum(){return OptionEnum;};
    36                 Object* copy(){_error2_("Not implemented yet");};
     36                Object* copy(){_error_("Not implemented yet");};
    3737                /*}}}*/
    3838

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionCell.h

    r12832 r13036  
    2828                void  DeepEcho();
    2929                void  DeepEcho(char* indent);
    30                 int   Id(){_error2_("Not implemented yet");};
    31                 int   MyRank(){_error2_("Not implemented yet");};
     30                int   Id(){_error_("Not implemented yet");};
     31                int   MyRank(){_error_("Not implemented yet");};
    3232                int   ObjectEnum(){return OptionCellEnum;};
    33                 Object* copy(){_error2_("Not implemented yet");};
     33                Object* copy(){_error_("Not implemented yet");};
    3434                /*}}}*/
    3535
    … …  
    3939                int   NDims();
    4040                int*  Size();
    41                 void  Get(int* pvalue){_error2_("An OptionCell object cannot return a int");};
    42                 void  Get(IssmDouble* pvalue){_error2_("An OptionCell object cannot return a IssmDouble");};
    43                 void  Get(bool* pvalue){  _error2_("An OptionCell object cannot return a bool");};
    44                 void  Get(char** pvalue){ _error2_("An OptionCell object cannot return a string");};
    45                 void  Get(char*** ppvalue,int *pnumel){ _error2_("An OptionCell object cannot return a string vec");};
    46                 void  Get(IssmDouble** pvalue,int *pnumel){ _error2_("An OptionCell object cannot return a IssmDouble vec");};
     41                void  Get(int* pvalue){_error_("An OptionCell object cannot return a int");};
     42                void  Get(IssmDouble* pvalue){_error_("An OptionCell object cannot return a IssmDouble");};
     43                void  Get(bool* pvalue){  _error_("An OptionCell object cannot return a bool");};
     44                void  Get(char** pvalue){ _error_("An OptionCell object cannot return a string");};
     45                void  Get(char*** ppvalue,int *pnumel){ _error_("An OptionCell object cannot return a string vec");};
     46                void  Get(IssmDouble** pvalue,int *pnumel){ _error_("An OptionCell object cannot return a IssmDouble vec");};
    4747                void  Get(Options** pvalue);
    48                 void  Get(Options*** ppvalue,int *pnumel){ _error2_("An OptionCell object cannot return an Options DataSet vec");};
     48                void  Get(Options*** ppvalue,int *pnumel){ _error_("An OptionCell object cannot return an Options DataSet vec");};
    4949
    5050};

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionChar.cpp

    r12832 r13036  
    153153        /*We should first check that the size is at least one*/
    154154        if(this->NumEl()<=0){
    155                 _error2_("option \"" << this->name << "\" is empty and cannot return a string vector");
     155                _error_("option \"" << this->name << "\" is empty and cannot return a string vector");
    156156        }
    157157

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionChar.h

    r12832 r13036  
    2828                void  DeepEcho();
    2929                void  DeepEcho(char* indent);
    30                 int   Id(){_error2_("Not implemented yet");};
    31                 int   MyRank(){_error2_("Not implemented yet");};
     30                int   Id(){_error_("Not implemented yet");};
     31                int   MyRank(){_error_("Not implemented yet");};
    3232                int   ObjectEnum(){return OptionCharEnum;};
    33                 Object* copy(){_error2_("Not implemented yet");};
     33                Object* copy(){_error_("Not implemented yet");};
    3434                /*}}}*/
    3535
    … …  
    3939                int   NDims();
    4040                int*  Size();
    41                 void  Get(int* pvalue){_error2_("An OptionChar object cannot return a int");};
    42                 void  Get(IssmDouble* pvalue){_error2_("An OptionChar object cannot return a IssmDouble");};
    43                 void  Get(bool* pvalue){  _error2_("An OptionChar object cannot return a bool");};
     41                void  Get(int* pvalue){_error_("An OptionChar object cannot return a int");};
     42                void  Get(IssmDouble* pvalue){_error_("An OptionChar object cannot return a IssmDouble");};
     43                void  Get(bool* pvalue){  _error_("An OptionChar object cannot return a bool");};
    4444                void  Get(char** pvalue);
    4545                void  Get(char*** ppvalue,int *pnumel);
    46                 void  Get(IssmDouble** pvalue,int *pnumel){ _error2_("An OptionChar object cannot return a IssmDouble vec");};
    47                 void  Get(Options** pvalue){ _error2_("An OptionChar object cannot return an Options DataSet");};
    48                 void  Get(Options*** ppvalue,int *pnumel){ _error2_("An OptionChar object cannot return an Options DataSet vec");};
     46                void  Get(IssmDouble** pvalue,int *pnumel){ _error_("An OptionChar object cannot return a IssmDouble vec");};
     47                void  Get(Options** pvalue){ _error_("An OptionChar object cannot return an Options DataSet");};
     48                void  Get(Options*** ppvalue,int *pnumel){ _error_("An OptionChar object cannot return an Options DataSet vec");};
    4949
    5050};

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionDouble.cpp

    r12832 r13036  
    125125        /*We should first check that the size is one*/
    126126        if(this->NumEl()!=1){
    127                 _error2_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single int");
     127                _error_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single int");
    128128        }
    129129
    … …  
    137137        /*We should first check that the size is one*/
    138138        if(this->NumEl()!=1){
    139                 _error2_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single IssmDouble");
     139                _error_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single IssmDouble");
    140140        }
    141141
    … …  
    149149        /*We should first check that the size is at least one*/
    150150        if(this->NumEl()<=0){
    151                 _error2_("option \"" << this->name << "\" is empty and cannot return a IssmDouble vector");
     151                _error_("option \"" << this->name << "\" is empty and cannot return a IssmDouble vector");
    152152        }
    153153

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionDouble.h

    r12832 r13036  
    2828                void  DeepEcho();
    2929                void  DeepEcho(char* indent);
    30                 int   Id(){_error2_("Not implemented yet");};
    31                 int   MyRank(){_error2_("Not implemented yet");};
     30                int   Id(){_error_("Not implemented yet");};
     31                int   MyRank(){_error_("Not implemented yet");};
    3232                int   ObjectEnum(){return OptionDoubleEnum;};
    33                 Object* copy(){_error2_("Not implemented yet");};
     33                Object* copy(){_error_("Not implemented yet");};
    3434                /*}}}*/
    3535
    … …  
    4141                void  Get(int* pvalue);
    4242                void  Get(IssmDouble* pvalue);
    43                 void  Get(bool* pvalue){  _error2_("An OptionDouble object cannot return a bool");};
    44                 void  Get(char** pvalue){ _error2_("An OptionDouble object cannot return a string");};
    45                 void  Get(char*** ppvalue,int *pnumel){ _error2_("An OptionDouble object cannot return a string vec");};
     43                void  Get(bool* pvalue){  _error_("An OptionDouble object cannot return a bool");};
     44                void  Get(char** pvalue){ _error_("An OptionDouble object cannot return a string");};
     45                void  Get(char*** ppvalue,int *pnumel){ _error_("An OptionDouble object cannot return a string vec");};
    4646                void  Get(IssmDouble** pvalue,int* pnumel);
    47                 void  Get(Options** pvalue){ _error2_("An OptionDouble object cannot return an Options DataSet");};
    48                 void  Get(Options*** ppvalue,int *pnumel){ _error2_("An OptionDouble object cannot return an Options DataSet vec");};
     47                void  Get(Options** pvalue){ _error_("An OptionDouble object cannot return an Options DataSet");};
     48                void  Get(Options*** ppvalue,int *pnumel){ _error_("An OptionDouble object cannot return an Options DataSet vec");};
    4949
    5050};

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionLogical.cpp

    r12832 r13036  
    125125        /*We should first check that the size is one*/
    126126        if(this->NumEl()!=1){
    127                 _error2_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single bool");
     127                _error_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single bool");
    128128        }
    129129

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionLogical.h

    r12832 r13036  
    2828                void  DeepEcho();
    2929                void  DeepEcho(char* indent);
    30                 int   Id(){_error2_("Not implemented yet");};
    31                 int   MyRank(){_error2_("Not implemented yet");};
     30                int   Id(){_error_("Not implemented yet");};
     31                int   MyRank(){_error_("Not implemented yet");};
    3232                int   ObjectEnum(){return OptionLogicalEnum;};
    33                 Object* copy(){_error2_("Not implemented yet");};
     33                Object* copy(){_error_("Not implemented yet");};
    3434                /*}}}*/
    3535
    … …  
    3939                int   NDims();
    4040                int*  Size();
    41                 void  Get(int* pvalue){_error2_("An OptionLogical object cannot return a int");};
    42                 void  Get(IssmDouble* pvalue){_error2_("An OptionLogical object cannot return a IssmDouble");};
     41                void  Get(int* pvalue){_error_("An OptionLogical object cannot return a int");};
     42                void  Get(IssmDouble* pvalue){_error_("An OptionLogical object cannot return a IssmDouble");};
    4343                void  Get(bool* pvalue);
    44                 void  Get(char** pvalue){ _error2_("An OptionLogical object cannot return a string");};
    45                 void  Get(char*** ppvalue,int *pnumel){ _error2_("An OptionLogical object cannot return a string vec");};
    46                 void  Get(IssmDouble** pvalue,int *pnumel){ _error2_("An OptionLogical object cannot return a IssmDouble vec");};
    47                 void  Get(Options** pvalue){ _error2_("An OptionLogical object cannot return an Options DataSet");};
    48                 void  Get(Options*** ppvalue,int *pnumel){ _error2_("An OptionLogical object cannot return an Options DataSet vec");};
     44                void  Get(char** pvalue){ _error_("An OptionLogical object cannot return a string");};
     45                void  Get(char*** ppvalue,int *pnumel){ _error_("An OptionLogical object cannot return a string vec");};
     46                void  Get(IssmDouble** pvalue,int *pnumel){ _error_("An OptionLogical object cannot return a IssmDouble vec");};
     47                void  Get(Options** pvalue){ _error_("An OptionLogical object cannot return an Options DataSet");};
     48                void  Get(Options*** ppvalue,int *pnumel){ _error_("An OptionLogical object cannot return an Options DataSet vec");};
    4949
    5050};

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionStruct.cpp

    r12832 r13036  
    132132        /*We should first check that the size is one*/
    133133        if(this->NumEl()!=1){
    134                 _error2_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single options dataset");
     134                _error_("option \"" << this->name << "\" has " << this->NumEl() << " elements and cannot return a single options dataset");
    135135        }
    136136
    … …  
    144144        /*We should first check that the size is at least one*/
    145145        if(this->NumEl()<=0){
    146                 _error2_("option \"" << this->name << "\" is empty and cannot return an options dataset vector");
     146                _error_("option \"" << this->name << "\" is empty and cannot return an options dataset vector");
    147147        }
    148148

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionStruct.h

    r12832 r13036  
    2828                void  DeepEcho();
    2929                void  DeepEcho(char* indent);
    30                 int   Id(){_error2_("Not implemented yet");};
    31                 int   MyRank(){_error2_("Not implemented yet");};
     30                int   Id(){_error_("Not implemented yet");};
     31                int   MyRank(){_error_("Not implemented yet");};
    3232                int   ObjectEnum(){return OptionStructEnum;};
    33                 Object* copy(){_error2_("Not implemented yet");};
     33                Object* copy(){_error_("Not implemented yet");};
    3434                /*}}}*/
    3535
    … …  
    3939                int   NDims();
    4040                int*  Size();
    41                 void  Get(int* pvalue){_error2_("An OptionStruct object cannot return a int");};
    42                 void  Get(IssmDouble* pvalue){_error2_("An OptionStruct object cannot return a IssmDouble");};
    43                 void  Get(bool* pvalue){  _error2_("An OptionStruct object cannot return a bool");};
    44                 void  Get(char** pvalue){ _error2_("An OptionStruct object cannot return a string");};
    45                 void  Get(char*** ppvalue,int *pnumel){ _error2_("An OptionStruct object cannot return a string vec");};
    46                 void  Get(IssmDouble** pvalue,int *pnumel){ _error2_("An OptionStruct object cannot return a IssmDouble vec");};
     41                void  Get(int* pvalue){_error_("An OptionStruct object cannot return a int");};
     42                void  Get(IssmDouble* pvalue){_error_("An OptionStruct object cannot return a IssmDouble");};
     43                void  Get(bool* pvalue){  _error_("An OptionStruct object cannot return a bool");};
     44                void  Get(char** pvalue){ _error_("An OptionStruct object cannot return a string");};
     45                void  Get(char*** ppvalue,int *pnumel){ _error_("An OptionStruct object cannot return a string vec");};
     46                void  Get(IssmDouble** pvalue,int *pnumel){ _error_("An OptionStruct object cannot return a IssmDouble vec");};
    4747                void  Get(Options** pvalue);
    4848                void  Get(Options*** ppvalue,int *pnumel);

  • issm/trunk-jpl/src/c/classes/objects/Options/OptionUtilities.cpp

    r12832 r13036  
    2727        /*check for index too large  */
    2828        for (i=0;i<ndims;i++) aprod*=size[i];
    29         if (index >= aprod) _error2_("Index " << index << " exceeds number of elements " << aprod << ".");
     29        if (index >= aprod) _error_("Index " << index << " exceeds number of elements " << aprod << ".");
    3030
    3131        /*calculate the dimensions (being careful of integer division)  */
    … …  
    4646        /*check for any dimension too large  */
    4747        for (i=0;i<ndims;i++){
    48                 if (dims[i] >= size[i]) _error2_("Dimension " << i << " of " << dims[i] << " exceeds size of " << size[i] << ".");
     48                if (dims[i] >= size[i]) _error_("Dimension " << i << " of " << dims[i] << " exceeds size of " << size[i] << ".");
    4949        }
    5050
    … …  
    6565        /*check for index too large  */
    6666        for (i=0; i<ndims; i++) aprod*=size[i];
    67         if (index >= aprod) _error2_("Index " << index << " exceeds number of elements " << aprod << ".");
     67        if (index >= aprod) _error_("Index " << index << " exceeds number of elements " << aprod << ".");
    6868
    6969        /*calculate the dimensions (being careful of integer division)  */
    … …  
    8484        /*check for any dimension too large  */
    8585        for (i=0; i<ndims; i++){
    86                 if (dims[i] >= size[i]) _error2_("Dimension " << i << " of " << dims[i] << " exceeds size of " << size[i] << ".");
     86                if (dims[i] >= size[i]) _error_("Dimension " << i << " of " << dims[i] << " exceeds size of " << size[i] << ".");
    8787        }
    8888

  • issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.h

    r12832 r13036  
    4343                int   InstanceEnum(){return enum_type;}
    4444                void  GetParameterValue(bool* pbool){*pbool=value;}
    45                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return an integer");}
    46                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return an array of integers");}
    47                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return an array of integers");}
    48                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble");}
    49                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    50                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a string");}
    51                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a string array");}
    52                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble array");}
    53                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble array");}
    54                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a matrix array");}
    55                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a Vec");}
    56                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a Mat");}
    57                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot return a FILE");}
     45                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return an integer");}
     46                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return an array of integers");}
     47                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return an array of integers");}
     48                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble");}
     49                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     50                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a string");}
     51                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a string array");}
     52                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble array");}
     53                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a IssmDouble array");}
     54                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a matrix array");}
     55                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a Vec");}
     56                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a Mat");}
     57                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << ") cannot return a FILE");}
    5858
    5959                void  SetValue(bool boolean){this->value=boolean;}
    60                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold an int");}
    61                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold an IssmPDouble");}
    62                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a string");}
    63                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a string array");}
    64                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");}
    65                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");}
    66                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a int array");}
    67                 void  SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a int array");}
    68                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a Vec");}
    69                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a Mat");}
    70                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold a FILE");}
    71                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << ") cannot hold an array of matrices");}
     60                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold an int");}
     61                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold an IssmPDouble");}
     62                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a string");}
     63                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a string array");}
     64                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");}
     65                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");}
     66                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a int array");}
     67                void  SetValue(int* pintarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a int array");}
     68                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a Vec");}
     69                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a Mat");}
     70                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold a FILE");}
     71                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << ") cannot hold an array of matrices");}
    7272                void  UnitConversion(int direction_enum);
    7373               

  • issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.h

    r12832 r13036  
    4545                /*Param vritual function definitions: {{{*/
    4646                int   InstanceEnum(){return enum_type;}
    47                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a bool");}
    48                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return an integer");}
    49                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return an array of integers");}
    50                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return an array of integers");}
    51                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble");}
    52                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    53                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a string");}
    54                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a string array");}
    55                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble array");}
    56                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble array");}
     47                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a bool");}
     48                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << "cannot return an integer");}
     49                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << "cannot return an array of integers");}
     50                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << "cannot return an array of integers");}
     51                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble");}
     52                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     53                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a string");}
     54                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a string array");}
     55                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble array");}
     56                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a IssmDouble array");}
    5757                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims);
    58                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a Vec");}
    59                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a Mat");}
    60                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << "cannot return a FILE");}
     58                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a Vec");}
     59                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a Mat");}
     60                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << "cannot return a FILE");}
    6161
    62                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a boolean");}
    63                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold an integer");}
    64                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a scalar");}
    65                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a string");}
    66                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a string array");}
    67                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a IssmDouble vec array");}
    68                 void  SetValue(IssmDouble* IssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a IssmDouble mat array");}
    69                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a int vec array");}
    70                 void  SetValue(int* intarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a int mat array");}
    71                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a Vec");}
    72                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << "cannot hold a Mat");}
    73                 void  SetValue(FILE* fid){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");}
     62                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a boolean");}
     63                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold an integer");}
     64                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a scalar");}
     65                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a string");}
     66                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a string array");}
     67                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a IssmDouble vec array");}
     68                void  SetValue(IssmDouble* IssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a IssmDouble mat array");}
     69                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a int vec array");}
     70                void  SetValue(int* intarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a int mat array");}
     71                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a Vec");}
     72                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << "cannot hold a Mat");}
     73                void  SetValue(FILE* fid){_error_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");}
    7474                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array);
    7575                void  UnitConversion(int direction_enum);

  • issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp

    r12832 r13036  
    109109/*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{*/
    110110void  DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){
    111         _error2_("DoubleMat of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of int");
     111        _error_("DoubleMat of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of int");
    112112}
    113113/*}}}*/

  • issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.h

    r12832 r13036  
    4444                /*Param vritual function definitions: {{{*/
    4545                int   InstanceEnum(){return enum_type;}
    46                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    47                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
    48                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     46                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     47                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
     48                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    4949                void  GetParameterValue(int** pintarray,int* pM,int* pN);
    50                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    51                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    52                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    53                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    54                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     50                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     51                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     52                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     53                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     54                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    5555                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN);
    56                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    57                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    58                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    59                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
     56                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     57                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     58                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     59                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
    6060
    61                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
    62                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
    63                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
    64                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    65                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    66                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");}
     61                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
     62                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
     63                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
     64                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     65                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     66                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");}
    6767                void  SetValue(IssmDouble* IssmDoublearray,int M,int N);
    68                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int vec array");}
    69                 void  SetValue(int* intarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");};
    70                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    71                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    72                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    73                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     68                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int vec array");}
     69                void  SetValue(int* intarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");};
     70                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     71                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     72                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     73                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7474                void  UnitConversion(int direction_enum);
    7575

  • issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp

    r12832 r13036  
    8282/*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{*/
    8383void DoubleParam::GetParameterValue(int* pinteger){
    84         _error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");
     84        _error_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer");
    8585}
    8686/*}}}*/
    8787/*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{*/
    8888void DoubleParam::GetParameterValue(bool* pbool){
    89         _error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an bool");
     89        _error_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an bool");
    9090}
    9191/*}}}*/
    9292/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{*/
    9393void DoubleParam::GetParameterValue(int** pintarray,int* pM){
    94         _error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");
     94        _error_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");
    9595}
    9696/*}}}*/
    9797/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{*/
    9898void DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){
    99         _error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");
     99        _error_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of integers");
    100100}
    101101/*}}}*/
    102102/*FUNCTION DoubleParam::GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){{{*/
    103103void DoubleParam::GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){
    104         _error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of IssmDouble");
     104        _error_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of IssmDouble");
    105105}
    106106/*}}}*/
    107107/*FUNCTION DoubleParam::GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN){{{*/
    108108void DoubleParam::GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN){
    109         _error2_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of IssmDouble");
     109        _error_("Double param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of IssmDouble");
    110110}
    111111/*}}}*/

  • issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.h

    r12832 r13036  
    4848                void  GetParameterValue(int** pintarray,int* pM,int* pN);
    4949                void  GetParameterValue(IssmDouble* pIssmDouble){*pIssmDouble=value;}
    50                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    51                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    52                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     50                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     51                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     52                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    5353                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM);
    5454                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN);
    55                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    56                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    57                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    58                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
     55                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     56                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     57                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     58                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
    5959
    6060                void  SetValue(bool boolean){this->value=(IssmDouble)boolean;}
    6161                void  SetValue(int integer){this->value=(IssmDouble)integer;}
    6262                void  SetValue(IssmDouble scalar){this->value=(IssmDouble)scalar;}
    63                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    64                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    65                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    66                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    67                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    68                 void  SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    69                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    70                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    71                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    72                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     63                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     64                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     65                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     66                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     67                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     68                void  SetValue(int* pintarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     69                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     70                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     71                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     72                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7373                void  UnitConversion(int direction_enum);
    7474

  • issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp

    r12832 r13036  
    124124/*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{*/
    125125void  DoubleVecParam::GetParameterValue(int** pintarray,int* pM){
    126         _error2_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of int");
     126        _error_("DoubleVec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an array of int");
    127127}
    128128/*}}}*/

  • issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.h

    r12832 r13036  
    4343                /*Param virtual functions definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    45                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    46                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
     45                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     46                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
    4747                void  GetParameterValue(int** pintarray,int* pM);
    48                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");};
    49                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    50                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    51                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    52                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     48                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");};
     49                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     50                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     51                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     52                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    5353                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM);
    5454                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN);
    55                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    56                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    57                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    58                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
     55                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     56                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     57                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     58                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
    5959
    60                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
    61                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
    62                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
    63                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    64                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     60                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
     61                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
     62                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
     63                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     64                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    6565                void  SetValue(IssmDouble* IssmDoublearray,int M);
    66                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");}
    67                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");};
    68                 void  SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");}
    69                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    70                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    71                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    72                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     66                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");}
     67                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");};
     68                void  SetValue(int* pintarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");}
     69                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     70                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     71                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     72                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7373                void  UnitConversion(int direction_enum);
    7474               

  • issm/trunk-jpl/src/c/classes/objects/Params/FileParam.h

    r12832 r13036  
    4242                /*Param vritual function definitions: {{{*/
    4343                int   InstanceEnum(){return enum_type;}
    44                 void  GetParameterValue(bool* pbool){  _error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    45                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    46                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    47                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    48                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    49                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    50                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    51                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    52                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    53                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    54                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");}
    55                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    56                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     44                void  GetParameterValue(bool* pbool){  _error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     45                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     46                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     47                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     48                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     49                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     50                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     51                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     52                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     53                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     54                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");}
     55                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     56                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    5757                void  GetParameterValue(FILE** pfid){*pfid=value;};
    5858
    59                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    60                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    61                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    62                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    63                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    64                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    65                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    66                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    67                 void  SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    68                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    69                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    70                 void  SetValue(FILE* fid){_error2_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");}
    71                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");}
     59                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     60                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     61                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     62                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     63                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     64                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     65                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     66                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     67                void  SetValue(int* pintarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     68                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     69                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     70                void  SetValue(FILE* fid){_error_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");}
     71                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("File param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an array of matrices");}
    7272                void  UnitConversion(int direction_enum);
    7373

  • issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.h

    r12832 r13036  
    4444                /*Param vritual function definitions: {{{*/
    4545                int   InstanceEnum(){return enum_type;}
    46                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    47                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
    48                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     46                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     47                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
     48                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    4949                void  GetParameterValue(int** pintarray,int* pM,int* pN);
    50                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    51                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    52                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    53                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    54                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    55                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");};
    56                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    57                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    58                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    59                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
     50                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     51                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     52                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     53                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     54                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     55                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");};
     56                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     57                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     58                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     59                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
    6060
    61                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
    62                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
    63                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
    64                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    65                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    66                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");}
    67                 void  SetValue(IssmDouble* IssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");};
    68                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int vec array");};
     61                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
     62                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
     63                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
     64                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     65                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     66                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");}
     67                void  SetValue(IssmDouble* IssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");};
     68                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int vec array");};
    6969                void  SetValue(int* intarray,int M,int N);
    70                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    71                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    72                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    73                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     70                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     71                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     72                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     73                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7474                void  UnitConversion(int direction_enum);
    7575

  • issm/trunk-jpl/src/c/classes/objects/Params/IntParam.h

    r12832 r13036  
    4343                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    45                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     45                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    4646                void  GetParameterValue(int* pinteger){*pinteger=value;}
    47                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    48                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    49                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    50                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    51                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    52                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    53                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    54                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    55                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    56                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    57                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    58                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
     47                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     48                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     49                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     50                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     51                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     52                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     53                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     54                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     55                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     56                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     57                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     58                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
    5959
    60                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a bool");}
     60                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a bool");}
    6161                void  SetValue(int integer){this->value=integer;}
    62                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an int array");}
    63                 void  SetValue(int* intarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an int array");}
    64                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an IssmDouble");}
    65                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    66                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    67                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    68                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    69                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    70                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    71                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    72                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     62                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an int array");}
     63                void  SetValue(int* intarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an int array");}
     64                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an IssmDouble");}
     65                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     66                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     67                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     68                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     69                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     70                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     71                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     72                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7373                void  UnitConversion(int direction_enum);
    7474

  • issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.h

    r12832 r13036  
    4444                /*Param virtual functions definitions: {{{*/
    4545                int   InstanceEnum(){return enum_type;}
    46                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    47                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
     46                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     47                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
    4848                void  GetParameterValue(int** pintarray,int* pM);
    49                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix");}
    50                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    51                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    52                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    53                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    54                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array (maybe in serial?)");}
    55                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    56                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    57                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    58                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    59                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
     49                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix");}
     50                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     51                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     52                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     53                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     54                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array (maybe in serial?)");}
     55                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     56                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     57                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     58                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     59                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
    6060
    61                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
    62                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
    63                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
    64                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    65                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    66                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");}
    67                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");}
     61                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
     62                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
     63                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
     64                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     65                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     66                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");}
     67                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble mat array");}
    6868                void  SetValue(int* intarray,int M);
    69                 void  SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");}
    70                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    71                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    72                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    73                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     69                void  SetValue(int* pintarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int mat array");}
     70                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     71                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     72                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     73                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7474                void  UnitConversion(int direction_enum);
    7575               

  • issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.h

    r12832 r13036  
    4343                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    45                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    46                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
    47                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    48                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    49                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    50                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    51                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    52                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    53                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    54                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    55                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    56                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a vec");}
     45                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     46                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
     47                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     48                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     49                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     50                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     51                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     52                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     53                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     54                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     55                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     56                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a vec");}
    5757                void  GetParameterValue(Matrix** poutput);
    58                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
     58                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
    5959
    60                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
    61                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
    62                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
    63                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    64                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    65                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    66                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    67                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    68                 void  SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    69                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     60                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
     61                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
     62                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
     63                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     64                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     65                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     66                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     67                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     68                void  SetValue(int* pintarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     69                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    7070                void  SetValue(Matrix* mat);
    71                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    72                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     71                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     72                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7373                void  UnitConversion(int direction_enum);
    7474

  • issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.h

    r12832 r13036  
    4545                /*Param vritual function definitions: {{{*/
    4646                int   InstanceEnum(){return enum_type;}
    47                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    48                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
    49                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    50                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    51                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    52                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    53                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     47                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     48                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
     49                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     50                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     51                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     52                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     53                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    5454                void  GetParameterValue(char*** pstringarray,int* pM);
    55                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    56                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    57                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Vec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");}
    58                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    59                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    60                 void  GetParameterValue(FILE** pfid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
     55                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     56                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     57                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Vec param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a matrix array");}
     58                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     59                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     60                void  GetParameterValue(FILE** pfid){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a FILE");}
    6161
    62                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
    63                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
    64                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
    65                 void  SetValue(char* string){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
     62                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
     63                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
     64                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
     65                void  SetValue(char* string){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string");}
    6666                void  SetValue(char** stringarray,int M);
    67                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    68                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    69                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    70                 void  SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    71                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    72                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    73                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    74                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     67                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     68                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     69                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     70                void  SetValue(int* pintarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     71                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     72                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     73                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     74                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7575                void  UnitConversion(int direction_enum);
    7676

  • issm/trunk-jpl/src/c/classes/objects/Params/StringParam.h

    r12832 r13036  
    4343                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    45                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    46                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
    47                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    48                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    49                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    50                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     45                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     46                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
     47                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     48                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     49                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     50                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    5151                void  GetParameterValue(char** pstring);
    52                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    53                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    54                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    55                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    56                 void  GetParameterValue(Vector** pvec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
    57                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    58                 void  GetParameterValue(FILE** pfid){_error2_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");}
     52                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     53                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     54                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     55                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     56                void  GetParameterValue(Vector** pvec){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Vec");}
     57                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     58                void  GetParameterValue(FILE** pfid){_error_("Bool param of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");}
    5959
    60                 void  SetValue(bool boolean){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
    61                 void  SetValue(int integer){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
    62                 void  SetValue(IssmDouble scalar){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
     60                void  SetValue(bool boolean){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a boolean");}
     61                void  SetValue(int integer){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an integer");}
     62                void  SetValue(IssmDouble scalar){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a scalar");}
    6363                void  SetValue(char* string);
    64                 void  SetValue(char** stringarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
    65                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    66                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    67                 void  SetValue(int* intarray,int M){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    68                 void  SetValue(int* pintarray,int M,int N){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
    69                 void  SetValue(Vector* vec){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
    70                 void  SetValue(Matrix* mat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
    71                 void  SetValue(FILE* fid){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
    72                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     64                void  SetValue(char** stringarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a string array");}
     65                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     66                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     67                void  SetValue(int* intarray,int M){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     68                void  SetValue(int* pintarray,int M,int N){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a int array");}
     69                void  SetValue(Vector* vec){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Vec");}
     70                void  SetValue(Matrix* mat){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a Mat");}
     71                void  SetValue(FILE* fid){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold a FILE");}
     72                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7373                void  UnitConversion(int direction_enum);
    7474

  • issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp

    r12988 r13036  
    136136                }
    137137        }
    138         if(!found)_error2_("did not find time interval on which to interpolate values");
     138        if(!found)_error_("did not find time interval on which to interpolate values");
    139139        *pdouble=output;
    140140}

  • issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.h

    r12832 r13036  
    4444                /*Param vritual function definitions: {{{*/
    4545                int   InstanceEnum(){return enum_type;}
    46                 void  GetParameterValue(bool* pbool){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a bool");}
    47                 void  GetParameterValue(int* pinteger){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return an integer");}
    48                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return an array of integers");}
    49                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a array of integers");}
    50                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     46                void  GetParameterValue(bool* pbool){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a bool");}
     47                void  GetParameterValue(int* pinteger){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return an integer");}
     48                void  GetParameterValue(int** pintarray,int* pM){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return an array of integers");}
     49                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a array of integers");}
     50                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    5151                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time);
    52                 void  GetParameterValue(char** pstring){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a string");}
    53                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a string array");}
    54                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    55                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    56                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a matrix array");}
    57                 void  GetParameterValue(Vector** pvec){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a Vec");}
    58                 void  GetParameterValue(Matrix** pmat){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a Mat");}
    59                 void  GetParameterValue(FILE** pfid){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot return a FILE");}
     52                void  GetParameterValue(char** pstring){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a string");}
     53                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a string array");}
     54                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     55                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM,int* pN){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     56                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a matrix array");}
     57                void  GetParameterValue(Vector** pvec){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a Vec");}
     58                void  GetParameterValue(Matrix** pmat){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a Mat");}
     59                void  GetParameterValue(FILE** pfid){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot return a FILE");}
    6060
    61                 void  SetValue(bool boolean){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a boolean");}
    62                 void  SetValue(int integer){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold an integer");}
    63                 void  SetValue(IssmDouble scalar){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a scalar");}
    64                 void  SetValue(char* string){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a string");}
    65                 void  SetValue(char** stringarray,int M){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a string array");}
    66                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");}
    67                 void  SetValue(IssmDouble* IssmDoublearray,int M,int N){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
    68                 void  SetValue(int* intarray,int M){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a int vec array");}
    69                 void  SetValue(int* intarray,int M,int N){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a int mat array");};
    70                 void  SetValue(Vector* vec){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a Vec");}
    71                 void  SetValue(Matrix* mat){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a Mat");}
    72                 void  SetValue(FILE* fid){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a FILE");}
    73                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Parameter " <<EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     61                void  SetValue(bool boolean){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a boolean");}
     62                void  SetValue(int integer){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold an integer");}
     63                void  SetValue(IssmDouble scalar){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a scalar");}
     64                void  SetValue(char* string){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a string");}
     65                void  SetValue(char** stringarray,int M){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a string array");}
     66                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a IssmDouble vec array");}
     67                void  SetValue(IssmDouble* IssmDoublearray,int M,int N){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a IssmDouble array");}
     68                void  SetValue(int* intarray,int M){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a int vec array");}
     69                void  SetValue(int* intarray,int M,int N){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a int mat array");};
     70                void  SetValue(Vector* vec){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a Vec");}
     71                void  SetValue(Matrix* mat){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a Mat");}
     72                void  SetValue(FILE* fid){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold a FILE");}
     73                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Parameter " <<EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7474                void  UnitConversion(int direction_enum);
    7575

  • issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.h

    r12832 r13036  
    4343                /*Param vritual function definitions: {{{*/
    4444                int   InstanceEnum(){return enum_type;}
    45                 void  GetParameterValue(bool* pbool){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
    46                 void  GetParameterValue(int* pinteger){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
    47                 void  GetParameterValue(int** pintarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    48                 void  GetParameterValue(int** pintarray,int* pM,int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
    49                 void  GetParameterValue(IssmDouble* pIssmDouble){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
    50                 void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
    51                 void  GetParameterValue(char** pstring){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
    52                 void  GetParameterValue(char*** pstringarray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
    53                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    54                 void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
    55                 void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
    56                 void  GetParameterValue(Matrix** pmat){_error2_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
     45                void  GetParameterValue(bool* pbool){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a bool");}
     46                void  GetParameterValue(int* pinteger){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an integer");}
     47                void  GetParameterValue(int** pintarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     48                void  GetParameterValue(int** pintarray,int* pM,int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return an array of integers");}
     49                void  GetParameterValue(IssmDouble* pIssmDouble){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble");}
     50                void  GetParameterValue(IssmDouble* pdouble,IssmDouble time){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble for a given time");}
     51                void  GetParameterValue(char** pstring){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string");}
     52                void  GetParameterValue(char*** pstringarray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a string array");}
     53                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     54                void  GetParameterValue(IssmDouble** pIssmDoublearray,int* pM, int* pN){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a IssmDouble array");}
     55                void  GetParameterValue(IssmDouble*** parray, int* pM,int** pmdims, int** pndims){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a matrix array");}
     56                void  GetParameterValue(Matrix** pmat){_error_("Param "<< EnumToStringx(enum_type) << " cannot return a Mat");}
    5757                void  GetParameterValue(Vector** poutput);
    58                 void  GetParameterValue(FILE** pfid){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");}
     58                void  GetParameterValue(FILE** pfid){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return a FILE");}
    5959
    60                 void  SetValue(bool boolean){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a boolean");}
    61                 void  SetValue(int integer){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an integer");}
    62                 void  SetValue(IssmDouble scalar){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a scalar");}
    63                 void  SetValue(char* string){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");}
    64                 void  SetValue(char** stringarray,int M){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");}
    65                 void  SetValue(IssmDouble* IssmDoublearray,int M){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");}
    66                 void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");}
    67                 void  SetValue(int* intarray,int M){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");}
    68                 void  SetValue(int* pintarray,int M,int N){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");}
     60                void  SetValue(bool boolean){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a boolean");}
     61                void  SetValue(int integer){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold an integer");}
     62                void  SetValue(IssmDouble scalar){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a scalar");}
     63                void  SetValue(char* string){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string");}
     64                void  SetValue(char** stringarray,int M){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a string array");}
     65                void  SetValue(IssmDouble* IssmDoublearray,int M){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");}
     66                void  SetValue(IssmDouble* pIssmDoublearray,int M,int N){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a IssmDouble array");}
     67                void  SetValue(int* intarray,int M){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");}
     68                void  SetValue(int* pintarray,int M,int N){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a int array");}
    6969                void  SetValue(Vector* vec);
    70                 void  SetValue(Matrix* mat){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");}
    71                 void  SetValue(FILE* fid){_error2_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");}
    72                 void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error2_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
     70                void  SetValue(Matrix* mat){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a Mat");}
     71                void  SetValue(FILE* fid){_error_("Vector of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot hold a FILE");}
     72                void  SetValue(IssmDouble** array, int M, int* mdim_array, int* ndim_array){_error_("Param "<< EnumToStringx(enum_type) << " cannot hold an array of matrices");}
    7373                void  UnitConversion(int direction_enum);
    7474

  • issm/trunk-jpl/src/c/include/macros.h

    r13035 r13036  
    2626/*new Error exception macro*/
    2727#ifdef _INTEL_WIN_
    28 #define _error2_(StreamArgs)\
     28#define _error_(StreamArgs)\
    2929   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    3030   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    3131   throw ErrorException(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    3232#else
    33 #define _error2_(StreamArgs)\
     33#define _error_(StreamArgs)\
    3434        do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    3535   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    … …  
    6565#ifdef _ISSM_DEBUG_
    6666#define _assert_(statement)\
    67   if (!(statement)) _error2_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
     67  if (!(statement)) _error_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
    6868#else
    6969#define _assert_(ignore)\

  • issm/trunk-jpl/src/c/io/Disk/pfclose.cpp

    r12494 r13036  
    1818        extern int my_rank;
    1919        _assert_(fid);
    20         if(fclose(fid)!=0)_error2_("could not close file " << filename);
     20        if(fclose(fid)!=0)_error_("could not close file " << filename);
    2121}

  • issm/trunk-jpl/src/c/io/Disk/pfopen.cpp

    r12494 r13036  
    2020        /*Open handle to data on disk: */
    2121        fid=fopen(filename,format);
    22         if(fid==NULL) _error2_("could not open file " << filename << " for binary reading or writing");
     22        if(fid==NULL) _error_("could not open file " << filename << " for binary reading or writing");
    2323
    2424        return fid;

  • issm/trunk-jpl/src/c/matlab/io/CheckNumMatlabArguments.cpp

    r12493 r13036  
    2222                /* special case: */
    2323                function();
    24                 _error2_("usage: see above");
     24                _error_("usage: see above");
    2525        }
    2626        else if (nlhs!=NLHS || nrhs!=NRHS ) {
    2727                function();
    28                 _error2_("usage error.");
     28                _error_("usage error.");
    2929        }
    3030        return 1;

  • issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp

    r12594 r13036  
    4848        else{
    4949                /*This is an error: we don't have the correct input!: */
    50                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     50                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    5151        }
    5252                       
    … …  
    8989        else{
    9090                /*This is an error: we don't have the correct input!: */
    91                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     91                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    9292        }
    9393                       
    … …  
    134134        else{
    135135                /*This is an error: we don't have the correct input!: */
    136                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     136                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    137137        }
    138138
    … …  
    176176        else{
    177177                /*This is an error: we don't have the correct input!: */
    178                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     178                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    179179        }
    180180
    … …  
    238238        else{
    239239                /*This is an error: we don't have the correct input!: */
    240                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     240                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    241241        }
    242242                       
    … …  
    269269        else{
    270270                /*This is an error: we don't have the correct input!: */
    271                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     271                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    272272        }
    273273
    … …  
    301301        else{
    302302                /*This is an error: we don't have the correct input!: */
    303                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     303                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    304304        }
    305305
    … …  
    333333        else{
    334334                /*This is an error: we don't have the correct input!: */
    335                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     335                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    336336        }
    337337
    … …  
    365365        else{
    366366                /*This is an error: we don't have the correct input!: */
    367                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     367                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    368368        }
    369369
    … …  
    381381        /*Ok, the string should be coming directly from the matlab workspace: */
    382382        if (!mxIsClass(dataref,"char")){
    383                 _error2_("input data_type is not a string!");
     383                _error_("input data_type is not a string!");
    384384        }
    385385        else{
    … …  
    416416        else{
    417417                /*This is an error: we don't have the correct input!: */
    418                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     418                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    419419        }
    420420                       
    … …  
    434434
    435435        if (!mxIsClass(dataref,"double")){
    436                 _error2_("input data_type is not a double!");
     436                _error_("input data_type is not a double!");
    437437        }
    438438        else{
    … …  
    451451
    452452        if (!mxIsClass(dataref,"double")){
    453                 _error2_("input data_type is not a scalar!");
     453                _error_("input data_type is not a scalar!");
    454454        }
    455455        else{
    … …  
    468468
    469469        if (mxIsClass(dataref,"logical")){
    470                 if(mxGetM(dataref)!=1) _error2_("input data is not of size 1x1");
    471                 if(mxGetN(dataref)!=1) _error2_("input data is not of size 1x1");
     470                if(mxGetM(dataref)!=1) _error_("input data is not of size 1x1");
     471                if(mxGetN(dataref)!=1) _error_("input data is not of size 1x1");
    472472                mxbool_ptr=mxGetLogicals(dataref);
    473473        }
    474474        else{
    475                 _error2_("input data_type is not a bool!");
     475                _error_("input data_type is not a bool!");
    476476        }
    477477
    … …  
    495495        else{
    496496                /*This is an error: we don't have the correct input!: */
    497                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     497                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    498498        }
    499499
    … …  
    519519        else{
    520520                /*This is an error: we don't have the correct input!: */
    521                 _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     521                _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    522522        }
    523523
    … …  
    620620        /*Fetch all options*/
    621621        for (int i=istart; i<nrhs; i=i+2){
    622                 if (!mxIsClass(pdataref[i],"char")) _error2_("Argument " << i+1 << " must be name of option");
     622                if (!mxIsClass(pdataref[i],"char")) _error_("Argument " << i+1 << " must be name of option");
    623623
    624624                FetchData(&name,pdataref[i]);
    625                 if(i+1 == nrhs) _error2_("Argument " << i+2 << " must exist and be value of option \"" << name << "\".");
     625                if(i+1 == nrhs) _error_("Argument " << i+2 << " must exist and be value of option \"" << name << "\".");
    626626
    627627                option=(Option*)OptionParse(name,&pdataref[i+1]);

  • issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToDoubleMatrix.cpp

    r12594 r13036  
    119119        }
    120120        else{
    121                 _error2_("Matlab matrix type Not implemented yet");
     121                _error_("Matlab matrix type Not implemented yet");
    122122        }
    123123

  • issm/trunk-jpl/src/c/matlab/io/MatlabVectorToDoubleVector.cpp

    r12493 r13036  
    4646               
    4747                /*Check that input is actualy a vector*/
    48                 if (cols!=1) _error2_("input vector of size " << rows << "x" << cols << " should have only one column");
     48                if (cols!=1) _error_("input vector of size " << rows << "x" << cols << " should have only one column");
    4949
    5050                nz=(int)((double)nnz/(double)rows);
    … …  
    7777
    7878                /*Check that input is actualy a vector*/
    79                 if (cols!=1) _error2_("input vector of size " << rows << "x" << cols << " should have only one column");
     79                if (cols!=1) _error_("input vector of size " << rows << "x" << cols << " should have only one column");
    8080
    8181                /*allocate and memcpy*/

  • issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp

    r12704 r13036  
    2727        /*check and parse the value  */
    2828        if (!mxIsClass(prhs[0],"double")){
    29                 _error2_("Value of option \"" << odouble->name  << "\" must be class \"double\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     29                _error_("Value of option \"" << odouble->name  << "\" must be class \"double\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
    3030        }
    3131        FetchData(&odouble->values,&odouble->numel,&odouble->ndims,&odouble->size,prhs[0]);
    … …  
    4545        /*check and parse the value  */
    4646        if (!mxIsClass(prhs[0],"logical")){
    47                 _error2_("Value of option \"" << ological->name  << "\" must be class \"logical\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     47                _error_("Value of option \"" << ological->name  << "\" must be class \"logical\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
    4848        }
    4949        FetchData(&ological->values,&ological->numel,&ological->ndims,&ological->size,prhs[0]);
    … …  
    6363        /*check and parse the value  */
    6464        if (!mxIsClass(prhs[0],"char")){
    65                 _error2_("Value of option \"" << ochar->name  << "\" must be class \"char\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     65                _error_("Value of option \"" << ochar->name  << "\" must be class \"char\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
    6666        }
    6767        FetchData(&ochar->values,&ochar->numel,&ochar->ndims,&ochar->size,prhs[0]);
    … …  
    8787        /*check and parse the value  */
    8888        if (!mxIsClass(prhs[0],"struct")){
    89                 _error2_("Value of option \"" << ostruct->name  << "\" must be class \"struct\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     89                _error_("Value of option \"" << ostruct->name  << "\" must be class \"struct\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
    9090        }
    9191        ostruct->numel=mxGetNumberOfElements(prhs[0]);
    … …  
    133133        /*check and parse the value  */
    134134        if (!mxIsClass(prhs[0],"cell")){
    135                 _error2_("Value of option \"" << ocell->name  << "\" must be class \"cell\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     135                _error_("Value of option \"" << ocell->name  << "\" must be class \"cell\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
    136136        }
    137137
    … …  
    181181                        mxDestroyArray(lhs[0]);
    182182                }
    183                 else _error2_("Second argument value of option \""<< name <<"\" is of unrecognized class \""<< mxGetClassName(prhs[0]) <<"\".");
     183                else _error_("Second argument value of option \""<< name <<"\" is of unrecognized class \""<< mxGetClassName(prhs[0]) <<"\".");
    184184        }
    185185

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

    r12520 r13036  
    8686                }
    8787                else if (flag==NodalEnum){
    88                         _error2_("nodal response functions not supported yet!");
     88                        _error_("nodal response functions not supported yet!");
    8989
    9090                        /*increment response_pointer :*/
    … …  
    104104                        }
    105105                }
    106                 else _error2_("flag type " << flag << " not supported yet for response analysis");
     106                else _error_("flag type " << flag << " not supported yet for response analysis");
    107107        }
    108108

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

    r12495 r13036  
    2323        /*retrieve first token, separated by underscore: */
    2424        pch = strtok (descriptor,"_");
    25         if(!pch)_error2_("descriptor " << descriptor << " is not correctly formatted!");
     25        if(!pch)_error_("descriptor " << descriptor << " is not correctly formatted!");
    2626
    2727        if (strncmp(pch,"scaled",6)==0){
    2828                /*we have a scaled variable. recover the root: */
    2929                pch = strtok (NULL, "_");
    30                 if(!pch)_error2_("scaled descriptor " << descriptor << " is not correctly formatted!");
     30                if(!pch)_error_("scaled descriptor " << descriptor << " is not correctly formatted!");
    3131                memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
    3232
    … …  
    4444                /*we have an indexed variable. recover the root: */
    4545                pch = strtok (NULL, "_");
    46                 if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!");
     46                if(!pch)_error_("indexed descriptor " << descriptor << " is not correctly formatted!");
    4747                memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
    4848                /*now recover  the index: */
    4949                pch = strtok (NULL, "_");
    50                 if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!");
     50                if(!pch)_error_("indexed descriptor " << descriptor << " is not correctly formatted!");
    5151                sscanf(pch,"%i",pindex);
    5252                return IndexedEnum;
    … …  
    5555                /*we have an indexed variable. recover the root: */
    5656                pch = strtok (NULL, "_");
    57                 if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
     57                if(!pch)_error_("nodal descriptor " << descriptor << " is not correctly formatted!");
    5858                memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
    5959                /*now recover  the index: */
    6060                pch = strtok (NULL, "_");
    61                 if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
     61                if(!pch)_error_("nodal descriptor " << descriptor << " is not correctly formatted!");
    6262                sscanf(pch,"%i",pindex);
    6363                return NodalEnum;

  • issm/trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp

    r12832 r13036  
    7272        if(control_analysis)solutioncore=&control_core;
    7373        #else
    74         _error2_("ISSM was not compiled with control capabilities, exiting!");
     74        _error_("ISSM was not compiled with control capabilities, exiting!");
    7575        #endif
    7676

  • issm/trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.cpp

    r12494 r13036  
    3939        #ifdef _HAVE_MPI_
    4040        MPI_Allreduce ( &found,&sumfound,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
    41         if(!sumfound)_error2_("could not find material with id" << index << " to compute ElementResponse");
     41        if(!sumfound)_error_("could not find material with id" << index << " to compute ElementResponse");
    4242        #endif
    4343

  • issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp

    r12519 r13036  
    5555
    5656        if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp))
    57                 _error2_("Error reading exp file.");
     57                _error_("Error reading exp file.");
    5858        _pprintLine_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\".");
    5959//      for (i=0; i<nprof; i++)

  • issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp

    r12493 r13036  
    2626        /*Get size of vector: */
    2727        gsize=nodes->NumberOfDofs(configuration_type,GsetEnum);
    28         if (gsize==0) _error2_("Allocating a Vec of size 0 as gsize=0 for configuration: " << EnumToStringx(configuration_type));
     28        if (gsize==0) _error_("Allocating a Vec of size 0 as gsize=0 for configuration: " << EnumToStringx(configuration_type));
    2929       
    3030        /*Initialize solution: */

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

    r12495 r13036  
    3232        }
    3333        else{
    34                 _error2_("vector type: " << EnumToStringx(type) << " not supported yet!");
     34                _error_("vector type: " << EnumToStringx(type) << " not supported yet!");
    3535        }
    3636

  • issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp

    r12529 r13036  
    5454        /*Check that gradient is clean*/
    5555        norm_inf=gradient->Norm(NORM_INF);
    56         if(norm_inf<=0)    _error2_("||∂J/∂α||∞ = 0    gradient norm is zero");
    57         if(xIsNan<IssmDouble>(norm_inf))_error2_("||∂J/∂α||∞ = NaN  gradient norm is NaN");
     56        if(norm_inf<=0)    _error_("||∂J/∂α||∞ = 0    gradient norm is zero");
     57        if(xIsNan<IssmDouble>(norm_inf))_error_("||∂J/∂α||∞ = NaN  gradient norm is NaN");
    5858
    5959        /*Clean-up and assign output pointer*/

  • issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

    r12515 r13036  
    2727
    2828        if(migration_style==NoneEnum) return;
    29         if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error2_(EnumToStringx(migration_style) << " not supported yet!");
     29        if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error_(EnumToStringx(migration_style) << " not supported yet!");
    3030
    3131        if(migration_style==SoftMigrationEnum){

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

    r12495 r13036  
    9595                }
    9696                else if (strncmp(descriptor,"indexed_",8)==0){
    97                         _error2_("indexed variables not supported yet!");
     97                        _error_("indexed variables not supported yet!");
    9898                }
    9999                else if (strncmp(descriptor,"nodal_",8)==0){
    100                         _error2_("nodal variables not supported yet!");
     100                        _error_("nodal variables not supported yet!");
    101101                }
    102102                else{

  • issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp

    r12636 r13036  
    3737        /*Some checks on arguments: */
    3838        if ((M<2) || (N<2) || (nods<=0)){
    39                 _error2_("nothing to be done according to the dimensions of input matrices and vectors.");
     39                _error_("nothing to be done according to the dimensions of input matrices and vectors.");
    4040        }
    4141        if (x_in[1]-x_in[0]<0){
    42                 _error2_("x coordinate vector should be increasing.\n   use Matlab's command x=flipud(x), also flip the data matrix data=fliplr(data)");
     42                _error_("x coordinate vector should be increasing.\n   use Matlab's command x=flipud(x), also flip the data matrix data=fliplr(data)");
    4343        }
    4444        if (y_in[1]-y_in[0]<0){
    45                 _error2_("y coordinate vector should be increasing.\n   use Matlab's command y=flipud(y), also flip the data matrix data=flipud(data)");
     45                _error_("y coordinate vector should be increasing.\n   use Matlab's command y=flipud(y), also flip the data matrix data=flipud(data)");
    4646        }
    4747
    … …  
    6969        }
    7070        else{
    71                 _error2_("x and y vectors length should be 1 or 0 more than data number of rows.");
     71                _error_("x and y vectors length should be 1 or 0 more than data number of rows.");
    7272        }
    7373

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

    r12864 r13036  
    4040        /*some checks*/
    4141        if (nels_data<1 || nods_data<3 || nods_prime==0){
    42                 _error2_("nothing to be done according to the mesh given in input");
     42                _error_("nothing to be done according to the mesh given in input");
    4343        }
    4444
    … …  
    5454        }
    5555        else{
    56                 _error2_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!");
     56                _error_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!");
    5757        }
    5858
    5959        if((numcontours) && (interpolation_type==2)){
    60                 _error2_("element interpolation_type with contours not supported yet!");
     60                _error_("element interpolation_type with contours not supported yet!");
    6161        }
    6262

  • issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp

    r12529 r13036  
    3030        /*some checks*/
    3131        if (nels<1 || nods<3 || nlines<1 || ncols<1 || xposting==0 || yposting==0){
    32                 _error2_("nothing to be done according to the mesh given in input");
     32                _error_("nothing to be done according to the mesh given in input");
    3333        }
    3434
    … …  
    4141        }
    4242        else{
    43                 _error2_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!");
     43                _error_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!");
    4444        }
    4545

  • issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

    r12832 r13036  
    3535        /*Checks*/
    3636        if (M_data!=nods_data && M_data!=nels_data){
    37                 _error2_("data provided should have either " << nods_data << " or " << nels_data << " lines (not " << M_data << ")");
     37                _error_("data provided should have either " << nods_data << " or " << nels_data << " lines (not " << M_data << ")");
    3838        }
    3939
    … …  
    138138                        for (j=0;j<N_data;j++){
    139139                                if (it<0 || it>=nels_data){
    140                                         _error2_("Triangle number " << it << " not in [0 " << nels_data << "], report bug to developers");
     140                                        _error_("Triangle number " << it << " not in [0 " << nels_data << "], report bug to developers");
    141141                                }
    142142                                data_interp[i*N_data+j]=data[N_data*it+j];

  • issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp

    r12529 r13036  
    2727        /*some checks*/
    2828        if (nels_data<1 || nods_data<6 || nods_prime==0){
    29                 _error2_("nothing to be done according to the mesh given in input");
     29                _error_("nothing to be done according to the mesh given in input");
    3030        }
    3131
    … …  
    4141        }
    4242        else{
    43                 _error2_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!");
     43                _error_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!");
    4444        }
    4545

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

    r12529 r13036  
    3838        fid=iomodel->SetFilePointerToData(&code, &vector_layout,vector_enum);
    3939
    40         if(code!=7)_error2_("expecting a IssmDouble vector for constraints with enum " << EnumToStringx(vector_enum));
    41         if(vector_layout!=1)_error2_("expecting a nodal vector for constraints with enum " << EnumToStringx(vector_enum));
     40        if(code!=7)_error_("expecting a IssmDouble vector for constraints with enum " << EnumToStringx(vector_enum));
     41        if(vector_layout!=1)_error_("expecting a nodal vector for constraints with enum " << EnumToStringx(vector_enum));
    4242
    4343        /*Fetch vector:*/
    … …  
    9999        }
    100100        else{
    101                 _error2_("Size of field " << EnumToStringx(vector_enum) << " not supported");
     101                _error_("Size of field " << EnumToStringx(vector_enum) << " not supported");
    102102        }
    103103

  • issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp

    r12519 r13036  
    133133                                        }
    134134                                        else
    135                                                 _error2_("Nodal connectivity table needs more than specified " << mxepg << " columns.\n");
     135                                                _error_("Nodal connectivity table needs more than specified " << mxepg << " columns.\n");
    136136                                }
    137137                                jpt++;
    … …  
    173173
    174174                else
    175                         _error2_("Data matrix has incorrect number of " << mdata << " rows.\n");
     175                        _error_("Data matrix has incorrect number of " << mdata << " rows.\n");
    176176        }
    177177

  • issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp

    r12519 r13036  
    4444        fidi=fopen(filkml,"r");
    4545        if (!(kobj=KMLFileReadx(fidi)))
    46                 _error2_("Error reading kml file.");
     46                _error_("Error reading kml file.");
    4747        fclose(fidi);
    4848

  • issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp

    r12832 r13036  
    138138        }
    139139        else{
    140                 _error2_("output '" << output << "' not supported yet");
     140                _error_("output '" << output << "' not supported yet");
    141141        }
    142142
    … …  
    305305                else if(strcmp(model,"spherical")==0)   variogram = new SphericalVariogram(options);
    306306                else if(strcmp(model,"power")==0)       variogram = new PowerVariogram(options);
    307                 else _error2_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)");
     307                else _error_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)");
    308308        }
    309309        else variogram = new GaussianVariogram(options);

  • issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp

    r12832 r13036  
    103103        }
    104104        else{
    105                 _error2_("output '" << output << "' not supported yet");
     105                _error_("output '" << output << "' not supported yet");
    106106        }
    107107
    … …  
    126126                else if(strcmp(model,"spherical")==0)   variogram = new SphericalVariogram(options);
    127127                else if(strcmp(model,"power")==0)       variogram = new PowerVariogram(options);
    128                 else _error2_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)");
     128                else _error_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)");
    129129        }
    130130        else variogram = new GaussianVariogram(options);

  • issm/trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp

    r12515 r13036  
    5252        double  T,rho,sl,tc,mc;
    5353
    54         if((sgn!=1) && (sgn!=-1)) _error2_("Sign should be either +1 or -1.\n");
     54        if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1.\n");
    5555
    5656        delta = central_meridian;
    … …  
    123123                if(flag) _pprintLine_("Info: creating coordinates in polar stereographic (Std Latitude: 71S Meridian: 0).");
    124124        }
    125         else _error2_("Sign should be either +1 or -1.\n");
     125        else _error_("Sign should be either +1 or -1.\n");
    126126
    127127        return;

  • issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.cpp

    r12572 r13036  
    5151                        for (i=0;i<numberofnodes;i++)    npart[i]=0;
    5252                }
    53                 else _error2_("At least one processor is required");
     53                else _error_("At least one processor is required");
    5454        }
    5555        else{
    … …  
    7878                        for (i=0;i<numberofnodes2d;i++)    npart2d[i]=0;
    7979                }
    80                 else _error2_("At least one processor is required");
     80                else _error_("At least one processor is required");
    8181
    8282                /*Extrude epart2d to epart, using numlayers: */

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

    r12495 r13036  
    3838        if(    (edge1==IntersectEnum) && (edge2==IntersectEnum) && (edge3==IntersectEnum)   ){
    3939                /*This case is impossible: */
    40                 _error2_("error: a line cannot go through 3 different vertices!");
     40                _error_("error: a line cannot go through 3 different vertices!");
    4141        }
    4242        else if(    ((edge1==IntersectEnum) && (edge2==IntersectEnum)) || ((edge2==IntersectEnum) && (edge3==IntersectEnum)) || ((edge3==IntersectEnum) && (edge1==IntersectEnum))   ){

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp

    r12832 r13036  
    4646
    4747        /*Check in 3d*/
    48         if(stabilization==3 && dim==3) _error2_("DG 3d not implemented yet");
     48        if(stabilization==3 && dim==3) _error_("DG 3d not implemented yet");
    4949
    5050        /*First fetch data: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

    r12832 r13036  
    4848                        case FrictionCoefficientEnum: iomodel->FetchData(1,FrictionCoefficientEnum); break;
    4949                        case MaterialsRheologyBbarEnum:    iomodel->FetchData(1,MaterialsRheologyBEnum); break;
    50                         default: _error2_("Control " << EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]) << " not implemented yet");
     50                        default: _error_("Control " << EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]) << " not implemented yet");
    5151                }
    5252        }

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

    r12832 r13036  
    124124
    125125                default:
    126                         _error2_("analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!");
     126                        _error_("analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!");
    127127        }
    128128

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

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

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

    r12832 r13036  
    145145
    146146                                        }
    147                                         else _error2_("if vertices_type is MacAyealPattyn, you shoud have nodeonpattyn or nodeonmacayeal");
     147                                        else _error_("if vertices_type is MacAyealPattyn, you shoud have nodeonpattyn or nodeonmacayeal");
    148148                        }
    149149                        /*Also add spcs of coupling: zero at the border pattyn/stokes for the appropriate dofs*/
    … …  
    185185                                                }
    186186                                        }
    187                                         else _error2_("if vertices_type is PattynStokes, you shoud have nodeonpattyn or nodeonstokes");
     187                                        else _error_("if vertices_type is PattynStokes, you shoud have nodeonpattyn or nodeonstokes");
    188188                        }
    189189                        /*Also add spcs of coupling: zero at the border pattyn/stokes for the appropriate dofs*/
    … …  
    225225                                                }
    226226                                        }
    227                                         else _error2_("if vertices_type is MacAyealStokes, you shoud have nodeonmacayeal or nodeonstokes");
     227                                        else _error_("if vertices_type is MacAyealStokes, you shoud have nodeonmacayeal or nodeonstokes");
    228228                        }
    229229                        /*Now add the regular spcs*/
    … …  
    318318                                                count++;
    319319                                                break;
    320                                         default: _error2_("Vertex approximation " << EnumToStringx((int)vertices_type[i]) << " not supported");
     320                                        default: _error_("Vertex approximation " << EnumToStringx((int)vertices_type[i]) << " not supported");
    321321                                }
    322322                        }

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp

    r12564 r13036  
    6161                        doftype[5]=StokesApproximationEnum;
    6262                }
    63                 else _error2_("Approximationtype " << reCast<int>(*vertices_type) << " (" << EnumToStringx(reCast<int>(*vertices_type)) << ") not implemented yet for DiagnosticHoriz");
     63                else _error_("Approximationtype " << reCast<int>(*vertices_type) << " (" << EnumToStringx(reCast<int>(*vertices_type)) << ") not implemented yet for DiagnosticHoriz");
    6464        }
    6565        else if (analysis_type==DiagnosticVertAnalysisEnum){
    … …  
    9090                numdofs=1;
    9191        }
    92         else _error2_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet");
     92        else _error_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet");
    9393
    9494        /*Now initialize the index*/

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp

    r12832 r13036  
    106106        }
    107107        else{
    108                 _error2_("Size of field " << EnumToStringx(ThermalSpctemperatureEnum) << " not supported");
     108                _error_("Size of field " << EnumToStringx(ThermalSpctemperatureEnum) << " not supported");
    109109        }
    110110

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp

    r12832 r13036  
    2626
    2727        /*if 2d: Error*/
    28         if (dim==2) _error2_("2d meshes not supported yet");
     28        if (dim==2) _error_("2d meshes not supported yet");
    2929
    3030        /*Recover pointer: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp

    r12832 r13036  
    103103        }
    104104        else{
    105                 _error2_("not implemented yet");
     105                _error_("not implemented yet");
    106106        }
    107107
    … …  
    111111        iomodel->FetchData(&edges,&numberofedges,&cols,MeshEdgesEnum);
    112112        iomodel->FetchData(&elements,NULL,NULL,MeshElementsEnum);
    113         if (cols!=4) _error2_("field edges should have 4 columns");
     113        if (cols!=4) _error_("field edges should have 4 columns");
    114114
    115115        /*!All elements have been partitioned above, only create elements for this CPU: */
    … …  
    152152                        }
    153153                        else{
    154                                 _error2_("Problem in edges creation");
     154                                _error_("Problem in edges creation");
    155155                        }
    156156                }

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp

    r12832 r13036  
    4646
    4747        /*Check in 3d*/
    48         if(stabilization==3 && dim==3) _error2_("DG 3d not implemented yet");
     48        if(stabilization==3 && dim==3) _error_("DG 3d not implemented yet");
    4949
    5050        /*First fetch data: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

    r12832 r13036  
    3333
    3434        /*return if 2d mesh*/
    35         if (dim==2) _error2_("2d meshes not supported yet");
     35        if (dim==2) _error_("2d meshes not supported yet");
    3636
    3737        //create penalties for nodes: no node can have a temperature over the melting point

  • issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp

    r12494 r13036  
    3838        #ifdef _HAVE_MPI_
    3939        MPI_Allreduce ( &found,&sumfound,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
    40         if(!sumfound)_error2_("could not find element with vertex with id" << index << " to compute nodal value " << EnumToStringx(natureofdataenum));
     40        if(!sumfound)_error_("could not find element with vertex with id" << index << " to compute nodal value " << EnumToStringx(natureofdataenum));
    4141        #endif
    4242

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

    r12495 r13036  
    7171         * warn the user to increase the connectivity width: */
    7272        for(i=0;i<nods;i++){
    73                 if (*(connectivity+width*i+maxels)>maxels)_error2_("max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table");
     73                if (*(connectivity+width*i+maxels)>maxels)_error_("max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table");
    7474        }
    7575

  • issm/trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp

    r12572 r13036  
    106106                char* string=strings[i];
    107107                if(my_rank==0){
    108                         if(string==NULL) _error2_("PETSc options for analysis " << EnumToStringx(reCast<int>(analyses[i])) << " have been declared but were not found");
     108                        if(string==NULL) _error_("PETSc options for analysis " << EnumToStringx(reCast<int>(analyses[i])) << " have been declared but were not found");
    109109                }
    110110                if(my_rank==0)stringlength=(strlen(string)+1)*sizeof(char);

  • issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp

    r12515 r13036  
    3030         * management routine, otherwise, skip : */
    3131        if (RiftIsPresent(loads,analysis_type)){
    32                 _error2_("rift constraints reset not supported yet!");
     32                _error_("rift constraints reset not supported yet!");
    3333        }
    3434        else if(ThermalIsPresent(loads,analysis_type)){

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

    r12931 r13036  
    4949                case VelEnum:ElementResponsex(responses, elements,nodes, vertices, loads, materials, parameters,VelEnum,process_units); break;
    5050                case FrictionCoefficientEnum:NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters,process_units); break;
    51                 default: _error2_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break;
     51                default: _error_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break;
    5252                #else
    53                 default: _error2_("ISSM was not compiled with responses capabilities, exiting!");
     53                default: _error_("ISSM was not compiled with responses capabilities, exiting!");
    5454                #endif
    5555        }

  • issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

    r12519 r13036  
    7575
    7676        hSHP = SHPOpen( filshp, "rb" );
    77         if (!hSHP) _error2_("Error opening shp/shx files.");
     77        if (!hSHP) _error_("Error opening shp/shx files.");
    7878
    7979/*  read header and print out file bounds  */

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

    r12905 r13036  
    4444                        break;}
    4545                default:
    46                           _error2_("Matrix type: " << Kff->type << " not supported yet!");
     46                          _error_("Matrix type: " << Kff->type << " not supported yet!");
    4747        }
    4848

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

    r12865 r13036  
    9696                #if _PETSC_MAJOR_ >=3
    9797                        #ifndef _HAVE_MUMPS_
    98                         _error2_("requested MUMPS solver, which was not compiled into ISSM!\n");
     98                        _error_("requested MUMPS solver, which was not compiled into ISSM!\n");
    9999                        #endif
    100100                #endif
    … …  
    120120        if (solver_type==StokesSolverEnum){
    121121                /*Make indices out of doftypes: */
    122                 if(!df)_error2_("need doftypes for Stokes solver!\n");
     122                if(!df)_error_("need doftypes for Stokes solver!\n");
    123123                DofTypesToIndexSet(&isv,&isp,df,StokesSolverEnum);
    124124
    … …  
    151151        /*Check convergence*/
    152152        KSPGetIterationNumber(ksp,&iteration_number);
    153         if (iteration_number<0) _error2_("Solver diverged at iteration number: " << -iteration_number);
     153        if (iteration_number<0) _error_("Solver diverged at iteration number: " << -iteration_number);
    154154
    155155        /*Free resources:*/

  • issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp

    r12988 r13036  
    3030        pf->GetSize(&N2);
    3131
    32         if(N!=N2)_error2_("Right hand side vector of size " << N2 << ", when matrix is of size " << M << "-" << N << " !");
    33         if(M!=N)_error2_("Stiffness matrix should be square!");
     32        if(N!=N2)_error_("Right hand side vector of size " << N2 << ", when matrix is of size " << M << "-" << N << " !");
     33        if(M!=N)_error_("Stiffness matrix should be square!");
    3434
    3535        SolverxSeq(&x,Kff->matrix,pf->vector,N);
    … …  
    4040
    4141        #else
    42                 _error2_("GSL support not compiled in!");
     42                _error_("GSL support not compiled in!");
    4343        #endif
    4444

  • issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r12927 r13036  
    488488   }
    489489        /*If we reach this point, the string provided has not been found*/
    490         _error2_("Enum " << name << " not found");
     490        _error_("Enum " << name << " not found");
    491491}

  • issm/trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp

    r12515 r13036  
    5353        double  sl,rho,cm,T,chi;
    5454
    55         if((sgn!=1) && (sgn!=-1)) _error2_("Sign should be either +1 or -1.\n");
     55        if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1.\n");
    5656
    5757        delta = central_meridian;
    … …  
    131131                if(flag) _pprintLine_("Warning: expecting coordinates in polar stereographic (Std Latitude: 71S Meridian: 0).");
    132132        }
    133         else _error2_("Sign should be either +1 or -1.\n");
     133        else _error_("Sign should be either +1 or -1.\n");
    134134
    135135        return;

  • issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp

    r12493 r13036  
    2727        if (size==0){
    2828                function();
    29                 _error2_("usage: see above");
     29                _error_("usage: see above");
    3030        }
    3131        else if (size!=NRHS ) {
    3232                function();
    33                 _error2_("usage error.");
     33                _error_("usage error.");
    3434        }
    3535        return 1;

  • issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp

    r12776 r13036  
    4848       
    4949        /*check this is indeed a subtype of long type: */
    50         if(!PyBool_Check(py_boolean))_error2_("expecting a boolean in input!");
     50        if(!PyBool_Check(py_boolean))_error_("expecting a boolean in input!");
    5151
    5252        /*extract boolean: */
    … …  
    6969        /*retrive dimensions: */
    7070        ndim=PyArray_NDIM((const PyArrayObject*)py_matrix);
    71         if(ndim!=2)_error2_("expecting an MxN matrix in input!");
     71        if(ndim!=2)_error_("expecting an MxN matrix in input!");
    7272        dims=PyArray_DIMS((PyArrayObject*)py_matrix);
    7373        M=dims[0]; N=dims[1];
    … …  
    9797        /*retrive dimensions: */
    9898        ndim=PyArray_NDIM((const PyArrayObject*)py_matrix);
    99         if(ndim!=2)_error2_("expecting an MxN matrix in input!");
     99        if(ndim!=2)_error_("expecting an MxN matrix in input!");
    100100        dims=PyArray_DIMS((PyArrayObject*)py_matrix);
    101101        M=dims[0]; N=dims[1];
    … …  
    125125        /*retrive dimensions: */
    126126        ndim=PyArray_NDIM((const PyArrayObject*)py_vector);
    127         if(ndim!=1)_error2_("expecting an Mx1 vector in input!");
     127        if(ndim!=1)_error_("expecting an Mx1 vector in input!");
    128128        dims=PyArray_DIMS((PyArrayObject*)py_vector);
    129129        M=dims[0];

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

    r12832 r13036  
    3131        void* memptr=NULL;
    3232
    33         if(!size)_error2_("attempting to 0 size allocation!");
     33        if(!size)_error_("attempting to 0 size allocation!");
    3434
    3535        /* Use the c library to do the allocation: */
    3636        memptr=malloc(size);
    37         if(!memptr) _error2_("memory allocation failed!");
     37        if(!memptr) _error_("memory allocation failed!");
    3838
    3939        return memptr;
    … …  
    4444        void* memptr=NULL;
    4545       
    46         if(!size)_error2_("attempting to 0 size allocation!");
     46        if(!size)_error_("attempting to 0 size allocation!");
    4747
    4848        /* Use the c library to do the allocation: */
    4949        memptr=calloc(n,size);
    50         if(!memptr) _error2_("memory allocation failed!");
     50        if(!memptr) _error_("memory allocation failed!");
    5151
    5252        return memptr;
    … …  
    8888        register void* value=NULL;
    8989       
    90         if(!size)_error2_("attempting to realloc to zero");
     90        if(!size)_error_("attempting to realloc to zero");
    9191        value = (void*)realloc(pv,size);
    9292
    9393        if (value == NULL) {
    94                 _error2_("virtual memory exhausted");
     94                _error_("virtual memory exhausted");
    9595        }
    9696        return value;

  • issm/trunk-jpl/src/c/shared/Elements/CoordinateSystemTransform.cpp

    r12493 r13036  
    2222                        case XYEnum:   numdofs+=2; break;
    2323                        case XYZPEnum: numdofs+=4; break;
    24                         default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
     24                        default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
    2525                }
    2626        }
    … …  
    6767                                break;
    6868                        default:
    69                                 _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
     69                                _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
    7070                }
    7171        }

  • issm/trunk-jpl/src/c/shared/Elements/TransformInvStiffnessMatrixCoord.cpp

    r12493 r13036  
    3131                        case XYEnum:   numdofs+=2; break;
    3232                        case XYZPEnum: numdofs+=4; break;
    33                         default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
     33                        default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
    3434                }
    3535        }

  • issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp

    r12493 r13036  
    3030                        case XYEnum:   numdofs+=2; break;
    3131                        case XYZPEnum: numdofs+=4; break;
    32                         default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
     32                        default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
    3333                }
    3434        }

  • issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp

    r12493 r13036  
    3131                        case XYEnum:   numdofs+=2; break;
    3232                        case XYZPEnum: numdofs+=4; break;
    33                         default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
     33                        default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
    3434                }
    3535        }

  • issm/trunk-jpl/src/c/shared/Elements/TransformStiffnessMatrixCoord.cpp

    r12493 r13036  
    3131                        case XYEnum:   numdofs+=2; break;
    3232                        case XYZPEnum: numdofs+=4; break;
    33                         default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
     33                        default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet");
    3434                }
    3535        }

  • issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp

    r12835 r13036  
    3939        /*open domain outline file for reading: */
    4040        if ((fid=fopen(domainname,"r"))==NULL){
    41                 _error2_("could not find domain file " << domainname);
     41                _error_("could not find domain file " << domainname);
    4242        }
    4343

  • issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp

    r12494 r13036  
    2323        /*open domain outline file for writing: */
    2424        if ((fid=fopen(domainname,"w"))==NULL){
    25                 _error2_("could not open domain file " << domainname);
     25                _error_("could not open domain file " << domainname);
    2626                noerr=0; goto cleanupandreturn;
    2727        }

  • issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

    r12493 r13036  
    3636        if (!itrnb) {
    3737                if (nrowb != idimb) {
    38                         _error2_("Matrix A and B inner vectors not equal size.");
     38                        _error_("Matrix A and B inner vectors not equal size.");
    3939                }
    4040                idimc=ncolb;
    … …  
    4242        else {
    4343                if (ncolb != idimb) {
    44                         _error2_("Matrix A and B inner vectors not equal size.");
     44                        _error_("Matrix A and B inner vectors not equal size.");
    4545                }
    4646                idimc=nrowb;
    … …  
    4949        if (!itrnc) {
    5050                if (nrowc != idimc) {
    51                         _error2_("Matrix B and C inner vectors not equal size.");
     51                        _error_("Matrix B and C inner vectors not equal size.");
    5252                }
    5353                idimd=ncolc;
    … …  
    5555        else {
    5656                if (ncolc != idimc) {
    57                         _error2_("Matrix B and C inner vectors not equal size.");
     57                        _error_("Matrix B and C inner vectors not equal size.");
    5858                }
    5959                idimd=nrowc;
    … …  
    124124
    125125        if (ntrma != ntrmb) {
    126                 _error2_("Matrix A and B inner vectors not equal size");
     126                _error_("Matrix A and B inner vectors not equal size");
    127127            noerr=0;   
    128128                return noerr;
    … …  
    175175
    176176        if (!b && nvec) {
    177                 _error2_("No right-hand side for nvec=" << nvec << ".");
     177                _error_("No right-hand side for nvec=" << nvec << ".");
    178178                noerr=0;
    179179                return noerr;
    … …  
    214214                        xDelete<int>(pivrc2);
    215215                        xDelete<int>(pindx);
    216                         _error2_("Pivot " << pivot << " less than machine epsilon");
     216                        _error_("Pivot " << pivot << " less than machine epsilon");
    217217                        noerr=0;
    218218                        return noerr;
    … …  
    349349        /*Compute determinant*/
    350350        Matrix2x2Determinant(&det,A);
    351         if (fabs(det) < DBL_EPSILON) _error2_("Determinant smaller that machine epsilon");
     351        if (fabs(det) < DBL_EPSILON) _error_("Determinant smaller that machine epsilon");
    352352
    353353        /*Compute invert*/
    … …  
    374374        /*Compute determinant*/
    375375        Matrix3x3Determinant(&det,A);
    376         if (fabs(det) < DBL_EPSILON) _error2_("Determinant smaller that machine epsilon");
     376        if (fabs(det) < DBL_EPSILON) _error_("Determinant smaller that machine epsilon");
    377377
    378378        /*Compute invert*/

  • issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp

    r12832 r13036  
    4444        iter=0;
    4545        fxmin = (*f)(xmin,optargs);
    46         if (xIsNan<IssmDouble>(fxmin)) _error2_("Function evaluation returned NaN");
     46        if (xIsNan<IssmDouble>(fxmin)) _error_("Function evaluation returned NaN");
    4747        cout<<setprecision(5);
    4848        if(VerboseControl()) _pprintLine_("");
    … …  
    5151        if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<xmin<<"  "<<setw(12)<<fxmin<<"           N/A         boundary");
    5252        fxmax = (*f)(xmax,optargs);
    53         if (xIsNan<IssmDouble>(fxmax)) _error2_("Function evaluation returned NaN");
     53        if (xIsNan<IssmDouble>(fxmax)) _error_("Function evaluation returned NaN");
    5454        if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<xmax<<"  "<<setw(12)<<fxmax<<"           N/A         boundary");
    5555
    … …  
    7575        /*2: call the function to be evaluated*/
    7676        fxbest = (*f)(x,optargs);
    77         if(xIsNan<IssmDouble>(fxbest)) _error2_("Function evaluation returned NaN");
     77        if(xIsNan<IssmDouble>(fxbest)) _error_("Function evaluation returned NaN");
    7878        iter=iter+1;
    7979
    … …  
    159159                //evaluate function on x
    160160                fx = (*f)(x,optargs);
    161                 if(xIsNan<IssmDouble>(fx)) _error2_("Function evaluation returned NaN");
     161                if(xIsNan<IssmDouble>(fx)) _error_("Function evaluation returned NaN");
    162162                iter=iter+1;
    163163

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

    r12519 r13036  
    16701670                if (iter >= MAX_GAUS_ITER) {
    16711671                        xDelete<IssmPDouble>(work);
    1672                         _error2_("Max iterations exceeded for l=" << MAX_GAUS_ITER);
     1672                        _error_("Max iterations exceeded for l=" << MAX_GAUS_ITER);
    16731673                }
    16741674        }

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

    r12832 r13036  
    5353                else eps=0;
    5454        }
    55         else _error2_("convergence criterion " << EnumToStringx(criterion_enum) << " not supported yet!");
     55        else _error_("convergence criterion " << EnumToStringx(criterion_enum) << " not supported yet!");
    5656
    5757        /*Assign output pointers:*/

  • issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp

    r12832 r13036  
    4141        //get the value of the function at the first boundary
    4242        fx1= (*f)(x1,optargs);
    43         if (xIsNan<IssmDouble>(fx1)) _error2_("Function evaluation returned NaN");
     43        if (xIsNan<IssmDouble>(fx1)) _error_("Function evaluation returned NaN");
    4444        cout<<setprecision(5);
    4545        if(VerboseControl()) _pprintLine_("");
    … …  
    5757                iter++;
    5858                fx2 = (*f)(x2,optargs);
    59                 if (xIsNan<IssmDouble>(fx2)) _error2_("Function evaluation returned NaN");
     59                if (xIsNan<IssmDouble>(fx2)) _error_("Function evaluation returned NaN");
    6060                if(VerboseControl())
    6161                 _pprintLine_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x2<<"  "<<setw(12)<<fx2<<"  "<<(fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1)));

  • issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp

    r12832 r13036  
    5757        if (found==-1){
    5858                /*ok, we did not find anything, this is not good! error out: */
    59                 _error2_("could find neither a default analysis  nor analysis " << EnumToStringx(analysis_type));
     59                _error_("could find neither a default analysis  nor analysis " << EnumToStringx(analysis_type));
    6060        }
    6161

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

    r12909 r13036  
    2929        if(direction_enum==IuToExtEnum) for(i=0;i<numvalues;i++)values[i]=values[i]*scale;
    3030        else if(direction_enum==ExtToIuEnum) for(i=0;i<numvalues;i++)values[i]=values[i]/scale;
    31         else _error2_("wrong direction for unit conversion, either IuToExtEnum or ExtToIuEnum. ");
     31        else _error_("wrong direction for unit conversion, either IuToExtEnum or ExtToIuEnum. ");
    3232
    3333}

  • issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp

    r12493 r13036  
    3434void SetVerbosityLevel(int level){
    3535
    36         if(level<0) _error2_("vebosity level should be a positive integer (user provided " << level << ")");
     36        if(level<0) _error_("vebosity level should be a positive integer (user provided " << level << ")");
    3737
    3838        verbositylevel = level;

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

    r12495 r13036  
    2323        /*retrieve first token, separated by underscore: */
    2424        pch = strtok (descriptor,"_");
    25         if(!pch)_error2_("descriptor " << descriptor << " is not correctly formatted!");
     25        if(!pch)_error_("descriptor " << descriptor << " is not correctly formatted!");
    2626
    2727        if (strncmp(pch,"scaled",6)==0){
    2828                /*we have a scaled variable. recover the root: */
    2929                pch = strtok (NULL, "_");
    30                 if(!pch)_error2_("scaled descriptor " << descriptor << " is not correctly formatted!");
     30                if(!pch)_error_("scaled descriptor " << descriptor << " is not correctly formatted!");
    3131                memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
    3232
    … …  
    4444                /*we have an indexed variable. recover the root: */
    4545                pch = strtok (NULL, "_");
    46                 if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!");
     46                if(!pch)_error_("indexed descriptor " << descriptor << " is not correctly formatted!");
    4747                memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
    4848                /*now recover  the index: */
    4949                pch = strtok (NULL, "_");
    50                 if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!");
     50                if(!pch)_error_("indexed descriptor " << descriptor << " is not correctly formatted!");
    5151                sscanf(pch,"%i",pindex);
    5252                return IndexedEnum;
    … …  
    5555                /*we have an indexed variable. recover the root: */
    5656                pch = strtok (NULL, "_");
    57                 if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
     57                if(!pch)_error_("nodal descriptor " << descriptor << " is not correctly formatted!");
    5858                memcpy(root,pch,(strlen(pch)+1)*sizeof(char));
    5959                /*now recover  the index: */
    6060                pch = strtok (NULL, "_");
    61                 if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
     61                if(!pch)_error_("nodal descriptor " << descriptor << " is not correctly formatted!");
    6262                sscanf(pch,"%i",pindex);
    6363                return NodalEnum;

  • issm/trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp

    r13035 r13036  
    3030        _pprintLine_("PETSc memory used   : " << memUse << "  Bytes");
    3131        #else
    32                 _error2_("Profiling not supported under this numerical toolkit");
     32                _error_("Profiling not supported under this numerical toolkit");
    3333        #endif
    3434

  • issm/trunk-jpl/src/c/shared/Sys/ProfilingStart.cpp

    r13035 r13036  
    2323                PetscGetFlops(&Flops_start );
    2424        #else
    25                 _error2_("Profiling not supported under this numerical toolkit");
     25                _error_("Profiling not supported under this numerical toolkit");
    2626        #endif
    2727

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

    r12495 r13036  
    4444
    4545                if(pthread_create(threads+i,NULL,function,(void*)(handles+i))){
    46                         _error2_("pthread_create error");
     46                        _error_("pthread_create error");
    4747                }
    4848        }
    4949        for(i=0;i<num_threads;i++){
    5050                if(pthread_join(threads[i],(void**)&status)){
    51                         _error2_("pthread_join error");
     51                        _error_("pthread_join error");
    5252                }
    5353        }

  • issm/trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp

    r12832 r13036  
    3535                        break;
    3636                default:
    37                         _error2_("No adjoint has been implemented for solution " << EnumToStringx(solutiontype) << " yet");
     37                        _error_("No adjoint has been implemented for solution " << EnumToStringx(solutiontype) << " yet");
    3838                        break;
    3939        }

  • issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp

    r12832 r13036  
    110110               
    111111                default:
    112                         _error2_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!");
     112                        _error_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!");
    113113                        break;
    114114        }

  • issm/trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp

    r12832 r13036  
    2929                        solutioncore=&diagnostic_core;
    3030                        #else
    31                         _error2_("ISSM was not compiled with diagnostic capabilities. Exiting");
     31                        _error_("ISSM was not compiled with diagnostic capabilities. Exiting");
    3232                        #endif
    3333                        break;
    … …  
    3636                        solutioncore=&steadystate_core;
    3737                        #else
    38                         _error2_("ISSM was not compiled with steady state capabilities. Exiting");
     38                        _error_("ISSM was not compiled with steady state capabilities. Exiting");
    3939                        #endif
    4040                        break;
    … …  
    4343                        solutioncore=&thermal_core;
    4444                        #else
    45                         _error2_("ISSM was not compiled with thermal capabilities. Exiting");
     45                        _error_("ISSM was not compiled with thermal capabilities. Exiting");
    4646                        #endif
    4747                        break;
    … …  
    5050                        solutioncore=&enthalpy_core;
    5151                        #else
    52                         _error2_("ISSM was not compiled with thermal capabilities. Exiting");
     52                        _error_("ISSM was not compiled with thermal capabilities. Exiting");
    5353                        #endif
    5454                        break;
    … …  
    5757                        solutioncore=&balancethickness_core;
    5858                        #else
    59                         _error2_("ISSM was not compiled with balanced capabilities. Exiting");
     59                        _error_("ISSM was not compiled with balanced capabilities. Exiting");
    6060                        #endif
    6161                        break;
    … …  
    6464                        solutioncore=&hydrology_core;
    6565                        #else
    66                         _error2_("ISSM was not compiled with hydrology capabilities. Exiting");
     66                        _error_("ISSM was not compiled with hydrology capabilities. Exiting");
    6767                        #endif
    6868                        break;
    … …  
    7171                        solutioncore=&surfaceslope_core;
    7272                        #else
    73                         _error2_("ISSM was not compiled with slope capabilities. Exiting");
     73                        _error_("ISSM was not compiled with slope capabilities. Exiting");
    7474                        #endif
    7575                        break;
    … …  
    7878                        solutioncore=&bedslope_core;
    7979                        #else
    80                         _error2_("ISSM was not compiled with slope capabilities. Exiting");
     80                        _error_("ISSM was not compiled with slope capabilities. Exiting");
    8181                        #endif
    8282                        break;
    … …  
    8585                        solutioncore=&transient_core;
    8686                        #else
    87                         _error2_("ISSM was not compiled with transient capabilities. Exiting");
     87                        _error_("ISSM was not compiled with transient capabilities. Exiting");
    8888                        #endif
    8989                        break;
    … …  
    9292                        solutioncore=&prognostic_core;
    9393                        #else
    94                         _error2_("ISSM was not compiled with prognostic capabilities. Exiting");
     94                        _error_("ISSM was not compiled with prognostic capabilities. Exiting");
    9595                        #endif
    9696                        break;
    9797                default:
    98                         _error2_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!");
     98                        _error_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!");
    9999                        break;
    100100        }

  • issm/trunk-jpl/src/c/solutions/ProcessArguments.cpp

    r12493 r13036  
    1717        char *lockfilename   = NULL;
    1818
    19         if(argc<2)_error2_("Usage error: no solution requested");
     19        if(argc<2)_error_("Usage error: no solution requested");
    2020        *solution_type=StringToEnumx(argv[1]);
    21         if(argc<3)_error2_("Usage error: missing model name");
     21        if(argc<3)_error_("Usage error: missing model name");
    2222        modelname=argv[3];
    2323        binfilename    = xNew<char>(strlen(modelname)+strlen(".bin")   +1); sprintf(binfilename,   "%s%s",modelname,".bin");

  • issm/trunk-jpl/src/c/solutions/WriteLockFile.cpp

    r12494 r13036  
    1717        if(my_rank==0){
    1818                fid=fopen(filename,"w");
    19                 if(fid==NULL) _error2_("error message: could not open lock file " << filename);
     19                if(fid==NULL) _error_("error message: could not open lock file " << filename);
    2020
    2121                /*Close file: */
    22                 if(fclose(fid)!=0) _error2_("could not close lock file " << filename);
     22                if(fclose(fid)!=0) _error_("could not close lock file " << filename);
    2323        }
    2424

  • issm/trunk-jpl/src/c/solutions/controltao_core.cpp

    r12955 r13036  
    4242        PetscGetArgs(&argc,&args);
    4343        ierr = TaoInitialize(&argc,&args,(char*)0,"");
    44         if(ierr) _error2_("Could not initialize Tao");
     44        if(ierr) _error_("Could not initialize Tao");
    4545
    4646        /*Recover some parameters*/
    … …  
    185185#else
    186186void controltao_core(FemModel* femmodel){
    187         _error2_("TAO not installed or PETSc version not supported");
     187        _error_("TAO not installed or PETSc version not supported");
    188188}
    189189#endif //_HAVE_TAO_

  • issm/trunk-jpl/src/c/solutions/convergence.cpp

    r12832 r13036  
    7272        if (xIsNan<IssmDouble>(res)){
    7373                _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f");
    74                 _error2_("mechanical equilibrium convergence criterion is NaN!");
     74                _error_("mechanical equilibrium convergence criterion is NaN!");
    7575        }
    7676
    … …  
    9696                ndu=duf->Norm(NORM_TWO); nu=old_uf->Norm(NORM_TWO);
    9797
    98                 if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error2_("convergence criterion is NaN!");
     98                if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error_("convergence criterion is NaN!");
    9999
    100100                //clean up
    … …  
    121121                duf=old_uf->Duplicate(); old_uf->Copy(duf); duf->AYPX(uf,-1.0);
    122122                ndu=duf->Norm(NORM_TWO); nduinf=duf->Norm(NORM_INF);
    123                 if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error2_("convergence criterion is NaN!");
     123                if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error_("convergence criterion is NaN!");
    124124
    125125                //clean up

  • issm/trunk-jpl/src/c/solutions/gradient_core.cpp

    r12832 r13036  
    3737        /*Check that gradient is clean*/
    3838        norm_inf=new_gradient->Norm(NORM_INF);
    39         if(norm_inf<=0)    _error2_("||∂J/∂α||∞ = 0    gradient norm is zero");
    40         if(xIsNan<IssmDouble>(norm_inf))_error2_("||∂J/∂α||∞ = NaN  gradient norm is NaN");
     39        if(norm_inf<=0)    _error_("||∂J/∂α||∞ = 0    gradient norm is zero");
     40        if(xIsNan<IssmDouble>(norm_inf))_error_("||∂J/∂α||∞ = NaN  gradient norm is NaN");
    4141
    4242        /*plug back into inputs: */

  • issm/trunk-jpl/src/c/solutions/issm.cpp

    r12988 r13036  
    5353        #ifdef _HAVE_PETSC_
    5454        ierr=PetscInitialize(&argc,&argv,(char*)0,""); 
    55         if(ierr) _error2_("Could not initialize Petsc");
     55        if(ierr) _error_("Could not initialize Petsc");
    5656        #else
    5757        #ifdef _HAVE_MPI_
    … …  
    128128                Dakotax(femmodel);
    129129                #else
    130                 _error2_("ISSM was not compiled with dakota support, cannot carry out dakota analysis!");
     130                _error_("ISSM was not compiled with dakota support, cannot carry out dakota analysis!");
    131131                #endif
    132132        }
    … …  
    138138                 control_core(femmodel);
    139139                #else
    140                 _error2_("ISSM was not compiled with control support, cannot carry out dakota analysis!");
     140                _error_("ISSM was not compiled with control support, cannot carry out dakota analysis!");
    141141                #endif
    142142        }

  • issm/trunk-jpl/src/c/solutions/kriging.cpp

    r12519 r13036  
    4040#ifdef _HAVE_PETSC_
    4141        int ierr=PetscInitialize(&argc,&argv,(char*)0,""); 
    42         if(ierr) _error2_("Could not initialize Petsc");
     42        if(ierr) _error_("Could not initialize Petsc");
    4343#else
    4444#ifdef _HAVE_MPI_
    … …  
    122122        char *lockfilename   = NULL;
    123123
    124         if(argc<2)_error2_("Usage error: missing model name");
     124        if(argc<2)_error_("Usage error: missing model name");
    125125        modelname=argv[2];
    126126        binfilename    = xNew<char>((strlen(modelname)+strlen(".bin")   +1)); sprintf(binfilename,   "%s%s",modelname,".bin");

  • issm/trunk-jpl/src/c/solutions/objectivefunction.cpp

    r12832 r13036  
    4949        }
    5050        else{
    51                 _error2_("Solution " << EnumToStringx(solution_type) << " not implemented yet");
     51                _error_("Solution " << EnumToStringx(solution_type) << " not implemented yet");
    5252        }
    5353
    … …  
    6666        }
    6767        else{
    68                 _error2_("Solution " << EnumToStringx(solution_type) << " not implemented yet");
     68                _error_("Solution " << EnumToStringx(solution_type) << " not implemented yet");
    6969        }
    7070

  • issm/trunk-jpl/src/c/solutions/steadystate_core.cpp

    r12832 r13036  
    5252                }
    5353                #else
    54                 _error2_("ISSM was not compiled with thermal capabilities. Exiting");
     54                _error_("ISSM was not compiled with thermal capabilities. Exiting");
    5555                #endif
    5656

  • issm/trunk-jpl/src/c/solutions/transient_core.cpp

    r12884 r13036  
    104104                        }
    105105                        #else
    106                         _error2_("ISSM was not compiled with thermal capabilities. Exiting");
     106                        _error_("ISSM was not compiled with thermal capabilities. Exiting");
    107107                        #endif
    108108                }
    … …  
    113113                        diagnostic_core(femmodel);
    114114                        #else
    115                         _error2_("ISSM was not compiled with diagnostic capabilities. Exiting");
     115                        _error_("ISSM was not compiled with diagnostic capabilities. Exiting");
    116116                        #endif
    117117                }
    … …  
    129129                        GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    130130                        #else
    131                         _error2_("ISSM was not compiled with grounding line migration capabilities. Exiting");
     131                        _error_("ISSM was not compiled with grounding line migration capabilities. Exiting");
    132132                        #endif
    133133                }

  • issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp

    r12860 r13036  
    119119                        break;
    120120                default:
    121                         _error2_("unknown norm !");
     121                        _error_("unknown norm !");
    122122                        break;
    123123        }
    … …  
    150150        AX->GetSize(&AXM);
    151151
    152         if(M!=AXM)_error2_("A and AX should have the same number of rows!");
    153         if(N!=XM)_error2_("A and X should have the same number of columns!");
     152        if(M!=AXM)_error_("A and AX should have the same number of rows!");
     153        if(N!=XM)_error_("A and X should have the same number of columns!");
    154154
    155155        for(i=0;i<M;i++){
    … …  
    197197                        break;
    198198                default:
    199                         _error2_("unknown insert mode!");
     199                        _error_("unknown insert mode!");
    200200                        break;
    201201        }

  • issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp

    r12863 r13036  
    8585                        break;
    8686                default:
    87                         _error2_("unknown insert mode!");
     87                        _error_("unknown insert mode!");
    8888                        break;
    8989        }
    … …  
    102102                        break;
    103103                default:
    104                         _error2_("unknown insert mode!");
     104                        _error_("unknown insert mode!");
    105105                        break;
    106106        }
    … …  
    204204                        break;
    205205                default:
    206                         _error2_("unknown norm !");
     206                        _error_("unknown norm !");
    207207                        break;
    208208        }

  • issm/trunk-jpl/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp

    r12731 r13036  
    6060
    6161        #else
    62         _error2_("METIS version not supported yet");
     62        _error_("METIS version not supported yet");
    6363        #endif
    6464}

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp

    r12493 r13036  
    3030                        break;
    3131                default:
    32                         _error2_("unknown insert mode!");
     32                        _error_("unknown insert mode!");
    3333                        break;
    3434        }

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp

    r12493 r13036  
    3030                        break;
    3131                default:
    32                         _error2_("unknown matrix type !");
     32                        _error_("unknown matrix type !");
    3333                        break;
    3434        }

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp

    r12493 r13036  
    3030                        break;
    3131                default:
    32                         _error2_("unknown norm !");
     32                        _error_("unknown norm !");
    3333                        break;
    3434        }

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/MatInvert.cpp

    r12493 r13036  
    2929        /*Some checks: */
    3030        MatGetSize(matrix,&M,&N);
    31         if(M!=N) _error2_("trying to invert a non square matrix!");
     31        if(M!=N) _error_("trying to invert a non square matrix!");
    3232
    3333        /*Create identitiy matrix: */

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp

    r12729 r13036  
    6262                }
    6363                else{
    64                         _error2_("MatType " << type << " not supported yet");
     64                        _error_("MatType " << type << " not supported yet");
    6565                }
    6666                /*Assemble*/

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp

    r12729 r13036  
    5555                        if(first[0]!='-'){
    5656                                /*This is not good, the option does not have '-'! Get out*/
    57                                 _error2_("Option " << first << " should be preceded by '-'!");
     57                                _error_("Option " << first << " should be preceded by '-'!");
    5858                        }
    5959                        /*Reduce first to bare option value*/

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp

    r12493 r13036  
    3535        /*If the dimension of the partitioning vector is not the same as that of vector B, we have a problem: */
    3636        if ( (row_partition_size !=MB) ){
    37                 _error2_("Dimensions of partitioning vector incompatible with dimensions of input vector\n");
     37                _error_("Dimensions of partitioning vector incompatible with dimensions of input vector\n");
    3838        }
    3939

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

    r12495 r13036  
    5151
    5252        /*Some dimensions checks: */
    53         if (mA!=nA) _error2_("trying to take the invert of a non-square matrix!");
     53        if (mA!=nA) _error_("trying to take the invert of a non-square matrix!");
    5454
    5555        /* Set default Plapack parameters */

  • issm/trunk-jpl/src/modules/BamgConvertMesh/BamgConvertMesh.cpp

    r12601 r13036  
    3434
    3535        /*Check inputs*/
    36         if(nels<0) _error2_("Number of elements must be positive, check index number of lines");
    37         if(nods<0) _error2_("Number of nods must be positive, check x and y sizes");
    38         if(test1!=3) _error2_("index should have 3 columns");
    39         if(test2!=nods) _error2_("x and y do not have the same length");
     36        if(nels<0) _error_("Number of elements must be positive, check index number of lines");
     37        if(nods<0) _error_("Number of nods must be positive, check x and y sizes");
     38        if(test1!=3) _error_("index should have 3 columns");
     39        if(test2!=nods) _error_("x and y do not have the same length");
    4040
    4141        /* Run core computations: */

  • issm/trunk-jpl/src/modules/BamgTriangulate/BamgTriangulate.cpp

    r12518 r13036  
    3232
    3333        /*Check inputs*/
    34         if(y_rows!=nods)         _error2_("x and y do not have the same length");
    35         if(x_cols>1 || y_cols>1) _error2_("x and y should have only one column");
    36         if(nods<3)               _error2_("At least 3 points are required");
     34        if(y_rows!=nods)         _error_("x and y do not have the same length");
     35        if(x_cols>1 || y_cols>1) _error_("x and y should have only one column");
     36        if(nods<3)               _error_("At least 3 points are required");
    3737
    3838        /* Run core computations: */

  • issm/trunk-jpl/src/modules/Chaco/Chaco.cpp

    r12520 r13036  
    4242
    4343        #ifndef _HAVE_CHACO_ //only works if dakota library has been compiled in.
    44         _error2_("Chaco not available! Cannot carry out Chaco partitioning!");
     44        _error_("Chaco not available! Cannot carry out Chaco partitioning!");
    4545        #endif
    4646

  • issm/trunk-jpl/src/modules/ContourToMesh/ContourToMesh.cpp

    r12517 r13036  
    4747        if(nlhs!=1 && nlhs!=2){
    4848                ContourToMeshUsage();
    49                 _error2_("usage. See above");
     49                _error_("usage. See above");
    5050        }
    5151        #endif
    … …  
    5353        if(nrhs!=NRHS){
    5454                ContourToMeshUsage();
    55                 _error2_("usage. See above");
     55                _error_("usage. See above");
    5656        }
    5757
    … …  
    8282                WriteData(PLHS1,in_elem);
    8383        }
    84         else _error2_("wrong interpolation type");
     84        else _error_("wrong interpolation type");
    8585
    8686        /*end module: */

  • issm/trunk-jpl/src/modules/Exp2Kml/Exp2Kml.cpp

    r12518 r13036  
    2525        /*checks on arguments on the matlab side: */
    2626        if (nlhs > NLHS) {
    27                 Exp2KmlUsage(); _error2_("Exp2Kml usage error");
     27                Exp2KmlUsage(); _error_("Exp2Kml usage error");
    2828        }
    2929        if (nrhs < NRHS) {
    30                 Exp2KmlUsage(); _error2_("Exp2Kml usage error");
     30                Exp2KmlUsage(); _error_("Exp2Kml usage error");
    3131        }
    3232
    … …  
    4949
    5050        /*some checks*/
    51         if (sgn !=+1 && sgn !=-1) _error2_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
    52         if (fabs(cm)      > 180.) _error2_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
    53         if (sp < 0. || sp >  90.) _error2_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
     51        if (sgn !=+1 && sgn !=-1) _error_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
     52        if (fabs(cm)      > 180.) _error_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
     53        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
    5454
    5555        /* Run core computations: */

  • issm/trunk-jpl/src/modules/InternalFront/InternalFront.cpp

    r12518 r13036  
    2626        /*Fetch required fields*/
    2727        FetchData(&numberofelements,mxGetAssignedField(MODEL,0,"numberofelements"));
    28         if(numberofelements<=0) _error2_("No elements found in the model");
     28        if(numberofelements<=0) _error_("No elements found in the model");
    2929        FetchData(&elements,&M,&N,mxGetAssignedField(MODEL,0,"elements"));
    30         if(M!=numberofelements || N!=3) _error2_("Field 'elements' should be of size [md.numberofelements 3]");
     30        if(M!=numberofelements || N!=3) _error_("Field 'elements' should be of size [md.numberofelements 3]");
    3131        FetchData(&elementonwater,&M,&N,mxGetAssignedField(MODEL,0,"elementonwater"));
    32         if(M!=numberofelements || N!=1) _error2_("Field 'elementonwater' should be of size [md.numberofelements 1]");
     32        if(M!=numberofelements || N!=1) _error_("Field 'elementonwater' should be of size [md.numberofelements 1]");
    3333        FetchData(&elementconnectivity,&M,&N,mxGetAssignedField(MODEL,0,"elementconnectivity"));
    34         if(M!=numberofelements || N!=3) _error2_("Field 'elementconnectivity' should be of size [md.numberofelements 3]");
     34        if(M!=numberofelements || N!=3) _error_("Field 'elementconnectivity' should be of size [md.numberofelements 3]");
    3535
    3636        /*Allocate and initialize all variables*/

  • issm/trunk-jpl/src/modules/InterpFromGridToMesh/InterpFromGridToMesh.cpp

    r12518 r13036  
    4646        if((nlhs!=NLHS) || (nrhs!=6 && nrhs!=7)){
    4747                InterpFromGridToMeshUsage();
    48                 _error2_("usage. See above");
     48                _error_("usage. See above");
    4949        }
    5050

  • issm/trunk-jpl/src/modules/InterpFromMesh2d/InterpFromMesh2d.cpp

    r12518 r13036  
    6969        if(nlhs!=NLHS){
    7070                InterpFromMesh2dUsage();
    71                 _error2_("InterpFromMeshToMesh2dUsage usage error");
     71                _error_("InterpFromMeshToMesh2dUsage usage error");
    7272        }
    7373        if((nrhs!=6) && (nrhs!=7) && (nrhs!=8)){
    7474                InterpFromMesh2dUsage();
    75                 _error2_("InterpFromMeshToMesh2dUsage usage error");
     75                _error_("InterpFromMeshToMesh2dUsage usage error");
    7676        }
    7777
    … …  
    131131        /*some checks*/
    132132        if (x_data_rows!=y_data_rows){
    133                 _error2_("vectors x and y should have the same length!");
     133                _error_("vectors x and y should have the same length!");
    134134        }
    135135        if (x_prime_rows!=y_prime_rows){
    136                 _error2_("vectors x_prime and y_prime should have the same length!");
     136                _error_("vectors x_prime and y_prime should have the same length!");
    137137        }
    138138       

  • issm/trunk-jpl/src/modules/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp

    r12778 r13036  
    2828        if(nlhs!=NLHS){
    2929                InterpFromMeshToMesh2dUsage();
    30                 _error2_("InterpFromMeshToMesh2dUsage usage error");
     30                _error_("InterpFromMeshToMesh2dUsage usage error");
    3131        }
    3232        #endif
    … …  
    3434        if(nrhs<NRHS){
    3535                InterpFromMeshToMesh2dUsage();
    36                 _error2_("InterpFromMeshToMesh2dUsage usage error");
     36                _error_("InterpFromMeshToMesh2dUsage usage error");
    3737        }
    3838
    3939        /*Fetch inputs: */
    40         FetchData(&index,&nels_data,&test,INDEX); if(test!=3) _error2_("index should have 3 columns");
    41         FetchData(&x_data,&nods_data,X);          if(nods_data<3) _error2_("there should be at least three points");
    42         FetchData(&y_data,&test,Y);               if(test!=nods_data) _error2_("vectors x and y should have the same length");
    43         FetchData(&data,&M_data,&N_data,DATA);    if(M_data*N_data<1) _error2_("data is empty");
    44         FetchData(&x_interp,&N_interp,XINTERP);   if(N_interp<1) _error2_("no interpolation requested");
    45         FetchData(&y_interp,&test,YINTERP);       if(test!=N_interp) _error2_("vectors x_interp and y_interp should have the same length");
     40        FetchData(&index,&nels_data,&test,INDEX); if(test!=3) _error_("index should have 3 columns");
     41        FetchData(&x_data,&nods_data,X);          if(nods_data<3) _error_("there should be at least three points");
     42        FetchData(&y_data,&test,Y);               if(test!=nods_data) _error_("vectors x and y should have the same length");
     43        FetchData(&data,&M_data,&N_data,DATA);    if(M_data*N_data<1) _error_("data is empty");
     44        FetchData(&x_interp,&N_interp,XINTERP);   if(N_interp<1) _error_("no interpolation requested");
     45        FetchData(&y_interp,&test,YINTERP);       if(test!=N_interp) _error_("vectors x_interp and y_interp should have the same length");
    4646        FetchData(&options,NRHS,nrhs,ARGUMENTS);
    4747

  • issm/trunk-jpl/src/modules/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp

    r12518 r13036  
    7676        /*some checks*/
    7777        if (x_data_rows!=y_data_rows || x_data_rows!=z_data_rows){
    78                 _error2_("vectors x, y and z should have the same length!");
     78                _error_("vectors x, y and z should have the same length!");
    7979        }
    8080        if (x_prime_rows!=y_prime_rows || x_prime_rows!=z_prime_rows){
    81                 _error2_("vectors x_prime, y_prime and z_prime should have the same length!");
     81                _error_("vectors x_prime, y_prime and z_prime should have the same length!");
    8282        }
    8383        /*get number of elements and number of nodes in the data*/

  • issm/trunk-jpl/src/modules/KMLFileRead/KMLFileRead.cpp

    r12518 r13036  
    4545        /*checks on arguments on the matlab side: */
    4646        if (nlhs > NLHS) {
    47                 KMLFileReadUsage(); _error2_("KMLFileRead usage error");
     47                KMLFileReadUsage(); _error_("KMLFileRead usage error");
    4848        }
    4949        if (nrhs < NRHS) {
    50                 KMLFileReadUsage(); _error2_("KMLFileRead usage error");
     50                KMLFileReadUsage(); _error_("KMLFileRead usage error");
    5151        }
    5252

  • issm/trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.cpp

    r12518 r13036  
    4040        /*checks on arguments on the matlab side: */
    4141        if (nlhs > NLHS) {
    42                 KMLMeshWriteUsage(); _error2_("KMLMeshWrite usage error");
     42                KMLMeshWriteUsage(); _error_("KMLMeshWrite usage error");
    4343        }
    4444        if (nrhs < NRHS) {
    45                 KMLMeshWriteUsage(); _error2_("KMLMeshWrite usage error");
     45                KMLMeshWriteUsage(); _error_("KMLMeshWrite usage error");
    4646        }
    4747
    … …  
    8787
    8888        if (nodecon && (mncon != nnodes))
    89           {_error2_("Nodal connectivity table, if supplied, must be supplied for all nodes.");}
     89          {_error_("Nodal connectivity table, if supplied, must be supplied for all nodes.");}
    9090        else if (!nodecon)
    9191                mncon=nnodes;
    9292        if ((llat != nnodes) || (llng != nnodes) || (llat != llng))
    93                 _error2_("Latitude and longitude vectors must be supplied for all nodes.");
     93                _error_("Latitude and longitude vectors must be supplied for all nodes.");
    9494        if (part && (lprt != nnodes))
    95                 _error2_("Partitioning vector, if supplied, must be supplied for all nodes.");
     95                _error_("Partitioning vector, if supplied, must be supplied for all nodes.");
    9696        if (data && !((mdata == nnodes) || (mdata == melem)))
    97                 _error2_("Data matrix, if supplied, must be supplied for all nodes or all elements.");
     97                _error_("Data matrix, if supplied, must be supplied for all nodes or all elements.");
    9898        if (cmap && (ncmap != 3))
    99                 _error2_("Colormap matrix, if supplied, must have three columns for rgb.");
     99                _error_("Colormap matrix, if supplied, must have three columns for rgb.");
    100100        if (!strlen(filnam))
    101101                strcpy(filnam,"stdout");

  • issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp

    r12520 r13036  
    3131        /*checks on arguments on the matlab side: */
    3232        if(nlhs>NLHS){
    33                 KMLOverlayUsage(); _error2_("KMLOverlay usage error");
     33                KMLOverlayUsage(); _error_("KMLOverlay usage error");
    3434        }
    3535        if(nrhs<NRHS){
    36                 KMLOverlayUsage(); _error2_("KMLOverlay usage error");
     36                KMLOverlayUsage(); _error_("KMLOverlay usage error");
    3737        }
    3838
    … …  
    5151
    5252        /*some checks*/
    53         if (nlat !=2) _error2_("Latitudinal axes \"lataxis\" require two double values, not " << nlat << ".");
    54         if (nlong!=2) _error2_("Longitudinal axes \"longaxis\" require two double values, not " << nlong << ".");
    55         if (!nimages) _error2_("No image files provided.");
     53        if (nlat !=2) _error_("Latitudinal axes \"lataxis\" require two double values, not " << nlat << ".");
     54        if (nlong!=2) _error_("Longitudinal axes \"longaxis\" require two double values, not " << nlong << ".");
     55        if (!nimages) _error_("No image files provided.");
    5656
    5757        if ((int)dzip){
    … …  
    9090                if (verbose) _printLine_(czip);
    9191
    92                 if (mexEvalString(czip)) _error2_("Error zipping file \"" << filkmz << "\".");
     92                if (mexEvalString(czip)) _error_("Error zipping file \"" << filkmz << "\".");
    9393                xfree((void**)&czip);
    9494                xfree((void**)&filkmz);

  • issm/trunk-jpl/src/modules/Kml2Exp/Kml2Exp.cpp

    r12518 r13036  
    2222        /*checks on arguments on the matlab side: */
    2323        if (nlhs > NLHS) {
    24                 Kml2ExpUsage(); _error2_("Kml2Exp usage error");
     24                Kml2ExpUsage(); _error_("Kml2Exp usage error");
    2525        }
    2626        if (nrhs < NRHS) {
    27                 Kml2ExpUsage(); _error2_("Kml2Exp usage error");
     27                Kml2ExpUsage(); _error_("Kml2Exp usage error");
    2828        }
    2929
    … …  
    4343
    4444        /*some checks*/
    45         if (sgn !=+1 && sgn!= -1) _error2_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
    46         if (fabs(cm)      > 180.) _error2_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
    47         if (sp < 0. || sp >  90.) _error2_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
     45        if (sgn !=+1 && sgn!= -1) _error_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
     46        if (fabs(cm)      > 180.) _error_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
     47        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
    4848
    4949        /* Run core computations: */

  • issm/trunk-jpl/src/modules/Kriging/Kriging.cpp

    r12518 r13036  
    2222        /*checks on arguments on the matlab side: */
    2323        if (nrhs<NRHS || nlhs>NLHS){
    24                 KrigingUsage(); _error2_("Kriging usage error");
     24                KrigingUsage(); _error_("Kriging usage error");
    2525        }
    2626
    2727        /*Fetch inputs: */
    2828        FetchData(&x,&n_obs,X);
    29         FetchData(&y,&N,Y);                       if(n_obs!=N) _error2_("x and y should have the same size");
    30         FetchData(&observations,&N,OBSERVATIONS); if(n_obs!=N) _error2_("x and observations should have the same size");
     29        FetchData(&y,&N,Y);                       if(n_obs!=N) _error_("x and y should have the same size");
     30        FetchData(&observations,&N,OBSERVATIONS); if(n_obs!=N) _error_("x and observations should have the same size");
    3131        FetchData(&x_interp,&M_interp,&N_interp,XINTERP);
    32         FetchData(&y_interp,&M,&N,YINTERP);       if(N!=N_interp || M!=M_interp) _error2_("x_interp and y_interp should have the same size");
     32        FetchData(&y_interp,&M,&N,YINTERP);       if(N!=N_interp || M!=M_interp) _error_("x_interp and y_interp should have the same size");
    3333        FetchData(&options,NRHS,nrhs,prhs);
    3434

  • issm/trunk-jpl/src/modules/Ll2xy/Ll2xy.cpp

    r12518 r13036  
    2525        /*checks on arguments on the matlab side: */
    2626        if (nlhs > NLHS) {
    27                 Ll2xyUsage(); _error2_("Ll2xy usage error");
     27                Ll2xyUsage(); _error_("Ll2xy usage error");
    2828        }
    2929        if (nrhs < NRHS) {
    30                 Ll2xyUsage(); _error2_("Ll2xy usage error");
     30                Ll2xyUsage(); _error_("Ll2xy usage error");
    3131        }
    3232
    … …  
    4747        /*some checks*/
    4848        if (verbose) _printLine_("Checking inputs:");
    49         if (nlat != nlon){_error2_("Must have same number of lat[" << nlat << "] and lon[" << nlon << "] coordinates.");}
     49        if (nlat != nlon){_error_("Must have same number of lat[" << nlat << "] and lon[" << nlon << "] coordinates.");}
    5050        else                ncoord=nlat;
    51         if (sgn != +1 && sgn != -1) _error2_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
    52         if (fabs(cm)      > 180.) _error2_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
    53         if (sp < 0. || sp >  90.) _error2_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
     51        if (sgn != +1 && sgn != -1) _error_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
     52        if (fabs(cm)      > 180.) _error_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
     53        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
    5454
    5555        x=(double*)mxMalloc(ncoord*sizeof(double));

  • issm/trunk-jpl/src/modules/MeshProfileIntersection/MeshProfileIntersection.cpp

    r12517 r13036  
    5454        //index
    5555        FetchData(&double_index,&nel,&dummy,INDEX);
    56         if(dummy!=3 && dummy!=6)_error2_("element triangulation should be of 3 or 6 column width!");
     56        if(dummy!=3 && dummy!=6)_error_("element triangulation should be of 3 or 6 column width!");
    5757        index=(int*)xmalloc(nel*3*sizeof(int));
    5858        for(i=0;i<nel;i++){

  • issm/trunk-jpl/src/modules/Scotch/Scotch.cpp

    r12497 r13036  
    2525
    2626#ifndef _HAVE_SCOTCH_ //only works if scotch library has been compiled in.
    27         _error2_("Scotch not available! Cannot carry out Scotch partitioning!");
     27        _error_("Scotch not available! Cannot carry out Scotch partitioning!");
    2828        #else
    2929

  • issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp

    r12518 r13036  
    2525
    2626        #ifndef _HAVE_SHAPELIB_ //only works if shapelib library has been compiled in.
    27         _error2_("Shapelib not available! Cannot carry out shp file translation!");
     27        _error_("Shapelib not available! Cannot carry out shp file translation!");
    2828        #endif
    2929
    … …  
    3333        /*checks on arguments on the matlab side: */
    3434        if (nlhs > NLHS) {
    35                 Shp2KmlUsage(); _error2_("Shp2Kml usage error");
     35                Shp2KmlUsage(); _error_("Shp2Kml usage error");
    3636        }
    3737        if (nrhs < NRHS) {
    38                 Shp2KmlUsage(); _error2_("Shp2Kml usage error");
     38                Shp2KmlUsage(); _error_("Shp2Kml usage error");
    3939        }
    4040
    … …  
    5454
    5555        /*some checks*/
    56         if (sgn < -1 || sgn > +1) _error2_("Hemisphere sgn=" << sgn << " must be +1 (north), -1 (south), or 0 (no translation).");
    57         if (fabs(cm)      > 180.) _error2_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
    58         if (sp < 0. || sp >  90.) _error2_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
     56        if (sgn < -1 || sgn > +1) _error_("Hemisphere sgn=" << sgn << " must be +1 (north), -1 (south), or 0 (no translation).");
     57        if (fabs(cm)      > 180.) _error_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
     58        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
    5959
    6060        /* Run core computations: */

  • issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp

    r12993 r13036  
    6666                mexPrintf("   %s format error.\n", __FUNCT__);
    6767                TriMeshProcessRiftsUsage();
    68                 _error2_("bad usage");
     68                _error_("bad usage");
    6969        }
    7070
    … …  
    8181        }
    8282        else{
    83                 _error2_("first argument should be the element list");
     83                _error_("first argument should be the element list");
    8484        }
    8585
    … …  
    9494        }
    9595        else{
    96                 _error2_("second argument should be the x corrdinate list");
     96                _error_("second argument should be the x corrdinate list");
    9797        }
    9898
    … …  
    106106        }
    107107        else{
    108                 _error2_("third argument should be the y corrdinate list");
     108                _error_("third argument should be the y corrdinate list");
    109109        }       
    110110
    … …  
    121121        }
    122122        else{
    123                 _error2_("fourth argument should be the segments list");
     123                _error_("fourth argument should be the segments list");
    124124        }
    125125
    … …  
    133133        }
    134134        else{
    135                 _error2_("fourth argument should be the segmentmarkers list");
     135                _error_("fourth argument should be the segmentmarkers list");
    136136        }
    137137

  • issm/trunk-jpl/src/modules/Xy2ll/Xy2ll.cpp

    r12518 r13036  
    2424        /*checks on arguments on the matlab side: */
    2525        if (nlhs > NLHS) {
    26                 Xy2llUsage(); _error2_("Xy2ll usage error");
     26                Xy2llUsage(); _error_("Xy2ll usage error");
    2727        }
    2828        if (nrhs < NRHS) {
    29                 Xy2llUsage(); _error2_("Xy2ll usage error");
     29                Xy2llUsage(); _error_("Xy2ll usage error");
    3030        }
    3131
    … …  
    4545
    4646        /*some checks*/
    47         if   (nx != ny){_error2_("Must have same number of x[" << nx << "] and y[" << ny << "] coordinates.");}
     47        if   (nx != ny){_error_("Must have same number of x[" << nx << "] and y[" << ny << "] coordinates.");}
    4848        else            ncoord=nx;
    49         if (sgn != +1 && sgn != -1) _error2_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
    50         if (fabs(cm)      > 180.) _error2_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
    51         if (sp < 0. || sp >  90.) _error2_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
     49        if (sgn != +1 && sgn != -1) _error_("Hemisphere sgn=" << sgn << " must be +1 (north) or -1 (south).");
     50        if (fabs(cm)      > 180.) _error_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
     51        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
    5252
    5353        lat=(double*)mxMalloc(ncoord*sizeof(double));
Note: See TracChangeset for help on using the changeset viewer.