Changeset 13055


Ignore:
Timestamp:
08/15/12 18:02:10 (13 years ago)
Author:
glperez
Message:

BUG: Reverted back. Chaco module not compiling...

Location:
issm/trunk-jpl
Files:
168 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/configure.ac

    r13046 r13055  
    2222AM_PROG_CC_C_O
    2323AM_PROG_AR
     24AC_PROG_RANLIB
    2425
    25 #Libtool
    26 LT_INIT
     26# To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized
     27# even if all linking is static, since, if not shared libraries are to be produce, libtool
     28# will act simply as a wrapper around AR and Ranlib.
     29#LT_INIT
    2730
    2831#Run issm_options.m4

  • issm/trunk-jpl/m4/issm_options.m4

    r13046 r13055  
    1515        dnl }}}
    1616    dnl shared build {{{
    17     AC_ARG_ENABLE([sharedlibs],                                                dnl feature
    18         AS_HELP_STRING([--enable-sharedlibs], [produce libISSM.so.0]),         dnl help string
    19         [enable_sharedlibs=$enableval],                                        dnl action if given
    20         [enable_sharedlibs=no])                                                dnl action if not given
    21     AM_CONDITIONAL([SHAREDLIBS], [test x$enable_sharedlibs = xyes])
    22     dnl }}}
    23 
    24     dnl shared build {{{
    25     AC_ARG_ENABLE([version],                                                dnl feature
    26         AS_HELP_STRING([--enable-version], [produce libISSM.so.0]),         dnl help string
    27         [enable_version=$enableval],                                        dnl action if given
    28         [enable_version=no])                                                dnl action if not given
    29     AM_CONDITIONAL([VERSION], [test x$enable_VERSION = xyes])
     17    AC_ARG_ENABLE([shared],                                                dnl feature
     18        AS_HELP_STRING([--enable-shared], [produce libISSM.so.0]),         dnl help string
     19        [enable_shared=$enableval],                                        dnl action if given
     20        [enable_shared=no])                                                dnl action if not given
     21    AM_CONDITIONAL([SHARED], [test $enable_shared = yes])
    3022    dnl }}}
    3123
    … …  
    597589                                ;;
    598590                        esac
    599 
     591       
    600592                        METISINCL=-I"$METIS_ROOT/include"
    601593                        AC_DEFINE([_METIS_VERSION_],[5],[ Metis version number])
    … …  
    614606        AC_MSG_CHECKING(for mpi)
    615607        AC_ARG_WITH([mpi-lib],
    616                 AS_HELP_STRING([--with-mpi-lib = options],[mpi options, for ex: "-L$MPIROOT -lmpich]),
     608                AS_HELP_STRING([--with-mpi-lib = otions],[mpi options, for ex: "-L$MPIROOT -lmpich]),
    617609                [MPILIB=$withval],[MPILIB=""])
    618610       
    … …  
    628620                else
    629621                        HAVE_MPI=yes
    630                         MPIINCL=-I"$MPI_INCLUDE"
     622                        MPIINCL=-I"$MPI_INCLUDE/"
    631623                        AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
    632624                        AC_DEFINE([HAVE_MPI],[1],[Mpi Flag for Dakota (DO NOT REMOVE)])

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

    r13036 r13055  
    133133        vector<Object*>::iterator object;
    134134
    135         if(this==NULL)_error_("trying to echo a NULL dataset");
     135        if(this==NULL)_error2_("trying to echo a NULL dataset");
    136136
    137137        _pprintLine_("DataSet echo: " << objects.size() << " objects");
    … …  
    150150        vector<Object*>::iterator object;
    151151
    152         if(this==NULL)_error_("trying to echo a NULL dataset");
     152        if(this==NULL)_error2_("trying to echo a NULL dataset");
    153153
    154154        _pprintLine_("DataSet echo: " << objects.size() << " objects");
    … …  
    194194
    195195        _assert_(this);
    196         if(!sorted)_error_("trying to binary search on a non-sorted dataset!");
     196        if(!sorted)_error2_("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                 _error_("could not find object with id " << eid << " in DataSet " << EnumToStringx(enum_type));
     200                _error2_("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                 _error_("not implemented yet!");
    262         }
    263 }
    264 /*}}}*/
     261                _error2_("not implemented yet!");
     262        }
     263}
     264/*}}}*/

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

    r13036 r13055  
    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) _error_("Cannot write results because there is no element??");
     205                        if(this->Size()==0) _error2_("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 _error_("Unkown result size: " << EnumToStringx(resultssizes[i]));
     234                        else _error2_("Unkown result size: " << EnumToStringx(resultssizes[i]));
    235235                        vector=new Vector(vectorsize);
    236236

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

    r13036 r13055  
    5757                /*we could not find an input with the correct enum type. No defaults values were provided,
    5858                 * error out: */
    59                 _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
     59                _error2_("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                 _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
     87                _error2_("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                 _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
     115                _error2_("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                 _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
     143                _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")");
    144144        }
    145145
    … …  
    213213
    214214        /*some checks: */
    215         if(!constrain_input) _error_("input " << EnumToStringx(constrain_enum) << " could not be found!");
     215        if(!constrain_input) _error2_("input " << EnumToStringx(constrain_enum) << " could not be found!");
    216216
    217217        /*Apply ContrainMin: */
    … …  
    254254        }
    255255        else{
    256                 _error_("Input " << EnumToStringx(enumtype) << " not found");
     256                _error2_("Input " << EnumToStringx(enumtype) << " not found");
    257257        }
    258258
    … …  
    275275        }
    276276        else{
    277                 _error_("Input " << EnumToStringx(enumtype) << " not found");
     277                _error2_("Input " << EnumToStringx(enumtype) << " not found");
    278278        }
    279279
    … …  
    296296        }
    297297        else{
    298                 _error_("Input " << EnumToStringx(enumtype) << " not found");
     298                _error2_("Input " << EnumToStringx(enumtype) << " not found");
    299299        }
    300300
    … …  
    317317        }
    318318        else{
    319                 _error_("Input " << EnumToStringx(enumtype) << " not found");
     319                _error2_("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)_error_("could not find input with enum: " << EnumToStringx(original_enum));
     371        if(!original)_error2_("could not find input with enum: " << EnumToStringx(original_enum));
    372372        copy=(Input*)original->copy();
    373373
    … …  
    416416
    417417        /*some checks: */
    418         if(!xinput) _error_("input " << EnumToStringx(MeshXEnum) << " could not be found!");
    419         if(!yinput) _error_("input " << EnumToStringx(MeshYEnum) << " could not be found!");
     418        if(!xinput) _error2_("input " << EnumToStringx(MeshXEnum) << " could not be found!");
     419        if(!yinput) _error2_("input " << EnumToStringx(MeshYEnum) << " could not be found!");
    420420
    421421        /*Apply AXPY: */

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

    r13036 r13055  
    5858        options->Get(&maxtrimming,"maxtrimming",+1.e+21);
    5959        options->Get(&minspacing,"minspacing",0.01);
    60         if(minspacing<=0) _error_("minspacing must > 0");
     60        if(minspacing<=0) _error2_("minspacing must > 0");
    6161
    6262        /*Get Minimum box size*/
    6363        if(options->GetOption("boxlength")){
    6464                options->Get(&minlength,"boxlength");
    65                 if(minlength<=0)_error_("boxlength should be a positive number");
     65                if(minlength<=0)_error2_("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         _error_("GSL is required");
     385        _error2_("GSL is required");
    386386#endif
    387387

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

    r13036 r13055  
    4747
    4848        /*Also, check the option name*/
    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 \"]\"");
     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 \"]\"");
    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                         _error_("Options \"" << in_option->name << "\" found multiple times");
     59                        _error2_("Options \"" << in_option->name << "\" found multiple times");
    6060                        break;
    6161                }
    … …  
    8383        /*Else, the Option does not exist, no default provided*/
    8484        else{
    85                 _error_("option of name \"" << name << "\" not found, and no default value has been provided");
     85                _error2_("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                 _error_("option of name \"" << name << "\" not found, and no default value has been provided");
     123                _error2_("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                 _error_("option of name \"" << name << "\" not found, and no default value has been provided");
     161                _error2_("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                 _error_("option of name \"" << name << "\" not found, and no default value has been provided");
     201                _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
    202202        }
    203203
    … …  
    264264                /*Else: not supported*/
    265265                else{
    266                         _error_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
     266                        _error2_("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                 _error_("option of name \"" << name << "\" not found, and no default value has been provided");
     292                _error2_("option of name \"" << name << "\" not found, and no default value has been provided");
    293293        }
    294294}
    … …  
    324324                                /*Else: not supported*/
    325325                                else{
    326                                         _error_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
     326                                        _error2_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum()));
    327327                                }
    328328                        }

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

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

  • issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh

    r13054 r13055  
    107107#Add header to pythonenum file{{{
    108108cat <<END > $ISSM_DIR/src/m/enum/EnumDefinitions.py
    109 from StringToEnum import StringToEnum
    110 
    111109"""
    112110
    … …  
    168166        """
    169167
    170         return StringToEnum('$NAME')[0]
     168        return StringToEnum('$NAME')
    171169
    172170END

  • issm/trunk-jpl/src/c/Makefile.am

    r13051 r13055  
    66lib_LIBRARIES = libISSMCore.a libISSMOverload.a
    77
    8 if SHAREDLIBS
    9 lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
    10 endif
     8#if SHARED
     9#lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
     10#endif
    1111if PYTHON
    1212lib_LIBRARIES += libISSMPython.a
    1313endif
    1414if MATLAB
    15 if SHAREDLIBS
    16 lib_LTLIBRARIES += libISSMMatlab.la
    17 endif
     15#if SHARED
     16#lib_LTLIBRARIES += libISSMMatlab.la
     17#endif
    1818lib_LIBRARIES += libISSMMatlab.a
    1919endif
    2020if MODULES
    21 if SHAREDLIBS
    22 lib_LTLIBRARIES += libISSMModules.la
    23 endif
     21#if SHARED
     22#lib_LTLIBRARIES += libISSMModules.la
     23#endif
    2424lib_LIBRARIES += libISSMModules.a
    2525endif
    … …  
    10111011libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
    10121012
    1013 if SHAREDLIBS
    1014 libISSM_la_SOURCES = solutions/issm.cpp
    1015 libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
    1016 
    1017 libISSMCore_la_SOURCES  = $(issm_sources)
    1018 libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
    1019 
    1020 libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
    1021 endif
     1013#if SHARED
     1014#libISSM_la_SOURCES = solutions/issm.cpp
     1015#libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
     1016#
     1017#libISSMCore_la_SOURCES  = $(issm_sources)
     1018#libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB)
     1019#
     1020#libISSMOverload_la_SOURCES = ./shared/String/stricmp.c
     1021#endif
    10221022
    10231023if MODULES
    1024 if SHAREDLIBS
    1025 libISSMModules_la_SOURCES = $(module_sources)
    1026 libISSMModules_la_SOURCES += $(bamg_sources)
    1027 libISSMModules_la_SOURCES += $(kriging_sources)
    1028 libISSMModules_la_SOURCES += $(kml_sources)
    1029 endif
     1024#if SHARED
     1025#libISSMModules_la_SOURCES = $(module_sources)
     1026#libISSMModules_la_SOURCES += $(bamg_sources)
     1027#libISSMModules_la_SOURCES += $(kriging_sources)
     1028#libISSMModules_la_SOURCES += $(kml_sources)
     1029#endif
    10301030libISSMModules_a_SOURCES = $(module_sources)
    10311031libISSMModules_a_SOURCES += $(bamg_sources)
    … …  
    10331033libISSMModules_a_SOURCES += $(kml_sources)
    10341034libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS)
    1035 libISSMModules_a_LIBADD = ./libISSMCore.a
    10361035endif
    10371036
    … …  
    10421041
    10431042if MATLAB
    1044 if SHAREDLIBS
    1045 libISSMMatlab_la_SOURCES = $(matlab_sources)
    1046 endif
     1043#if SHARED
     1044#libISSMMatlab_la_SOURCES = $(matlab_sources)
     1045#endif
    10471046libISSMMatlab_a_SOURCES = $(matlab_sources)
    10481047libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS)
    10491048endif
    10501049
    1051 if VERSION
    1052 AM_LDFLAGS =
    1053 else
    1054 AM_LDFLAGS = -avoid-version
    1055 endif
    10561050#}}}
    10571051#Overload library, to overload any non-standard symbols. {{{

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

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

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

    r13036 r13055  
    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]) _error_("wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << "  in resolved pointer!");
     187                        if (this->objects[i]->Id()!=this->ids[i]) _error2_("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) _error_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n");
     196        if (this->num!=1) _error2_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n");
    197197
    198198        /*check NULL: */
    199         if (this->objects==NULL) _error_("hook is not pointing to any object, objects pointer is NULL");
     199        if (this->objects==NULL) _error2_("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) _error_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects");
     248        if (numindices>this->num) _error2_("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) _error_("Trying to spawn an empty ElementProperties!");
     252        if(output->num<1) _error2_("Trying to spawn an empty ElementProperties!");
    253253
    254254        output->objects=xNew<Object*>(output->num);

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

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

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

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

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

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

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

    r13036 r13055  
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    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");};
     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");};
    4242                ElementResult* SpawnResult(int step, IssmDouble time);
    4343                void Configure(Parameters* parameters);
    44                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
     44                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("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){_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");};
     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");};
    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){_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");};
     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");};
    6666                void ChangeEnum(int newenumtype);
    6767                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters);
    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");};
     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");};
    7474                void Scale(IssmDouble scale_factor);
    75                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
     75                void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
    7676                void AXPY(Input* xinput,IssmDouble scalar);
    77                 void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error_("Constrain not implemented for booleans");};
     77                void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error2_("Constrain not implemented for booleans");};
    7878                void Extrude(void);
    79                 void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");};
     79                void VerticallyIntegrate(Input* thickness_input){_error2_("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

    r13036 r13055  
    4848                        break;
    4949                default:
    50                         _error_("Input of Enum " << EnumToStringx(enum_input) << " not supported yet by ControlInput");
     50                        _error2_("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) _error_("Gradient of ControlInput " << EnumToStringx(enum_type) << " not found");
     154        if(!gradient) _error2_("Gradient of ControlInput " << EnumToStringx(enum_type) << " not found");
    155155        gradient->Scale(scaling_factor);
    156156}/*}}}*/
    … …  
    170170                        break;
    171171                default:
    172                         _error_("more than 3 controls not implemented yet (Gradient " << this->control_id << " was requested). EnumDefinitions.h needs to be updated.");
     172                        _error2_("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                  _error_("Data " << data << " not supported yet");
     223                 _error2_("Data " << data << " not supported yet");
    224224         }
    225225}/*}}}*/
    … …  
    258258/*FUNCTION ControlInput::SaveValue{{{*/
    259259void ControlInput::SaveValue(void){
    260         if(!values) _error_("Values of " << EnumToStringx(this->enum_type) << " not found");
     260        if(!values) _error2_("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)    _error_("Gradient of " << EnumToStringx(this->enum_type) << " not found");
    268         if(!savedvalues) _error_("Values of " << EnumToStringx(this->enum_type) << " not found");
     267        if(!gradient)    _error2_("Gradient of " << EnumToStringx(this->enum_type) << " not found");
     268        if(!savedvalues) _error2_("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

    r13036 r13055  
    4141                int    InstanceEnum();
    4242                Input* SpawnTriaInput(int* indices);
    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");};
     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");};
    4646                ElementResult* SpawnResult(int step, IssmDouble time);
    47                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
     47                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("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){_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");};
     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");};
    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){_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");};
     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");};
    7777                void Constrain(void);
    7878                void Constrain(IssmDouble min,IssmDouble max);
    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");};
     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");};
    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){_error_("not implemented yet");};
     88                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("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

    r13036 r13055  
    115115
    116116        /*Get requested input within dataset*/
    117         if(index<0 || index > inputs->Size()-1) _error_("index requested (" << index << ") exceeds dataset size (" << inputs->Size() << ")");
     117        if(index<0 || index > inputs->Size()-1) _error2_("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

    r13036 r13055  
    3737                int    InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    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");};
     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");};
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    4646                /*numerics: {{{*/
    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");};
     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");};
    5454                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index);
    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");};
     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");};
    8989                /*}}}*/
    9090

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

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

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

    r13036 r13055  
    4040                Input* PointwiseMax(Input* inputB);
    4141                ElementResult* SpawnResult(int step, IssmDouble time);
    42                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
     42                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("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){_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");};
     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");};
    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){_error_("not implemented yet");};
     69                void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
    7070                void AXPY(Input* xinput,IssmDouble scalar);
    7171                void Constrain(IssmDouble cm_min, IssmDouble cm_max);
    72                 IssmDouble InfinityNorm(void){_error_("not implemented yet");};
     72                IssmDouble InfinityNorm(void){_error2_("not implemented yet");};
    7373                IssmDouble Max(void);
    7474                IssmDouble MaxAbs(void);
    7575                IssmDouble Min(void);
    7676                IssmDouble MinAbs(void);
    77                 void Extrude(void){_error_("not supported yet");};
     77                void Extrude(void){_error2_("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

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

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

    r13036 r13055  
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    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");};
     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");};
    4242                ElementResult* SpawnResult(int step, IssmDouble time);
    43                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
     43                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("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){_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");};
     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");};
    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){_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");};
     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");};
    6666                void ChangeEnum(int newenumtype);
    6767                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters);
    68                 void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");};
     68                void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");};
    6969                void Scale(IssmDouble scale_factor);
    70                 void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");};
     70                void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");};
    7171                void AXPY(Input* xinput,IssmDouble scalar);
    7272                void Constrain(IssmDouble cm_min, IssmDouble cm_max);
    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");};
     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");};
    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

    r13036 r13055  
    455455                case ControlInputEnum:{
    456456                        ControlInput* cont_input=(ControlInput*)xinput;
    457                         if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error_("not supported yet");
     457                        if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error2_("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                         _error_("not implemented yet");
     462                        _error2_("not implemented yet");
    463463        }
    464464
    … …  
    495495
    496496        /*Check that input provided is a thickness*/
    497         if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
     497        if (thickness_input->InstanceEnum()!=ThicknessEnum) _error2_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")");
    498498
    499499        /*Get Thickness value pointer*/
    … …  
    511511
    512512                default:
    513                         _error_("not implemented yet");
     513                        _error2_("not implemented yet");
    514514        }
    515515}
    … …  
    529529
    530530        /*Check that inputB is of the same type*/
    531         if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     531        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("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) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     562        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("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) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     593        if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("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

    r13036 r13055  
    4141                Input* PointwiseMax(Input* inputB);
    4242                ElementResult* SpawnResult(int step, IssmDouble time);
    43                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
     43                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    4646                /*numerics: {{{*/
    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");};
     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");};
    5151                void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss);
    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");};
     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");};
    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){_error_("not implemented yet");};
    60                 void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("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");};
    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){_error_("not implemented yet");};
     71                void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("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

    r13036 r13055  
    482482                }
    483483        }
    484         if(!found)_error_("did not find time interval on which to interpolate forcing values!");
     484        if(!found)_error2_("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

    r13036 r13055  
    4040                int    InstanceEnum();
    4141                Input* SpawnTriaInput(int* indices);
    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");};
     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");};
    4545                ElementResult* SpawnResult(int step, IssmDouble time);
    4646                void Configure(Parameters* parameters);
    4747                /*}}}*/
    4848                /*numerics: {{{*/
    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");};
     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");};
    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){_error_("not implemented yet");};
    57                 void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");};
     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");};
    5858                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss);
    59                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     59                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");};
    6060                void GetInputAverage(IssmDouble* pvalue);
    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");};
     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");};
    6868                void ChangeEnum(int newenumtype);
    6969
    7070                void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters);
    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");};
     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");};
    7676                IssmDouble InfinityNorm(void);
    7777                IssmDouble Max(void);
    … …  
    8080                IssmDouble MinAbs(void);
    8181                void Extrude(void);
    82                 void VerticallyIntegrate(Input* thickness_forcing){_error_("not supported yet");};
     82                void VerticallyIntegrate(Input* thickness_forcing){_error2_("not supported yet");};
    8383                void GetVectorFromInputs(Vector* vector,int* doflist);
    84                 void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not supported yet");};
    85       void GetTimeValues(IssmDouble* values,IssmDouble time){_error_("not implemented yet");};
     84                void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("not supported yet");};
     85      void GetTimeValues(IssmDouble* values,IssmDouble time){_error2_("not implemented yet");};
    8686                Input* GetTimeInput(IssmDouble time);
    8787                /*}}}*/

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

    r13036 r13055  
    323323
    324324                default :
    325                         _error_("not implemented yet");
     325                        _error2_("not implemented yet");
    326326        }
    327327
    … …  
    368368
    369369        /*Check that inputB is of the same type*/
    370         if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     370        if (inputB->ObjectEnum()!=TriaP1InputEnum) _error2_("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) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum()));
     401        if (inputB->ObjectEnum()!=TriaP1InputEnum) _error2_("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

    r13036 r13055  
    3737                int   InstanceEnum();
    3838                Input* SpawnTriaInput(int* indices);
    39                 Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");};
     39                Input* PointwiseDivide(Input* inputB){_error2_("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){_error_("not supported yet");};
     43                void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");};
    4444                void Configure(Parameters* parameters);
    4545                /*}}}*/
    4646                /*numerics: {{{*/
    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");}
     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");}
    5050                void GetInputValue(IssmDouble* pvalue,GaussTria* gauss);
    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");};
     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");};
    5656                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss);
    57                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");};
     57                void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("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){_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");};
     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");};
    6666                void ChangeEnum(int newenumtype);
    6767
    … …  
    7777                IssmDouble Min(void);
    7878                IssmDouble MinAbs(void);
    79                 void Extrude(void){_error_("not supported yet");};
    80                 void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");};
     79                void Extrude(void){_error2_("not supported yet");};
     80                void VerticallyIntegrate(Input* thickness_input){_error2_("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

    r13036 r13055  
    259259
    260260        if (strncmp(&ktag[0],"<"        ,1) || strncmp(&ktag[strlen(ktag)-1],">",1))
    261                 _error_("KMLFileTagName -- Missing tag delimiters in " << ktag << ".\n");
     261                _error2_("KMLFileTagName -- Missing tag delimiters in " << ktag << ".\n");
    262262
    263263/*  strtok modifies ktag, so work on copy  */
    … …  
    355355                                                        NULL,NULL)) ||
    356356                (kstr[0] == '<'))
    357                 _error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");
     357                _error2_("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                   {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     370                  {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    371371                else
    372372                        xDelete<char>(kstr);
    … …  
    388388                                                        NULL,NULL)) ||
    389389                (kstr[0] == '<'))
    390           {_error_("KMLFileTokenParse -- Missing bool field for " << ktag << ".\n");}
     390          {_error2_("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                   {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     404                  {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    405405                else
    406406                        xDelete<char>(kstr);
    … …  
    433433                                                        NULL,NULL)) ||
    434434                (kstr[0] == '<'))
    435                 _error_("KMLFileTokenParse -- Missing string field for " << ktag << ".\n");
     435                _error2_("KMLFileTokenParse -- Missing string field for " << ktag << ".\n");
    436436
    437437        if (!pstr) {
    … …  
    463463                        (kstr[1] != '/') ||
    464464                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
    465                   {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     465                  {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    466466                else
    467467                        xDelete<char>(kstr);
    … …  
    484484                                                        NULL,NULL)) ||
    485485                (kstr[0] == '<'))
    486           {_error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");}
     486          {_error2_("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                   {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     499                  {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    500500                else
    501501                        xDelete<char>(kstr);
    … …  
    518518                                                        NULL,NULL)) ||
    519519                (kstr[0] == '<'))
    520                 _error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");
     520                _error2_("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                   {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     533                  {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    534534                else
    535535                        xDelete<char>(kstr);
    … …  
    556556                                                        NULL,NULL)) ||
    557557                (kstr[0] == '<'))
    558                 _error_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n");
     558                _error2_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n");
    559559
    560560        if (!*pdval)
    … …  
    570570                i++;
    571571                if (maxlen && (maxlen < i+1))
    572                         _error_("KMLFileTokenParse -- Double [m] field too short for " << ktag << ".\n");
     572                        _error2_("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                   {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     597                  {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    598598                else
    599599                        xDelete<char>(kstr);
    … …  
    622622                                                        NULL,NULL)) ||
    623623                (kstr[0] == '<'))
    624                 _error_("KMLFileTokenParse -- Missing double [m x n] field for " << ktag << ".\n");
     624                _error2_("KMLFileTokenParse -- Missing double [m x n] field for " << ktag << ".\n");
    625625
    626626        if (!*pdval)
    … …  
    636636                i++;
    637637                if (maxlen && (maxlen*n < i+1))
    638                         _error_("KMLFileTokenParse -- Double [m x n] field too short for " << ktag << ".\n");
     638                        _error2_("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                   {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
     667                  {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");}
    668668                else
    669669                        xDelete<char>(kstr);
    … …  
    712712                else if ((kstr[0] == '<') &&
    713713                                 (kstr[1] == '/')) {
    714                         _error_("KMLFileTagSkip -- Unexpected closing tag " << kstr << ".\n");
     714                        _error2_("KMLFileTagSkip -- Unexpected closing tag " << kstr << ".\n");
    715715                }
    716716
    … …  
    718718        }
    719719
    720         _error_("KMLFileTokenParse -- Corresponding closing tag for " << ktag << " not found.\n");
     720        _error2_("KMLFileTokenParse -- Corresponding closing tag for " << ktag << " not found.\n");
    721721
    722722        return(0);

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

    r13036 r13055  
    3030                virtual void  DeepEcho();
    3131                virtual void  DeepEcho(const char* indent);
    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.");};
     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.");};
    3939                /*}}}*/
    4040

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

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

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

    r13036 r13055  
    3535                void  Write(FILE* fid,const char* indent);
    3636                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    4444                /*}}}*/
    4545

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

    r13036 r13055  
    3333                void  Read(FILE* fid,char* kstr);
    3434                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    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.");};
     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.");};
    4242                /*}}}*/
    4343

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

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

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

    r13036 r13055  
    149149                return;
    150150        else if (!strncmp(kstr,"</",2))
    151           {_error_("KML_Feature::Read -- Unexpected closing tag " << kstr);}
     151          {_error2_("KML_Feature::Read -- Unexpected closing tag " << kstr);}
    152152        else if (strncmp(kstr,"<",1))
    153           {_error_("KML_Feature::Read -- Unexpected field \"" << kstr << "\"");}
     153          {_error2_("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

    r13036 r13055  
    4444                void  Write(FILE* fid,const char* indent);
    4545                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    5353                /*}}}*/
    5454

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

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

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

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

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

    r13036 r13055  
    7979                return;
    8080        else if (!strncmp(kstr,"</",2))
    81           {_error_("KML_Geometry::Read -- Unexpected closing tag " << kstr << ".\n");}
     81          {_error2_("KML_Geometry::Read -- Unexpected closing tag " << kstr << ".\n");}
    8282        else if (strncmp(kstr,"<",1))
    83           {_error_("KML_Geometry::Read -- Unexpected field \"" << kstr << "\".\n");}
     83          {_error2_("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

    r13036 r13055  
    2929                void  Write(FILE* fid,const char* indent);
    3030                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    3838                /*}}}*/
    3939

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

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

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

    r13036 r13055  
    145145                }
    146146                else if (!strncmp(kstri,"</",2))
    147                   {_error_("KML_Icon::Read -- Unexpected closing tag " << kstri << ".\n");}
     147                  {_error2_("KML_Icon::Read -- Unexpected closing tag " << kstri << ".\n");}
    148148                else if (strncmp(kstri,"<",1))
    149                   {_error_("KML_Icon::Read -- Unexpected field \"" << kstri << "\".\n");}
     149                  {_error2_("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

    r13036 r13055  
    4444                void  Write(FILE* fid,const char* indent);
    4545                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    5353                /*}}}*/
    5454

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

    r13036 r13055  
    121121                }
    122122                else if (!strncmp(kstri,"</",2))
    123                   {_error_("KML_LatLonBox::Read -- Unexpected closing tag " << kstri << ".\n");}
     123                  {_error2_("KML_LatLonBox::Read -- Unexpected closing tag " << kstri << ".\n");}
    124124                else if (strncmp(kstri,"<",1))
    125                   {_error_("KML_LatLonBox::Read -- Unexpected field \"" << kstri << "\".\n");}
     125                  {_error2_("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

    r13036 r13055  
    3535                void  Write(FILE* fid,const char* indent);
    3636                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    4444                /*}}}*/
    4545

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

    r13036 r13055  
    3838                void  Read(FILE* fid,char* kstr);
    3939                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    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.");};
     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.");};
    4747                /*}}}*/
    4848

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

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

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

    r13036 r13055  
    139139                }
    140140                else if (!strncmp(kstri,"</",2))
    141                   {_error_("KML_LinearRing::Read -- Unexpected closing tag " << kstri << ".\n");}
     141                  {_error2_("KML_LinearRing::Read -- Unexpected closing tag " << kstri << ".\n");}
    142142                else if (strncmp(kstri,"<",1))
    143                   {_error_("KML_LinearRing::Read -- Unexpected field \"" << kstri << "\".\n");}
     143                  {_error2_("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

    r13036 r13055  
    3838                void  Read(FILE* fid,char* kstr);
    3939                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    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.");};
     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.");};
    4747                /*}}}*/
    4848

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

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

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

    r13036 r13055  
    3131                virtual void  DeepEcho();
    3232                virtual void  DeepEcho(const char* indent);
    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.");};
     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.");};
    4040                /*}}}*/
    4141

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

    r13036 r13055  
    3636                void  Write(FILE* fid,const char* indent);
    3737                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    4545                /*}}}*/
    4646

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

    r13036 r13055  
    140140                }
    141141                else if (!strncmp(kstri,"</",2))
    142                   {_error_("KML_Placemark::Read -- Unexpected closing tag " << kstri << ".\n");}
     142                  {_error2_("KML_Placemark::Read -- Unexpected closing tag " << kstri << ".\n");}
    143143                else if (strncmp(kstri,"<",1))
    144                   {_error_("KML_Placemark::Read -- Unexpected field \"" << kstri << "\".\n");}
     144                  {_error2_("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

    r13036 r13055  
    3434                void  Read(FILE* fid,char* kstr);
    3535                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    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.");};
     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.");};
    4343                /*}}}*/
    4444

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

    r13036 r13055  
    126126                }
    127127                else if (!strncmp(kstri,"</",2))
    128                   {_error_("KML_Point::Read -- Unexpected closing tag " << kstri << ".\n");}
     128                  {_error2_("KML_Point::Read -- Unexpected closing tag " << kstri << ".\n");}
    129129                else if (strncmp(kstri,"<",1))
    130                   {_error_("KML_Point::Read -- Unexpected field \"" << kstri << "\".\n");}
     130                  {_error2_("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

    r13036 r13055  
    3636                void  Read(FILE* fid,char* kstr);
    3737                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    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.");};
     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.");};
    4545                /*}}}*/
    4646

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

    r13036 r13055  
    117117                }
    118118                else if (!strncmp(kstri,"</",2))
    119                   {_error_("KML_PolyStyle::Read -- Unexpected closing tag " << kstri << ".\n");}
     119                  {_error2_("KML_PolyStyle::Read -- Unexpected closing tag " << kstri << ".\n");}
    120120                else if (strncmp(kstri,"<",1))
    121                   {_error_("KML_PolyStyle::Read -- Unexpected field \"" << kstri << "\".\n");}
     121                  {_error2_("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

    r13036 r13055  
    3232                void  Write(FILE* fid,const char* indent);
    3333                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    4141                /*}}}*/
    4242

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

    r13036 r13055  
    4040                void  Read(FILE* fid,char* kstr);
    4141                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    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.");};
     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.");};
    4949                /*}}}*/
    5050

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

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

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

    r13036 r13055  
    8383                return;
    8484        else if (!strncmp(kstr,"</",2))
    85           {_error_("KML_StyleSelector::Read -- Unexpected closing tag " << kstr << ".\n");}
     85          {_error2_("KML_StyleSelector::Read -- Unexpected closing tag " << kstr << ".\n");}
    8686        else if (strncmp(kstr,"<",1))
    87           {_error_("KML_StyleSelector::Read -- Unexpected field \"" << kstr << "\".\n");}
     87          {_error2_("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

    r13036 r13055  
    2929                void  Write(FILE* fid,const char* indent);
    3030                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    3838                /*}}}*/
    3939

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

    r13036 r13055  
    2929                void  Write(FILE* fid,const char* indent);
    3030                void  Read(FILE* fid,char* kstr);
    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.");};
     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.");};
    3838                /*}}}*/
    3939

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

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

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

    r13051 r13055  
    194194                        /*Get input (either in element or material)*/
    195195                        Input* input=inputs->GetInput(input_enum);
    196                         if(!input) _error_("Input " << EnumToStringx(input_enum) << " not found in material");
     196                        if(!input) _error2_("Input " << EnumToStringx(input_enum) << " not found in material");
    197197
    198198                        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
    … …  
    200200                        break;
    201201
    202                 default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
     202                default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
    203203        }
    204204}
    … …  
    260260
    261261        /*Checks in debugging mode*/
    262         if(viscosity<=0) _error_("Negative viscosity");
     262        if(viscosity<=0) _error2_("Negative viscosity");
    263263        _assert_(B>0);
    264264        _assert_(n>0);
    … …  
    331331
    332332        /*Checks in debugging mode*/
    333         if(viscosity3d<=0) _error_("Negative viscosity");
     333        if(viscosity3d<=0) _error2_("Negative viscosity");
    334334        _assert_(B>0);
    335335        _assert_(n>0);
    … …  
    403403
    404404        /*Checks in debugging mode*/
    405         if(viscosity3d<=0) _error_("Negative viscosity");
     405        if(viscosity3d<=0) _error2_("Negative viscosity");
    406406        _assert_(B>0);
    407407        _assert_(n>0);
    … …  
    564564                                        return;
    565565                                }
    566                                 default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
    567                         }
    568                 default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     566                                default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
     567                        }
     568                default: _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    569569        }
    570570}
    … …  
    622622                                        return;
    623623                                }
    624                                 default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
    625                         }
    626                 default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
     624                                default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet");
     625                        }
     626                default: _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
    627627        }
    628628
    … …  
    764764        #endif
    765765        else{
    766                 _error_("Mesh type not supported yet!");
     766                _error2_("Mesh type not supported yet!");
    767767        }
    768768

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

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

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

    r13036 r13055  
    2323#define _printf_(flag,...) do{if(flag) PrintfFunction(__VA_ARGS__);}while(0)
    2424/*}}}*/
     25/* _error_ {{{*/
     26/*Error exception macro*/
     27#ifdef _INTEL_WIN_
     28#define _error_(...)\
     29  throw ErrorException(exprintf(__VA_ARGS__))
     30#else
     31#define _error_(...)\
     32  throw ErrorException(__FILE__,__func__,__LINE__,exprintf(__VA_ARGS__))
     33#endif
     34/*}}}*/
    2535/* _error2_ {{{*/
    2636/*new Error exception macro*/
    2737#ifdef _INTEL_WIN_
    28 #define _error_(StreamArgs)\
     38#define _error2_(StreamArgs)\
    2939   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    3040   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    3141   throw ErrorException(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    3242#else
    33 #define _error_(StreamArgs)\
     43#define _error2_(StreamArgs)\
    3444        do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    3545   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    … …  
    6575#ifdef _ISSM_DEBUG_
    6676#define _assert_(statement)\
    67   if (!(statement)) _error_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
     77  if (!(statement)) _error_("Assertion \"%s\" failed, please report bug to %s",#statement,PACKAGE_BUGREPORT)
    6878#else
    6979#define _assert_(ignore)\

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

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

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

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

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

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

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

    r13036 r13055  
    4848        else{
    4949                /*This is an error: we don't have the correct input!: */
    50                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     50                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     91                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     136                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     178                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     240                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     271                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     303                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     335                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     367                _error2_("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                 _error_("input data_type is not a string!");
     383                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     418                _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
    419419        }
    420420                       
    … …  
    434434
    435435        if (!mxIsClass(dataref,"double")){
    436                 _error_("input data_type is not a double!");
     436                _error2_("input data_type is not a double!");
    437437        }
    438438        else{
    … …  
    451451
    452452        if (!mxIsClass(dataref,"double")){
    453                 _error_("input data_type is not a scalar!");
     453                _error2_("input data_type is not a scalar!");
    454454        }
    455455        else{
    … …  
    468468
    469469        if (mxIsClass(dataref,"logical")){
    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");
     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");
    472472                mxbool_ptr=mxGetLogicals(dataref);
    473473        }
    474474        else{
    475                 _error_("input data_type is not a bool!");
     475                _error2_("input data_type is not a bool!");
    476476        }
    477477
    … …  
    495495        else{
    496496                /*This is an error: we don't have the correct input!: */
    497                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     497                _error2_("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                 _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet");
     521                _error2_("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")) _error_("Argument " << i+1 << " must be name of option");
     622                if (!mxIsClass(pdataref[i],"char")) _error2_("Argument " << i+1 << " must be name of option");
    623623
    624624                FetchData(&name,pdataref[i]);
    625                 if(i+1 == nrhs) _error_("Argument " << i+2 << " must exist and be value of option \"" << name << "\".");
     625                if(i+1 == nrhs) _error2_("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

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

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

    r13036 r13055  
    4646               
    4747                /*Check that input is actualy a vector*/
    48                 if (cols!=1) _error_("input vector of size " << rows << "x" << cols << " should have only one column");
     48                if (cols!=1) _error2_("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) _error_("input vector of size " << rows << "x" << cols << " should have only one column");
     79                if (cols!=1) _error2_("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

    r13036 r13055  
    2727        /*check and parse the value  */
    2828        if (!mxIsClass(prhs[0],"double")){
    29                 _error_("Value of option \"" << odouble->name  << "\" must be class \"double\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     29                _error2_("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                 _error_("Value of option \"" << ological->name  << "\" must be class \"logical\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     47                _error2_("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                 _error_("Value of option \"" << ochar->name  << "\" must be class \"char\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     65                _error2_("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                 _error_("Value of option \"" << ostruct->name  << "\" must be class \"struct\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     89                _error2_("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                 _error_("Value of option \"" << ocell->name  << "\" must be class \"cell\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
     135                _error2_("Value of option \"" << ocell->name  << "\" must be class \"cell\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
    136136        }
    137137
    … …  
    181181                        mxDestroyArray(lhs[0]);
    182182                }
    183                 else _error_("Second argument value of option \""<< name <<"\" is of unrecognized class \""<< mxGetClassName(prhs[0]) <<"\".");
     183                else _error2_("Second argument value of option \""<< name <<"\" is of unrecognized class \""<< mxGetClassName(prhs[0]) <<"\".");
    184184        }
    185185

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

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

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

    r13036 r13055  
    2323        /*retrieve first token, separated by underscore: */
    2424        pch = strtok (descriptor,"_");
    25         if(!pch)_error_("descriptor " << descriptor << " is not correctly formatted!");
     25        if(!pch)_error2_("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)_error_("scaled descriptor " << descriptor << " is not correctly formatted!");
     30                if(!pch)_error2_("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)_error_("indexed descriptor " << descriptor << " is not correctly formatted!");
     46                if(!pch)_error2_("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)_error_("indexed descriptor " << descriptor << " is not correctly formatted!");
     50                if(!pch)_error2_("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)_error_("nodal descriptor " << descriptor << " is not correctly formatted!");
     57                if(!pch)_error2_("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)_error_("nodal descriptor " << descriptor << " is not correctly formatted!");
     61                if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
    6262                sscanf(pch,"%i",pindex);
    6363                return NodalEnum;

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

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

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

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

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

    r13036 r13055  
    5555
    5656        if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp))
    57                 _error_("Error reading exp file.");
     57                _error2_("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

    r13036 r13055  
    2626        /*Get size of vector: */
    2727        gsize=nodes->NumberOfDofs(configuration_type,GsetEnum);
    28         if (gsize==0) _error_("Allocating a Vec of size 0 as gsize=0 for configuration: " << EnumToStringx(configuration_type));
     28        if (gsize==0) _error2_("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

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

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

    r13036 r13055  
    5454        /*Check that gradient is clean*/
    5555        norm_inf=gradient->Norm(NORM_INF);
    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");
     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");
    5858
    5959        /*Clean-up and assign output pointer*/

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

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

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

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

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

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

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

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

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

    r13036 r13055  
    3535        /*Checks*/
    3636        if (M_data!=nods_data && M_data!=nels_data){
    37                 _error_("data provided should have either " << nods_data << " or " << nels_data << " lines (not " << M_data << ")");
     37                _error2_("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                                         _error_("Triangle number " << it << " not in [0 " << nels_data << "], report bug to developers");
     140                                        _error2_("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

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

    r13036 r13055  
    3838        fid=iomodel->SetFilePointerToData(&code, &vector_layout,vector_enum);
    3939
    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));
     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));
    4242
    4343        /*Fetch vector:*/
    … …  
    9999        }
    100100        else{
    101                 _error_("Size of field " << EnumToStringx(vector_enum) << " not supported");
     101                _error2_("Size of field " << EnumToStringx(vector_enum) << " not supported");
    102102        }
    103103

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

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

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

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

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

    r13036 r13055  
    138138        }
    139139        else{
    140                 _error_("output '" << output << "' not supported yet");
     140                _error2_("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 _error_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)");
     307                else _error2_("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

    r13036 r13055  
    103103        }
    104104        else{
    105                 _error_("output '" << output << "' not supported yet");
     105                _error2_("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 _error_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)");
     128                else _error2_("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

    r13036 r13055  
    5252        double  T,rho,sl,tc,mc;
    5353
    54         if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1.\n");
     54        if((sgn!=1) && (sgn!=-1)) _error2_("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 _error_("Sign should be either +1 or -1.\n");
     125        else _error2_("Sign should be either +1 or -1.\n");
    126126
    127127        return;

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

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

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

    r13036 r13055  
    3838        if(    (edge1==IntersectEnum) && (edge2==IntersectEnum) && (edge3==IntersectEnum)   ){
    3939                /*This case is impossible: */
    40                 _error_("error: a line cannot go through 3 different vertices!");
     40                _error2_("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

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

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

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

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

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

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

    r13036 r13055  
    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)_error_("qmu_mass_flux_num_profiles is 0, when MassFlux computations were requested!");
     155                        if(qmu_mass_flux_num_profiles==0)_error2_("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

    r13051 r13055  
    146146
    147147                                        }
    148                                         else _error_("if vertices_type is MacAyealPattyn, you shoud have nodeonpattyn or nodeonmacayeal");
     148                                        else _error2_("if vertices_type is MacAyealPattyn, you shoud have nodeonpattyn or nodeonmacayeal");
    149149                        }
    150150                        /*Also add spcs of coupling: zero at the border pattyn/stokes for the appropriate dofs*/
    … …  
    186186                                                }
    187187                                        }
    188                                         else _error_("if vertices_type is PattynStokes, you shoud have nodeonpattyn or nodeonstokes");
     188                                        else _error2_("if vertices_type is PattynStokes, you shoud have nodeonpattyn or nodeonstokes");
    189189                        }
    190190                        /*Also add spcs of coupling: zero at the border pattyn/stokes for the appropriate dofs*/
    … …  
    226226                                                }
    227227                                        }
    228                                         else _error_("if vertices_type is MacAyealStokes, you shoud have nodeonmacayeal or nodeonstokes");
     228                                        else _error2_("if vertices_type is MacAyealStokes, you shoud have nodeonmacayeal or nodeonstokes");
    229229                        }
    230230                        /*Now add the regular spcs*/
    … …  
    319319                                                count++;
    320320                                                break;
    321                                         default: _error_("Vertex approximation " << EnumToStringx((int)vertices_type[i]) << " not supported");
     321                                        default: _error2_("Vertex approximation " << EnumToStringx((int)vertices_type[i]) << " not supported");
    322322                                }
    323323                        }

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

    r13051 r13055  
    6464                        doftype[5]=StokesApproximationEnum;
    6565                }
    66                 else _error_("Approximationtype " << reCast<int>(*vertices_type) << " (" << EnumToStringx(reCast<int>(*vertices_type)) << ") not implemented yet for DiagnosticHoriz");
     66                else _error2_("Approximationtype " << reCast<int>(*vertices_type) << " (" << EnumToStringx(reCast<int>(*vertices_type)) << ") not implemented yet for DiagnosticHoriz");
    6767        }
    6868        else if (analysis_type==DiagnosticVertAnalysisEnum){
    … …  
    9393                numdofs=1;
    9494        }
    95         else _error_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet");
     95        else _error2_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet");
    9696
    9797        /*Now initialize the index*/

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

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

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

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

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

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

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

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

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

    r13036 r13055  
    3333
    3434        /*return if 2d mesh*/
    35         if (dim==2) _error_("2d meshes not supported yet");
     35        if (dim==2) _error2_("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

    r13036 r13055  
    3838        #ifdef _HAVE_MPI_
    3939        MPI_Allreduce ( &found,&sumfound,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
    40         if(!sumfound)_error_("could not find element with vertex with id" << index << " to compute nodal value " << EnumToStringx(natureofdataenum));
     40        if(!sumfound)_error2_("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

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

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

    r13036 r13055  
    106106                char* string=strings[i];
    107107                if(my_rank==0){
    108                         if(string==NULL) _error_("PETSc options for analysis " << EnumToStringx(reCast<int>(analyses[i])) << " have been declared but were not found");
     108                        if(string==NULL) _error2_("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

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

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

    r13036 r13055  
    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: _error_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break;
     51                default: _error2_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break;
    5252                #else
    53                 default: _error_("ISSM was not compiled with responses capabilities, exiting!");
     53                default: _error2_("ISSM was not compiled with responses capabilities, exiting!");
    5454                #endif
    5555        }

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

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

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

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

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

    r13036 r13055  
    9696                #if _PETSC_MAJOR_ >=3
    9797                        #ifndef _HAVE_MUMPS_
    98                         _error_("requested MUMPS solver, which was not compiled into ISSM!\n");
     98                        _error2_("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)_error_("need doftypes for Stokes solver!\n");
     122                if(!df)_error2_("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) _error_("Solver diverged at iteration number: " << -iteration_number);
     153        if (iteration_number<0) _error2_("Solver diverged at iteration number: " << -iteration_number);
    154154
    155155        /*Free resources:*/

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

    r13036 r13055  
    3030        pf->GetSize(&N2);
    3131
    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!");
     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!");
    3434
    3535        SolverxSeq(&x,Kff->matrix,pf->vector,N);
    … …  
    4040
    4141        #else
    42                 _error_("GSL support not compiled in!");
     42                _error2_("GSL support not compiled in!");
    4343        #endif
    4444

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

    r13053 r13055  
    491491   }
    492492        /*If we reach this point, the string provided has not been found*/
    493         _error_("Enum " << name << " not found");
     493        _error2_("Enum " << name << " not found");
    494494}

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

    r13036 r13055  
    5353        double  sl,rho,cm,T,chi;
    5454
    55         if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1.\n");
     55        if((sgn!=1) && (sgn!=-1)) _error2_("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 _error_("Sign should be either +1 or -1.\n");
     133        else _error2_("Sign should be either +1 or -1.\n");
    134134
    135135        return;

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

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

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

    r13036 r13055  
    4848       
    4949        /*check this is indeed a subtype of long type: */
    50         if(!PyBool_Check(py_boolean))_error_("expecting a boolean in input!");
     50        if(!PyBool_Check(py_boolean))_error2_("expecting a boolean in input!");
    5151
    5252        /*extract boolean: */
    … …  
    6969        /*retrive dimensions: */
    7070        ndim=PyArray_NDIM((const PyArrayObject*)py_matrix);
    71         if(ndim!=2)_error_("expecting an MxN matrix in input!");
     71        if(ndim!=2)_error2_("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)_error_("expecting an MxN matrix in input!");
     99        if(ndim!=2)_error2_("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)_error_("expecting an Mx1 vector in input!");
     127        if(ndim!=1)_error2_("expecting an Mx1 vector in input!");
    128128        dims=PyArray_DIMS((PyArrayObject*)py_vector);
    129129        M=dims[0];

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

    r13033 r13055  
    2121
    2222
    23 /*FUNCTION WriteData(PyObject* py_tuple,int index,int integer){{{*/
    24 void WriteData(PyObject* py_tuple, int index, int integer){
    25        
    26         PyTuple_SetItem(py_tuple, index, PyInt_FromSsize_t(integer));
    27 
    28 }/*}}}*/
    2923/*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{*/
    3024void WriteData(PyObject* py_tuple, int index, char* string){

  • issm/trunk-jpl/src/c/python/io/pythonio.h

    r13033 r13055  
    2828//void WriteData(DataHandle* py_tuple,Parameters* parameters);
    2929void WriteData(PyObject* py_tuple, int index, double* matrix, int M,int N);
    30 void WriteData(PyObject* py_tuple, int index, int integer);
    3130void WriteData(PyObject* py_tuple, int index, char* string);
    3231void WriteData(PyObject* py_tuple, int index, Matrix* matrix);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    r13036 r13055  
    4444        iter=0;
    4545        fxmin = (*f)(xmin,optargs);
    46         if (xIsNan<IssmDouble>(fxmin)) _error_("Function evaluation returned NaN");
     46        if (xIsNan<IssmDouble>(fxmin)) _error2_("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)) _error_("Function evaluation returned NaN");
     53        if (xIsNan<IssmDouble>(fxmax)) _error2_("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)) _error_("Function evaluation returned NaN");
     77        if(xIsNan<IssmDouble>(fxbest)) _error2_("Function evaluation returned NaN");
    7878        iter=iter+1;
    7979
    … …  
    159159                //evaluate function on x
    160160                fx = (*f)(x,optargs);
    161                 if(xIsNan<IssmDouble>(fx)) _error_("Function evaluation returned NaN");
     161                if(xIsNan<IssmDouble>(fx)) _error2_("Function evaluation returned NaN");
    162162                iter=iter+1;
    163163

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

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

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

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

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

    r13036 r13055  
    4141        //get the value of the function at the first boundary
    4242        fx1= (*f)(x1,optargs);
    43         if (xIsNan<IssmDouble>(fx1)) _error_("Function evaluation returned NaN");
     43        if (xIsNan<IssmDouble>(fx1)) _error2_("Function evaluation returned NaN");
    4444        cout<<setprecision(5);
    4545        if(VerboseControl()) _pprintLine_("");
    … …  
    5757                iter++;
    5858                fx2 = (*f)(x2,optargs);
    59                 if (xIsNan<IssmDouble>(fx2)) _error_("Function evaluation returned NaN");
     59                if (xIsNan<IssmDouble>(fx2)) _error2_("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

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

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

    r13036 r13055  
    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 _error_("wrong direction for unit conversion, either IuToExtEnum or ExtToIuEnum. ");
     31        else _error2_("wrong direction for unit conversion, either IuToExtEnum or ExtToIuEnum. ");
    3232
    3333}

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

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

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

    r13036 r13055  
    2323        /*retrieve first token, separated by underscore: */
    2424        pch = strtok (descriptor,"_");
    25         if(!pch)_error_("descriptor " << descriptor << " is not correctly formatted!");
     25        if(!pch)_error2_("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)_error_("scaled descriptor " << descriptor << " is not correctly formatted!");
     30                if(!pch)_error2_("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)_error_("indexed descriptor " << descriptor << " is not correctly formatted!");
     46                if(!pch)_error2_("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)_error_("indexed descriptor " << descriptor << " is not correctly formatted!");
     50                if(!pch)_error2_("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)_error_("nodal descriptor " << descriptor << " is not correctly formatted!");
     57                if(!pch)_error2_("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)_error_("nodal descriptor " << descriptor << " is not correctly formatted!");
     61                if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!");
    6262                sscanf(pch,"%i",pindex);
    6363                return NodalEnum;

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

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

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

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

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

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

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

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

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

    r13036 r13055  
    1717        char *lockfilename   = NULL;
    1818
    19         if(argc<2)_error_("Usage error: no solution requested");
     19        if(argc<2)_error2_("Usage error: no solution requested");
    2020        *solution_type=StringToEnumx(argv[1]);
    21         if(argc<3)_error_("Usage error: missing model name");
     21        if(argc<3)_error2_("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

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

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

    r13037 r13055  
    4242        PetscGetArgs(&argc,&args);
    4343        ierr = TaoInitialize(&argc,&args,(char*)0,"");
    44         if(ierr) _error_("Could not initialize Tao");
     44        if(ierr) _error2_("Could not initialize Tao");
    4545
    4646        /*Recover some parameters*/
    … …  
    7575        xdelete(&XU);
    7676
    77         user.J=xNewZeroInit<double>(maxiter+5);
     77        user.J=(double*)xcalloc((maxiter+5),sizeof(double));
    7878        user.femmodel=femmodel;
    7979        TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user);
    … …  
    185185#else
    186186void controltao_core(FemModel* femmodel){
    187         _error_("TAO not installed or PETSc version not supported");
     187        _error2_("TAO not installed or PETSc version not supported");
    188188}
    189189#endif //_HAVE_TAO_

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

    r13051 r13055  
    7272        if (xIsNan<IssmDouble>(res)){
    7373                _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f");
    74                 _error_("mechanical equilibrium convergence criterion is NaN!");
     74                _error2_("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)) _error_("convergence criterion is NaN!");
     98                if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error2_("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)) _error_("convergence criterion is NaN!");
     123                if (xIsNan<IssmDouble>(ndu) || xIsNan<IssmDouble>(nu)) _error2_("convergence criterion is NaN!");
    124124
    125125                //clean up

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

    r13036 r13055  
    3737        /*Check that gradient is clean*/
    3838        norm_inf=new_gradient->Norm(NORM_INF);
    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");
     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");
    4141
    4242        /*plug back into inputs: */

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

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

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

    r13036 r13055  
    4040#ifdef _HAVE_PETSC_
    4141        int ierr=PetscInitialize(&argc,&argv,(char*)0,""); 
    42         if(ierr) _error_("Could not initialize Petsc");
     42        if(ierr) _error2_("Could not initialize Petsc");
    4343#else
    4444#ifdef _HAVE_MPI_
    … …  
    122122        char *lockfilename   = NULL;
    123123
    124         if(argc<2)_error_("Usage error: missing model name");
     124        if(argc<2)_error2_("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

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

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

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

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

    r13036 r13055  
    104104                        }
    105105                        #else
    106                         _error_("ISSM was not compiled with thermal capabilities. Exiting");
     106                        _error2_("ISSM was not compiled with thermal capabilities. Exiting");
    107107                        #endif
    108108                }
    … …  
    113113                        diagnostic_core(femmodel);
    114114                        #else
    115                         _error_("ISSM was not compiled with diagnostic capabilities. Exiting");
     115                        _error2_("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                         _error_("ISSM was not compiled with grounding line migration capabilities. Exiting");
     131                        _error2_("ISSM was not compiled with grounding line migration capabilities. Exiting");
    132132                        #endif
    133133                }

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

    r13036 r13055  
    119119                        break;
    120120                default:
    121                         _error_("unknown norm !");
     121                        _error2_("unknown norm !");
    122122                        break;
    123123        }
    … …  
    150150        AX->GetSize(&AXM);
    151151
    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!");
     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!");
    154154
    155155        for(i=0;i<M;i++){
    … …  
    197197                        break;
    198198                default:
    199                         _error_("unknown insert mode!");
     199                        _error2_("unknown insert mode!");
    200200                        break;
    201201        }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    r13036 r13055  
    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                 _error_("Dimensions of partitioning vector incompatible with dimensions of input vector\n");
     37                _error2_("Dimensions of partitioning vector incompatible with dimensions of input vector\n");
    3838        }
    3939

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

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

  • issm/trunk-jpl/src/modules/matlab/Makefile.am

    r13046 r13055  
    11AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
    2 
    32EXEEXT=$(MATLABWRAPPEREXT)
    4 
    5 #Modules {{{1
     3#Bin programs {{{1
    64if MODULES
    7 lib_LTLIBRARIES =  AverageFilter.la\
    8                                BamgMesher.la\
    9                                    BamgConvertMesh.la\
    10                                    BamgTriangulate.la\
    11                                    Chaco.la\
    12                                    ContourToMesh.la\
    13                                    ContourToNodes.la\
    14                                    ElementConnectivity.la\
    15                                    EnumToString.la\
    16                                    Exp2Kml.la\
    17                                    HoleFiller.la\
    18                                    InternalFront.la\
    19                                    InterpFromGridToMesh.la\
    20                                    InterpFromMeshToMesh2d.la\
    21                                    InterpFromMeshToMesh3d.la\
    22                                    InterpFromMeshToGrid.la\
    23                                    InterpFromMesh2d.la\
    24                                    KMLFileRead.la\
    25                                    KMLMeshWrite.la\
    26                                    KMLOverlay.la\
    27                                    Kml2Exp.la\
    28                                    Kriging.la\
    29                                    Ll2xy.la\
    30                                    NodeConnectivity.la\
    31                                    MeshPartition.la\
    32                                    MeshProfileIntersection.la\
    33                                    PointCloudFindNeighbors.la\
    34                                    PropagateFlagsFromConnectivity.la\
    35                                    Shp2Kml.la\
    36                                    StringToEnum.la\
    37                                    TriaSearch.la\
    38                                    TriMesh.la\
    39                                    TriMeshProcessRifts.la\
    40                                    Scotch.la\
    41                                    Xy2ll.la
     5bin_PROGRAMS =  AverageFilter\
     6                                BamgMesher\
     7                                BamgConvertMesh\
     8                                BamgTriangulate\
     9                                Chaco\
     10                                ContourToMesh \
     11                                ContourToNodes \
     12                                ElementConnectivity\
     13                                EnumToString\
     14                                Exp2Kml \
     15                                HoleFiller \
     16                                InternalFront\
     17                                InterpFromGridToMesh \
     18                                InterpFromMeshToMesh2d \
     19                                InterpFromMeshToMesh3d \
     20                                InterpFromMeshToGrid \
     21                                InterpFromMesh2d \
     22                                KMLFileRead \
     23                                KMLMeshWrite \
     24                                KMLOverlay \
     25                                Kml2Exp \
     26                                Kriging \
     27                                Ll2xy \
     28                                NodeConnectivity \
     29                                MeshPartition\
     30                                MeshProfileIntersection\
     31                                PointCloudFindNeighbors\
     32                                PropagateFlagsFromConnectivity\
     33                                Scotch\
     34                                Shp2Kml\
     35                                StringToEnum\
     36                                TriaSearch\
     37                                TriMesh\
     38                                TriMeshProcessRifts\
     39                                Xy2ll
    4240endif
    4341#}}}
    4442#Flags and libraries {{{1
    45 if SHAREDLIBS
    46 deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
    47 else
    48 deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
    49 endif
    50 deps += $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB) ${MEXLIB}
     43LDADD = ../../c/libISSMCore.a ../../c/libISSMModules.a $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
    5144
    5245#Triangle library
    … …  
    5447
    5548#Matlab part
    56 AM_LDFLAGS = $(MEXLINK) -shrext ${EXEEXT} -module
    57 if VERSION
    58 AM_LDFLAGS +=
    59 else
    60 AM_LDFLAGS += -avoid-version
     49AM_LDFLAGS   = $(MEXLINK)
     50AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
     51LDADD       += $(MEXLIB) ../../c/libISSMMatlab.a
     52LDADD       += ../../c/libISSMCore.a
     53if CIRCULAR_DEPENDENCIES
     54LDADD       += $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
    6155endif
    62 if SHAREDLIBS
    63 deps += ../../c/libISSMMatlab.la
    64 else
    65 deps += ../../c/libISSMMatlab.a
    66 deps += ../../c/libISSMCore.a
    67 AM_LDFLAGS += --no-warnings
    68 endif
    69 
    70 AM_CXXFLAGS +=  -D_HAVE_MATLAB_MODULES_ -D_GNU_SOURCE -fPIC -fno-omit-frame-pointer -pthread
    71 
    72 ######################################################################################
    73 # Circular dependencies may not be necessary here.
    74 #deps += ../../c/libISSMCore.a
    75 if CIRCULAR_DEPENDENCIES
    76 deps += $(TRIANGLELIB) $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(SPOOLESLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(SHAPELIBLIB) $(GSLLIB)
    77 endif
    78 if SHAREDLIBS
    79 deps +=
    80 else
    81 deps += ../../c/libISSMModules.a ../../c/libISSMCore.a
    82 endif
    83 ######################################################################################
     56LDADD       += ../../c/libISSMModules.a
    8457
    8558#Optimization flags:
    8659AM_CXXFLAGS += $(CXXOPTFLAGS)
    8760#}}}
     61#Bin sources {{{1
     62AverageFilter_SOURCES = ../AverageFilter/AverageFilter.cpp\
     63                          ../AverageFilter/AverageFilter.h
    8864
    89 #Bin sources {{{1
    90 AverageFilter_la_SOURCES = ../AverageFilter/AverageFilter.cpp\
    91                           ../AverageFilter/AverageFilter.h
    92 AverageFilter_la_LIBADD = ${deps}
     65BamgMesher_SOURCES = ../BamgMesher/BamgMesher.cpp\
     66                                        ../BamgMesher/BamgMesher.h
    9367
    94 BamgMesher_la_SOURCES = ../BamgMesher/BamgMesher.cpp\
    95                                         ../BamgMesher/BamgMesher.h
    96 BamgMesher_la_LIBADD = ${deps}
     68BamgConvertMesh_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp\
     69                                        ../BamgConvertMesh/BamgConvertMesh.h
    9770
    98 BamgConvertMesh_la_SOURCES = ../BamgConvertMesh/BamgConvertMesh.cpp\
    99                                         ../BamgConvertMesh/BamgConvertMesh.h
    100 BamgConvertMesh_la_LIBADD = ${deps}
     71BamgTriangulate_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp\
     72                                                                  ../BamgTriangulate/BamgTriangulate.h
    10173
    102 BamgTriangulate_la_SOURCES = ../BamgTriangulate/BamgTriangulate.cpp\
    103                                                                   ../BamgTriangulate/BamgTriangulate.h
    104 BamgTriangulate_la_LIBADD = ${deps}
     74Chaco_SOURCES = ../Chaco/Chaco.cpp\
     75                                        ../Chaco/Chaco.h
    10576
    106 Chaco_la_SOURCES = ../Chaco/Chaco.cpp\
    107                                         ../Chaco/Chaco.h
    108 Chaco_la_LIBADD = ${deps}
     77ContourToMesh_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
     78                          ../ContourToMesh/ContourToMesh.h
    10979
    110 ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
    111                           ../ContourToMesh/ContourToMesh.h
    112 ContourToMesh_la_LIBADD = ${deps}
     80ContourToNodes_SOURCES = ../ContourToNodes/ContourToNodes.cpp\
     81                          ../ContourToNodes/ContourToNodes.h
    11382
    114 ContourToNodes_la_SOURCES = ../ContourToNodes/ContourToNodes.cpp\
    115                           ../ContourToNodes/ContourToNodes.h
    116 ContourToNodes_la_LIBADD = ${deps}
     83ElementConnectivity_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
     84                          ../ElementConnectivity/ElementConnectivity.h
    11785
    118 ElementConnectivity_la_SOURCES = ../ElementConnectivity/ElementConnectivity.cpp\
    119                           ../ElementConnectivity/ElementConnectivity.h
    120 ElementConnectivity_la_LIBADD = ${deps}
     86EnumToString_SOURCES = ../EnumToString/EnumToString.cpp\
     87                          ../EnumToString/EnumToString.h
    12188
    122 EnumToString_la_SOURCES = ../EnumToString/EnumToString.cpp\
    123                           ../EnumToString/EnumToString.h
    124 EnumToString_la_LIBADD = ${deps}
     89StringToEnum_SOURCES = ../StringToEnum/StringToEnum.cpp\
     90                          ../StringToEnum/StringToEnum.h
    12591
    126 StringToEnum_la_SOURCES = ../StringToEnum/StringToEnum.cpp\
    127                           ../StringToEnum/StringToEnum.h
    128 StringToEnum_la_LIBADD = ${deps}
     92HoleFiller_SOURCES = ../HoleFiller/HoleFiller.cpp\
     93                          ../HoleFiller/HoleFiller.h
    12994
    130 HoleFiller_la_SOURCES = ../HoleFiller/HoleFiller.cpp\
    131                           ../HoleFiller/HoleFiller.h
    132 HoleFiller_la_LIBADD = ${deps}
     95InternalFront_SOURCES = ../InternalFront/InternalFront.cpp\
     96                                                                                 ../InternalFront/InternalFront.h
    13397
    134 InternalFront_la_SOURCES = ../InternalFront/InternalFront.cpp\
    135                                                                                  ../InternalFront/InternalFront.h
    136 InternalFront_la_LIBADD = ${deps}
     98InterpFromGridToMesh_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
     99                          ../InterpFromGridToMesh/InterpFromGridToMesh.h
    137100
    138 InterpFromGridToMesh_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp\
    139                           ../InterpFromGridToMesh/InterpFromGridToMesh.h
    140 InterpFromGridToMesh_la_LIBADD = ${deps}
     101InterpFromMeshToMesh2d_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
     102                                                        ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
    141103
    142 InterpFromMeshToMesh2d_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
    143                                                         ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h
    144 InterpFromMeshToMesh2d_la_LIBADD = ${deps}
     104InterpFromMeshToMesh3d_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\
     105                                                                        ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
    145106
    146 InterpFromMeshToMesh3d_la_SOURCES = ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\
    147                                                                         ../InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h
    148 InterpFromMeshToMesh3d_la_LIBADD = ${deps}
     107InterpFromMeshToGrid_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\
     108                                                                        ../InterpFromMeshToGrid/InterpFromMeshToGrid.h
    149109
    150 InterpFromMeshToGrid_la_SOURCES = ../InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\
    151                                                                         ../InterpFromMeshToGrid/InterpFromMeshToGrid.h
    152 InterpFromMeshToGrid_la_LIBADD = ${deps}
     110InterpFromMesh2d_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp\
     111                                                                        ../InterpFromMesh2d/InterpFromMesh2d.h
    153112
    154 InterpFromMesh2d_la_SOURCES = ../InterpFromMesh2d/InterpFromMesh2d.cpp\
    155                                                                         ../InterpFromMesh2d/InterpFromMesh2d.h
    156 InterpFromMesh2d_la_LIBADD = ${deps}
     113KMLFileRead_SOURCES = ../KMLFileRead/KMLFileRead.cpp\
     114                          ../KMLFileRead/KMLFileRead.h
    157115
    158 KMLFileRead_la_SOURCES = ../KMLFileRead/KMLFileRead.cpp\
    159                           ../KMLFileRead/KMLFileRead.h
    160 KMLFileRead_la_LIBADD = ${deps}
     116KMLMeshWrite_SOURCES = ../KMLMeshWrite/KMLMeshWrite.cpp\
     117                          ../KMLMeshWrite/KMLMeshWrite.h
    161118
    162 KMLMeshWrite_la_SOURCES = ../KMLMeshWrite/KMLMeshWrite.cpp\
    163                           ../KMLMeshWrite/KMLMeshWrite.h
    164 KMLMeshWrite_la_LIBADD = ${deps}
     119KMLOverlay_SOURCES = ../KMLOverlay/KMLOverlay.cpp\
     120                          ../KMLOverlay/KMLOverlay.h
    165121
    166 KMLOverlay_la_SOURCES = ../KMLOverlay/KMLOverlay.cpp\
    167                           ../KMLOverlay/KMLOverlay.h
    168 KMLOverlay_la_LIBADD = ${deps}
     122Xy2ll_SOURCES = ../Xy2ll/Xy2ll.cpp\
     123                          ../Xy2ll/Xy2ll.h
    169124
    170 Xy2ll_la_SOURCES = ../Xy2ll/Xy2ll.cpp\
    171                           ../Xy2ll/Xy2ll.h
    172 Xy2ll_la_LIBADD = ${deps}
     125Ll2xy_SOURCES = ../Ll2xy/Ll2xy.cpp\
     126                          ../Ll2xy/Ll2xy.h
    173127
    174 Ll2xy_la_SOURCES = ../Ll2xy/Ll2xy.cpp\
    175                           ../Ll2xy/Ll2xy.h
    176 Ll2xy_la_LIBADD = ${deps}
     128Exp2Kml_SOURCES = ../Exp2Kml/Exp2Kml.cpp\
     129                          ../Exp2Kml/Exp2Kml.h
    177130
    178 Exp2Kml_la_SOURCES = ../Exp2Kml/Exp2Kml.cpp\
    179                           ../Exp2Kml/Exp2Kml.h
    180 Exp2Kml_la_LIBADD = ${deps}
     131Kml2Exp_SOURCES = ../Kml2Exp/Kml2Exp.cpp\
     132                          ../Kml2Exp/Kml2Exp.h
    181133
    182 Kml2Exp_la_SOURCES = ../Kml2Exp/Kml2Exp.cpp\
    183                           ../Kml2Exp/Kml2Exp.h
    184 Kml2Exp_la_LIBADD = ${deps}
     134Kriging_SOURCES = ../Kriging/Kriging.cpp\
     135                                                ../Kriging/Kriging.h
    185136
    186 Kriging_la_SOURCES = ../Kriging/Kriging.cpp\
    187                                                 ../Kriging/Kriging.h
    188 Kriging_la_LIBADD = ${deps}
     137MeshPartition_SOURCES = ../MeshPartition/MeshPartition.cpp\
     138                          ../MeshPartition/MeshPartition.h
    189139
    190 MeshPartition_la_SOURCES = ../MeshPartition/MeshPartition.cpp\
    191                           ../MeshPartition/MeshPartition.h
    192 MeshPartition_la_LIBADD = ${deps}
     140MeshProfileIntersection_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
     141                          ../MeshProfileIntersection/MeshProfileIntersection.h
    193142
    194 MeshProfileIntersection_la_SOURCES = ../MeshProfileIntersection/MeshProfileIntersection.cpp\
    195                           ../MeshProfileIntersection/MeshProfileIntersection.h
    196 MeshProfileIntersection_la_LIBADD = ${deps}
     143NodeConnectivity_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
     144                                                                                ../NodeConnectivity/NodeConnectivity.h
    197145
    198 NodeConnectivity_la_SOURCES = ../NodeConnectivity/NodeConnectivity.cpp\
    199                                                                                 ../NodeConnectivity/NodeConnectivity.h
    200 NodeConnectivity_la_LIBADD = ${deps}
     146PointCloudFindNeighbors_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
     147                          ../PointCloudFindNeighbors/PointCloudFindNeighbors.h
    201148
    202 PointCloudFindNeighbors_la_SOURCES = ../PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
    203                           ../PointCloudFindNeighbors/PointCloudFindNeighbors.h
    204 PointCloudFindNeighbors_la_LIBADD = ${deps}
     149PropagateFlagsFromConnectivity_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\
     150                          ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
    205151
    206 PropagateFlagsFromConnectivity_la_SOURCES = ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\
    207                           ../PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h
    208 PropagateFlagsFromConnectivity_la_LIBADD = ${deps}
     152Scotch_SOURCES = ../Scotch/Scotch.cpp\
     153                          ../Scotch/Scotch.h
    209154
    210 Scotch_la_SOURCES = ../Scotch/Scotch.cpp\
    211                     ../Scotch/Scotch.h
    212 Scotch_la_LIBADD = ${deps} $(SCOTCHLIB)
     155Shp2Kml_SOURCES = ../Shp2Kml/Shp2Kml.cpp\
     156                          ../Shp2Kml/Shp2Kml.h
    213157
    214 Shp2Kml_la_SOURCES = ../Shp2Kml/Shp2Kml.cpp\
    215                      ../Shp2Kml/Shp2Kml.h
    216 Shp2Kml_la_LIBADD = ${deps}
     158TriaSearch_SOURCES = ../TriaSearch/TriaSearch.cpp\
     159                          ../TriaSearch/TriaSearch.h
    217160
    218 TriaSearch_la_SOURCES = ../TriaSearch/TriaSearch.cpp\
    219                           ../TriaSearch/TriaSearch.h
    220 TriaSearch_la_LIBADD = ${deps}
     161TriMesh_SOURCES = ../TriMesh/TriMesh.cpp\
     162                          ../TriMesh/TriMesh.h
    221163
    222 TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp\
    223                      ../TriMesh/TriMesh.h
    224 TriMesh_la_LIBADD = ${deps} $(TRIANGLELIB)
    225 
    226 TriMeshProcessRifts_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp\
     164TriMeshProcessRifts_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp\
    227165                          ../TriMeshProcessRifts/TriMeshProcessRifts.h
    228 TriMeshProcessRifts_la_LIBADD = ${deps}
    229166#}}}
Note: See TracChangeset for help on using the changeset viewer.