Index: /issm/trunk-jpl/configure.ac =================================================================== --- /issm/trunk-jpl/configure.ac (revision 13055) +++ /issm/trunk-jpl/configure.ac (revision 13056) @@ -22,9 +22,7 @@ AM_PROG_CC_C_O AM_PROG_AR -AC_PROG_RANLIB +AC_PROG_RANLIB -# To produce shared libraries uncomment LT_INIT. In theory, Libtool can be initialized -# even if all linking is static, since, if not shared libraries are to be produce, libtool -# will act simply as a wrapper around AR and Ranlib. +#Libtool #LT_INIT Index: /issm/trunk-jpl/m4/issm_options.m4 =================================================================== --- /issm/trunk-jpl/m4/issm_options.m4 (revision 13055) +++ /issm/trunk-jpl/m4/issm_options.m4 (revision 13056) @@ -15,9 +15,17 @@ dnl }}} dnl shared build {{{ - AC_ARG_ENABLE([shared], dnl feature - AS_HELP_STRING([--enable-shared], [produce libISSM.so.0]), dnl help string - [enable_shared=$enableval], dnl action if given - [enable_shared=no]) dnl action if not given - AM_CONDITIONAL([SHARED], [test $enable_shared = yes]) + AC_ARG_ENABLE([sharedlibs], dnl feature + AS_HELP_STRING([--enable-sharedlibs], [produce libISSM.so.0]), dnl help string + [enable_sharedlibs=$enableval], dnl action if given + [enable_sharedlibs=no]) dnl action if not given + AM_CONDITIONAL([SHAREDLIBS], [test x$enable_sharedlibs = xyes]) + dnl }}} + + dnl shared build {{{ + AC_ARG_ENABLE([version], dnl feature + AS_HELP_STRING([--enable-version], [produce libISSM.so.0]), dnl help string + [enable_version=$enableval], dnl action if given + [enable_version=no]) dnl action if not given + AM_CONDITIONAL([VERSION], [test x$enable_VERSION = xyes]) dnl }}} @@ -589,5 +597,5 @@ ;; esac - + METISINCL=-I"$METIS_ROOT/include" AC_DEFINE([_METIS_VERSION_],[5],[ Metis version number]) @@ -606,5 +614,5 @@ AC_MSG_CHECKING(for mpi) AC_ARG_WITH([mpi-lib], - AS_HELP_STRING([--with-mpi-lib = otions],[mpi options, for ex: "-L$MPIROOT -lmpich]), + AS_HELP_STRING([--with-mpi-lib = options],[mpi options, for ex: "-L$MPIROOT -lmpich]), [MPILIB=$withval],[MPILIB=""]) @@ -620,5 +628,5 @@ else HAVE_MPI=yes - MPIINCL=-I"$MPI_INCLUDE/" + MPIINCL=-I"$MPI_INCLUDE" AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src]) AC_DEFINE([HAVE_MPI],[1],[Mpi Flag for Dakota (DO NOT REMOVE)]) Index: /issm/trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 13056) @@ -133,5 +133,5 @@ vector::iterator object; - if(this==NULL)_error2_("trying to echo a NULL dataset"); + if(this==NULL)_error_("trying to echo a NULL dataset"); _pprintLine_("DataSet echo: " << objects.size() << " objects"); @@ -150,5 +150,5 @@ vector::iterator object; - if(this==NULL)_error2_("trying to echo a NULL dataset"); + if(this==NULL)_error_("trying to echo a NULL dataset"); _pprintLine_("DataSet echo: " << objects.size() << " objects"); @@ -194,9 +194,9 @@ _assert_(this); - if(!sorted)_error2_("trying to binary search on a non-sorted dataset!"); + if(!sorted)_error_("trying to binary search on a non-sorted dataset!"); /*Carry out a binary search on the sorted_ids: */ if(!binary_search(&id_offset,eid, sorted_ids,objects.size())){ - _error2_("could not find object with id " << eid << " in DataSet " << EnumToStringx(enum_type)); + _error_("could not find object with id " << eid << " in DataSet " << EnumToStringx(enum_type)); } @@ -259,6 +259,6 @@ /*Only sort if we are not already sorted: */ if(!sorted){ - _error2_("not implemented yet!"); - } -} -/*}}}*/ + _error_("not implemented yet!"); + } +} +/*}}}*/ Index: /issm/trunk-jpl/src/c/Container/Elements.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 13056) @@ -203,5 +203,5 @@ /*see what the first element of this partition has in stock (this is common to all partitions)*/ if(my_rank==minrank){ - if(this->Size()==0) _error2_("Cannot write results because there is no element??"); + if(this->Size()==0) _error_("Cannot write results because there is no element??"); Element* element=(Element*)this->GetObjectByOffset(0); element->ListResultsInfo(&resultsenums,&resultssizes,&resultstimes,&resultssteps,&numberofresults); @@ -232,5 +232,5 @@ if(resultssizes[i]==P1Enum) vectorsize=numberofvertices; else if(resultssizes[i]==P0Enum) vectorsize=numberofelements; - else _error2_("Unkown result size: " << EnumToStringx(resultssizes[i])); + else _error_("Unkown result size: " << EnumToStringx(resultssizes[i])); vector=new Vector(vectorsize); Index: /issm/trunk-jpl/src/c/Container/Inputs.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 13056) @@ -57,5 +57,5 @@ /*we could not find an input with the correct enum type. No defaults values were provided, * error out: */ - _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")"); + _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")"); } @@ -85,5 +85,5 @@ /*we could not find an input with the correct enum type. No defaults values were provided, * error out: */ - _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")"); + _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")"); } @@ -113,5 +113,5 @@ /*we could not find an input with the correct enum type. No defaults values were provided, * error out: */ - _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")"); + _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")"); } @@ -141,5 +141,5 @@ /*we could not find an input with the correct enum type. No defaults values were provided, * error out: */ - _error2_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")"); + _error_("could not find input with enum type " << enum_type << " (" << EnumToStringx(enum_type) << ")"); } @@ -213,5 +213,5 @@ /*some checks: */ - if(!constrain_input) _error2_("input " << EnumToStringx(constrain_enum) << " could not be found!"); + if(!constrain_input) _error_("input " << EnumToStringx(constrain_enum) << " could not be found!"); /*Apply ContrainMin: */ @@ -254,5 +254,5 @@ } else{ - _error2_("Input " << EnumToStringx(enumtype) << " not found"); + _error_("Input " << EnumToStringx(enumtype) << " not found"); } @@ -275,5 +275,5 @@ } else{ - _error2_("Input " << EnumToStringx(enumtype) << " not found"); + _error_("Input " << EnumToStringx(enumtype) << " not found"); } @@ -296,5 +296,5 @@ } else{ - _error2_("Input " << EnumToStringx(enumtype) << " not found"); + _error_("Input " << EnumToStringx(enumtype) << " not found"); } @@ -317,5 +317,5 @@ } else{ - _error2_("Input " << EnumToStringx(enumtype) << " not found"); + _error_("Input " << EnumToStringx(enumtype) << " not found"); } @@ -369,5 +369,5 @@ /*Make a copy of the original input: */ original=(Input*)this->GetInput(original_enum); - if(!original)_error2_("could not find input with enum: " << EnumToStringx(original_enum)); + if(!original)_error_("could not find input with enum: " << EnumToStringx(original_enum)); copy=(Input*)original->copy(); @@ -416,6 +416,6 @@ /*some checks: */ - if(!xinput) _error2_("input " << EnumToStringx(MeshXEnum) << " could not be found!"); - if(!yinput) _error2_("input " << EnumToStringx(MeshYEnum) << " could not be found!"); + if(!xinput) _error_("input " << EnumToStringx(MeshXEnum) << " could not be found!"); + if(!yinput) _error_("input " << EnumToStringx(MeshYEnum) << " could not be found!"); /*Apply AXPY: */ Index: /issm/trunk-jpl/src/c/Container/Observations.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Observations.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/Container/Observations.cpp (revision 13056) @@ -58,10 +58,10 @@ options->Get(&maxtrimming,"maxtrimming",+1.e+21); options->Get(&minspacing,"minspacing",0.01); - if(minspacing<=0) _error2_("minspacing must > 0"); + if(minspacing<=0) _error_("minspacing must > 0"); /*Get Minimum box size*/ if(options->GetOption("boxlength")){ options->Get(&minlength,"boxlength"); - if(minlength<=0)_error2_("boxlength should be a positive number"); + if(minlength<=0)_error_("boxlength should be a positive number"); maxdepth=int(log(max(xmax-xmin,ymax-ymin)/minlength +1)/log(2.0)); } @@ -383,5 +383,5 @@ SolverxSeq(&GinvZ, Gamma,obs,n_obs); // Gamma^-1 Z #else - _error2_("GSL is required"); + _error_("GSL is required"); #endif Index: /issm/trunk-jpl/src/c/Container/Options.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Options.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/Container/Options.cpp (revision 13056) @@ -47,8 +47,8 @@ /*Also, check the option name*/ - if(!in_option->name) _error2_("input option has an empty name"); - if(strchr(in_option->name,'.')) _error2_("Option \"" << in_option->name << "\" has a protected character \".\""); - if(strchr(in_option->name,'[')) _error2_("Option \"" << in_option->name << "\" has a protected character \"[\""); - if(strchr(in_option->name,']')) _error2_("Option \"" << in_option->name << "\" has a protected character \"]\""); + if(!in_option->name) _error_("input option has an empty name"); + if(strchr(in_option->name,'.')) _error_("Option \"" << in_option->name << "\" has a protected character \".\""); + if(strchr(in_option->name,'[')) _error_("Option \"" << in_option->name << "\" has a protected character \"[\""); + if(strchr(in_option->name,']')) _error_("Option \"" << in_option->name << "\" has a protected character \"]\""); /*Finally, check that no option of the same name already exists in the dataset*/ @@ -57,5 +57,5 @@ option=(Option*)(*object); if (!strcmp(option->name,in_option->name)){ - _error2_("Options \"" << in_option->name << "\" found multiple times"); + _error_("Options \"" << in_option->name << "\" found multiple times"); break; } @@ -83,5 +83,5 @@ /*Else, the Option does not exist, no default provided*/ else{ - _error2_("option of name \"" << name << "\" not found, and no default value has been provided"); + _error_("option of name \"" << name << "\" not found, and no default value has been provided"); } } @@ -121,5 +121,5 @@ /*Else, the Option does not exist, no default provided*/ else{ - _error2_("option of name \"" << name << "\" not found, and no default value has been provided"); + _error_("option of name \"" << name << "\" not found, and no default value has been provided"); } } @@ -159,5 +159,5 @@ /*Else, the Option does not exist, no default provided*/ else{ - _error2_("option of name \"" << name << "\" not found, and no default value has been provided"); + _error_("option of name \"" << name << "\" not found, and no default value has been provided"); } } @@ -199,5 +199,5 @@ /*Else, the Option does not exist, no default provided*/ else{ - _error2_("option of name \"" << name << "\" not found, and no default value has been provided"); + _error_("option of name \"" << name << "\" not found, and no default value has been provided"); } @@ -264,5 +264,5 @@ /*Else: not supported*/ else{ - _error2_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum())); + _error_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum())); } } @@ -290,5 +290,5 @@ /*Else, the Option does not exist, no default provided*/ else{ - _error2_("option of name \"" << name << "\" not found, and no default value has been provided"); + _error_("option of name \"" << name << "\" not found, and no default value has been provided"); } } @@ -324,5 +324,5 @@ /*Else: not supported*/ else{ - _error2_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum())); + _error_("Cannot recover field \"" << name << "\" for an option of type " << EnumToStringx(option->ObjectEnum())); } } Index: /issm/trunk-jpl/src/c/Container/Parameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Parameters.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/Container/Parameters.cpp (revision 13056) @@ -65,5 +65,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -82,5 +82,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -99,5 +99,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -116,5 +116,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -133,5 +133,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } @@ -151,5 +151,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } @@ -169,5 +169,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } @@ -187,5 +187,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } @@ -205,5 +205,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } @@ -223,5 +223,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } @@ -241,5 +241,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -258,5 +258,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } @@ -276,5 +276,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } @@ -294,5 +294,5 @@ } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ Index: /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 13055) +++ /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 13056) @@ -107,4 +107,6 @@ #Add header to pythonenum file{{{ cat < $ISSM_DIR/src/m/enum/EnumDefinitions.py +from StringToEnum import StringToEnum + """ @@ -166,5 +168,5 @@ """ - return StringToEnum('$NAME') + return StringToEnum('$NAME')[0] END Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 13055) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 13056) @@ -6,20 +6,20 @@ lib_LIBRARIES = libISSMCore.a libISSMOverload.a -#if SHARED -#lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la -#endif +if SHAREDLIBS +lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la +endif if PYTHON lib_LIBRARIES += libISSMPython.a endif if MATLAB -#if SHARED -#lib_LTLIBRARIES += libISSMMatlab.la -#endif +if SHAREDLIBS +lib_LTLIBRARIES += libISSMMatlab.la +endif lib_LIBRARIES += libISSMMatlab.a endif if MODULES -#if SHARED -#lib_LTLIBRARIES += libISSMModules.la -#endif +if SHAREDLIBS +lib_LTLIBRARIES += libISSMModules.la +endif lib_LIBRARIES += libISSMModules.a endif @@ -1011,21 +1011,21 @@ libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS) -#if SHARED -#libISSM_la_SOURCES = solutions/issm.cpp -#libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la -# -#libISSMCore_la_SOURCES = $(issm_sources) -#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) -# -#libISSMOverload_la_SOURCES = ./shared/String/stricmp.c -#endif +if SHAREDLIBS +libISSM_la_SOURCES = solutions/issm.cpp +libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la + +libISSMCore_la_SOURCES = $(issm_sources) +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) + +libISSMOverload_la_SOURCES = ./shared/String/stricmp.c +endif if MODULES -#if SHARED -#libISSMModules_la_SOURCES = $(module_sources) -#libISSMModules_la_SOURCES += $(bamg_sources) -#libISSMModules_la_SOURCES += $(kriging_sources) -#libISSMModules_la_SOURCES += $(kml_sources) -#endif +if SHAREDLIBS +libISSMModules_la_SOURCES = $(module_sources) +libISSMModules_la_SOURCES += $(bamg_sources) +libISSMModules_la_SOURCES += $(kriging_sources) +libISSMModules_la_SOURCES += $(kml_sources) +endif libISSMModules_a_SOURCES = $(module_sources) libISSMModules_a_SOURCES += $(bamg_sources) @@ -1033,4 +1033,5 @@ libISSMModules_a_SOURCES += $(kml_sources) libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS) +libISSMModules_a_LIBADD = ./libISSMCore.a endif @@ -1041,11 +1042,16 @@ if MATLAB -#if SHARED -#libISSMMatlab_la_SOURCES = $(matlab_sources) -#endif +if SHAREDLIBS +libISSMMatlab_la_SOURCES = $(matlab_sources) +endif libISSMMatlab_a_SOURCES = $(matlab_sources) libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS) endif +if VERSION +AM_LDFLAGS = +else +AM_LDFLAGS = -avoid-version +endif #}}} #Overload library, to overload any non-standard symbols. {{{ Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 13056) @@ -143,5 +143,5 @@ else this->sdoflist=NULL; } - else _error2_("set of enum type " << EnumToStringx(setenum) << " not supported yet!"); + else _error_("set of enum type " << EnumToStringx(setenum) << " not supported yet!"); } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Hook.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Hook.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/Hook.cpp (revision 13056) @@ -185,5 +185,5 @@ this->objects[i]=(Object*)dataset->GetObjectById(this->offsets+i,this->ids[i]); //remember the offset for later on. /*check the id is correct!: */ - if (this->objects[i]->Id()!=this->ids[i]) _error2_("wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << " in resolved pointer!"); + if (this->objects[i]->Id()!=this->ids[i]) _error_("wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << " in resolved pointer!"); } } @@ -194,8 +194,8 @@ /*first, check that we only have one T object in our object list: */ - if (this->num!=1) _error2_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n"); + if (this->num!=1) _error_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n"); /*check NULL: */ - if (this->objects==NULL) _error2_("hook is not pointing to any object, objects pointer is NULL"); + if (this->objects==NULL) _error_("hook is not pointing to any object, objects pointer is NULL"); return *objects; @@ -246,9 +246,9 @@ /*Else, check that we are requesting a half of num*/ - if (numindices>this->num) _error2_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects"); + if (numindices>this->num) _error_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects"); /*go pickup the correct objects, ids and offsets :*/ output->num=numindices; - if(output->num<1) _error2_("Trying to spawn an empty ElementProperties!"); + if(output->num<1) _error_("Trying to spawn an empty ElementProperties!"); output->objects=xNew(output->num); Index: /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp (revision 13056) @@ -119,5 +119,5 @@ } else{ - _error2_("Penta not supported yet"); + _error_("Penta not supported yet"); } @@ -159,5 +159,5 @@ } else{ - _error2_("Tria not supported yet"); + _error_("Tria not supported yet"); } @@ -221,5 +221,5 @@ } else{ - _error2_("Tria not supported yet (user provided indices " << index1 << " " << index2 << " " << index3 << " " << index4 << ")"); + _error_("Tria not supported yet (user provided indices " << index1 << " " << index2 << " " << index3 << " " << index4 << ")"); } @@ -340,5 +340,5 @@ break; default: - _error2_("vertex index should be in [0 5]"); + _error_("vertex index should be in [0 5]"); } @@ -359,5 +359,5 @@ } else{ - _error2_("Tria not supported yet"); + _error_("Tria not supported yet"); } Index: /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 13056) @@ -80,5 +80,5 @@ } else - _error2_("The 2 indices provided are not supported yet (user provided " << index1 << " and " << index2 << ")"); + _error_("The 2 indices provided are not supported yet (user provided " << index1 << " and " << index2 << ")"); /*Initialize static fields as undefined*/ @@ -178,5 +178,5 @@ } else - _error2_("The 2 indices provided are not supported yet (user provided " << index1 << " and " << index2 << ")"); + _error_("The 2 indices provided are not supported yet (user provided " << index1 << " and " << index2 << ")"); } @@ -241,5 +241,5 @@ break; default: - _error2_("vertex index should be in [0 2]"); + _error_("vertex index should be in [0 2]"); } Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 13056) @@ -112,20 +112,20 @@ /*}}}*/ /*FUNCTION BoolInput::GetInputValue(int* pvalue){{{*/ -void BoolInput::GetInputValue(int* pvalue){_error2_("not supported yet!");} +void BoolInput::GetInputValue(int* pvalue){_error_("not supported yet!");} /*}}}*/ /*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue){{{*/ -void BoolInput::GetInputValue(IssmDouble* pvalue){_error2_("not supported yet!");} +void BoolInput::GetInputValue(IssmDouble* pvalue){_error_("not supported yet!");} /*}}}*/ /*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/ -void BoolInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not supported yet!");} +void BoolInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION BoolInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ -void BoolInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not supported yet!");} +void BoolInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");} +void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");} +void BoolInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION BoolInput::ChangeEnum{{{*/ @@ -161,5 +161,5 @@ default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } @@ -176,5 +176,5 @@ void BoolInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_("not supporte yet!"); + _error_("not supporte yet!"); } @@ -183,5 +183,5 @@ void BoolInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - _error2_("not supported yet!"); + _error_("not supported yet!"); } Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h (revision 13056) @@ -37,10 +37,10 @@ int InstanceEnum(); Input* SpawnTriaInput(int* indices); - Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");}; - Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");}; - Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");}; + Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; + Input* PointwiseMin(Input* inputB){_error_("not implemented yet");}; + Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; ElementResult* SpawnResult(int step, IssmDouble time); void Configure(Parameters* parameters); - void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");}; + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; /*}}}*/ /*numerics: {{{*/ @@ -50,32 +50,32 @@ void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); - void GetInputAverage(IssmDouble* pvalue){_error2_("not implemented yet");}; - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; + void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");}; + void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype); void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters); - void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");}; - IssmDouble InfinityNorm(void){_error2_("InfinityNorm not implemented for booleans");}; - IssmDouble Max(void){_error2_("Max not implemented for booleans");}; - IssmDouble MaxAbs(void){_error2_("Max not implemented for booleans");}; - IssmDouble Min(void){_error2_("Min not implemented for booleans");}; - IssmDouble MinAbs(void){_error2_("Min not implemented for booleans");}; + void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");}; + IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for booleans");}; + IssmDouble Max(void){_error_("Max not implemented for booleans");}; + IssmDouble MaxAbs(void){_error_("Max not implemented for booleans");}; + IssmDouble Min(void){_error_("Min not implemented for booleans");}; + IssmDouble MinAbs(void){_error_("Min not implemented for booleans");}; void Scale(IssmDouble scale_factor); - void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");}; + void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");}; void AXPY(Input* xinput,IssmDouble scalar); - void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error2_("Constrain not implemented for booleans");}; + void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error_("Constrain not implemented for booleans");}; void Extrude(void); - void VerticallyIntegrate(Input* thickness_input){_error2_("not supported yet");}; + void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13056) @@ -48,5 +48,5 @@ break; default: - _error2_("Input of Enum " << EnumToStringx(enum_input) << " not supported yet by ControlInput"); + _error_("Input of Enum " << EnumToStringx(enum_input) << " not supported yet by ControlInput"); } gradient =NULL; @@ -152,5 +152,5 @@ /*FUNCTION ControlInput::ScaleGradient{{{*/ void ControlInput::ScaleGradient(IssmDouble scaling_factor){ - if(!gradient) _error2_("Gradient of ControlInput " << EnumToStringx(enum_type) << " not found"); + if(!gradient) _error_("Gradient of ControlInput " << EnumToStringx(enum_type) << " not found"); gradient->Scale(scaling_factor); }/*}}}*/ @@ -170,5 +170,5 @@ break; default: - _error2_("more than 3 controls not implemented yet (Gradient " << this->control_id << " was requested). EnumDefinitions.h needs to be updated."); + _error_("more than 3 controls not implemented yet (Gradient " << this->control_id << " was requested). EnumDefinitions.h needs to be updated."); } @@ -221,5 +221,5 @@ } else{ - _error2_("Data " << data << " not supported yet"); + _error_("Data " << data << " not supported yet"); } }/*}}}*/ @@ -258,5 +258,5 @@ /*FUNCTION ControlInput::SaveValue{{{*/ void ControlInput::SaveValue(void){ - if(!values) _error2_("Values of " << EnumToStringx(this->enum_type) << " not found"); + if(!values) _error_("Values of " << EnumToStringx(this->enum_type) << " not found"); if(savedvalues) delete this->savedvalues; @@ -265,6 +265,6 @@ /*FUNCTION ControlInput::UpdateValue{{{*/ void ControlInput::UpdateValue(IssmDouble scalar){ - if(!gradient) _error2_("Gradient of " << EnumToStringx(this->enum_type) << " not found"); - if(!savedvalues) _error2_("Values of " << EnumToStringx(this->enum_type) << " not found"); + if(!gradient) _error_("Gradient of " << EnumToStringx(this->enum_type) << " not found"); + if(!savedvalues) _error_("Values of " << EnumToStringx(this->enum_type) << " not found"); if(values) delete this->values; Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h (revision 13056) @@ -41,9 +41,9 @@ int InstanceEnum(); Input* SpawnTriaInput(int* indices); - Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");}; - Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");}; - Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");}; + Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; + Input* PointwiseMin(Input* inputB){_error_("not implemented yet");}; + Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; ElementResult* SpawnResult(int step, IssmDouble time); - void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");}; + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); /*}}}*/ @@ -55,36 +55,36 @@ void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); void GetInputAverage(IssmDouble* pvalue); - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void ChangeEnum(int newenumtype){_error2_("not implemented yet");}; - void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error2_("not implemented yet");}; - void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");}; - void Scale(IssmDouble scale_factor){_error2_("not implemented yet");}; - void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");}; - void AXPY(Input* xinput,IssmDouble scalar){_error2_("not implemented yet");}; + void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void ChangeEnum(int newenumtype){_error_("not implemented yet");}; + void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error_("not implemented yet");}; + void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");}; + void Scale(IssmDouble scale_factor){_error_("not implemented yet");}; + void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");}; + void AXPY(Input* xinput,IssmDouble scalar){_error_("not implemented yet");}; void Constrain(void); void Constrain(IssmDouble min,IssmDouble max); - IssmDouble InfinityNorm(void){_error2_("not implemented yet");}; - IssmDouble Max(void){_error2_("not implemented yet");}; - IssmDouble MaxAbs(void){_error2_("not implemented yet");}; - IssmDouble Min(void){_error2_("not implemented yet");}; - IssmDouble MinAbs(void){_error2_("not implemented yet");}; + IssmDouble InfinityNorm(void){_error_("not implemented yet");}; + IssmDouble Max(void){_error_("not implemented yet");}; + IssmDouble MaxAbs(void){_error_("not implemented yet");}; + IssmDouble Min(void){_error_("not implemented yet");}; + IssmDouble MinAbs(void){_error_("not implemented yet");}; void Extrude(void); void VerticallyIntegrate(Input* thickness_input); void GetVectorFromInputs(Vector* vector,int* doflist,const char* data); void GetVectorFromInputs(Vector* vector,int* doflist); - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("not implemented yet");}; + void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not implemented yet");}; ElementResult* SpawnGradient(int step, IssmDouble time); void GetGradient(Vector* gradient_vec,int* doflist); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13056) @@ -115,5 +115,5 @@ /*Get requested input within dataset*/ - if(index<0 || index > inputs->Size()-1) _error2_("index requested (" << index << ") exceeds dataset size (" << inputs->Size() << ")"); + if(index<0 || index > inputs->Size()-1) _error_("index requested (" << index << ") exceeds dataset size (" << inputs->Size() << ")"); Input* input=(Input*)this->inputs->GetObjectByOffset(index); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h (revision 13056) @@ -37,54 +37,54 @@ int InstanceEnum(); Input* SpawnTriaInput(int* indices); - Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");}; - Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");}; - Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");}; - ElementResult* SpawnResult(int step, IssmDouble time){_error2_("not implemented yet");}; - void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");}; + Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; + Input* PointwiseMin(Input* inputB){_error_("not implemented yet");}; + Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; + ElementResult* SpawnResult(int step, IssmDouble time){_error_("not implemented yet");}; + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); /*}}}*/ /*numerics: {{{*/ - void GetInputValue(bool* pvalue){_error2_("not implemented yet");}; - void GetInputValue(int* pvalue){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; + void GetInputValue(bool* pvalue){_error_("not implemented yet");}; + void GetInputValue(int* pvalue){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetInputAverage(IssmDouble* pvalue){_error2_("not implemented yet");}; - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void ChangeEnum(int newenumtype){_error2_("not implemented yet");}; - void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error2_("not implemented yet");}; - void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");}; - void Scale(IssmDouble scale_factor){_error2_("not implemented yet");}; - void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");}; - void AXPY(Input* xinput,IssmDouble scalar){_error2_("not implemented yet");}; - void Constrain(void){_error2_("not implemented yet");}; - void Constrain(IssmDouble min,IssmDouble max){_error2_("not implemented yet");}; - IssmDouble InfinityNorm(void){_error2_("not implemented yet");}; - IssmDouble Max(void){_error2_("not implemented yet");}; - IssmDouble MaxAbs(void){_error2_("not implemented yet");}; - IssmDouble Min(void){_error2_("not implemented yet");}; - IssmDouble MinAbs(void){_error2_("not implemented yet");}; - void Extrude(void){_error2_("not implemented yet");}; - void VerticallyIntegrate(Input* thickness_input){_error2_("not implemented yet");}; - void GetVectorFromInputs(Vector* vector,int* doflist){_error2_("not implemented yet");}; - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("not implemented yet");}; - ElementResult* SpawnGradient(int step, IssmDouble time){_error2_("not implemented yet");}; - void GetGradient(Vector* gradient_vec,int* doflist){_error2_("not implemented yet");}; - void ScaleGradient(IssmDouble scale){_error2_("not implemented yet");}; - void SetGradient(Input* gradient_in){_error2_("not implemented yet");}; - void UpdateValue(IssmDouble scalar){_error2_("not implemented yet");}; - void SaveValue(void){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");}; + void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void ChangeEnum(int newenumtype){_error_("not implemented yet");}; + void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters){_error_("not implemented yet");}; + void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");}; + void Scale(IssmDouble scale_factor){_error_("not implemented yet");}; + void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");}; + void AXPY(Input* xinput,IssmDouble scalar){_error_("not implemented yet");}; + void Constrain(void){_error_("not implemented yet");}; + void Constrain(IssmDouble min,IssmDouble max){_error_("not implemented yet");}; + IssmDouble InfinityNorm(void){_error_("not implemented yet");}; + IssmDouble Max(void){_error_("not implemented yet");}; + IssmDouble MaxAbs(void){_error_("not implemented yet");}; + IssmDouble Min(void){_error_("not implemented yet");}; + IssmDouble MinAbs(void){_error_("not implemented yet");}; + void Extrude(void){_error_("not implemented yet");}; + void VerticallyIntegrate(Input* thickness_input){_error_("not implemented yet");}; + void GetVectorFromInputs(Vector* vector,int* doflist){_error_("not implemented yet");}; + void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not implemented yet");}; + ElementResult* SpawnGradient(int step, IssmDouble time){_error_("not implemented yet");}; + void GetGradient(Vector* gradient_vec,int* doflist){_error_("not implemented yet");}; + void ScaleGradient(IssmDouble scale){_error_("not implemented yet");}; + void SetGradient(Input* gradient_in){_error_("not implemented yet");}; + void UpdateValue(IssmDouble scalar){_error_("not implemented yet");}; + void SaveValue(void){_error_("not implemented yet");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 13056) @@ -108,5 +108,5 @@ /*FUNCTION DoubleInput::GetInputValue(bool* pvalue) {{{*/ void DoubleInput::GetInputValue(bool* pvalue){ - _error2_("Double input of enum " << EnumToStringx(enum_type) << " cannot return a boolean"); + _error_("Double input of enum " << EnumToStringx(enum_type) << " cannot return a boolean"); } @@ -114,5 +114,5 @@ /*FUNCTION DoubleInput::GetInputValue(int* pvalue){{{*/ void DoubleInput::GetInputValue(int* pvalue){ - _error2_("Double input of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer"); + _error_("Double input of enum " << enum_type << " (" << EnumToStringx(enum_type) << ") cannot return an integer"); } @@ -132,8 +132,8 @@ /*}}}*/ /*FUNCTION DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");} +void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");} +void DoubleInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION DoubleInput::GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){{{*/ @@ -217,5 +217,5 @@ default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } @@ -253,5 +253,5 @@ void DoubleInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_("not supporte yet!"); + _error_("not supporte yet!"); } @@ -260,5 +260,5 @@ void DoubleInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - _error2_("not supported yet!"); + _error_("not supported yet!"); } @@ -276,5 +276,5 @@ /*Check that input provided is a thickness*/ - if (thickness_input->InstanceEnum()!=ThicknessEnum) _error2_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")"); + if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")"); /*vertically integrate depending on type:*/ @@ -287,5 +287,5 @@ default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } } Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h (revision 13056) @@ -40,5 +40,5 @@ Input* PointwiseMax(Input* inputB); ElementResult* SpawnResult(int step, IssmDouble time); - void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");}; + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); /*}}}*/ @@ -49,8 +49,8 @@ void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); @@ -67,13 +67,13 @@ void ConstrainMin(IssmDouble minimum); void Scale(IssmDouble scale_factor); - void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");}; + void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");}; void AXPY(Input* xinput,IssmDouble scalar); void Constrain(IssmDouble cm_min, IssmDouble cm_max); - IssmDouble InfinityNorm(void){_error2_("not implemented yet");}; + IssmDouble InfinityNorm(void){_error_("not implemented yet");}; IssmDouble Max(void); IssmDouble MaxAbs(void); IssmDouble Min(void); IssmDouble MinAbs(void); - void Extrude(void){_error2_("not supported yet");}; + void Extrude(void){_error_("not supported yet");}; void VerticallyIntegrate(Input* thickness_input); void GetVectorFromInputs(Vector* vector,int* doflist); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 13056) @@ -99,5 +99,5 @@ ElementResult* IntInput::SpawnResult(int step, IssmDouble time){ - _error2_("not supported yet!"); + _error_("not supported yet!"); } @@ -106,5 +106,5 @@ /*Object functions*/ /*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{*/ -void IntInput::GetInputValue(bool* pvalue){_error2_("not supported yet!");} +void IntInput::GetInputValue(bool* pvalue){_error_("not supported yet!");} /*}}}*/ /*FUNCTION IntInput::GetInputValue(int* pvalue){{{*/ @@ -115,18 +115,18 @@ /*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue){{{*/ void IntInput::GetInputValue(IssmDouble* pvalue){ - _error2_("IntInput cannot return a IssmDouble in parallel"); + _error_("IntInput cannot return a IssmDouble in parallel"); } /*}}}*/ /*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){{{*/ -void IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not supported yet!");} +void IntInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){{{*/ -void IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not supported yet!");} +void IntInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){{{*/ -void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not supported yet!");} +void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){{{*/ -void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not supported yet!");} +void IntInput::GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not supported yet!");} /*}}}*/ /*FUNCTION IntInput::ChangeEnum{{{*/ @@ -166,5 +166,5 @@ default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } @@ -182,5 +182,5 @@ void IntInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_("not supporte yet!"); + _error_("not supporte yet!"); } @@ -189,5 +189,5 @@ void IntInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - _error2_("not supported yet!"); + _error_("not supported yet!"); } Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.h (revision 13056) @@ -37,9 +37,9 @@ int InstanceEnum(); Input* SpawnTriaInput(int* indices); - Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");}; - Input* PointwiseMin(Input* inputB){_error2_("not implemented yet");}; - Input* PointwiseMax(Input* inputB){_error2_("not implemented yet");}; + Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; + Input* PointwiseMin(Input* inputB){_error_("not implemented yet");}; + Input* PointwiseMax(Input* inputB){_error_("not implemented yet");}; ElementResult* SpawnResult(int step, IssmDouble time); - void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");}; + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); /*}}}*/ @@ -50,32 +50,32 @@ void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); - void GetInputAverage(IssmDouble* pvalue){_error2_("not implemented yet");}; - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; + void GetInputAverage(IssmDouble* pvalue){_error_("not implemented yet");}; + void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype); void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters); - void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");}; + void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");}; void Scale(IssmDouble scale_factor); - void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");}; + void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");}; void AXPY(Input* xinput,IssmDouble scalar); void Constrain(IssmDouble cm_min, IssmDouble cm_max); - IssmDouble InfinityNorm(void){_error2_("InfinityNorm not implemented for integers");}; - IssmDouble Max(void){_error2_("Max not implemented for integers");}; - IssmDouble MaxAbs(void){_error2_("Max not implemented for integers");}; - IssmDouble Min(void){_error2_("Min not implemented for integers");}; - IssmDouble MinAbs(void){_error2_("Min not implemented for integers");}; - void Extrude(void){_error2_("not supported yet");}; - void VerticallyIntegrate(Input* thickness_input){_error2_("not supported yet");}; + IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for integers");}; + IssmDouble Max(void){_error_("Max not implemented for integers");}; + IssmDouble MaxAbs(void){_error_("Max not implemented for integers");}; + IssmDouble Min(void){_error_("Min not implemented for integers");}; + IssmDouble MinAbs(void){_error_("Min not implemented for integers");}; + void Extrude(void){_error_("not supported yet");}; + void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 13056) @@ -455,10 +455,10 @@ case ControlInputEnum:{ ControlInput* cont_input=(ControlInput*)xinput; - if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error2_("not supported yet"); + if(cont_input->values->ObjectEnum()!=PentaP1InputEnum) _error_("not supported yet"); PentaP1Input* cast_input=(PentaP1Input*)cont_input->values; for(i=0;ivalues[i]=this->values[i]+scalar*(cast_input->values[i]);} return; default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } @@ -495,5 +495,5 @@ /*Check that input provided is a thickness*/ - if (thickness_input->InstanceEnum()!=ThicknessEnum) _error2_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")"); + if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is " << EnumToStringx(thickness_input->InstanceEnum()) << ")"); /*Get Thickness value pointer*/ @@ -511,5 +511,5 @@ default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } } @@ -529,5 +529,5 @@ /*Check that inputB is of the same type*/ - if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); + if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); xinputB=(PentaP1Input*)inputB; @@ -560,5 +560,5 @@ /*Check that inputB is of the same type*/ - if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); + if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); xinputB=(PentaP1Input*)inputB; @@ -591,5 +591,5 @@ /*Check that inputB is of the same type*/ - if (inputB->ObjectEnum()!=PentaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); + if (inputB->ObjectEnum()!=PentaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); xinputB=(PentaP1Input*)inputB; Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h (revision 13056) @@ -41,22 +41,22 @@ Input* PointwiseMax(Input* inputB); ElementResult* SpawnResult(int step, IssmDouble time); - void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");}; + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); /*}}}*/ /*numerics: {{{*/ - void GetInputValue(bool* pvalue){_error2_("not implemented yet");}; - void GetInputValue(int* pvalue){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error2_("not implemented yet");}; + void GetInputValue(bool* pvalue){_error_("not implemented yet");}; + void GetInputValue(int* pvalue){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss){_error_("not implemented yet");}; void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss); void GetInputAverage(IssmDouble* pvalue); - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; + void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss); void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss); @@ -69,5 +69,5 @@ void ConstrainMin(IssmDouble minimum); void Scale(IssmDouble scale_factor); - void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");}; + void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");}; void AXPY(Input* xinput,IssmDouble scalar); void Constrain(IssmDouble cm_min, IssmDouble cm_max); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 13056) @@ -482,5 +482,5 @@ } } - if(!found)_error2_("did not find time interval on which to interpolate forcing values!"); + if(!found)_error_("did not find time interval on which to interpolate forcing values!"); /*Assign output pointer*/ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h (revision 13056) @@ -40,38 +40,38 @@ int InstanceEnum(); Input* SpawnTriaInput(int* indices); - Input* PointwiseDivide(Input* forcingB){_error2_("not implemented yet");}; - Input* PointwiseMin(Input* forcingB){_error2_("not implemented yet");}; - Input* PointwiseMax(Input* forcingB){_error2_("not implemented yet");}; + Input* PointwiseDivide(Input* forcingB){_error_("not implemented yet");}; + Input* PointwiseMin(Input* forcingB){_error_("not implemented yet");}; + Input* PointwiseMax(Input* forcingB){_error_("not implemented yet");}; ElementResult* SpawnResult(int step, IssmDouble time); void Configure(Parameters* parameters); /*}}}*/ /*numerics: {{{*/ - void GetInputValue(bool* pvalue){_error2_("not implemented yet");}; - void GetInputValue(int* pvalue){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");}; + void GetInputValue(bool* pvalue){_error_("not implemented yet");}; + void GetInputValue(int* pvalue){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");}; void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss); void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time); void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time); - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss ,int index){_error_("not implemented yet");}; void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void GetInputAverage(IssmDouble* pvalue); - void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; + void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype); void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters); - void ConstrainMin(IssmDouble minimum){_error2_("not implemented yet");}; - void Scale(IssmDouble scale_factor){_error2_("not implemented yet");}; - void ArtificialNoise(IssmDouble min,IssmDouble max){_error2_("not implemented yet");}; - void AXPY(Input* xforcing,IssmDouble scalar){_error2_("not implemented yet");}; - void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error2_("not implemented yet");}; + void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");}; + void Scale(IssmDouble scale_factor){_error_("not implemented yet");}; + void ArtificialNoise(IssmDouble min,IssmDouble max){_error_("not implemented yet");}; + void AXPY(Input* xforcing,IssmDouble scalar){_error_("not implemented yet");}; + void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error_("not implemented yet");}; IssmDouble InfinityNorm(void); IssmDouble Max(void); @@ -80,8 +80,8 @@ IssmDouble MinAbs(void); void Extrude(void); - void VerticallyIntegrate(Input* thickness_forcing){_error2_("not supported yet");}; + void VerticallyIntegrate(Input* thickness_forcing){_error_("not supported yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); - void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error2_("not supported yet");}; - void GetTimeValues(IssmDouble* values,IssmDouble time){_error2_("not implemented yet");}; + void GetValuesPtr(IssmDouble** pvalues,int* pnum_values){_error_("not supported yet");}; + void GetTimeValues(IssmDouble* values,IssmDouble time){_error_("not implemented yet");}; Input* GetTimeInput(IssmDouble time); /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13056) @@ -323,5 +323,5 @@ default : - _error2_("not implemented yet"); + _error_("not implemented yet"); } @@ -368,5 +368,5 @@ /*Check that inputB is of the same type*/ - if (inputB->ObjectEnum()!=TriaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); + if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); xinputB=(TriaP1Input*)inputB; @@ -399,5 +399,5 @@ /*Check that inputB is of the same type*/ - if (inputB->ObjectEnum()!=TriaP1InputEnum) _error2_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); + if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type " << EnumToStringx(inputB->ObjectEnum())); xinputB=(TriaP1Input*)inputB; Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h (revision 13056) @@ -37,31 +37,31 @@ int InstanceEnum(); Input* SpawnTriaInput(int* indices); - Input* PointwiseDivide(Input* inputB){_error2_("not implemented yet");}; + Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; Input* PointwiseMin(Input* inputB); Input* PointwiseMax(Input* inputB); ElementResult* SpawnResult(int step, IssmDouble time); - void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error2_("not supported yet");}; + void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");}; void Configure(Parameters* parameters); /*}}}*/ /*numerics: {{{*/ - void GetInputValue(bool* pvalue){_error2_("not implemented yet");} - void GetInputValue(int* pvalue){_error2_("not implemented yet");} - void GetInputValue(IssmDouble* pvalue){_error2_("not implemented yet");} + void GetInputValue(bool* pvalue){_error_("not implemented yet");} + void GetInputValue(int* pvalue){_error_("not implemented yet");} + void GetInputValue(IssmDouble* pvalue){_error_("not implemented yet");} void GetInputValue(IssmDouble* pvalue,GaussTria* gauss); - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error2_("not implemented yet");}; - void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int index){_error2_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,IssmDouble time){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussTria* gauss ,int index){_error_("not implemented yet");}; + void GetInputValue(IssmDouble* pvalue,GaussPenta* gauss,int index){_error_("not implemented yet");}; void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussTria* gauss); - void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; + void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void GetInputAverage(IssmDouble* pvalue); void GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss); void GetVyStrainRate2d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussTria* gauss); - void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; - void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error2_("not implemented yet");}; + void GetVxStrainRate3d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3d(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVxStrainRate3dPattyn(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; + void GetVyStrainRate3dPattyn(IssmDouble* epsilonvy,IssmDouble* xyz_list, GaussPenta* gauss){_error_("not implemented yet");}; void ChangeEnum(int newenumtype); @@ -77,6 +77,6 @@ IssmDouble Min(void); IssmDouble MinAbs(void); - void Extrude(void){_error2_("not supported yet");}; - void VerticallyIntegrate(Input* thickness_input){_error2_("not supported yet");}; + void Extrude(void){_error_("not supported yet");}; + void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");}; void GetVectorFromInputs(Vector* vector,int* doflist); void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); Index: /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KMLFileReadUtils.cpp (revision 13056) @@ -259,5 +259,5 @@ if (strncmp(&ktag[0],"<" ,1) || strncmp(&ktag[strlen(ktag)-1],">",1)) - _error2_("KMLFileTagName -- Missing tag delimiters in " << ktag << ".\n"); + _error_("KMLFileTagName -- Missing tag delimiters in " << ktag << ".\n"); /* strtok modifies ktag, so work on copy */ @@ -355,5 +355,5 @@ NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n"); sscanf(kstr,"%d",pival); @@ -368,5 +368,5 @@ (kstr[1] != '/') || (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1))) - {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} else xDelete(kstr); @@ -388,5 +388,5 @@ NULL,NULL)) || (kstr[0] == '<')) - {_error2_("KMLFileTokenParse -- Missing bool field for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing bool field for " << ktag << ".\n");} sscanf(kstr,"%d",&ival); @@ -402,5 +402,5 @@ (kstr[1] != '/') || (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1))) - {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} else xDelete(kstr); @@ -433,5 +433,5 @@ NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing string field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing string field for " << ktag << ".\n"); if (!pstr) { @@ -463,5 +463,5 @@ (kstr[1] != '/') || (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1))) - {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} else xDelete(kstr); @@ -484,5 +484,5 @@ NULL,NULL)) || (kstr[0] == '<')) - {_error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");} sscanf(kstr,"%g",pfval); @@ -497,5 +497,5 @@ (kstr[1] != '/') || (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1))) - {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} else xDelete(kstr); @@ -518,5 +518,5 @@ NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n"); sscanf(kstr,"%lg",pdval); @@ -531,5 +531,5 @@ (kstr[1] != '/') || (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1))) - {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} else xDelete(kstr); @@ -556,5 +556,5 @@ NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n"); if (!*pdval) @@ -570,5 +570,5 @@ i++; if (maxlen && (maxlen < i+1)) - _error2_("KMLFileTokenParse -- Double [m] field too short for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Double [m] field too short for " << ktag << ".\n"); sscanf(ktok,"%lg",&((*pdval)[i])); ktok=strtok(NULL,delim); @@ -595,5 +595,5 @@ (kstr[1] != '/') || (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1))) - {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} else xDelete(kstr); @@ -622,5 +622,5 @@ NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing double [m x n] field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing double [m x n] field for " << ktag << ".\n"); if (!*pdval) @@ -636,5 +636,5 @@ i++; if (maxlen && (maxlen*n < i+1)) - _error2_("KMLFileTokenParse -- Double [m x n] field too short for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Double [m x n] field too short for " << ktag << ".\n"); j=(j+1) % n; sscanf(ktok,"%lg",&((*pdval)[i])); @@ -665,5 +665,5 @@ (kstr[1] != '/') || (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1))) - {_error2_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing closing tag for " << ktag << ".\n");} else xDelete(kstr); @@ -712,5 +712,5 @@ else if ((kstr[0] == '<') && (kstr[1] == '/')) { - _error2_("KMLFileTagSkip -- Unexpected closing tag " << kstr << ".\n"); + _error_("KMLFileTagSkip -- Unexpected closing tag " << kstr << ".\n"); } @@ -718,5 +718,5 @@ } - _error2_("KMLFileTokenParse -- Corresponding closing tag for " << ktag << " not found.\n"); + _error_("KMLFileTokenParse -- Corresponding closing tag for " << ktag << " not found.\n"); return(0); Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h (revision 13056) @@ -30,11 +30,11 @@ virtual void DeepEcho(); virtual void DeepEcho(const char* indent); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.cpp (revision 13056) @@ -93,7 +93,7 @@ return; else if (!strncmp(kstr,"")) Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h (revision 13056) @@ -35,11 +35,11 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Container.h (revision 13056) @@ -33,11 +33,11 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp (revision 13056) @@ -106,7 +106,7 @@ } else if (!strncmp(kstri,"")) Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.cpp (revision 13056) @@ -145,7 +145,7 @@ } else if (!strncmp(kstri,"")) Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Icon.h (revision 13056) @@ -44,11 +44,11 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp (revision 13056) @@ -121,7 +121,7 @@ } else if (!strncmp(kstri,"")) Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h (revision 13056) @@ -35,11 +35,11 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineString.h (revision 13056) @@ -38,11 +38,11 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.cpp (revision 13056) @@ -113,7 +113,7 @@ } else if (!strncmp(kstri,"")) Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp (revision 13056) @@ -139,7 +139,7 @@ } else if (!strncmp(kstri,"")) Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h (revision 13056) @@ -38,11 +38,11 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.cpp (revision 13056) @@ -140,7 +140,7 @@ } else if (!strncmp(kstri,"")) Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Point.h (revision 13056) @@ -36,11 +36,11 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp (revision 13056) @@ -117,7 +117,7 @@ } else if (!strncmp(kstri,"")) Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h (revision 13056) @@ -32,11 +32,11 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h (revision 13056) @@ -40,11 +40,11 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); - int Id(){_error2_("Not implemented yet.");}; - int MyRank(){_error2_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int MarshallSize(){_error2_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error2_("Not implemented yet.");}; - int ObjectEnum(){_error2_("Not implemented yet.");}; - Object* copy(){_error2_("Not implemented yet.");}; + int Id(){_error_("Not implemented yet.");}; + int MyRank(){_error_("Not implemented yet.");}; + void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int MarshallSize(){_error_("Not implemented yet.");}; + void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; + Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp (revision 13056) @@ -189,7 +189,7 @@ } else if (!strncmp(kstri,"GetInput(input_enum); - if(!input) _error2_("Input " << EnumToStringx(input_enum) << " not found in material"); + if(!input) _error_("Input " << EnumToStringx(input_enum) << " not found in material"); /*We found the enum. Use its values to fill into the vector, using the vertices ids: */ @@ -200,5 +200,5 @@ break; - default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); + default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); } } @@ -260,5 +260,5 @@ /*Checks in debugging mode*/ - if(viscosity<=0) _error2_("Negative viscosity"); + if(viscosity<=0) _error_("Negative viscosity"); _assert_(B>0); _assert_(n>0); @@ -331,5 +331,5 @@ /*Checks in debugging mode*/ - if(viscosity3d<=0) _error2_("Negative viscosity"); + if(viscosity3d<=0) _error_("Negative viscosity"); _assert_(B>0); _assert_(n>0); @@ -403,5 +403,5 @@ /*Checks in debugging mode*/ - if(viscosity3d<=0) _error2_("Negative viscosity"); + if(viscosity3d<=0) _error_("Negative viscosity"); _assert_(B>0); _assert_(n>0); @@ -564,7 +564,7 @@ return; } - default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); - } - default: _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); + default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); + } + default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); } } @@ -622,7 +622,7 @@ return; } - default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); - } - default: _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); + default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); + } + default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); } @@ -764,5 +764,5 @@ #endif else{ - _error2_("Mesh type not supported yet!"); + _error_("Mesh type not supported yet!"); } Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 13055) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 13056) @@ -62,8 +62,8 @@ void InputUpdateFromConstant(bool constant, int name); void InputUpdateFromSolution(IssmDouble* solution); - void InputUpdateFromIoModel(int index, IoModel* iomodel){_error2_("not implemented yet");}; + void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ /*Material virtual functions resolution: {{{*/ - void InputDuplicate(int original_enum,int new_enum){_error2_("not implemented yet");}; + void InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");}; void Configure(Elements* elements); void GetVectorFromInputs(Vector* vector,int input_enum){return;} Index: /issm/trunk-jpl/src/c/include/macros.h =================================================================== --- /issm/trunk-jpl/src/c/include/macros.h (revision 13055) +++ /issm/trunk-jpl/src/c/include/macros.h (revision 13056) @@ -23,23 +23,13 @@ #define _printf_(flag,...) do{if(flag) PrintfFunction(__VA_ARGS__);}while(0) /*}}}*/ -/* _error_ {{{*/ -/*Error exception macro*/ -#ifdef _INTEL_WIN_ -#define _error_(...)\ - throw ErrorException(exprintf(__VA_ARGS__)) -#else -#define _error_(...)\ - throw ErrorException(__FILE__,__func__,__LINE__,exprintf(__VA_ARGS__)) -#endif -/*}}}*/ /* _error2_ {{{*/ /*new Error exception macro*/ #ifdef _INTEL_WIN_ -#define _error2_(StreamArgs)\ +#define _error_(StreamArgs)\ do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \ aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \ throw ErrorException(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0) #else -#define _error2_(StreamArgs)\ +#define _error_(StreamArgs)\ do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \ aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \ @@ -75,5 +65,5 @@ #ifdef _ISSM_DEBUG_ #define _assert_(statement)\ - if (!(statement)) _error_("Assertion \"%s\" failed, please report bug to %s",#statement,PACKAGE_BUGREPORT) + if (!(statement)) _error_("Assertion \""<<#statement<<"\" failed, please report bug to "<name << "\" must be class \"double\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); + _error_("Value of option \"" << odouble->name << "\" must be class \"double\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); } FetchData(&odouble->values,&odouble->numel,&odouble->ndims,&odouble->size,prhs[0]); @@ -45,5 +45,5 @@ /*check and parse the value */ if (!mxIsClass(prhs[0],"logical")){ - _error2_("Value of option \"" << ological->name << "\" must be class \"logical\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); + _error_("Value of option \"" << ological->name << "\" must be class \"logical\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); } FetchData(&ological->values,&ological->numel,&ological->ndims,&ological->size,prhs[0]); @@ -63,5 +63,5 @@ /*check and parse the value */ if (!mxIsClass(prhs[0],"char")){ - _error2_("Value of option \"" << ochar->name << "\" must be class \"char\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); + _error_("Value of option \"" << ochar->name << "\" must be class \"char\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); } FetchData(&ochar->values,&ochar->numel,&ochar->ndims,&ochar->size,prhs[0]); @@ -87,5 +87,5 @@ /*check and parse the value */ if (!mxIsClass(prhs[0],"struct")){ - _error2_("Value of option \"" << ostruct->name << "\" must be class \"struct\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); + _error_("Value of option \"" << ostruct->name << "\" must be class \"struct\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); } ostruct->numel=mxGetNumberOfElements(prhs[0]); @@ -133,5 +133,5 @@ /*check and parse the value */ if (!mxIsClass(prhs[0],"cell")){ - _error2_("Value of option \"" << ocell->name << "\" must be class \"cell\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); + _error_("Value of option \"" << ocell->name << "\" must be class \"cell\", not class \"" << mxGetClassName(prhs[0]) <<"\"."); } @@ -181,5 +181,5 @@ mxDestroyArray(lhs[0]); } - else _error2_("Second argument value of option \""<< name <<"\" is of unrecognized class \""<< mxGetClassName(prhs[0]) <<"\"."); + else _error_("Second argument value of option \""<< name <<"\" is of unrecognized class \""<< mxGetClassName(prhs[0]) <<"\"."); } Index: /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 13056) @@ -86,5 +86,5 @@ } else if (flag==NodalEnum){ - _error2_("nodal response functions not supported yet!"); + _error_("nodal response functions not supported yet!"); /*increment response_pointer :*/ @@ -104,5 +104,5 @@ } } - else _error2_("flag type " << flag << " not supported yet for response analysis"); + else _error_("flag type " << flag << " not supported yet for response analysis"); } Index: /issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp (revision 13056) @@ -23,10 +23,10 @@ /*retrieve first token, separated by underscore: */ pch = strtok (descriptor,"_"); - if(!pch)_error2_("descriptor " << descriptor << " is not correctly formatted!"); + if(!pch)_error_("descriptor " << descriptor << " is not correctly formatted!"); if (strncmp(pch,"scaled",6)==0){ /*we have a scaled variable. recover the root: */ pch = strtok (NULL, "_"); - if(!pch)_error2_("scaled descriptor " << descriptor << " is not correctly formatted!"); + if(!pch)_error_("scaled descriptor " << descriptor << " is not correctly formatted!"); memcpy(root,pch,(strlen(pch)+1)*sizeof(char)); @@ -44,9 +44,9 @@ /*we have an indexed variable. recover the root: */ pch = strtok (NULL, "_"); - if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!"); + if(!pch)_error_("indexed descriptor " << descriptor << " is not correctly formatted!"); memcpy(root,pch,(strlen(pch)+1)*sizeof(char)); /*now recover the index: */ pch = strtok (NULL, "_"); - if(!pch)_error2_("indexed descriptor " << descriptor << " is not correctly formatted!"); + if(!pch)_error_("indexed descriptor " << descriptor << " is not correctly formatted!"); sscanf(pch,"%i",pindex); return IndexedEnum; @@ -55,9 +55,9 @@ /*we have an indexed variable. recover the root: */ pch = strtok (NULL, "_"); - if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!"); + if(!pch)_error_("nodal descriptor " << descriptor << " is not correctly formatted!"); memcpy(root,pch,(strlen(pch)+1)*sizeof(char)); /*now recover the index: */ pch = strtok (NULL, "_"); - if(!pch)_error2_("nodal descriptor " << descriptor << " is not correctly formatted!"); + if(!pch)_error_("nodal descriptor " << descriptor << " is not correctly formatted!"); sscanf(pch,"%i",pindex); return NodalEnum; Index: /issm/trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp (revision 13056) @@ -72,5 +72,5 @@ if(control_analysis)solutioncore=&control_core; #else - _error2_("ISSM was not compiled with control capabilities, exiting!"); + _error_("ISSM was not compiled with control capabilities, exiting!"); #endif Index: /issm/trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.cpp (revision 13056) @@ -39,5 +39,5 @@ #ifdef _HAVE_MPI_ MPI_Allreduce ( &found,&sumfound,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD); - if(!sumfound)_error2_("could not find material with id" << index << " to compute ElementResponse"); + if(!sumfound)_error_("could not find material with id" << index << " to compute ElementResponse"); #endif Index: /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 13056) @@ -55,5 +55,5 @@ if (!DomainOutlineRead(&nprof,&pnvert,&pprofx,&pprofy,&closed,filexp)) - _error2_("Error reading exp file."); + _error_("Error reading exp file."); _pprintLine_("Exp2Kmlx -- Reading " << nprof << " exp profiles from file \"" << filexp << "\"."); // for (i=0; iNumberOfDofs(configuration_type,GsetEnum); - if (gsize==0) _error2_("Allocating a Vec of size 0 as gsize=0 for configuration: " << EnumToStringx(configuration_type)); + if (gsize==0) _error_("Allocating a Vec of size 0 as gsize=0 for configuration: " << EnumToStringx(configuration_type)); /*Initialize solution: */ Index: /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 13056) @@ -32,5 +32,5 @@ } else{ - _error2_("vector type: " << EnumToStringx(type) << " not supported yet!"); + _error_("vector type: " << EnumToStringx(type) << " not supported yet!"); } Index: /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 13056) @@ -54,6 +54,6 @@ /*Check that gradient is clean*/ norm_inf=gradient->Norm(NORM_INF); - if(norm_inf<=0) _error2_("||∂J/∂α||∞ = 0 gradient norm is zero"); - if(xIsNan(norm_inf))_error2_("||∂J/∂α||∞ = NaN gradient norm is NaN"); + if(norm_inf<=0) _error_("||∂J/∂α||∞ = 0 gradient norm is zero"); + if(xIsNan(norm_inf))_error_("||∂J/∂α||∞ = NaN gradient norm is NaN"); /*Clean-up and assign output pointer*/ Index: /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 13056) @@ -27,5 +27,5 @@ if(migration_style==NoneEnum) return; - if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error2_(EnumToStringx(migration_style) << " not supported yet!"); + if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error_(EnumToStringx(migration_style) << " not supported yet!"); if(migration_style==SoftMigrationEnum){ Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 13056) @@ -95,8 +95,8 @@ } else if (strncmp(descriptor,"indexed_",8)==0){ - _error2_("indexed variables not supported yet!"); + _error_("indexed variables not supported yet!"); } else if (strncmp(descriptor,"nodal_",8)==0){ - _error2_("nodal variables not supported yet!"); + _error_("nodal variables not supported yet!"); } else{ Index: /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13056) @@ -37,11 +37,11 @@ /*Some checks on arguments: */ if ((M<2) || (N<2) || (nods<=0)){ - _error2_("nothing to be done according to the dimensions of input matrices and vectors."); + _error_("nothing to be done according to the dimensions of input matrices and vectors."); } if (x_in[1]-x_in[0]<0){ - _error2_("x coordinate vector should be increasing.\n use Matlab's command x=flipud(x), also flip the data matrix data=fliplr(data)"); + _error_("x coordinate vector should be increasing.\n use Matlab's command x=flipud(x), also flip the data matrix data=fliplr(data)"); } if (y_in[1]-y_in[0]<0){ - _error2_("y coordinate vector should be increasing.\n use Matlab's command y=flipud(y), also flip the data matrix data=flipud(data)"); + _error_("y coordinate vector should be increasing.\n use Matlab's command y=flipud(y), also flip the data matrix data=flipud(data)"); } @@ -69,5 +69,5 @@ } else{ - _error2_("x and y vectors length should be 1 or 0 more than data number of rows."); + _error_("x and y vectors length should be 1 or 0 more than data number of rows."); } Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 13056) @@ -40,5 +40,5 @@ /*some checks*/ if (nels_data<1 || nods_data<3 || nods_prime==0){ - _error2_("nothing to be done according to the mesh given in input"); + _error_("nothing to be done according to the mesh given in input"); } @@ -54,9 +54,9 @@ } else{ - _error2_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!"); + _error_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!"); } if((numcontours) && (interpolation_type==2)){ - _error2_("element interpolation_type with contours not supported yet!"); + _error_("element interpolation_type with contours not supported yet!"); } Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 13056) @@ -30,5 +30,5 @@ /*some checks*/ if (nels<1 || nods<3 || nlines<1 || ncols<1 || xposting==0 || yposting==0){ - _error2_("nothing to be done according to the mesh given in input"); + _error_("nothing to be done according to the mesh given in input"); } @@ -41,5 +41,5 @@ } else{ - _error2_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!"); + _error_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!"); } Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 13056) @@ -35,5 +35,5 @@ /*Checks*/ if (M_data!=nods_data && M_data!=nels_data){ - _error2_("data provided should have either " << nods_data << " or " << nels_data << " lines (not " << M_data << ")"); + _error_("data provided should have either " << nods_data << " or " << nels_data << " lines (not " << M_data << ")"); } @@ -138,5 +138,5 @@ for (j=0;j=nels_data){ - _error2_("Triangle number " << it << " not in [0 " << nels_data << "], report bug to developers"); + _error_("Triangle number " << it << " not in [0 " << nels_data << "], report bug to developers"); } data_interp[i*N_data+j]=data[N_data*it+j]; Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp (revision 13056) @@ -27,5 +27,5 @@ /*some checks*/ if (nels_data<1 || nods_data<6 || nods_prime==0){ - _error2_("nothing to be done according to the mesh given in input"); + _error_("nothing to be done according to the mesh given in input"); } @@ -41,5 +41,5 @@ } else{ - _error2_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!"); + _error_("length of vector data not supported yet. It should be of length (number of nodes) or (number of elements)!"); } Index: /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 13056) @@ -38,6 +38,6 @@ fid=iomodel->SetFilePointerToData(&code, &vector_layout,vector_enum); - if(code!=7)_error2_("expecting a IssmDouble vector for constraints with enum " << EnumToStringx(vector_enum)); - if(vector_layout!=1)_error2_("expecting a nodal vector for constraints with enum " << EnumToStringx(vector_enum)); + if(code!=7)_error_("expecting a IssmDouble vector for constraints with enum " << EnumToStringx(vector_enum)); + if(vector_layout!=1)_error_("expecting a nodal vector for constraints with enum " << EnumToStringx(vector_enum)); /*Fetch vector:*/ @@ -99,5 +99,5 @@ } else{ - _error2_("Size of field " << EnumToStringx(vector_enum) << " not supported"); + _error_("Size of field " << EnumToStringx(vector_enum) << " not supported"); } Index: /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 13056) @@ -133,5 +133,5 @@ } else - _error2_("Nodal connectivity table needs more than specified " << mxepg << " columns.\n"); + _error_("Nodal connectivity table needs more than specified " << mxepg << " columns.\n"); } jpt++; @@ -173,5 +173,5 @@ else - _error2_("Data matrix has incorrect number of " << mdata << " rows.\n"); + _error_("Data matrix has incorrect number of " << mdata << " rows.\n"); } Index: /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 13056) @@ -44,5 +44,5 @@ fidi=fopen(filkml,"r"); if (!(kobj=KMLFileReadx(fidi))) - _error2_("Error reading kml file."); + _error_("Error reading kml file."); fclose(fidi); Index: /issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (revision 13056) @@ -138,5 +138,5 @@ } else{ - _error2_("output '" << output << "' not supported yet"); + _error_("output '" << output << "' not supported yet"); } @@ -305,5 +305,5 @@ else if(strcmp(model,"spherical")==0) variogram = new SphericalVariogram(options); else if(strcmp(model,"power")==0) variogram = new PowerVariogram(options); - else _error2_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)"); + else _error_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)"); } else variogram = new GaussianVariogram(options); Index: /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp (revision 13056) @@ -103,5 +103,5 @@ } else{ - _error2_("output '" << output << "' not supported yet"); + _error_("output '" << output << "' not supported yet"); } @@ -126,5 +126,5 @@ else if(strcmp(model,"spherical")==0) variogram = new SphericalVariogram(options); else if(strcmp(model,"power")==0) variogram = new PowerVariogram(options); - else _error2_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)"); + else _error_("variogram " << model << " not supported yet (list of supported variogram: gaussian, exponential, spherical and power)"); } else variogram = new GaussianVariogram(options); Index: /issm/trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp (revision 13056) @@ -52,5 +52,5 @@ double T,rho,sl,tc,mc; - if((sgn!=1) && (sgn!=-1)) _error2_("Sign should be either +1 or -1.\n"); + if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1.\n"); delta = central_meridian; @@ -123,5 +123,5 @@ if(flag) _pprintLine_("Info: creating coordinates in polar stereographic (Std Latitude: 71S Meridian: 0)."); } - else _error2_("Sign should be either +1 or -1.\n"); + else _error_("Sign should be either +1 or -1.\n"); return; Index: /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.cpp (revision 13056) @@ -51,5 +51,5 @@ for (i=0;iFetchData(1,FrictionCoefficientEnum); break; case MaterialsRheologyBbarEnum: iomodel->FetchData(1,MaterialsRheologyBEnum); break; - default: _error2_("Control " << EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]) << " not implemented yet"); + default: _error_("Control " << EnumToStringx((int)iomodel->Data(InversionControlParametersEnum)[i]) << " not implemented yet"); } } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 13056) @@ -124,5 +124,5 @@ default: - _error2_("analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!"); + _error_("analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!"); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 13056) @@ -153,5 +153,5 @@ /*Fetch the mass flux segments necessary to compute the mass fluxes. Build a DoubleMatArrayParam object out of them: */ iomodel->FetchData(&array,&mdims_array,&ndims_array,&qmu_mass_flux_num_profiles,QmuMassFluxSegmentsEnum); - if(qmu_mass_flux_num_profiles==0)_error2_("qmu_mass_flux_num_profiles is 0, when MassFlux computations were requested!"); + if(qmu_mass_flux_num_profiles==0)_error_("qmu_mass_flux_num_profiles is 0, when MassFlux computations were requested!"); /*Go through segments, and extract those that belong to this cpu: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 13056) @@ -146,5 +146,5 @@ } - else _error2_("if vertices_type is MacAyealPattyn, you shoud have nodeonpattyn or nodeonmacayeal"); + else _error_("if vertices_type is MacAyealPattyn, you shoud have nodeonpattyn or nodeonmacayeal"); } /*Also add spcs of coupling: zero at the border pattyn/stokes for the appropriate dofs*/ @@ -186,5 +186,5 @@ } } - else _error2_("if vertices_type is PattynStokes, you shoud have nodeonpattyn or nodeonstokes"); + else _error_("if vertices_type is PattynStokes, you shoud have nodeonpattyn or nodeonstokes"); } /*Also add spcs of coupling: zero at the border pattyn/stokes for the appropriate dofs*/ @@ -226,5 +226,5 @@ } } - else _error2_("if vertices_type is MacAyealStokes, you shoud have nodeonmacayeal or nodeonstokes"); + else _error_("if vertices_type is MacAyealStokes, you shoud have nodeonmacayeal or nodeonstokes"); } /*Now add the regular spcs*/ @@ -319,5 +319,5 @@ count++; break; - default: _error2_("Vertex approximation " << EnumToStringx((int)vertices_type[i]) << " not supported"); + default: _error_("Vertex approximation " << EnumToStringx((int)vertices_type[i]) << " not supported"); } } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 13056) @@ -64,5 +64,5 @@ doftype[5]=StokesApproximationEnum; } - else _error2_("Approximationtype " << reCast(*vertices_type) << " (" << EnumToStringx(reCast(*vertices_type)) << ") not implemented yet for DiagnosticHoriz"); + else _error_("Approximationtype " << reCast(*vertices_type) << " (" << EnumToStringx(reCast(*vertices_type)) << ") not implemented yet for DiagnosticHoriz"); } else if (analysis_type==DiagnosticVertAnalysisEnum){ @@ -93,5 +93,5 @@ numdofs=1; } - else _error2_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet"); + else _error_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet"); /*Now initialize the index*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 13056) @@ -106,5 +106,5 @@ } else{ - _error2_("Size of field " << EnumToStringx(ThermalSpctemperatureEnum) << " not supported"); + _error_("Size of field " << EnumToStringx(ThermalSpctemperatureEnum) << " not supported"); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 13056) @@ -26,5 +26,5 @@ /*if 2d: Error*/ - if (dim==2) _error2_("2d meshes not supported yet"); + if (dim==2) _error_("2d meshes not supported yet"); /*Recover pointer: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 13056) @@ -103,5 +103,5 @@ } else{ - _error2_("not implemented yet"); + _error_("not implemented yet"); } @@ -111,5 +111,5 @@ iomodel->FetchData(&edges,&numberofedges,&cols,MeshEdgesEnum); iomodel->FetchData(&elements,NULL,NULL,MeshElementsEnum); - if (cols!=4) _error2_("field edges should have 4 columns"); + if (cols!=4) _error_("field edges should have 4 columns"); /*!All elements have been partitioned above, only create elements for this CPU: */ @@ -152,5 +152,5 @@ } else{ - _error2_("Problem in edges creation"); + _error_("Problem in edges creation"); } } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp (revision 13056) @@ -46,5 +46,5 @@ /*Check in 3d*/ - if(stabilization==3 && dim==3) _error2_("DG 3d not implemented yet"); + if(stabilization==3 && dim==3) _error_("DG 3d not implemented yet"); /*First fetch data: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 13056) @@ -33,5 +33,5 @@ /*return if 2d mesh*/ - if (dim==2) _error2_("2d meshes not supported yet"); + if (dim==2) _error_("2d meshes not supported yet"); //create penalties for nodes: no node can have a temperature over the melting point Index: /issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp (revision 13056) @@ -38,5 +38,5 @@ #ifdef _HAVE_MPI_ MPI_Allreduce ( &found,&sumfound,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD); - if(!sumfound)_error2_("could not find element with vertex with id" << index << " to compute nodal value " << EnumToStringx(natureofdataenum)); + if(!sumfound)_error_("could not find element with vertex with id" << index << " to compute nodal value " << EnumToStringx(natureofdataenum)); #endif Index: /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 13056) @@ -71,5 +71,5 @@ * warn the user to increase the connectivity width: */ for(i=0;imaxels)_error2_("max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table"); + if (*(connectivity+width*i+maxels)>maxels)_error_("max connectivity width reached (" << *(connectivity+width*i+maxels) << ")! increase width of connectivity table"); } Index: /issm/trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp (revision 13056) @@ -106,5 +106,5 @@ char* string=strings[i]; if(my_rank==0){ - if(string==NULL) _error2_("PETSc options for analysis " << EnumToStringx(reCast(analyses[i])) << " have been declared but were not found"); + if(string==NULL) _error_("PETSc options for analysis " << EnumToStringx(reCast(analyses[i])) << " have been declared but were not found"); } if(my_rank==0)stringlength=(strlen(string)+1)*sizeof(char); Index: /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 13056) @@ -30,5 +30,5 @@ * management routine, otherwise, skip : */ if (RiftIsPresent(loads,analysis_type)){ - _error2_("rift constraints reset not supported yet!"); + _error_("rift constraints reset not supported yet!"); } else if(ThermalIsPresent(loads,analysis_type)){ Index: /issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp (revision 13056) @@ -49,7 +49,7 @@ case VelEnum:ElementResponsex(responses, elements,nodes, vertices, loads, materials, parameters,VelEnum,process_units); break; case FrictionCoefficientEnum:NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters,process_units); break; - default: _error2_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break; + default: _error_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break; #else - default: _error2_("ISSM was not compiled with responses capabilities, exiting!"); + default: _error_("ISSM was not compiled with responses capabilities, exiting!"); #endif } Index: /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 13056) @@ -75,5 +75,5 @@ hSHP = SHPOpen( filshp, "rb" ); - if (!hSHP) _error2_("Error opening shp/shx files."); + if (!hSHP) _error_("Error opening shp/shx files."); /* read header and print out file bounds */ Index: /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 13056) @@ -44,5 +44,5 @@ break;} default: - _error2_("Matrix type: " << Kff->type << " not supported yet!"); + _error_("Matrix type: " << Kff->type << " not supported yet!"); } Index: /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 13056) @@ -96,5 +96,5 @@ #if _PETSC_MAJOR_ >=3 #ifndef _HAVE_MUMPS_ - _error2_("requested MUMPS solver, which was not compiled into ISSM!\n"); + _error_("requested MUMPS solver, which was not compiled into ISSM!\n"); #endif #endif @@ -120,5 +120,5 @@ if (solver_type==StokesSolverEnum){ /*Make indices out of doftypes: */ - if(!df)_error2_("need doftypes for Stokes solver!\n"); + if(!df)_error_("need doftypes for Stokes solver!\n"); DofTypesToIndexSet(&isv,&isp,df,StokesSolverEnum); @@ -151,5 +151,5 @@ /*Check convergence*/ KSPGetIterationNumber(ksp,&iteration_number); - if (iteration_number<0) _error2_("Solver diverged at iteration number: " << -iteration_number); + if (iteration_number<0) _error_("Solver diverged at iteration number: " << -iteration_number); /*Free resources:*/ Index: /issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp (revision 13056) @@ -30,6 +30,6 @@ pf->GetSize(&N2); - if(N!=N2)_error2_("Right hand side vector of size " << N2 << ", when matrix is of size " << M << "-" << N << " !"); - if(M!=N)_error2_("Stiffness matrix should be square!"); + if(N!=N2)_error_("Right hand side vector of size " << N2 << ", when matrix is of size " << M << "-" << N << " !"); + if(M!=N)_error_("Stiffness matrix should be square!"); SolverxSeq(&x,Kff->matrix,pf->vector,N); @@ -40,5 +40,5 @@ #else - _error2_("GSL support not compiled in!"); + _error_("GSL support not compiled in!"); #endif Index: /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 13056) @@ -491,4 +491,4 @@ } /*If we reach this point, the string provided has not been found*/ - _error2_("Enum " << name << " not found"); + _error_("Enum " << name << " not found"); } Index: /issm/trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp (revision 13056) @@ -53,5 +53,5 @@ double sl,rho,cm,T,chi; - if((sgn!=1) && (sgn!=-1)) _error2_("Sign should be either +1 or -1.\n"); + if((sgn!=1) && (sgn!=-1)) _error_("Sign should be either +1 or -1.\n"); delta = central_meridian; @@ -131,5 +131,5 @@ if(flag) _pprintLine_("Warning: expecting coordinates in polar stereographic (Std Latitude: 71S Meridian: 0)."); } - else _error2_("Sign should be either +1 or -1.\n"); + else _error_("Sign should be either +1 or -1.\n"); return; Index: /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp =================================================================== --- /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp (revision 13056) @@ -27,9 +27,9 @@ if (size==0){ function(); - _error2_("usage: see above"); + _error_("usage: see above"); } else if (size!=NRHS ) { function(); - _error2_("usage error."); + _error_("usage error."); } return 1; Index: /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp =================================================================== --- /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 13056) @@ -48,5 +48,5 @@ /*check this is indeed a subtype of long type: */ - if(!PyBool_Check(py_boolean))_error2_("expecting a boolean in input!"); + if(!PyBool_Check(py_boolean))_error_("expecting a boolean in input!"); /*extract boolean: */ @@ -69,5 +69,5 @@ /*retrive dimensions: */ ndim=PyArray_NDIM((const PyArrayObject*)py_matrix); - if(ndim!=2)_error2_("expecting an MxN matrix in input!"); + if(ndim!=2)_error_("expecting an MxN matrix in input!"); dims=PyArray_DIMS((PyArrayObject*)py_matrix); M=dims[0]; N=dims[1]; @@ -97,5 +97,5 @@ /*retrive dimensions: */ ndim=PyArray_NDIM((const PyArrayObject*)py_matrix); - if(ndim!=2)_error2_("expecting an MxN matrix in input!"); + if(ndim!=2)_error_("expecting an MxN matrix in input!"); dims=PyArray_DIMS((PyArrayObject*)py_matrix); M=dims[0]; N=dims[1]; @@ -125,5 +125,5 @@ /*retrive dimensions: */ ndim=PyArray_NDIM((const PyArrayObject*)py_vector); - if(ndim!=1)_error2_("expecting an Mx1 vector in input!"); + if(ndim!=1)_error_("expecting an Mx1 vector in input!"); dims=PyArray_DIMS((PyArrayObject*)py_vector); M=dims[0]; Index: /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp =================================================================== --- /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 13056) @@ -21,4 +21,10 @@ +/*FUNCTION WriteData(PyObject* py_tuple,int index,int integer){{{*/ +void WriteData(PyObject* py_tuple, int index, int integer){ + + PyTuple_SetItem(py_tuple, index, PyInt_FromSsize_t(integer)); + +}/*}}}*/ /*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{*/ void WriteData(PyObject* py_tuple, int index, char* string){ Index: /issm/trunk-jpl/src/c/python/io/pythonio.h =================================================================== --- /issm/trunk-jpl/src/c/python/io/pythonio.h (revision 13055) +++ /issm/trunk-jpl/src/c/python/io/pythonio.h (revision 13056) @@ -28,4 +28,5 @@ //void WriteData(DataHandle* py_tuple,Parameters* parameters); void WriteData(PyObject* py_tuple, int index, double* matrix, int M,int N); +void WriteData(PyObject* py_tuple, int index, int integer); void WriteData(PyObject* py_tuple, int index, char* string); void WriteData(PyObject* py_tuple, int index, Matrix* matrix); Index: /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 13056) @@ -31,9 +31,9 @@ void* memptr=NULL; - if(!size)_error2_("attempting to 0 size allocation!"); + if(!size)_error_("attempting to 0 size allocation!"); /* Use the c library to do the allocation: */ memptr=malloc(size); - if(!memptr) _error2_("memory allocation failed!"); + if(!memptr) _error_("memory allocation failed!"); return memptr; @@ -44,9 +44,9 @@ void* memptr=NULL; - if(!size)_error2_("attempting to 0 size allocation!"); + if(!size)_error_("attempting to 0 size allocation!"); /* Use the c library to do the allocation: */ memptr=calloc(n,size); - if(!memptr) _error2_("memory allocation failed!"); + if(!memptr) _error_("memory allocation failed!"); return memptr; @@ -88,9 +88,9 @@ register void* value=NULL; - if(!size)_error2_("attempting to realloc to zero"); + if(!size)_error_("attempting to realloc to zero"); value = (void*)realloc(pv,size); if (value == NULL) { - _error2_("virtual memory exhausted"); + _error_("virtual memory exhausted"); } return value; Index: /issm/trunk-jpl/src/c/shared/Elements/CoordinateSystemTransform.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/CoordinateSystemTransform.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Elements/CoordinateSystemTransform.cpp (revision 13056) @@ -22,5 +22,5 @@ case XYEnum: numdofs+=2; break; case XYZPEnum: numdofs+=4; break; - default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); + default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); } } @@ -67,5 +67,5 @@ break; default: - _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); + _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); } } Index: /issm/trunk-jpl/src/c/shared/Elements/TransformInvStiffnessMatrixCoord.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/TransformInvStiffnessMatrixCoord.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Elements/TransformInvStiffnessMatrixCoord.cpp (revision 13056) @@ -31,5 +31,5 @@ case XYEnum: numdofs+=2; break; case XYZPEnum: numdofs+=4; break; - default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); + default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); } } Index: /issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp (revision 13056) @@ -30,5 +30,5 @@ case XYEnum: numdofs+=2; break; case XYZPEnum: numdofs+=4; break; - default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); + default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); } } Index: /issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp (revision 13056) @@ -31,5 +31,5 @@ case XYEnum: numdofs+=2; break; case XYZPEnum: numdofs+=4; break; - default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); + default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); } } Index: /issm/trunk-jpl/src/c/shared/Elements/TransformStiffnessMatrixCoord.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/TransformStiffnessMatrixCoord.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Elements/TransformStiffnessMatrixCoord.cpp (revision 13056) @@ -31,5 +31,5 @@ case XYEnum: numdofs+=2; break; case XYZPEnum: numdofs+=4; break; - default: _error2_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); + default: _error_("Coordinate system " << EnumToStringx(cs_array[i]) << " not supported yet"); } } Index: /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp (revision 13056) @@ -39,5 +39,5 @@ /*open domain outline file for reading: */ if ((fid=fopen(domainname,"r"))==NULL){ - _error2_("could not find domain file " << domainname); + _error_("could not find domain file " << domainname); } Index: /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp (revision 13056) @@ -23,5 +23,5 @@ /*open domain outline file for writing: */ if ((fid=fopen(domainname,"w"))==NULL){ - _error2_("could not open domain file " << domainname); + _error_("could not open domain file " << domainname); noerr=0; goto cleanupandreturn; } Index: /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 13056) @@ -36,5 +36,5 @@ if (!itrnb) { if (nrowb != idimb) { - _error2_("Matrix A and B inner vectors not equal size."); + _error_("Matrix A and B inner vectors not equal size."); } idimc=ncolb; @@ -42,5 +42,5 @@ else { if (ncolb != idimb) { - _error2_("Matrix A and B inner vectors not equal size."); + _error_("Matrix A and B inner vectors not equal size."); } idimc=nrowb; @@ -49,5 +49,5 @@ if (!itrnc) { if (nrowc != idimc) { - _error2_("Matrix B and C inner vectors not equal size."); + _error_("Matrix B and C inner vectors not equal size."); } idimd=ncolc; @@ -55,5 +55,5 @@ else { if (ncolc != idimc) { - _error2_("Matrix B and C inner vectors not equal size."); + _error_("Matrix B and C inner vectors not equal size."); } idimd=nrowc; @@ -124,5 +124,5 @@ if (ntrma != ntrmb) { - _error2_("Matrix A and B inner vectors not equal size"); + _error_("Matrix A and B inner vectors not equal size"); noerr=0; return noerr; @@ -175,5 +175,5 @@ if (!b && nvec) { - _error2_("No right-hand side for nvec=" << nvec << "."); + _error_("No right-hand side for nvec=" << nvec << "."); noerr=0; return noerr; @@ -214,5 +214,5 @@ xDelete(pivrc2); xDelete(pindx); - _error2_("Pivot " << pivot << " less than machine epsilon"); + _error_("Pivot " << pivot << " less than machine epsilon"); noerr=0; return noerr; @@ -349,5 +349,5 @@ /*Compute determinant*/ Matrix2x2Determinant(&det,A); - if (fabs(det) < DBL_EPSILON) _error2_("Determinant smaller that machine epsilon"); + if (fabs(det) < DBL_EPSILON) _error_("Determinant smaller that machine epsilon"); /*Compute invert*/ @@ -374,5 +374,5 @@ /*Compute determinant*/ Matrix3x3Determinant(&det,A); - if (fabs(det) < DBL_EPSILON) _error2_("Determinant smaller that machine epsilon"); + if (fabs(det) < DBL_EPSILON) _error_("Determinant smaller that machine epsilon"); /*Compute invert*/ Index: /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (revision 13056) @@ -44,5 +44,5 @@ iter=0; fxmin = (*f)(xmin,optargs); - if (xIsNan(fxmin)) _error2_("Function evaluation returned NaN"); + if (xIsNan(fxmin)) _error_("Function evaluation returned NaN"); cout<(fxmax)) _error2_("Function evaluation returned NaN"); + if (xIsNan(fxmax)) _error_("Function evaluation returned NaN"); if(VerboseControl()) _pprintLine_(" N/A "<(fxbest)) _error2_("Function evaluation returned NaN"); + if(xIsNan(fxbest)) _error_("Function evaluation returned NaN"); iter=iter+1; @@ -159,5 +159,5 @@ //evaluate function on x fx = (*f)(x,optargs); - if(xIsNan(fx)) _error2_("Function evaluation returned NaN"); + if(xIsNan(fx)) _error_("Function evaluation returned NaN"); iter=iter+1; Index: /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 13056) @@ -1670,5 +1670,5 @@ if (iter >= MAX_GAUS_ITER) { xDelete(work); - _error2_("Max iterations exceeded for l=" << MAX_GAUS_ITER); + _error_("Max iterations exceeded for l=" << MAX_GAUS_ITER); } } Index: /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp (revision 13056) @@ -53,5 +53,5 @@ else eps=0; } - else _error2_("convergence criterion " << EnumToStringx(criterion_enum) << " not supported yet!"); + else _error_("convergence criterion " << EnumToStringx(criterion_enum) << " not supported yet!"); /*Assign output pointers:*/ Index: /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp (revision 13056) @@ -41,5 +41,5 @@ //get the value of the function at the first boundary fx1= (*f)(x1,optargs); - if (xIsNan(fx1)) _error2_("Function evaluation returned NaN"); + if (xIsNan(fx1)) _error_("Function evaluation returned NaN"); cout<(fx2)) _error2_("Function evaluation returned NaN"); + if (xIsNan(fx2)) _error_("Function evaluation returned NaN"); if(VerboseControl()) _pprintLine_(" "<fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1))); Index: /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 13056) @@ -57,5 +57,5 @@ if (found==-1){ /*ok, we did not find anything, this is not good! error out: */ - _error2_("could find neither a default analysis nor analysis " << EnumToStringx(analysis_type)); + _error_("could find neither a default analysis nor analysis " << EnumToStringx(analysis_type)); } Index: /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 13056) @@ -29,5 +29,5 @@ if(direction_enum==IuToExtEnum) for(i=0;i(strlen(modelname)+strlen(".bin") +1); sprintf(binfilename, "%s%s",modelname,".bin"); Index: /issm/trunk-jpl/src/c/solutions/WriteLockFile.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/WriteLockFile.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/WriteLockFile.cpp (revision 13056) @@ -17,8 +17,8 @@ if(my_rank==0){ fid=fopen(filename,"w"); - if(fid==NULL) _error2_("error message: could not open lock file " << filename); + if(fid==NULL) _error_("error message: could not open lock file " << filename); /*Close file: */ - if(fclose(fid)!=0) _error2_("could not close lock file " << filename); + if(fclose(fid)!=0) _error_("could not close lock file " << filename); } Index: /issm/trunk-jpl/src/c/solutions/controltao_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/controltao_core.cpp (revision 13056) @@ -42,5 +42,5 @@ PetscGetArgs(&argc,&args); ierr = TaoInitialize(&argc,&args,(char*)0,""); - if(ierr) _error2_("Could not initialize Tao"); + if(ierr) _error_("Could not initialize Tao"); /*Recover some parameters*/ @@ -75,5 +75,5 @@ xdelete(&XU); - user.J=(double*)xcalloc((maxiter+5),sizeof(double)); + user.J=xNewZeroInit(maxiter+5); user.femmodel=femmodel; TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); @@ -185,5 +185,5 @@ #else void controltao_core(FemModel* femmodel){ - _error2_("TAO not installed or PETSc version not supported"); + _error_("TAO not installed or PETSc version not supported"); } #endif //_HAVE_TAO_ Index: /issm/trunk-jpl/src/c/solutions/convergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 13056) @@ -72,5 +72,5 @@ if (xIsNan(res)){ _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f"); - _error2_("mechanical equilibrium convergence criterion is NaN!"); + _error_("mechanical equilibrium convergence criterion is NaN!"); } @@ -96,5 +96,5 @@ ndu=duf->Norm(NORM_TWO); nu=old_uf->Norm(NORM_TWO); - if (xIsNan(ndu) || xIsNan(nu)) _error2_("convergence criterion is NaN!"); + if (xIsNan(ndu) || xIsNan(nu)) _error_("convergence criterion is NaN!"); //clean up @@ -121,5 +121,5 @@ duf=old_uf->Duplicate(); old_uf->Copy(duf); duf->AYPX(uf,-1.0); ndu=duf->Norm(NORM_TWO); nduinf=duf->Norm(NORM_INF); - if (xIsNan(ndu) || xIsNan(nu)) _error2_("convergence criterion is NaN!"); + if (xIsNan(ndu) || xIsNan(nu)) _error_("convergence criterion is NaN!"); //clean up Index: /issm/trunk-jpl/src/c/solutions/gradient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/gradient_core.cpp (revision 13056) @@ -37,6 +37,6 @@ /*Check that gradient is clean*/ norm_inf=new_gradient->Norm(NORM_INF); - if(norm_inf<=0) _error2_("||∂J/∂α||∞ = 0 gradient norm is zero"); - if(xIsNan(norm_inf))_error2_("||∂J/∂α||∞ = NaN gradient norm is NaN"); + if(norm_inf<=0) _error_("||∂J/∂α||∞ = 0 gradient norm is zero"); + if(xIsNan(norm_inf))_error_("||∂J/∂α||∞ = NaN gradient norm is NaN"); /*plug back into inputs: */ Index: /issm/trunk-jpl/src/c/solutions/issm.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/issm.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/issm.cpp (revision 13056) @@ -53,5 +53,5 @@ #ifdef _HAVE_PETSC_ ierr=PetscInitialize(&argc,&argv,(char*)0,""); - if(ierr) _error2_("Could not initialize Petsc"); + if(ierr) _error_("Could not initialize Petsc"); #else #ifdef _HAVE_MPI_ @@ -128,5 +128,5 @@ Dakotax(femmodel); #else - _error2_("ISSM was not compiled with dakota support, cannot carry out dakota analysis!"); + _error_("ISSM was not compiled with dakota support, cannot carry out dakota analysis!"); #endif } @@ -138,5 +138,5 @@ control_core(femmodel); #else - _error2_("ISSM was not compiled with control support, cannot carry out dakota analysis!"); + _error_("ISSM was not compiled with control support, cannot carry out dakota analysis!"); #endif } Index: /issm/trunk-jpl/src/c/solutions/kriging.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/kriging.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/kriging.cpp (revision 13056) @@ -40,5 +40,5 @@ #ifdef _HAVE_PETSC_ int ierr=PetscInitialize(&argc,&argv,(char*)0,""); - if(ierr) _error2_("Could not initialize Petsc"); + if(ierr) _error_("Could not initialize Petsc"); #else #ifdef _HAVE_MPI_ @@ -122,5 +122,5 @@ char *lockfilename = NULL; - if(argc<2)_error2_("Usage error: missing model name"); + if(argc<2)_error_("Usage error: missing model name"); modelname=argv[2]; binfilename = xNew((strlen(modelname)+strlen(".bin") +1)); sprintf(binfilename, "%s%s",modelname,".bin"); Index: /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 13056) @@ -49,5 +49,5 @@ } else{ - _error2_("Solution " << EnumToStringx(solution_type) << " not implemented yet"); + _error_("Solution " << EnumToStringx(solution_type) << " not implemented yet"); } @@ -66,5 +66,5 @@ } else{ - _error2_("Solution " << EnumToStringx(solution_type) << " not implemented yet"); + _error_("Solution " << EnumToStringx(solution_type) << " not implemented yet"); } Index: /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 13056) @@ -52,5 +52,5 @@ } #else - _error2_("ISSM was not compiled with thermal capabilities. Exiting"); + _error_("ISSM was not compiled with thermal capabilities. Exiting"); #endif Index: /issm/trunk-jpl/src/c/solutions/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/solutions/transient_core.cpp (revision 13056) @@ -104,5 +104,5 @@ } #else - _error2_("ISSM was not compiled with thermal capabilities. Exiting"); + _error_("ISSM was not compiled with thermal capabilities. Exiting"); #endif } @@ -113,5 +113,5 @@ diagnostic_core(femmodel); #else - _error2_("ISSM was not compiled with diagnostic capabilities. Exiting"); + _error_("ISSM was not compiled with diagnostic capabilities. Exiting"); #endif } @@ -129,5 +129,5 @@ GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); #else - _error2_("ISSM was not compiled with grounding line migration capabilities. Exiting"); + _error_("ISSM was not compiled with grounding line migration capabilities. Exiting"); #endif } Index: /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 13055) +++ /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 13056) @@ -119,5 +119,5 @@ break; default: - _error2_("unknown norm !"); + _error_("unknown norm !"); break; } @@ -150,6 +150,6 @@ AX->GetSize(&AXM); - if(M!=AXM)_error2_("A and AX should have the same number of rows!"); - if(N!=XM)_error2_("A and X should have the same number of columns!"); + if(M!=AXM)_error_("A and AX should have the same number of rows!"); + if(N!=XM)_error_("A and X should have the same number of columns!"); for(i=0;i