Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 (revision 13056) @@ -14,13 +14,21 @@ 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 }}} + dnl Modules build {{{ AC_ARG_WITH([modules], AS_HELP_STRING([--with-modules = value],[modules compilation. ]), @@ -588,7 +596,7 @@ METISLIB=-L"$METIS_ROOT/lib -lmetis" ;; esac - + METISINCL=-I"$METIS_ROOT/include" AC_DEFINE([_METIS_VERSION_],[5],[ Metis version number]) fi @@ -605,7 +613,7 @@ dnl mpi{{{ 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=""]) AC_ARG_WITH([mpi-include], @@ -619,7 +627,7 @@ HAVE_MPI=no 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)]) AC_SUBST([MPIINCL]) Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/convergence.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/convergence.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/convergence.cpp (revision 13056) @@ -71,7 +71,7 @@ res=nKUoldF/nF; 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!"); } //clean up @@ -95,7 +95,7 @@ duf=old_uf->Duplicate(); old_uf->Copy(duf); duf->AYPX(uf,-1.0); 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 xdelete(&duf); @@ -120,7 +120,7 @@ //compute max(du) 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 xdelete(&duf); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/CorePointerFromSolutionEnum.cpp (revision 13056) @@ -28,74 +28,74 @@ #ifdef _HAVE_DIAGNOSTIC_ solutioncore=&diagnostic_core; #else - _error2_("ISSM was not compiled with diagnostic capabilities. Exiting"); + _error_("ISSM was not compiled with diagnostic capabilities. Exiting"); #endif break; case SteadystateSolutionEnum: #ifdef _HAVE_STEADYSTATE_ solutioncore=&steadystate_core; #else - _error2_("ISSM was not compiled with steady state capabilities. Exiting"); + _error_("ISSM was not compiled with steady state capabilities. Exiting"); #endif break; case ThermalSolutionEnum: #ifdef _HAVE_THERMAL_ solutioncore=&thermal_core; #else - _error2_("ISSM was not compiled with thermal capabilities. Exiting"); + _error_("ISSM was not compiled with thermal capabilities. Exiting"); #endif break; case EnthalpySolutionEnum: #ifdef _HAVE_THERMAL_ solutioncore=&enthalpy_core; #else - _error2_("ISSM was not compiled with thermal capabilities. Exiting"); + _error_("ISSM was not compiled with thermal capabilities. Exiting"); #endif break; case BalancethicknessSolutionEnum: #ifdef _HAVE_BALANCED_ solutioncore=&balancethickness_core; #else - _error2_("ISSM was not compiled with balanced capabilities. Exiting"); + _error_("ISSM was not compiled with balanced capabilities. Exiting"); #endif break; case HydrologySolutionEnum: #ifdef _HAVE_HYDROLOGY_ solutioncore=&hydrology_core; #else - _error2_("ISSM was not compiled with hydrology capabilities. Exiting"); + _error_("ISSM was not compiled with hydrology capabilities. Exiting"); #endif break; case SurfaceSlopeSolutionEnum: #ifdef _HAVE_SLOPE_ solutioncore=&surfaceslope_core; #else - _error2_("ISSM was not compiled with slope capabilities. Exiting"); + _error_("ISSM was not compiled with slope capabilities. Exiting"); #endif break; case BedSlopeSolutionEnum: #ifdef _HAVE_SLOPE_ solutioncore=&bedslope_core; #else - _error2_("ISSM was not compiled with slope capabilities. Exiting"); + _error_("ISSM was not compiled with slope capabilities. Exiting"); #endif break; case TransientSolutionEnum: #ifdef _HAVE_TRANSIENT_ solutioncore=&transient_core; #else - _error2_("ISSM was not compiled with transient capabilities. Exiting"); + _error_("ISSM was not compiled with transient capabilities. Exiting"); #endif break; case PrognosticSolutionEnum: #ifdef _HAVE_PROGNOSTIC_ solutioncore=&prognostic_core; #else - _error2_("ISSM was not compiled with prognostic capabilities. Exiting"); + _error_("ISSM was not compiled with prognostic capabilities. Exiting"); #endif break; default: - _error2_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!"); + _error_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!"); break; } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/steadystate_core.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/steadystate_core.cpp (revision 13056) @@ -51,7 +51,7 @@ enthalpy_core(femmodel); } #else - _error2_("ISSM was not compiled with thermal capabilities. Exiting"); + _error_("ISSM was not compiled with thermal capabilities. Exiting"); #endif if(VerboseSolution()) _pprintLine_(" computing new velocity"); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/WriteLockFile.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/WriteLockFile.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/WriteLockFile.cpp (revision 13056) @@ -16,10 +16,10 @@ /* Open lock file and write 1 into it: */ 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/ProcessArguments.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/ProcessArguments.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/ProcessArguments.cpp (revision 13056) @@ -16,9 +16,9 @@ char *petscfilename = NULL; char *lockfilename = NULL; - if(argc<2)_error2_("Usage error: no solution requested"); + if(argc<2)_error_("Usage error: no solution requested"); *solution_type=StringToEnumx(argv[1]); - if(argc<3)_error2_("Usage error: missing model name"); + if(argc<3)_error_("Usage error: missing model name"); modelname=argv[3]; binfilename = xNew(strlen(modelname)+strlen(".bin") +1); sprintf(binfilename, "%s%s",modelname,".bin"); outbinfilename = xNew(strlen(modelname)+strlen(".outbin")+1); sprintf(outbinfilename,"%s%s",modelname,".outbin"); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/gradient_core.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/gradient_core.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/gradient_core.cpp (revision 13056) @@ -36,8 +36,8 @@ /*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: */ ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,new_gradient); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/AdjointCorePointerFromSolutionEnum.cpp (revision 13056) @@ -34,7 +34,7 @@ adjointcore=&adjointbalancethickness_core; break; default: - _error2_("No adjoint has been implemented for solution " << EnumToStringx(solutiontype) << " yet"); + _error_("No adjoint has been implemented for solution " << EnumToStringx(solutiontype) << " yet"); break; } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp (revision 13056) @@ -109,7 +109,7 @@ break; default: - _error2_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!"); + _error_("solution type: " << EnumToStringx(solutiontype) << " not supported yet!"); break; } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/issm.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/issm.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/issm.cpp (revision 13056) @@ -52,7 +52,7 @@ /*Initialize environments: Petsc, MPI, etc...: */ #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_ MPI_Init(&argc,&argv); @@ -127,7 +127,7 @@ #ifdef _HAVE_DAKOTA_ 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 } else if(control_analysis){ @@ -137,7 +137,7 @@ else 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 } else{ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/transient_core.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/transient_core.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/transient_core.cpp (revision 13056) @@ -103,7 +103,7 @@ enthalpy_core(femmodel); } #else - _error2_("ISSM was not compiled with thermal capabilities. Exiting"); + _error_("ISSM was not compiled with thermal capabilities. Exiting"); #endif } @@ -112,7 +112,7 @@ #ifdef _HAVE_DIAGNOSTIC_ diagnostic_core(femmodel); #else - _error2_("ISSM was not compiled with diagnostic capabilities. Exiting"); + _error_("ISSM was not compiled with diagnostic capabilities. Exiting"); #endif } @@ -128,7 +128,7 @@ #ifdef _HAVE_GROUNDINGLINE_ 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/objectivefunction.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 13056) @@ -48,7 +48,7 @@ femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum); } else{ - _error2_("Solution " << EnumToStringx(solution_type) << " not implemented yet"); + _error_("Solution " << EnumToStringx(solution_type) << " not implemented yet"); } /*update parameter according to scalar: */ //false means: do not save control @@ -65,7 +65,7 @@ solver_linear(femmodel); } else{ - _error2_("Solution " << EnumToStringx(solution_type) << " not implemented yet"); + _error_("Solution " << EnumToStringx(solution_type) << " not implemented yet"); } /*Compute misfit for this velocity field.*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/kriging.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/kriging.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/kriging.cpp (revision 13056) @@ -39,7 +39,7 @@ /*Initialize environments: Petsc, MPI, etc...: */ #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_ MPI_Init(&argc,&argv); @@ -121,7 +121,7 @@ char *outbinfilename = NULL; 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"); outbinfilename = xNew((strlen(modelname)+strlen(".outbin")+1)); sprintf(outbinfilename,"%s%s",modelname,".outbin"); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/controltao_core.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/controltao_core.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/controltao_core.cpp (revision 13056) @@ -41,7 +41,7 @@ int argc; char **args=NULL; 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*/ femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); @@ -74,7 +74,7 @@ xdelete(&XL); xdelete(&XU); - user.J=(double*)xcalloc((maxiter+5),sizeof(double)); + user.J=xNewZeroInit(maxiter+5); user.femmodel=femmodel; TaoSetObjectiveAndGradientRoutine(tao,FormFunctionGradient,(void*)&user); @@ -184,6 +184,6 @@ #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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 13056) @@ -106,6 +106,8 @@ ENUM=0; #Add header to pythonenum file{{{ cat < $ISSM_DIR/src/m/enum/EnumDefinitions.py +from StringToEnum import StringToEnum + """ WARNING: DO NOT MODIFY THIS FILE @@ -165,7 +167,7 @@ macro=$NAMEENUM() """ - return StringToEnum('$NAME') + return StringToEnum('$NAME')[0] END #}}} Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/OptionParse.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 13056) @@ -26,7 +26,7 @@ /*check and parse the value */ if (!mxIsClass(prhs[0],"double")){ - _error2_("Value of option \"" << odouble->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]); @@ -44,7 +44,7 @@ /*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]); @@ -62,7 +62,7 @@ /*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]); @@ -86,7 +86,7 @@ /*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]); ostruct->ndims=mxGetNumberOfDimensions(prhs[0]); @@ -132,7 +132,7 @@ /*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]) <<"\"."); } ocell->numel=mxGetNumberOfElements(prhs[0]); @@ -180,7 +180,7 @@ option=(Option*)OptionStructParse(name,(const mxArray**)lhs); 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]) <<"\"."); } return(option); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/CheckNumMatlabArguments.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/CheckNumMatlabArguments.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/CheckNumMatlabArguments.cpp (revision 13056) @@ -21,11 +21,11 @@ if (NRHS==0 && NLHS==0)return 1; /* special case: */ function(); - _error2_("usage: see above"); + _error_("usage: see above"); } else if (nlhs!=NLHS || nrhs!=NRHS ) { function(); - _error2_("usage error."); + _error_("usage error."); } return 1; } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 13056) @@ -47,7 +47,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -88,7 +88,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -133,7 +133,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -175,7 +175,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -237,7 +237,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -268,7 +268,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -300,7 +300,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -332,7 +332,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -364,7 +364,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -380,7 +380,7 @@ /*Ok, the string should be coming directly from the matlab workspace: */ if (!mxIsClass(dataref,"char")){ - _error2_("input data_type is not a string!"); + _error_("input data_type is not a string!"); } else{ /*Recover the string:*/ @@ -415,7 +415,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -433,7 +433,7 @@ double scalar; if (!mxIsClass(dataref,"double")){ - _error2_("input data_type is not a double!"); + _error_("input data_type is not a double!"); } else{ /*Recover the double: */ @@ -450,7 +450,7 @@ int integer; if (!mxIsClass(dataref,"double")){ - _error2_("input data_type is not a scalar!"); + _error_("input data_type is not a scalar!"); } else{ /*Recover the double: */ @@ -467,12 +467,12 @@ bool* mxbool_ptr=NULL; if (mxIsClass(dataref,"logical")){ - if(mxGetM(dataref)!=1) _error2_("input data is not of size 1x1"); - if(mxGetN(dataref)!=1) _error2_("input data is not of size 1x1"); + if(mxGetM(dataref)!=1) _error_("input data is not of size 1x1"); + if(mxGetN(dataref)!=1) _error_("input data is not of size 1x1"); mxbool_ptr=mxGetLogicals(dataref); } else{ - _error2_("input data_type is not a bool!"); + _error_("input data_type is not a bool!"); } *pboolean=*mxbool_ptr; @@ -494,7 +494,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -518,7 +518,7 @@ } else{ /*This is an error: we don't have the correct input!: */ - _error2_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); + _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } /*Assign output pointers:*/ @@ -619,10 +619,10 @@ /*Fetch all options*/ for (int i=istart; iAddOption(option); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToDoubleVector.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToDoubleVector.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToDoubleVector.cpp (revision 13056) @@ -45,7 +45,7 @@ nnz=mxGetNzmax(mxvector); /*Check that input is actualy a vector*/ - if (cols!=1) _error2_("input vector of size " << rows << "x" << cols << " should have only one column"); + if (cols!=1) _error_("input vector of size " << rows << "x" << cols << " should have only one column"); nz=(int)((double)nnz/(double)rows); @@ -76,7 +76,7 @@ cols=mxGetN(mxvector); /*Check that input is actualy a vector*/ - if (cols!=1) _error2_("input vector of size " << rows << "x" << cols << " should have only one column"); + if (cols!=1) _error_("input vector of size " << rows << "x" << cols << " should have only one column"); /*allocate and memcpy*/ if(rows){ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToDoubleMatrix.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToDoubleMatrix.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToDoubleMatrix.cpp (revision 13056) @@ -118,7 +118,7 @@ } } else{ - _error2_("Matlab matrix type Not implemented yet"); + _error_("Matlab matrix type Not implemented yet"); } /*Assign output pointer: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/pythonio.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/pythonio.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/pythonio.h (revision 13056) @@ -27,6 +27,7 @@ //void WriteData(PyObject* py_tuple,double scalar); //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); void WriteData(PyObject* py_tuple, int index, Vector* vector); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp (revision 13056) @@ -26,11 +26,11 @@ /*check on requested size: */ 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/FetchPythonData.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 13056) @@ -47,7 +47,7 @@ bool boolean; /*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: */ boolean=(bool)PyLong_AsLong(py_boolean); @@ -68,7 +68,7 @@ /*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]; @@ -96,7 +96,7 @@ /*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]; @@ -124,7 +124,7 @@ /*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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/WritePythonData.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 13056) @@ -20,6 +20,12 @@ #include "../../EnumDefinitions/EnumDefinitions.h" +/*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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Parameters.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Parameters.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Parameters.cpp (revision 13056) @@ -64,7 +64,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ /*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{*/ @@ -81,7 +81,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ /*FUNCTION Parameters::FindParam(IssmDouble* pscalar, int enum_type){{{*/ @@ -98,7 +98,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ /*FUNCTION Parameters::FindParam(IssmDouble* pscalar, int enum_type,IssmDouble time){{{*/ @@ -115,7 +115,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ /*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{*/ @@ -132,7 +132,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -150,7 +150,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -168,7 +168,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -186,7 +186,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -204,7 +204,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -222,7 +222,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -240,7 +240,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ /*FUNCTION Parameters::FindParam(Vector** pvec,int enum_type){{{*/ @@ -257,7 +257,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -275,7 +275,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ @@ -293,7 +293,7 @@ return; } } - _error2_("could not find parameter " << EnumToStringx(enum_type)); + _error_("could not find parameter " << EnumToStringx(enum_type)); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.cpp (revision 13056) @@ -202,7 +202,7 @@ /*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); } @@ -231,7 +231,7 @@ /*Get vector for result number i*/ 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); for(int j=0;jSize();j++){ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Observations.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Observations.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Observations.cpp (revision 13056) @@ -57,12 +57,12 @@ options->Get(&mintrimming,"mintrimming",-1.e+21); 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)); } else{ @@ -382,7 +382,7 @@ SolverxSeq(&Ginv1, Gamma,ones,n_obs); // Gamma^-1 ones SolverxSeq(&GinvZ, Gamma,obs,n_obs); // Gamma^-1 Z #else - _error2_("GSL is required"); + _error_("GSL is required"); #endif /*Prepare predictor*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Inputs.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Inputs.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Inputs.cpp (revision 13056) @@ -56,7 +56,7 @@ if (!found){ /*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) << ")"); } /*Ok, we have an input if we made it here, request the input to return the value: */ @@ -84,7 +84,7 @@ if (!found){ /*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) << ")"); } /*Ok, we have an input if we made it here, request the input to return the value: */ @@ -112,7 +112,7 @@ if (!found){ /*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) << ")"); } /*Ok, we have an input if we made it here, request the input to return the value: */ @@ -140,7 +140,7 @@ if (!found){ /*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) << ")"); } /*Ok, we have an input if we made it here, request the input to return the value: */ @@ -212,7 +212,7 @@ constrain_input=(Input*)this->GetInput(constrain_enum); /*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: */ constrain_input->ConstrainMin(minimum); @@ -253,7 +253,7 @@ max=input->Max(); } else{ - _error2_("Input " << EnumToStringx(enumtype) << " not found"); + _error_("Input " << EnumToStringx(enumtype) << " not found"); } /*Return output*/ @@ -274,7 +274,7 @@ max=input->MaxAbs(); } else{ - _error2_("Input " << EnumToStringx(enumtype) << " not found"); + _error_("Input " << EnumToStringx(enumtype) << " not found"); } /*Return output*/ @@ -295,7 +295,7 @@ min=input->Min(); } else{ - _error2_("Input " << EnumToStringx(enumtype) << " not found"); + _error_("Input " << EnumToStringx(enumtype) << " not found"); } /*Return output*/ @@ -316,7 +316,7 @@ min=input->MinAbs(); } else{ - _error2_("Input " << EnumToStringx(enumtype) << " not found"); + _error_("Input " << EnumToStringx(enumtype) << " not found"); } /*Return output*/ @@ -368,7 +368,7 @@ /*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(); /*Change copy enum to reinitialized_enum: */ @@ -415,8 +415,8 @@ yinput=(Input*)this->GetInput(MeshYEnum); /*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: */ yinput->AXPY(xinput,scalar); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.cpp (revision 13056) @@ -132,7 +132,7 @@ 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"); @@ -149,7 +149,7 @@ 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"); @@ -193,11 +193,11 @@ int i; _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)); } /*Convert the id offset into sorted offset: */ @@ -258,7 +258,7 @@ /*Only sort if we are not already sorted: */ if(!sorted){ - _error2_("not implemented yet!"); + _error_("not implemented yet!"); } } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Options.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Options.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Options.cpp (revision 13056) @@ -46,17 +46,17 @@ _assert_(in_option); /*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*/ for(object=objects.begin();objectname,in_option->name)){ - _error2_("Options \"" << in_option->name << "\" found multiple times"); + _error_("Options \"" << in_option->name << "\" found multiple times"); break; } } @@ -82,7 +82,7 @@ } /*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"); } } /*}}}*/ @@ -120,7 +120,7 @@ } /*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"); } } /*}}}*/ @@ -158,7 +158,7 @@ } /*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"); } } /*}}}*/ @@ -198,7 +198,7 @@ } /*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"); } } @@ -263,7 +263,7 @@ } /*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())); } } /*Else, the Option does not exist, no default provided*/ @@ -289,7 +289,7 @@ } /*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"); } } /*}}}*/ @@ -323,7 +323,7 @@ } /*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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h (revision 13056) @@ -22,25 +22,15 @@ /*Printing macro: only cpu number 0 */ #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; \ throw ErrorException(__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0) @@ -74,7 +64,7 @@ /*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/ #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 "<(pivrc1); xDelete(pivrc2); xDelete(pindx); - _error2_("Pivot " << pivot << " less than machine epsilon"); + _error_("Pivot " << pivot << " less than machine epsilon"); noerr=0; return noerr; } @@ -348,7 +348,7 @@ /*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*/ Ainv[0]= A[3]/det; /* = d/det */ @@ -373,7 +373,7 @@ /*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*/ Ainv[0]=(A[4]*A[8]-A[5]*A[7])/det; /* = (e*i-f*h)/det */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (revision 13056) @@ -43,14 +43,14 @@ /*initialize counter and get response at the boundaries*/ 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; /*3: update the other variables*/ @@ -158,7 +158,7 @@ //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; // Update a, b, xm, x1, x2, tol1, tol2 Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 13056) @@ -1669,7 +1669,7 @@ } while (iter < MAX_GAUS_ITER); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 13056) @@ -56,7 +56,7 @@ } 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)); } /*ok, grab the option string: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 13056) @@ -28,7 +28,7 @@ /*Now, which direction are we going? once determined, use scale factor: */ if(direction_enum==IuToExtEnum) for(i=0;i(nu))eps=ndu/nu; 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:*/ *peps=eps; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp (revision 13056) @@ -40,7 +40,7 @@ //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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/String/DescriptorIndex.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/String/DescriptorIndex.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/String/DescriptorIndex.cpp (revision 13056) @@ -22,12 +22,12 @@ /*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)); /*now recover the index if it exists: */ @@ -43,22 +43,22 @@ else if (strncmp(pch,"indexed",7)==0){ /*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; } else if (strncmp(pch,"nodal",5)==0){ /*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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 13056) @@ -30,11 +30,11 @@ 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; } @@ -43,11 +43,11 @@ 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; } @@ -87,11 +87,11 @@ 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Threads/LaunchThread.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Threads/LaunchThread.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Threads/LaunchThread.cpp (revision 13056) @@ -43,12 +43,12 @@ for(i=0;i=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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Xy2llx/Xy2llx.cpp (revision 13056) @@ -52,7 +52,7 @@ double cde,re,ex2,ex; 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; slat = standard_parallel; @@ -130,7 +130,7 @@ *pslat = 71; 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 13056) @@ -29,7 +29,7 @@ /*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"); } /*figure out what kind of interpolation is needed*/ @@ -40,7 +40,7 @@ interpolation_type=2; } 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)!"); } /*First, allocate pointers: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 13056) @@ -26,7 +26,7 @@ parameters->FindParam(&analysis_type,AnalysisTypeEnum); 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){ /*Create flag for grounded vertices above the hydrostatic equilibrium: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Dakotax/SpawnCoreParallel.cpp (revision 13056) @@ -71,7 +71,7 @@ #ifdef _HAVE_CONTROL_ 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 /*Run the core solution sequence: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Dakotax/DescriptorIndex.cpp (revision 13056) @@ -22,12 +22,12 @@ /*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)); /*now recover the index if it exists: */ @@ -43,22 +43,22 @@ else if (strncmp(pch,"indexed",7)==0){ /*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; } else if (strncmp(pch,"nodal",5)==0){ /*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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 13056) @@ -25,7 +25,7 @@ /*Get size of vector: */ gsize=nodes->NumberOfDofs(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: */ solution=new Vector(gsize); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp (revision 13056) @@ -37,7 +37,7 @@ if( (edge1==IntersectEnum) && (edge2==IntersectEnum) && (edge3==IntersectEnum) ){ /*This case is impossible: */ - _error2_("error: a line cannot go through 3 different vertices!"); + _error_("error: a line cannot go through 3 different vertices!"); } else if( ((edge1==IntersectEnum) && (edge2==IntersectEnum)) || ((edge2==IntersectEnum) && (edge3==IntersectEnum)) || ((edge3==IntersectEnum) && (edge1==IntersectEnum)) ){ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ElementResponsex/ElementResponsex.cpp (revision 13056) @@ -38,7 +38,7 @@ /*Broadcast whether we found the element: */ #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 /*Ok, we found the element, compute responseocity: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 13056) @@ -29,7 +29,7 @@ /*Do we have penalties linked to rifts? In this case, run our special rifts penalty * 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)){ ThermalConstraintsReset(loads,analysis_type); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 13056) @@ -94,10 +94,10 @@ xDelete(distributed_values); } 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{ /*Ok, standard variable, just update inputs using the variable: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Ll2xyx/Ll2xyx.cpp (revision 13056) @@ -51,7 +51,7 @@ double latitude,longitude; 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; slat = standard_parallel; @@ -122,7 +122,7 @@ *pslat = 71; 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp (revision 13056) @@ -54,7 +54,7 @@ /*read exp file */ 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; i(numberofelements); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 13056) @@ -31,7 +31,7 @@ } } else{ - _error2_("vector type: " << EnumToStringx(type) << " not supported yet!"); + _error_("vector type: " << EnumToStringx(type) << " not supported yet!"); } vector->Assemble(); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (revision 13056) @@ -137,7 +137,7 @@ xDelete(gate.percent); } else{ - _error2_("output '" << output << "' not supported yet"); + _error_("output '" << output << "' not supported yet"); } /*clean-up and Assign output pointer*/ @@ -304,7 +304,7 @@ else if(strcmp(model,"exponential")==0) variogram = new ExponentialVariogram(options); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp (revision 13056) @@ -102,7 +102,7 @@ #endif } else{ - _error2_("output '" << output << "' not supported yet"); + _error_("output '" << output << "' not supported yet"); } /*clean-up and Assign output pointer*/ @@ -125,7 +125,7 @@ else if(strcmp(model,"exponential")==0) variogram = new ExponentialVariogram(options); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/NodalValuex/NodalValuex.cpp (revision 13056) @@ -37,7 +37,7 @@ /*Broadcast whether we found the element: */ #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 /*Broadcast and plug into response: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 13056) @@ -47,7 +47,7 @@ case VyEnum: iomodel->FetchData(1,VyEnum); break; case FrictionCoefficientEnum: iomodel->FetchData(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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 13056) @@ -102,7 +102,7 @@ } } else{ - _error2_("not implemented yet"); + _error_("not implemented yet"); } /*Second: add all missing nodes*/ @@ -110,7 +110,7 @@ /*Get edges and elements*/ 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: */ for (i=0;imy_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*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: */ iomodel->FetchData(7,MeshElementsEnum,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 13056) @@ -63,7 +63,7 @@ doftype[4]=StokesApproximationEnum; 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){ numdofs=1; @@ -92,7 +92,7 @@ else if (analysis_type==BalancethicknessAnalysisEnum){ 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->Init(numdofs,doftype); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 13056) @@ -32,7 +32,7 @@ if(!loads) loads = new Loads(); /*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 iomodel->FetchData(2,ThermalSpctemperatureEnum,MeshElementsEnum); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 13056) @@ -25,7 +25,7 @@ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); /*if 2d: Error*/ - if (dim==2) _error2_("2d meshes not supported yet"); + if (dim==2) _error_("2d meshes not supported yet"); /*Recover pointer: */ loads=*ploads; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 13056) @@ -145,7 +145,7 @@ } } - 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*/ else if ((int)vertices_type[i]==PattynStokesApproximationEnum){ @@ -185,7 +185,7 @@ count++; } } - 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*/ else if ((int)vertices_type[i]==MacAyealStokesApproximationEnum){ @@ -225,7 +225,7 @@ count++; } } - 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*/ else{ @@ -318,7 +318,7 @@ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0.,DiagnosticHorizAnalysisEnum)); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 13056) @@ -45,7 +45,7 @@ NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); /*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: */ iomodel->FetchData(7,MeshElementsEnum,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 13056) @@ -152,7 +152,7 @@ /*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: */ for(i=0;i=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 } @@ -119,7 +119,7 @@ /*Stokes: */ 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); /*Set field splits: */ @@ -150,7 +150,7 @@ /*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:*/ KSPFree(&ksp); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/Solverx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 13056) @@ -43,7 +43,7 @@ SolverxSeq(&uf->svector,Kff->smatrix,pf->svector); break;} default: - _error2_("Matrix type: " << Kff->type << " not supported yet!"); + _error_("Matrix type: " << Kff->type << " not supported yet!"); } /*Assign output pointers: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/SolverxSeq.cpp (revision 13056) @@ -29,8 +29,8 @@ Kff->GetSize(&M,&N); 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); uf=new SeqVec(x,N); @@ -39,7 +39,7 @@ *puf=uf; #else - _error2_("GSL support not compiled in!"); + _error_("GSL support not compiled in!"); #endif }/*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13056) @@ -36,13 +36,13 @@ /*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)"); } /*Allocate output vector: */ @@ -68,7 +68,7 @@ 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"); } /*Assign output pointers: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp (revision 13056) @@ -105,7 +105,7 @@ for(i=0;i(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); #ifdef _HAVE_MPI_ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 13056) @@ -53,8 +53,8 @@ /*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*/ if(pnorm_list){ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 13056) @@ -85,7 +85,7 @@ } } else if (flag==NodalEnum){ - _error2_("nodal response functions not supported yet!"); + _error_("nodal response functions not supported yet!"); /*increment response_pointer :*/ responses_pointer++; @@ -103,7 +103,7 @@ responses_pointer++; } } - else _error2_("flag type " << flag << " not supported yet for response analysis"); + else _error_("flag type " << flag << " not supported yet for response analysis"); } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/KMLMeshWritex/KMLMeshWritex.cpp (revision 13056) @@ -132,7 +132,7 @@ nodecon[ipt+(nncon-1)]++; } else - _error2_("Nodal connectivity table needs more than specified " << mxepg << " columns.\n"); + _error_("Nodal connectivity table needs more than specified " << mxepg << " columns.\n"); } jpt++; } @@ -172,7 +172,7 @@ } else - _error2_("Data matrix has incorrect number of " << mdata << " rows.\n"); + _error_("Data matrix has incorrect number of " << mdata << " rows.\n"); } /* write folder for mesh */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 13056) @@ -74,7 +74,7 @@ /* open shp/shx files */ 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 13056) @@ -37,8 +37,8 @@ /*First of, find the record for the enum, and get code of data type: */ 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:*/ iomodel->FetchData(&IssmDoublevector,&M,&N,vector_enum); @@ -98,7 +98,7 @@ } } else{ - _error2_("Size of field " << EnumToStringx(vector_enum) << " not supported"); + _error_("Size of field " << EnumToStringx(vector_enum) << " not supported"); } /*Free ressources:*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp (revision 13056) @@ -59,6 +59,6 @@ xDelete(tpwgts); #else - _error2_("METIS version not supported yet"); + _error_("METIS version not supported yet"); #endif } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 13056) @@ -84,7 +84,7 @@ for(i=0;ivector[list[i]]=values[i]; break; default: - _error2_("unknown insert mode!"); + _error_("unknown insert mode!"); break; } @@ -101,7 +101,7 @@ this->vector[dof]=value; break; default: - _error2_("unknown insert mode!"); + _error_("unknown insert mode!"); break; } } @@ -203,7 +203,7 @@ return sqrt(norm); break; default: - _error2_("unknown norm !"); + _error_("unknown norm !"); break; } } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 13056) @@ -118,7 +118,7 @@ return norm; break; default: - _error2_("unknown norm !"); + _error_("unknown norm !"); break; } } @@ -149,8 +149,8 @@ X->GetSize(&XM); 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;imatrix[N*idxm[i]+idxn[j]]=values[n*i+j]; break; default: - _error2_("unknown insert mode!"); + _error_("unknown insert mode!"); break; } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp (revision 13056) @@ -50,7 +50,7 @@ MatGetLocalSize(*A,&local_mA,&local_nA); /*Some dimensions checks: */ - if (mA!=nA) _error2_("trying to take the invert of a non-square matrix!"); + if (mA!=nA) _error_("trying to take the invert of a non-square matrix!"); /* Set default Plapack parameters */ //First find nprows*npcols=num_procs; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp (revision 13056) @@ -29,7 +29,7 @@ return MATSEQAIJ; break; default: - _error2_("unknown matrix type !"); + _error_("unknown matrix type !"); break; } } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp (revision 13056) @@ -29,7 +29,7 @@ return INSERT_VALUES; break; default: - _error2_("unknown insert mode!"); + _error_("unknown insert mode!"); break; } } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatInvert.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatInvert.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatInvert.cpp (revision 13056) @@ -28,7 +28,7 @@ /*Some checks: */ MatGetSize(matrix,&M,&N); - if(M!=N) _error2_("trying to invert a non square matrix!"); + if(M!=N) _error_("trying to invert a non square matrix!"); /*Create identitiy matrix: */ identity=NewMat(M,N,sparsity); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp (revision 13056) @@ -61,7 +61,7 @@ #endif } else{ - _error2_("MatType " << type << " not supported yet"); + _error_("MatType " << type << " not supported yet"); } /*Assemble*/ MatAssemblyBegin(outmatrix,MAT_FINAL_ASSEMBLY); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp (revision 13056) @@ -29,7 +29,7 @@ return NORM_2; break; default: - _error2_("unknown norm !"); + _error_("unknown norm !"); break; } } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (revision 13056) @@ -54,7 +54,7 @@ * and set the option, then end the token analysis.*/ if(first[0]!='-'){ /*This is not good, the option does not have '-'! Get out*/ - _error2_("Option " << first << " should be preceded by '-'!"); + _error_("Option " << first << " should be preceded by '-'!"); } /*Reduce first to bare option value*/ PetscStrlen(first,&len); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp (revision 13056) @@ -34,7 +34,7 @@ /*If the dimension of the partitioning vector is not the same as that of vector B, we have a problem: */ if ( (row_partition_size !=MB) ){ - _error2_("Dimensions of partitioning vector incompatible with dimensions of input vector\n"); + _error_("Dimensions of partitioning vector incompatible with dimensions of input vector\n"); } /*Get values from vector B and plug them into vector A, using the partitioning vector*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 13056) @@ -5,22 +5,22 @@ #Library declaration {{{ 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 #}}} @@ -1010,28 +1010,29 @@ libISSMCore_a_SOURCES = $(issm_sources) 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) libISSMModules_a_SOURCES += $(kriging_sources) libISSMModules_a_SOURCES += $(kml_sources) libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS) +libISSMModules_a_LIBADD = ./libISSMCore.a endif if PYTHON @@ -1040,13 +1041,18 @@ endif 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. {{{ libISSMOverload_a_SOURCES = ./shared/String/stricmp.c Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/DofIndexing.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/DofIndexing.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/DofIndexing.cpp (revision 13056) @@ -142,7 +142,7 @@ if(this->ssize)this->sdoflist=xNew(size); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/Hook.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/Hook.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/Hook.cpp (revision 13056) @@ -184,7 +184,7 @@ if(this->objects[i]==NULL){ 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!"); } } } @@ -193,10 +193,10 @@ Object* Hook::delivers(void){ /*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; } @@ -245,11 +245,11 @@ } /*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); output->ids=xNew(output->num); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/gauss/GaussTria.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/gauss/GaussTria.cpp (revision 13056) @@ -79,7 +79,7 @@ for(i=0;iGetInput(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: */ input->GetVectorFromInputs(vector,&doflist1[0]);} break; - default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); + default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); } } /*}}}*/ @@ -259,7 +259,7 @@ } /*Checks in debugging mode*/ - if(viscosity<=0) _error2_("Negative viscosity"); + if(viscosity<=0) _error_("Negative viscosity"); _assert_(B>0); _assert_(n>0); @@ -330,7 +330,7 @@ } /*Checks in debugging mode*/ - if(viscosity3d<=0) _error2_("Negative viscosity"); + if(viscosity3d<=0) _error_("Negative viscosity"); _assert_(B>0); _assert_(n>0); @@ -402,7 +402,7 @@ } /*Checks in debugging mode*/ - if(viscosity3d<=0) _error2_("Negative viscosity"); + if(viscosity3d<=0) _error_("Negative viscosity"); _assert_(B>0); _assert_(n>0); @@ -563,9 +563,9 @@ this->inputs->AddInput(new TriaP1Input(name,values)); return; } - default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); + default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); } - default: _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); + default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); } } /*}}}*/ @@ -621,9 +621,9 @@ /*}}}*/ return; } - default: _error2_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); + default: _error_("element " << EnumToStringx(element->ObjectEnum()) << " not implemented yet"); } - default: _error2_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); + default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); } @@ -763,7 +763,7 @@ } #endif else{ - _error2_("Mesh type not supported yet!"); + _error_("Mesh type not supported yet!"); } return; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Materials/Matpar.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 13056) @@ -61,10 +61,10 @@ void InputUpdateFromConstant(int constant, int name); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h (revision 13056) @@ -39,7 +39,7 @@ 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: {{{*/ @@ -48,10 +48,10 @@ void GetInputValue(IssmDouble* pvalue); 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); @@ -66,15 +66,15 @@ void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters); 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); void GetValuesPtr(IssmDouble** pvalues,int* pnum_values); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13056) @@ -47,7 +47,7 @@ maxvalues =new PentaP1Input(enum_type,pmax); 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; } @@ -151,7 +151,7 @@ }/*}}}*/ /*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); }/*}}}*/ /*FUNCTION ControlInput::SetGradient{{{*/ @@ -169,7 +169,7 @@ gradient_in->ChangeEnum(Gradient3Enum); 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."); } /*Delete old gradient and assign new gradient*/ @@ -220,7 +220,7 @@ gradient->GetVectorFromInputs(vector,doflist); } else{ - _error2_("Data " << data << " not supported yet"); + _error_("Data " << data << " not supported yet"); } }/*}}}*/ /*FUNCTION ControlInput::GetInputAverage(IssmDouble* pvalue){{{*/ @@ -257,15 +257,15 @@ }/*}}}*/ /*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; this->savedvalues=(Input*)this->values->copy(); }/*}}}*/ /*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; this->values=(Input*)this->savedvalues->copy(); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h (revision 13056) @@ -40,11 +40,11 @@ /*ControlInput management: {{{*/ 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); /*}}}*/ /*numerics: {{{*/ @@ -54,38 +54,38 @@ void GetInputValue(IssmDouble* pvalue); 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); void ScaleGradient(IssmDouble scale); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13056) @@ -114,7 +114,7 @@ void DatasetInput::GetInputValue(IssmDouble* pvalue,GaussTria* gauss,int index){ /*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); input->GetInputValue(pvalue,gauss); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h (revision 13056) @@ -36,56 +36,56 @@ /*DatasetInput management: {{{*/ 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 13056) @@ -98,14 +98,14 @@ /*FUNCTION IntInput::SpawnResult{{{*/ ElementResult* IntInput::SpawnResult(int step, IssmDouble time){ - _error2_("not supported yet!"); + _error_("not supported yet!"); } /*}}}*/ /*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){{{*/ void IntInput::GetInputValue(int* pvalue){ @@ -114,20 +114,20 @@ /*}}}*/ /*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{{{*/ void IntInput::ChangeEnum(int newenumtype){ @@ -165,7 +165,7 @@ return; default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } } @@ -181,14 +181,14 @@ /*FUNCTION IntInput::GetVectorFromInputs{{{*/ void IntInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_("not supporte yet!"); + _error_("not supporte yet!"); } /*}}}*/ /*FUNCTION IntInput::GetValuesPtr{{{*/ void IntInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - _error2_("not supported yet!"); + _error_("not supported yet!"); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 13056) @@ -111,22 +111,22 @@ } /*}}}*/ /*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{{{*/ void BoolInput::ChangeEnum(int newenumtype){ @@ -160,7 +160,7 @@ return; default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } } @@ -175,14 +175,14 @@ /*FUNCTION BoolInput::GetVectorFromInputs{{{*/ void BoolInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_("not supporte yet!"); + _error_("not supporte yet!"); } /*}}}*/ /*FUNCTION BoolInput::GetValuesPtr{{{*/ void BoolInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - _error2_("not supported yet!"); + _error_("not supported yet!"); } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/IntInput.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/IntInput.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/IntInput.h (revision 13056) @@ -36,11 +36,11 @@ /*IntInput management: {{{*/ 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); /*}}}*/ /*numerics: {{{*/ @@ -49,34 +49,34 @@ void GetInputValue(IssmDouble* pvalue); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h (revision 13056) @@ -36,12 +36,12 @@ /*BoolInput management: {{{*/ 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: {{{*/ void GetInputValue(bool* pvalue); @@ -49,34 +49,34 @@ void GetInputValue(IssmDouble* pvalue); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13056) @@ -322,7 +322,7 @@ return; default : - _error2_("not implemented yet"); + _error_("not implemented yet"); } } @@ -367,7 +367,7 @@ IssmDouble minvalues[numnodes]; /*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; /*Create point wise min*/ @@ -398,7 +398,7 @@ IssmDouble maxvalues[numnodes]; /*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; /*Create point wise max*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h (revision 13056) @@ -36,33 +36,33 @@ /*TriaP1Input management: {{{*/ 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); void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters); @@ -76,8 +76,8 @@ IssmDouble MaxAbs(void); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 13056) @@ -481,7 +481,7 @@ } } } - 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*/ return input; Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 13056) @@ -454,12 +454,12 @@ return; 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"); } } @@ -494,7 +494,7 @@ IssmDouble *thickness_values = NULL; /*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*/ thickness_input->GetValuesPtr(&thickness_values,&num_thickness_values); @@ -510,7 +510,7 @@ return; default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } } /*}}}*/ @@ -528,7 +528,7 @@ IssmDouble AdotBvalues[numnodes]; /*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; /*Create point wise sum*/ @@ -559,7 +559,7 @@ IssmDouble minvalues[numnodes]; /*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; /*Create point wise min*/ @@ -590,7 +590,7 @@ IssmDouble maxvalues[numnodes]; /*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; /*Create point wise max*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 13056) @@ -107,13 +107,13 @@ /*Object functions*/ /*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"); } /*}}}*/ /*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"); } /*}}}*/ @@ -131,10 +131,10 @@ void DoubleInput::GetInputValue(IssmDouble* pvalue,GaussPenta* gauss){*pvalue=this->value;} /*}}}*/ /*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){{{*/ void DoubleInput::GetVxStrainRate2d(IssmDouble* epsilonvx,IssmDouble* xyz_list, GaussTria* gauss){ @@ -216,7 +216,7 @@ return; default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } } @@ -252,14 +252,14 @@ /*FUNCTION DoubleInput::GetVectorFromInputs{{{*/ void DoubleInput::GetVectorFromInputs(Vector* vector,int* doflist){ - _error2_("not supporte yet!"); + _error_("not supporte yet!"); } /*}}}*/ /*FUNCTION DoubleInput::GetValuesPtr{{{*/ void DoubleInput::GetValuesPtr(IssmDouble** pvalues,int* pnum_values){ - _error2_("not supported yet!"); + _error_("not supported yet!"); } /*}}}*/ @@ -275,7 +275,7 @@ IssmDouble thickness_value; /*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:*/ switch(thickness_input->ObjectEnum()){ @@ -286,7 +286,7 @@ return; default: - _error2_("not implemented yet"); + _error_("not implemented yet"); } } /*}}}*/ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h (revision 13056) @@ -39,50 +39,50 @@ /*TransientInput management: {{{*/ 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); IssmDouble MaxAbs(void); IssmDouble Min(void); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h (revision 13056) @@ -40,24 +40,24 @@ 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(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); void GetVzStrainRate3d(IssmDouble* epsilonvz,IssmDouble* xyz_list, GaussPenta* gauss); @@ -68,7 +68,7 @@ void SquareMin(IssmDouble* psquaremin, bool process_units,Parameters* parameters); 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); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.cpp (revision 13056) @@ -78,9 +78,9 @@ if (!strncmp(kstr,"")) KMLFileTokenParse( color ,NULL,KML_COLORSTYLE_COLOR_LENGTH, kstr, fid); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.cpp (revision 13056) @@ -139,9 +139,9 @@ break; } else if (!strncmp(kstri,"")) KMLFileTokenParse(&altitude , Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Feature.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Feature.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Feature.h (revision 13056) @@ -43,13 +43,13 @@ void DeepEcho(const char* indent); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Style.cpp (revision 13056) @@ -188,9 +188,9 @@ break; } else if (!strncmp(kstri,"")) KMLFileTokenParse(&width , Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h (revision 13056) @@ -31,13 +31,13 @@ void DeepEcho(const char* indent); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Object.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Object.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Object.h (revision 13056) @@ -30,13 +30,13 @@ virtual void Echo(); 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.");}; /*}}}*/ /*virtual functions: */ Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Folder.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Folder.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Folder.cpp (revision 13056) @@ -105,9 +105,9 @@ break; } else if (!strncmp(kstri,"")) KMLFileTokenParse( href ,NULL,KML_ICON_HREF_LENGTH, kstri, fid); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Point.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Point.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Point.cpp (revision 13056) @@ -125,9 +125,9 @@ break; } else if (!strncmp(kstri,"")) KMLFileTokenParse(&extrude , kstri, fid); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.cpp (revision 13056) @@ -138,9 +138,9 @@ break; } else if (!strncmp(kstri,"")) KMLFileTokenParse(&extrude,kstri,fid); Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Feature.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Feature.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Feature.cpp (revision 13056) @@ -148,9 +148,9 @@ if (!strncmp(kstr,"",1)) - _error2_("KMLFileTagName -- Missing tag delimiters in " << ktag << ".\n"); + _error_("KMLFileTagName -- Missing tag delimiters in " << ktag << ".\n"); /* strtok modifies ktag, so work on copy */ @@ -354,7 +354,7 @@ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n"); sscanf(kstr,"%d",pival); xDelete(kstr); @@ -367,7 +367,7 @@ (kstr[0] != '<') || (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); @@ -387,7 +387,7 @@ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || (kstr[0] == '<')) - {_error2_("KMLFileTokenParse -- Missing bool field for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing bool field for " << ktag << ".\n");} sscanf(kstr,"%d",&ival); *pbval=(bool)ival; @@ -401,7 +401,7 @@ (kstr[0] != '<') || (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); @@ -432,7 +432,7 @@ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing string field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing string field for " << ktag << ".\n"); if (!pstr) { if (maxlen) @@ -462,7 +462,7 @@ (kstr[0] != '<') || (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); @@ -483,7 +483,7 @@ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || (kstr[0] == '<')) - {_error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");} + {_error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n");} sscanf(kstr,"%g",pfval); xDelete(kstr); @@ -496,7 +496,7 @@ (kstr[0] != '<') || (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); @@ -517,7 +517,7 @@ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing integer field for " << ktag << ".\n"); sscanf(kstr,"%lg",pdval); xDelete(kstr); @@ -530,7 +530,7 @@ (kstr[0] != '<') || (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); @@ -555,7 +555,7 @@ if (!(kstr=KMLFileToken(fid, NULL,NULL)) || (kstr[0] == '<')) - _error2_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n"); + _error_("KMLFileTokenParse -- Missing double [m] field for " << ktag << ".\n"); if (!*pdval) if (maxlen) @@ -569,7 +569,7 @@ while (ktok) { 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); } @@ -594,7 +594,7 @@ (kstr[0] != '<') || (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); @@ -621,7 +621,7 @@ if (!(kstr=KMLFileToken(fid, 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) if (maxlen) @@ -635,7 +635,7 @@ while (ktok) { 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])); ktok=strtok(NULL,delim); @@ -664,7 +664,7 @@ (kstr[0] != '<') || (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); @@ -711,13 +711,13 @@ else if ((kstr[0] == '<') && (kstr[1] == '/')) { - _error2_("KMLFileTagSkip -- Unexpected closing tag " << kstr << ".\n"); + _error_("KMLFileTagSkip -- Unexpected closing tag " << kstr << ".\n"); } xDelete(kstr); } - _error2_("KMLFileTokenParse -- Corresponding closing tag for " << ktag << " not found.\n"); + _error_("KMLFileTokenParse -- Corresponding closing tag for " << ktag << " not found.\n"); return(0); } Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h (revision 13056) @@ -28,13 +28,13 @@ void DeepEcho(const char* indent); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp (revision 13056) @@ -82,9 +82,9 @@ if (!strncmp(kstr,"")) KMLFileTokenParse(&north , Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h (revision 13056) @@ -34,13 +34,13 @@ void DeepEcho(const char* indent); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h (revision 13056) @@ -33,13 +33,13 @@ void Write(FILE* fid,const char* indent); 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: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.cpp (revision 13056) @@ -116,9 +116,9 @@ break; } else if (!strncmp(kstri,"")) KMLFileTokenParse(&fill , Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 13055) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 13056) @@ -21,11 +21,9 @@ AM_SILENT_RULES([yes]) #Do not show compilation command by default 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 #Run issm_options.m4