Index: /issm/oecreview/Archive/12321-12677/Date.tex =================================================================== --- /issm/oecreview/Archive/12321-12677/Date.tex (revision 12679) +++ /issm/oecreview/Archive/12321-12677/Date.tex (revision 12679) @@ -0,0 +1,1 @@ +Jul-20-2012 Index: /issm/oecreview/Archive/12321-12677/ISSM-12321-12322.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12321-12322.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12321-12322.diff (revision 12679) @@ -0,0 +1,295 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Contour.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Contour.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Contour.h (revision 12322) +@@ -19,13 +19,13 @@ + + int id; + int nods; //number of vertices in the contour +- double* x; +- double* y; ++ IssmDouble* x; ++ IssmDouble* y; + bool closed; //is this contour closed? + + /*Contour constructors, destructors {{{1*/ + Contour(); +- Contour(int id, int nods, double* x, double* y,bool closed); ++ Contour(int id, int nods, IssmDouble* x, IssmDouble* y,bool closed); + ~Contour(); + /*}}}*/ + /*Object virtual functions{{{1*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Patch.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Patch.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Patch.h (revision 12322) +@@ -33,13 +33,13 @@ + int maxvertices; //maxvertices corresponds to largest amount of vertices on a given element, determined by the geometry. + int maxnodes; // maxnodes corresponds to the largest amout of nodes on a given element, determined by the interpolation type. + +- double* values; //result values ++ IssmDouble* values; //result values + + Patch(); + Patch(int numrows, int maxvertices, int maxnodes); + ~Patch(); + void fillelementinfo(int row, int element_id, int* vertices_ids, int num_vertices); +- void fillresultinfo(int row,int enum_type,int step, double time, int interpolation, double* nodal_values, int num_nodes); ++ void fillresultinfo(int row,int enum_type,int step, IssmDouble time, int interpolation, IssmDouble* nodal_values, int num_nodes); + void Gather(void); + + }; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Update.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Update.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Update.h (revision 12322) +@@ -14,19 +14,19 @@ + + public: + +- virtual void InputUpdateFromVector(double* vector, int name, int type)=0; ++ virtual void InputUpdateFromVector(IssmDouble* vector, int name, int type)=0; + virtual void InputUpdateFromVector(int* vector, int name, int type)=0; + virtual void InputUpdateFromVector(bool* vector, int name, int type)=0; + #ifdef _HAVE_DAKOTA_ +- virtual void InputUpdateFromMatrixDakota(double* matrix, int rows, int ncols, int name, int type)=0; +- virtual void InputUpdateFromVectorDakota(double* vector, int name, int type)=0; ++ virtual void InputUpdateFromMatrixDakota(IssmDouble* matrix, int rows, int ncols, int name, int type)=0; ++ virtual void InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type)=0; + virtual void InputUpdateFromVectorDakota(int* vector, int name, int type)=0; + virtual void InputUpdateFromVectorDakota(bool* vector, int name, int type)=0; + #endif +- virtual void InputUpdateFromConstant(double constant, int name)=0; ++ virtual void InputUpdateFromConstant(IssmDouble constant, int name)=0; + virtual void InputUpdateFromConstant(int constant, int name)=0; + virtual void InputUpdateFromConstant(bool constant, int name)=0; +- virtual void InputUpdateFromSolution(double* solution)=0; ++ virtual void InputUpdateFromSolution(IssmDouble* solution)=0; + virtual void InputUpdateFromIoModel(int index, IoModel* iomodel)=0; + + }; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.h (revision 12322) +@@ -31,7 +31,7 @@ + Hook* hvertex; + Inputs* inputs; //properties of this node + int analysis_type; +- double coord_system[3][3]; ++ IssmDouble coord_system[3][3]; + + /*Node constructors, destructors {{{1*/ + Node(); +@@ -48,17 +48,17 @@ + /*}}}*/ + /*Update virtual functions definitions: {{{1*/ + +- void InputUpdateFromVector(double* vector, int name, int type); ++ void InputUpdateFromVector(IssmDouble* vector, int name, int type); + void InputUpdateFromVector(int* vector, int name, int type); + void InputUpdateFromVector(bool* vector, int name, int type); +- void InputUpdateFromMatrixDakota(double* matrix,int nrows, int ncols, int name, int type); +- void InputUpdateFromVectorDakota(double* vector, int name, int type); ++ void InputUpdateFromMatrixDakota(IssmDouble* matrix,int nrows, int ncols, int name, int type); ++ void InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type); + void InputUpdateFromVectorDakota(int* vector, int name, int type); + void InputUpdateFromVectorDakota(bool* vector, int name, int type); +- void InputUpdateFromConstant(double constant, int name); ++ void InputUpdateFromConstant(IssmDouble constant, int name); + void InputUpdateFromConstant(int constant, int name); + void InputUpdateFromConstant(bool constant, int name); +- void InputUpdateFromSolution(double* solution){_error_("Not implemented yet!");} ++ void InputUpdateFromSolution(IssmDouble* solution){_error_("Not implemented yet!");} + void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("Not implemented yet!");} + /*}}}*/ + /*Node numerical routines {{{1*/ +@@ -69,14 +69,14 @@ + int GetVertexDof(void); + int GetVertexId(void); + #ifdef _HAVE_DIAGNOSTIC_ +- void GetCoordinateSystem(double* coord_system_out); ++ void GetCoordinateSystem(IssmDouble* coord_system_out); + #endif + void SetVertexDof(int in_dof); + bool InAnalysis(int analysis_type); + int GetApproximation(); + int GetNumberOfDofs(int approximation_enum,int setenum); + int IsClone(); +- void ApplyConstraint(int dof,double value); ++ void ApplyConstraint(int dof,IssmDouble value); + void RelaxConstraint(int dof); + void DofInSSet(int dof); + void DofInFSet(int dof); +@@ -87,18 +87,18 @@ + void GetLocalDofList(int* poutdoflist,int approximation_enum,int setenum); + int GetDofList1(void); + int GetSidList(void); +- double GetX(); +- double GetY(); +- double GetZ(); +- double GetSigma(); ++ IssmDouble GetX(); ++ IssmDouble GetY(); ++ IssmDouble GetZ(); ++ IssmDouble GetSigma(); + int IsOnBed(); + int IsOnSurface(); + void FreezeDof(int dof); + int IsFloating(); + int IsGrounded(); +- void UpdateSpcs(double* ys); +- void VecMerge(Vector* ug, double* vector_serial,int setenum); +- void VecReduce(Vector* vector, double* ug_serial,int setnum); ++ void UpdateSpcs(IssmDouble* ys); ++ void VecMerge(Vector* ug, IssmDouble* vector_serial,int setenum); ++ void VecReduce(Vector* vector, IssmDouble* ug_serial,int setnum); + + /*}}}*/ + /*Dof Object routines {{{1*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/IoModel.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/IoModel.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/IoModel.h (revision 12322) +@@ -18,8 +18,8 @@ + + private: + FILE *fid; //pointer to input file +- double **data; //this dataset holds temporary data, memory intensive. +- Parameters *constants; //this dataset holds all double, int, bool and char *parameters read in from the input file.* ++ IssmDouble **data; //this dataset holds temporary data, memory intensive. ++ Parameters *constants; //this dataset holds all IssmDouble, int, bool and char *parameters read in from the input file.* + + public: + /*This data needs to stay memory resident at all time, even if it's memory intensive: */ +@@ -43,22 +43,22 @@ + void CheckEnumSync(void); + void Constant(bool *poutput,int constant_enum); + void Constant(int *poutput,int constant_enum); +- void Constant(double *poutput,int constant_enum); ++ void Constant(IssmDouble *poutput,int constant_enum); + void Constant(char **poutput,int constant_enum); + Param *CopyConstantObject(int constant_enum); +- double *Data(int dataenum); ++ IssmDouble *Data(int dataenum); + void DeleteData(int num,...); + void FetchConstants(void); + void FetchData(bool* pboolean,int data_enum); + void FetchData(int* pinteger,int data_enum); +- void FetchData(double* pscalar,int data_enum); ++ void FetchData(IssmDouble* pscalar,int data_enum); + void FetchData(char** pstring,int data_enum); + void FetchData(int** pmatrix,int* pM,int* pN,int data_enum); +- void FetchData(double** pscalarmatrix,int* pM,int* pN,int data_enum); ++ void FetchData(IssmDouble** pscalarmatrix,int* pM,int* pN,int data_enum); + void FetchData(char*** pstringarray,int* pnumstrings,int data_enum); +- void FetchData(double*** pmatrixarray,int** pmdims,int** pndims, int* pnumrecords,int data_enum); ++ void FetchData(IssmDouble*** pmatrixarray,int** pmdims,int** pndims, int* pnumrecords,int data_enum); + void FetchData(int num,...); +- void FetchDataToInput(Elements* elements,int vector_enum,int default_vector_enum=NoneEnum,double default_value=0); ++ void FetchDataToInput(Elements* elements,int vector_enum,int default_vector_enum=NoneEnum,IssmDouble default_value=0); + FILE* SetFilePointerToData(int* pcode,int* pvector_type, int data_enum); + }; + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/OptPars.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/OptPars.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/OptPars.h (revision 12322) +@@ -7,9 +7,9 @@ + + struct OptPars{ + +- double xmin; +- double xmax; +- double cm_jump; ++ IssmDouble xmin; ++ IssmDouble xmax; ++ IssmDouble cm_jump; + int maxiter; + + }; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.h (revision 12322) +@@ -5,6 +5,8 @@ + #ifndef _DOFINDEXING_H_ + #define _DOFINDEXING_H_ + ++#include "../include/include.h" ++ + class DofIndexing{ + + public: +@@ -20,7 +22,7 @@ + /*boundary conditions sets: */ + bool* f_set; //is dof on f-set (on which we solve) + bool* s_set; //is dof on s-set (on which boundary conditions -dirichlet- are applied) +- double* svalues; //list of constraint values. size g_size, for ease of use. ++ IssmDouble* svalues; //list of constraint values. size g_size, for ease of use. + + /*types of dofs: */ + int* doftype; //approximation type of the dofs (used only for coupling), size g_size +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.h (revision 12322) +@@ -14,14 +14,14 @@ + + public: + int eid; +- double x1; +- double y1; +- double x2; +- double y2; ++ IssmDouble x1; ++ IssmDouble y1; ++ IssmDouble x2; ++ IssmDouble y2; + + /*Segment constructors, destructors {{{1*/ + Segment(); +- Segment(int eid,double x1,double y1, double x2, double y2); ++ Segment(int eid,IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2); + ~Segment(); + /*}}}*/ + /*Object virtual functions definitions:{{{1 */ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.h (revision 12321) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.h (revision 12322) +@@ -24,10 +24,10 @@ + + int id; + int sid; //sid for "serial" id, ie the rank of this vertex in the vertices dataset, if the dataset was serial on 1 cpu. +- double x; +- double y; +- double z; +- double sigma; //sigma coordinate: (z-bed)/thickness ++ IssmDouble x; ++ IssmDouble y; ++ IssmDouble z; ++ IssmDouble sigma; //sigma coordinate: (z-bed)/thickness + int connectivity; //number of vertices connected to this vertex + + /*dof management: */ +@@ -36,8 +36,8 @@ + + /*Vertex constructors, destructors {{{1*/ + Vertex(); +- Vertex(int id, int sid,double x, double y, double z, double sigma, int connectivity); +- void Init(int id, int sid, double x, double y, double z, double sigma,int connectivity); ++ Vertex(int id, int sid,IssmDouble x, IssmDouble y, IssmDouble z, IssmDouble sigma, int connectivity); ++ void Init(int id, int sid, IssmDouble x, IssmDouble y, IssmDouble z, IssmDouble sigma,int connectivity); + Vertex(int id, int sid, int i, IoModel* iomodel); + ~Vertex(); + /*}}}*/ +@@ -59,7 +59,7 @@ + /*Vertex management: {{{1*/ + int Sid(void); + int Connectivity(void); +- void UpdatePosition(Vector* vz,Parameters* parameters,double* thickness,double* bed); ++ void UpdatePosition(Vector* vz,Parameters* parameters,IssmDouble* thickness,IssmDouble* bed); + /*}}}*/ + }; + #endif /* _VERTEX_H */ Index: /issm/oecreview/Archive/12321-12677/ISSM-12322-12323.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12322-12323.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12322-12323.diff (revision 12679) @@ -0,0 +1,113 @@ +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 12322) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/m4/issm_options.m4 (revision 12323) +@@ -307,26 +307,6 @@ + AM_CONDITIONAL([BOOST], [test x$HAVE_BOOST = xyes]) + AC_MSG_RESULT($HAVE_BOOST) + dnl }}} +- dnl python-version{{{ +- AC_ARG_WITH([python-version], +- AS_HELP_STRING([--with-python-version = PYTHONVERSION],[python version.]), +- [PYTHONVERSION=$withval],[PYTHONVERSION=""]) +- AC_MSG_CHECKING(for python version) +- +- HAVE_PYTHON3="no" +- +- dnl recover major: +- PYTHON_MAJOR=${PYTHONVERSION%.*} +- +- if test x$PYTHON_MAJOR = x3; then +- dnl are we running python 3? +- HAVE_PYTHON3="yes" +- fi +- AC_DEFINE_UNQUOTED([_PYTHON_MAJOR_],$PYTHON_MAJOR,[python version major]) +- +- AM_CONDITIONAL([PYTHON3], [test x$HAVE_PYTHON3 = xyes]) +- AC_MSG_RESULT($PYTHON_MAJOR) +- dnl }}} + dnl python{{{ + AC_ARG_WITH([python-dir], + AS_HELP_STRING([--with-python-dir=DIR], [python root directory.]), +@@ -352,6 +332,26 @@ + fi + AM_CONDITIONAL([PYTHON], [test x$HAVE_PYTHON = xyes]) + AC_MSG_RESULT($HAVE_PYTHON) ++ ++ dnl python-version ++ HAVE_PYTHON3="no" ++ if test x$HAVE_PYTHON = xyes; then ++ AC_ARG_WITH([python-version], ++ AS_HELP_STRING([--with-python-version = PYTHONVERSION],[python version.]), ++ [PYTHONVERSION=$withval],[PYTHONVERSION=""]) ++ AC_MSG_CHECKING(for python version) ++ ++ dnl recover major: ++ PYTHON_MAJOR=${PYTHONVERSION%.*} ++ ++ if test x$PYTHON_MAJOR = x3; then ++ dnl are we running python 3? ++ HAVE_PYTHON3="yes" ++ fi ++ AC_DEFINE_UNQUOTED([_PYTHON_MAJOR_],$PYTHON_MAJOR,[python version major]) ++ AC_MSG_RESULT($PYTHON_MAJOR) ++ fi ++ AM_CONDITIONAL([PYTHON3], [test x$HAVE_PYTHON3 = xyes]) + dnl }}} + dnl python-numpy{{{ + AC_ARG_WITH([python-numpy-dir], +@@ -943,27 +943,36 @@ + AC_MSG_RESULT(done) + dnl }}} + dnl fortran{{{ +- dnl fortran library option +- AC_MSG_CHECKING(for fortran library) +- AC_ARG_WITH([fortran-lib], +- AS_HELP_STRING([--with-fortran-lib = options],[fortran options, for ex: "/usr/lib/gfortran.a]), +- [FORTRAN_LIB=$withval],[FORTRAN_LIB=""]) ++ AC_ARG_WITH([fortran], ++ AS_HELP_STRING([--with-fortran = YES], [do we compile fortran code (default is yes)]), ++ [FORTRAN=$withval],[FORTRAN=yes]) ++ AC_MSG_CHECKING(for fortran compilation) ++ if test "x$FORTRAN" = "xyes"; then ++ dnl defaults ++ HAVE_FORTRAN=yes + +- dnl check that --with-fortran-lib may have been provided +- HAVE_FORTRAN=no +- if test -n "$FORTRAN_LIB" ; then +- if test "x$FORTRAN_LIB" = "xno"; then +- HAVE_FORTRAN=NO +- else +- HAVE_FORTRAN=yes +- FORTRANLIB="$FORTRAN_LIB" ++ AC_DEFINE([_HAVE_FORTRAN_],[1],[with fortran capability]) ++ else ++ HAVE_FORTRAN=no ++ fi ++ AM_CONDITIONAL([FORTRAN], [test x$FORTRAN = xyes]) ++ AC_MSG_RESULT($FORTRAN) + +- AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src]) +- AC_SUBST([FORTRANLIB]) +- fi ++ if test "x$FORTRAN" = "xyes"; then ++ dnl fortran library option ++ AC_MSG_CHECKING(for fortran library) ++ AC_ARG_WITH([fortran-lib], ++ AS_HELP_STRING([--with-fortran-lib = options],[fortran options, for ex: "/usr/lib/gfortran.a]), ++ [FORTRAN_LIB=$withval],[FORTRAN_LIB=""]) ++ ++ dnl check that --with-fortran-lib may have been provided ++ if test -n "$FORTRAN_LIB" ; then ++ FORTRANLIB="$FORTRAN_LIB" ++ AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src]) ++ AC_SUBST([FORTRANLIB]) ++ fi ++ AC_MSG_RESULT(done) + fi +- AM_CONDITIONAL([FORTRAN], [test x$HAVE_FORTRAN = xyes]) +- AC_MSG_RESULT(done) + dnl }}} + dnl graphics{{{ + AC_MSG_CHECKING(for graphics library) Index: /issm/oecreview/Archive/12321-12677/ISSM-12323-12324.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12323-12324.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12323-12324.diff (revision 12679) @@ -0,0 +1,22 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12323) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/configure.ac (revision 12324) +@@ -1,7 +1,7 @@ + # Process this file with autoconf to produce a configure script. + + #AUTOCONF +-AC_INIT([ISSM],[4.1],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure ++AC_INIT([ISSM],[4.2],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure + AC_CONFIG_AUX_DIR([./aux-config]) #Put config files in aux-config + AC_CONFIG_MACRO_DIR([m4]) #m4 macros are located in m4 + AC_CANONICAL_TARGET #Determine the system type +@@ -9,7 +9,7 @@ + AC_PROG_CC([cccl cl icl gcc]) + AC_PROG_CPP + AC_PROG_CXX([cccl cl icl g++]) +-#AC_PROG_F77([ifort g77 gfortran]) ++AC_PROG_F77([ifort g77 gfortran]) + #Libraries and linking + AC_PROG_RANLIB + AC_F77_LIBRARY_LDFLAGS Index: /issm/oecreview/Archive/12321-12677/ISSM-12326-12327.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12326-12327.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12326-12327.diff (revision 12679) @@ -0,0 +1,14 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m (revision 12326) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m (revision 12327) +@@ -352,6 +352,9 @@ + if ~isfield(structmd,'diagnostic_ref'); + md.diagnostic.referential=NaN*ones(md.mesh.numberofvertices,6); + end ++ if isfield(structmd,'npart'); ++ md.qmu.numberofpartitions=structmd.npart; ++ end + end% }}} + function md = setdefaultparameters(md) % {{{1 + Index: /issm/oecreview/Archive/12321-12677/ISSM-12327-12328.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12327-12328.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12327-12328.diff (revision 12679) @@ -0,0 +1,70 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12327) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12328) +@@ -7,8 +7,6 @@ + * Please read README for more information + */ + +-#include +- + #include "../../shared/shared.h" + #include "../../include/include.h" + #include "./StringToEnumx.h" +@@ -261,13 +259,11 @@ + else if (strcmp(name,"Icefront")==0) return IcefrontEnum; + else if (strcmp(name,"Input")==0) return InputEnum; + else if (strcmp(name,"IntInput")==0) return IntInputEnum; +- else if (strcmp(name,"IntParam")==0) return IntParamEnum; +- else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; +- else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; + else stage=3; + } + if(stage==3){ +- if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; ++ if (strcmp(name,"IntParam")==0) return IntParamEnum; ++ else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; + else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; + else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; + else if (strcmp(name,"Matice")==0) return MaticeEnum; +@@ -386,13 +382,13 @@ + else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; + else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum; + else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; +- else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; +- else if (strcmp(name,"P0")==0) return P0Enum; +- else if (strcmp(name,"P1")==0) return P1Enum; + else stage=4; + } + if(stage==4){ +- if (strcmp(name,"P1DG")==0) return P1DGEnum; ++ if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; ++ else if (strcmp(name,"P0")==0) return P0Enum; ++ else if (strcmp(name,"P1")==0) return P1Enum; ++ else if (strcmp(name,"P1DG")==0) return P1DGEnum; + else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; + else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum; + else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12327) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12328) +@@ -7,8 +7,6 @@ + * Please read README for more information + */ + +-#include +- + #include "../../shared/shared.h" + #include "../../include/include.h" + #include "./EnumToStringx.h" +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/MaximumNumberOfEnums.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 12327) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 12328) +@@ -8,4 +8,4 @@ + % Usage: + % macro=MaximumNumberOfEnums() + +-macro=437; ++macro=440; Index: /issm/oecreview/Archive/12321-12677/ISSM-12333-12334.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12333-12334.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12333-12334.diff (revision 12679) @@ -0,0 +1,61 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/dox/issm.dox +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/dox/issm.dox (revision 12333) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/dox/issm.dox (revision 12334) +@@ -45,38 +45,47 @@ + LanguagefilesblankcommentcodeTotal + + +- C++ 49914338163405465185329 ++ C++ 50814595167625603487391 + + +- MATLAB 9196875131843035050409 ++ MATLAB 9266911133053062350839 + + +- C/C++ Header 36626652529940014594 ++ C/C++ Header 37827542625980115180 + + +- m4 79938082379310 ++ m4 79978082599336 + + +- Python 4718351810991800 ++ Python 5440479914352638 + + + Objective C 9980370468 + + +- Perl 32123240284 ++ Bourne Shell 64773241361 + + +- Bourne Shell 54671226343 ++ Perl 32123240284 + + + IDL 1184124146 + + +- C 2332430 ++ XML 83712185243 + + +- SUM: 18582524032752104721162713 ++ Java 5174261120 + ++ ++ D 7302730 ++ ++ ++ C 34352160 ++ ++ ++ SUM: 19152590633869107321167096 ++ + + + Copyright (C) 2012 Index: /issm/oecreview/Archive/12321-12677/ISSM-12334-12335.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12334-12335.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12334-12335.diff (revision 12679) @@ -0,0 +1,30 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m (revision 12334) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m (revision 12335) +@@ -243,6 +243,8 @@ + if isfield(structmd,'diagnostic_ref'), md.diagnostic.referential=structmd.diagnostic_ref; end + + ++ ++ + %Field changes + if (isfield(structmd,'type') & ischar(structmd.type)), + if strcmpi(structmd.type,'2d'), md.mesh.dimension=2; end +@@ -349,12 +351,13 @@ + md.mesh.lowerelements=transpose(1:md.mesh.numberofelements)-md.mesh.numberofelements2d; + md.mesh.lowerelements(1:md.mesh.numberofelements2d)=NaN; + end ++ + if ~isfield(structmd,'diagnostic_ref'); + md.diagnostic.referential=NaN*ones(md.mesh.numberofvertices,6); + end +- if isfield(structmd,'npart'); +- md.qmu.numberofpartitions=structmd.npart; +- end ++ if isfield(structmd,'npart'); md.qmu.numberofpartitions=structmd.npart; end ++ if isfield(structmd,'part'); md.qmu.partition=structmd.part; end ++ + end% }}} + function md = setdefaultparameters(md) % {{{1 + Index: /issm/oecreview/Archive/12321-12677/ISSM-12335-12336.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12335-12336.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12335-12336.diff (revision 12679) @@ -0,0 +1,9 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl (revision 12335) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl (revision 12336) + +Property changes on: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r12334-12335 Index: /issm/oecreview/Archive/12321-12677/ISSM-12338-12339.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12338-12339.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12338-12339.diff (revision 12679) @@ -0,0 +1,15 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp (revision 12338) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Segment.cpp (revision 12339) +@@ -28,8 +28,8 @@ + this->y2=UNDEF; + } + /*}}}*/ +-/*FUNCTION Segment::Segment(int eid, double x1,double y1,double x2, double y2){{{1*/ +-Segment::Segment(int segment_eid, double segment_x1,double segment_y1,double segment_x2, double segment_y2){ ++/*FUNCTION Segment::Segment(int eid, IssmDouble x1,IssmDouble y1,IssmDouble x2, IssmDouble y2){{{1*/ ++Segment::Segment(int segment_eid, IssmDouble segment_x1,IssmDouble segment_y1,IssmDouble segment_x2, IssmDouble segment_y2){ + + this->eid=segment_eid; + this->x1=segment_x1; Index: /issm/oecreview/Archive/12321-12677/ISSM-12339-12340.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12339-12340.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12339-12340.diff (revision 12679) @@ -0,0 +1,38 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.cpp (revision 12339) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Vertex.cpp (revision 12340) +@@ -22,8 +22,8 @@ + return; + } + /*}}}*/ +-/*FUNCTION Vertex::Vertex(int vertex_id, double vertex_x, double vertex_y, double vertex_z, double vertex_sigma){{{1*/ +-Vertex::Vertex(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma,int vertex_connectivity){ ++/*FUNCTION Vertex::Vertex(int vertex_id, IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma){{{1*/ ++Vertex::Vertex(int vertex_id, int vertex_sid,IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma,int vertex_connectivity){ + this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma,vertex_connectivity); + } + /*}}}*/ +@@ -43,7 +43,7 @@ + } + /*}}}*/ + /*FUNCTION Vertex::Init{{{1*/ +-void Vertex::Init(int vertex_id, int vertex_sid,double vertex_x, double vertex_y, double vertex_z, double vertex_sigma,int vertex_connectivity){ ++void Vertex::Init(int vertex_id, int vertex_sid,IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma,int vertex_connectivity){ + + /*all the initialization has been done by the initializer, just fill in the id: */ + this->id=vertex_id; +@@ -198,10 +198,10 @@ + int Vertex::Sid(void){ return sid; } + /*}}}*/ + /*FUNCTION Vertex::UpdateVertexPosition {{{1*/ +-void Vertex::UpdatePosition(Vector* vz,Parameters* parameters,double* thickness,double* bed){ ++void Vertex::UpdatePosition(Vector* vz,Parameters* parameters,IssmDouble* thickness,IssmDouble* bed){ + +- double oldz,newz; +- double dt,velz; ++ IssmDouble oldz,newz; ++ IssmDouble dt,velz; + + /*Get time stepping*/ + parameters->FindParam(&dt,TimesteppingTimeStepEnum); Index: /issm/oecreview/Archive/12321-12677/ISSM-12340-12341.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12340-12341.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12340-12341.diff (revision 12679) @@ -0,0 +1,24 @@ +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 12340) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12341) +@@ -24,6 +24,7 @@ + * Please read README for more information + */ + ++#include + #include "../../shared/shared.h" + #include "../../include/include.h" + #include "./EnumToStringx.h" +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12340) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 12341) +@@ -7,6 +7,7 @@ + * Please read README for more information + */ + ++#include + #include "../../shared/shared.h" + #include "../../include/include.h" + #include "./EnumToStringx.h" Index: /issm/oecreview/Archive/12321-12677/ISSM-12341-12342.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12341-12342.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12341-12342.diff (revision 12679) @@ -0,0 +1,24 @@ +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 12341) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12342) +@@ -67,6 +67,7 @@ + * Please read README for more information + */ + ++#include + #include "../../shared/shared.h" + #include "../../include/include.h" + #include "./StringToEnumx.h" +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12341) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 12342) +@@ -7,6 +7,7 @@ + * Please read README for more information + */ + ++#include + #include "../../shared/shared.h" + #include "../../include/include.h" + #include "./StringToEnumx.h" Index: /issm/oecreview/Archive/12321-12677/ISSM-12342-12343.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12342-12343.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12342-12343.diff (revision 12679) @@ -0,0 +1,12 @@ +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 12342) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12343) +@@ -175,6 +175,7 @@ + ./shared/shared.h\ + ./shared/Alloc/alloc.h\ + ./shared/Alloc/alloc.cpp\ ++ ./shared/Alloc/xNewDelete.h\ + ./shared/Matrix/matrix.h\ + ./shared/Matrix/MatrixUtils.cpp\ + ./shared/Dofs/dofs.h\ Index: /issm/oecreview/Archive/12321-12677/ISSM-12343-12344.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12343-12344.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12343-12344.diff (revision 12679) @@ -0,0 +1,12 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12343) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12344) +@@ -8,6 +8,7 @@ + + #include "Alloc/alloc.h" + #include "Alloc/alloc_module.h" ++#include "Alloc/xNewDelete.h" + #include "Exceptions/exceptions.h" + #include "Exp/exp.h" + #include "TriMesh/trimesh.h" Index: /issm/oecreview/Archive/12321-12677/ISSM-12344-12345.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12344-12345.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12344-12345.diff (revision 12679) @@ -0,0 +1,215 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp (revision 12344) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Node.cpp (revision 12345) +@@ -438,7 +438,7 @@ + /*}}}*/ + #ifdef _HAVE_DIAGNOSTIC_ + /*FUNCTION Node::GetCoordinateSystem{{{1*/ +-void Node::GetCoordinateSystem(double* coord_system_out){ ++void Node::GetCoordinateSystem(IssmDouble* coord_system_out){ + + /*Copy coord_system*/ + for(int k=0;k<3;k++) for(int l=0;l<3;l++) coord_system_out[3*k+l]=this->coord_system[k][l]; +@@ -465,7 +465,7 @@ + + /*Node numerics:*/ + /*FUNCTION Node::ApplyConstraints{{{1*/ +-void Node::ApplyConstraint(int dof,double value){ ++void Node::ApplyConstraint(int dof,IssmDouble value){ + + int index; + +@@ -486,8 +486,8 @@ + /*FUNCTION Node::CreateVecSets {{{1*/ + void Node::CreateVecSets(Vector* pv_g,Vector* pv_f,Vector* pv_s){ + +- double gvalue=1.0; //all nodes are in the g set; +- double value; ++ IssmDouble gvalue=1.0; //all nodes are in the g set; ++ IssmDouble value; + + int i; + +@@ -497,11 +497,11 @@ + pv_g->SetValue(indexing.gdoflist[i],gvalue,INS_VAL); + + /*f set: */ +- value=(double)this->indexing.f_set[i]; ++ value=(IssmDouble)this->indexing.f_set[i]; + pv_f->SetValue(indexing.gdoflist[i],value,INS_VAL); + + /*s set: */ +- value=(double)this->indexing.s_set[i]; ++ value=(IssmDouble)this->indexing.s_set[i]; + pv_s->SetValue(indexing.gdoflist[i],value,INS_VAL); + + } +@@ -513,12 +513,12 @@ + void Node::CreateNodalConstraints(Vector* ys){ + + int i; +- double* values=NULL; ++ IssmDouble* values=NULL; + int count; + + /*Recover values for s set and plug them in constraints vector: */ + if(this->indexing.ssize){ +- values=(double*)xmalloc(this->indexing.ssize*sizeof(double)); ++ values=xNew(this->indexing.ssize); + count=0; + for(i=0;iindexing.gsize;i++){ + if(this->indexing.s_set[i]){ +@@ -533,7 +533,7 @@ + } + + /*Free ressources:*/ +- xfree((void**)&values); ++ xDelete(values); + + + } +@@ -633,7 +633,7 @@ + } + /*}}}*/ + /*FUNCTION Node::GetSigma {{{1*/ +-double Node::GetSigma(){ ++IssmDouble Node::GetSigma(){ + Vertex* vertex=NULL; + + vertex=(Vertex*)hvertex->delivers(); +@@ -641,7 +641,7 @@ + } + /*}}}*/ + /*FUNCTION Node::GetX {{{1*/ +-double Node::GetX(){ ++IssmDouble Node::GetX(){ + Vertex* vertex=NULL; + + vertex=(Vertex*)hvertex->delivers(); +@@ -649,7 +649,7 @@ + } + /*}}}*/ + /*FUNCTION Node::GetY {{{1*/ +-double Node::GetY(){ ++IssmDouble Node::GetY(){ + Vertex* vertex=NULL; + + vertex=(Vertex*)hvertex->delivers(); +@@ -657,7 +657,7 @@ + } + /*}}}*/ + /*FUNCTION Node::GetZ {{{1*/ +-double Node::GetZ(){ ++IssmDouble Node::GetZ(){ + Vertex* vertex=NULL; + + vertex=(Vertex*)hvertex->delivers(); +@@ -715,8 +715,8 @@ + return onsurface; + } + /*}}}*/ +-/*FUNCTION Node::InputUpdateFromVector(double* vector, int name, int type){{{1*/ +-void Node::InputUpdateFromVector(double* vector, int name, int type){ ++/*FUNCTION Node::InputUpdateFromVector(IssmDouble* vector, int name, int type){{{1*/ ++void Node::InputUpdateFromVector(IssmDouble* vector, int name, int type){ + + /*Nothing updated yet*/ + } +@@ -733,14 +733,14 @@ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Node::InputUpdateFromVectorDakota(double* vector, int name, int type){{{1*/ +-void Node::InputUpdateFromVectorDakota(double* vector, int name, int type){ ++/*FUNCTION Node::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){{{1*/ ++void Node::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){ + + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Node::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){{{1*/ +-void Node::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){ ++/*FUNCTION Node::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){{{1*/ ++void Node::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){ + + /*Nothing updated yet*/ + } +@@ -757,8 +757,8 @@ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Node::InputUpdateFromConstant(double constant, int name){{{1*/ +-void Node::InputUpdateFromConstant(double constant, int name){ ++/*FUNCTION Node::InputUpdateFromConstant(IssmDouble constant, int name){{{1*/ ++void Node::InputUpdateFromConstant(IssmDouble constant, int name){ + + /*Nothing updated yet*/ + } +@@ -776,7 +776,7 @@ + } + /*}}}*/ + /*FUNCTION Node::UpdateSpcs {{{1*/ +-void Node::UpdateSpcs(double* ys){ ++void Node::UpdateSpcs(IssmDouble* ys){ + + int count=0; + int i; +@@ -791,9 +791,9 @@ + } + /*}}}*/ + /*FUNCTION Node::VecMerge {{{1*/ +-void Node::VecMerge(Vector* ug, double* vector_serial,int setenum){ ++void Node::VecMerge(Vector* ug, IssmDouble* vector_serial,int setenum){ + +- double* values=NULL; ++ IssmDouble* values=NULL; + int* indices=NULL; + int count=0; + int i; +@@ -801,7 +801,7 @@ + if(setenum==FsetEnum){ + if(this->indexing.fsize){ + indices=(int*)xmalloc(this->indexing.fsize*sizeof(int)); +- values=(double*)xmalloc(this->indexing.fsize*sizeof(double)); ++ values=(IssmDouble*)xmalloc(this->indexing.fsize*sizeof(IssmDouble)); + + for(i=0;iindexing.gsize;i++){ + if(this->indexing.f_set[i]){ +@@ -819,7 +819,7 @@ + else if(setenum==SsetEnum){ + if(this->indexing.ssize){ + indices=(int*)xmalloc(this->indexing.ssize*sizeof(int)); +- values=(double*)xmalloc(this->indexing.ssize*sizeof(double)); ++ values=(IssmDouble*)xmalloc(this->indexing.ssize*sizeof(IssmDouble)); + + for(i=0;iindexing.gsize;i++){ + if(this->indexing.s_set[i]){ +@@ -842,15 +842,15 @@ + } + /*}}}*/ + /*FUNCTION Node::VecReduce {{{1*/ +-void Node::VecReduce(Vector* vector, double* ug_serial,int setenum){ ++void Node::VecReduce(Vector* vector, IssmDouble* ug_serial,int setenum){ + +- double* values=NULL; ++ IssmDouble* values=NULL; + int count=0; + int i; + + if(setenum==FsetEnum){ + if(this->indexing.fsize){ +- values=(double*)xmalloc(this->indexing.fsize*sizeof(double)); ++ values=(IssmDouble*)xmalloc(this->indexing.fsize*sizeof(IssmDouble)); + + for(i=0;iindexing.gsize;i++){ + if(this->indexing.f_set[i]){ +@@ -866,7 +866,7 @@ + } + else if(setenum==SsetEnum){ + if(this->indexing.ssize){ +- values=(double*)xmalloc(this->indexing.ssize*sizeof(double)); ++ values=(IssmDouble*)xmalloc(this->indexing.ssize*sizeof(IssmDouble)); + + for(i=0;iindexing.gsize;i++){ + if(this->indexing.s_set[i]){ Index: /issm/oecreview/Archive/12321-12677/ISSM-12350-12351.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12350-12351.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12350-12351.diff (revision 12679) @@ -0,0 +1,1223 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solveparallel.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solveparallel.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solveparallel.m (revision 12351) +@@ -1,58 +0,0 @@ +-function md=solveparallel(md,options) +-%SOLVEPARALLEL - solution sequence using a cluster in parallel mode +-% +-% Usage: +-% md=solveparallel(md); +- +-%retrieve cluster: otherwise, we can't call its methods (subsref bug) +-cluster=md.cluster; +- +-if options.loadonly, +- md=loadresultsfromcluster(md); +-else +- +- %In parallel mode, we need to make sure we have PETSC support, otherwise, we run with only one cpu: +- if ~ispetsc, +- disp('PETSC support not included, running on 1 cpu only!'); +- cluster.np=1; +- end +- +- %First, build a runtime name that is unique, that we will use to create +- %directories, name jobs, etc ... +- c=clock; md.private.runtimename=sprintf('%s-%02i-%02i-%04i-%02i-%02i-%02i-%i',md.miscellaneous.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid')); +- +- if verLessThan('matlab', '7.6') +- BuildQueueScript(cluster,md); +- LaunchQueueJob(cluster,md,options); +- else +- cluster.BuildQueueScript(md); +- cluster.LaunchQueueJob(md,options); +- end +- +- if ~strcmpi(options.upload,'on'), %did we even try to run? if so, wait on lock +- +- %Do we return, or just wait for results? +- if (md.settings.waitonlock>0 & ~strcmpi(options.batch,'yes')), +- %we wait for the done file +- islock=waitonlock(md); +- if islock==0, +- %no results to be loaded +- disp('The results must be loaded manually with md=loadresultsfromcluster(md).'); +- else +- %load results +- disp('loading results from cluster'); +- md=loadresultsfromcluster(md); +- end +- end +- +- %post processes qmu results if necessary +- if md.qmu.isdakota, +- if ~strncmpi(options.keep,'y',1) +- system(['rm -rf qmu' num2str(feature('GetPid'))]); +- end +- end +- else +- error('solveparallel done uploading test decks'); +- end +- +-end +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solve.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solve.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/model/solve.m (revision 12351) +@@ -23,10 +23,8 @@ + % Examples: + % md=solve(md,DiagnosticSolutionEnum); + +-%recover options ++%recover and process solve options + options=pairoptions(varargin{:},'solution_type',solutionenum); +- +-%add default options + options=process_solve_options(options); + + %recover some fields +@@ -45,46 +43,64 @@ + ismodelselfconsistent(md), + end + +-%if running qmu analysis, some preprocessing of dakota files using +-%models fields needs to be carried out. ++%if running qmu analysis, some preprocessing of dakota files using models ++%fields needs to be carried out. + if md.qmu.isdakota, + md=preqmu(md,options); + end + +-%Save model as is (in case of a crash) +-assignin('base',inputname(1),md); +- + %flaim analysis +-if (md.private.solution == FlaimSolutionEnum) ++if (options.solution_type == FlaimSolutionEnum) + md=flaim_sol(md,options); + md.private.solution=EnumToString(options.solution_type); + return; + end + +-%Marshall model data into a binary file. +-marshall(md); ++%Do we load results only? ++if options.loadonly, ++ md=loadresultsfromcluster(md); ++ return; ++end + +-%write a template file for issm to use, in parallel +-PetscFile(md.solver,[md.miscellaneous.name '.petsc']); ++%Wite all input files ++marshall(md); % bin file ++PetscFile(md.solver,[md.miscellaneous.name '.petsc']); % petsc file + +-%If running in parallel, we have a different way of launching the solution +-%sequences. +-if ~strcmpi(md.cluster.name,'none'), +- md=solveparallel(md,options); +- return; ++%Launch job on remote cluster ++cluster=md.cluster; ++ ++%we need to make sure we have PETSC support, otherwise, we run with only one cpu: ++if ~ispetsc, ++ disp('PETSC support not included, running on 1 cpu only!'); ++ cluster.np=1; + end + +-%Launch correct solution sequence +-md=issm(md,md.private.solution); ++%First, build a runtime name that is unique ++c=clock; md.private.runtimename=sprintf('%s-%02i-%02i-%04i-%02i-%02i-%02i-%i',md.miscellaneous.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid')); + +-%post processes qmu results if necessary +-if md.qmu.isdakota, +- md=postqmu(md); +- cd .. +- if ~strncmpi(options.keep,'y',1) +- system(['rm -rf qmu' num2str(feature('GetPid'))]); ++BuildQueueScript(cluster,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof); ++LaunchQueueJob(cluster,md,options); ++ ++if ~strcmpi(options.upload,'on'), %did we even try to run? if so, wait on lock ++ ++ %Do we return, or just wait for results? ++ if (md.settings.waitonlock>0 & ~strcmpi(options.batch,'yes')), ++ %we wait for the done file ++ islock=waitonlock(md); ++ if islock==0, %no results to be loaded ++ disp('The results must be loaded manually with md=loadresultsfromcluster(md).'); ++ else %load results ++ disp('loading results from cluster'); ++ md=loadresultsfromcluster(md); ++ end + end ++ ++ %post processes qmu results if necessary ++ if md.qmu.isdakota, ++ if ~strncmpi(options.keep,'y',1) ++ system(['rm -rf qmu' num2str(feature('GetPid'))]); ++ end ++ end ++else ++ disp('solve done uploading test decks'); + end +- +-%convert analysis type to string finally +-md.private.solution=EnumToString(options.solution_type); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/pairoptions.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/pairoptions.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/pairoptions.m (revision 12351) +@@ -222,5 +222,20 @@ + end + end + end % }}} ++ function marshall(obj,fid)% {{{ ++ disp('No options marshalled for now'); ++ for i=1:size(obj.list,1), ++ name = obj.list{i,1}; ++ value = obj.list{i,2}; ++ ++ if (isnumeric(value) & numel(value)==1), ++ % ++ elseif ischar(value), ++ % ++ else ++ error(['Cannot marshall option ' name ': format not supported yet']); ++ end ++ end ++ end % }}} + end + end +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/none.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/none.py (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/none.py (revision 12351) +@@ -1,24 +0,0 @@ +-#NONE cluster class definition +-# +-# Usage: +-# cluster=none(); +-# cluster=none('np',3); +-# cluster=none('np',3,'login','username'); +- +-class none: +- #properties +- def __init__(self): +- # {{{ Properties +- self.name='none' +- #}}} +- def __repr__(obj): +- # {{{ Display +- +- string="class 'none' object:" +- string="%s\n\n%s"%(string,"%s%s"%(' name: ',obj.name)) +- return string +- #}}} +- def checkconsistency(cluster,md,solution,analyses): +- pass +- def BuildQueueScript(cluster,md): +- raise RuntimeError('none.BuildQueueScript error message: serial cluster cannot build queue script') +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/greenplanet.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/greenplanet.m (revision 12351) +@@ -7,7 +7,7 @@ + + classdef greenplanet + properties (SetAccess=public) +- % {{{1 ++ % {{{ + name='greenplanet' + login=''; + numnodes=20; +@@ -23,7 +23,7 @@ + % }}} + end + methods +- function cluster=greenplanet(varargin) % {{{1 ++ function cluster=greenplanet(varargin) % {{{ + + %initialize cluster using default settings if provided + if (exist('greenplanet_settings')==2), greenplanet_settings; end +@@ -32,7 +32,7 @@ + cluster=AssignObjectFields(pairoptions(varargin{:}),cluster); + end + %}}} +- function disp(cluster) % {{{1 ++ function disp(cluster) % {{{ + % display the object + disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); + disp(sprintf(' name: %s',cluster.name)); +@@ -47,7 +47,7 @@ + disp(sprintf(' interactive: %i',cluster.interactive)); + end + %}}} +- function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ function checkconsistency(cluster,md,solution,analyses) % {{{ + + available_queues={'rignot','default'}; + queue_requirements_time=[Inf Inf]; +@@ -62,19 +62,16 @@ + + end + %}}} +- function BuildQueueScript(cluster,md) % {{{1 ++ function BuildQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{ + +- %retrieve parameters +- modelname=md.miscellaneous.name; +- solution=md.private.solution; +- isvalgrind=md.debug.valgrind; ++ if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end ++ if(isgprof), disp('gprof not supported by cluster, ignoring...'); end + + %compute number of processors + cluster.np=cluster.numnodes*cluster.cpuspernode; + +- %open file for writing: ++ %write queuing script + fid=fopen([modelname '.queue'],'w'); +- + fprintf(fid,'#PBS -S /bin/bash\n'); + fprintf(fid,'#PBS -N %s\n',modelname); + fprintf(fid,'#PBS -q %s \n',cluster.queue); +@@ -83,25 +80,18 @@ + fprintf(fid,'#PBS -M mmorligh@uci.edu\n'); + fprintf(fid,'#PBS -o %s.outlog \n',modelname); + fprintf(fid,'#PBS -e %s.errlog \n\n',modelname); +- + fprintf(fid,'cd %s/%s\n\n',cluster.executionpath,md.private.runtimename); + fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +- +- if ~md.settings.io_gather, +- %concatenate the output files: ++ if ~io_gather, %concatenate the output files: + fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); + end +- +- %close file + fclose(fid); + + %in interactive mode, create a run file, and errlog and outlog file + if cluster.interactive, + fid=fopen([modelname '.run'],'w'); + fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s\n',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +- +- if ~md.settings.io_gather, +- %concatenate the output files: ++ if ~io_gather, %concatenate the output files: + fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); + end + fclose(fid); +@@ -111,7 +101,7 @@ + fclose(fid); + end + end %}}} +- function LaunchQueueJob(cluster,md,options)% {{{1 ++ function LaunchQueueJob(cluster,md,options)% {{{ + + %lauch command, to be executed via ssh + if ~cluster.interactive, +@@ -151,7 +141,7 @@ + end + end + %}}} +- function Download(cluster,md)% {{{1 ++ function Download(cluster,md)% {{{ + + %some check + if isempty(md.private.runtimename), +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/gemini.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/gemini.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/gemini.m (revision 12351) +@@ -7,7 +7,7 @@ + + classdef gemini + properties (SetAccess=public) +- % {{{1 ++ % {{{ + name='gemini' + login='username'; + np=50; +@@ -19,11 +19,11 @@ + %}}} + end + methods +- function cluster=gemini(varargin) % {{{1 ++ function cluster=gemini(varargin) % {{{ + cluster=AssignObjectFields(pairoptions(varargin{:}),cluster); + end + %}}} +- function disp(cluster) % {{{1 ++ function disp(cluster) % {{{ + % display the object + disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); + disp(sprintf(' name: %s',cluster.name)); +@@ -36,7 +36,7 @@ + disp(sprintf(' executionpath: %s',cluster.executionpath)); + end + %}}} +- function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ function checkconsistency(cluster,md,solution,analyses) % {{{ + + available_queues={'debug','shortg','longg'}; + queue_requirements_time=[60 180 720]; +@@ -45,15 +45,13 @@ + QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time) + end + %}}} +- function BuildQueueScript(cluster,md) % {{{1 ++ function BuildQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{ + +- %retrieve parameters +- modelname=md.miscellaneous.name; +- solution=md.private.solution; ++ if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end ++ if(isgprof), disp('gprof not supported by cluster, ignoring...'); end + +- %open file for writing: ++ %write queuing script + fid=fopen([modelname '.queue'],'w'); +- + fprintf(fid,'#!/bin/sh\n'); + fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds. + fprintf(fid,'#PBS -N %s\n',modelname); +@@ -68,13 +66,11 @@ + fprintf(fid,'cd $PBS_O_WORKDIR\n'); + fprintf(fid,'export OMP_NUM_THREADS=1\n'); + fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +- +- %close file + fclose(fid); + + end + %}}} +- function LaunchQueueJob(cluster,md,options)% {{{1 ++ function LaunchQueueJob(cluster,md,options)% {{{ + + %lauch command, to be executed via ssh + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... +@@ -102,7 +98,7 @@ + + end + %}}} +- function Download(cluster,md)% {{{1 ++ function Download(cluster,md)% {{{ + + %some check + if isempty(md.private.runtimename), +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.py +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.py (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.py (revision 12351) +@@ -35,183 +35,3 @@ + string="%s\n%s"%(string,"%s%s"%(' valgrindsup: ',obj.valgrindsup)) + return string + #}}} +- +- +-#old matlab +-# function cluster=generic(varargin) % {{{1 +-# +-# %use provided options to change fields +-# options=pairoptions(varargin{:}); +-# +-# %get name +-# if ~exist(options,'name'), error('option ''name'' has not been provided'); end +-# cluster.name=getfieldvalue(options,'name'); +-# +-# %initialize cluster using user settings if provided +-# if (exist([cluster.name '_settings'])==2), eval([cluster.name '_settings']); end +-# +-# %OK get other fields +-# for i=1:size(options.list,1), +-# fieldname=options.list{i,1}; +-# fieldvalue=options.list{i,2}; +-# if ismember(fieldname,properties('generic')), +-# cluster.(fieldname)=fieldvalue; +-# else +-# disp(['''' fieldname ''' is not a property of cluster generic']); +-# end +-# end +-# end +-# %}}} +-# function checkconsistency(cluster,md,solution,analyses) % {{{1 +-# if cluster.np<1 +-# checkmessage(['number of processors should be at least 1']); +-# end +-# if isnan(cluster.np), +-# checkessage('number of processors should not be NaN!'); +-# end +-# end +-# %}}} +-# function BuildQueueScript(cluster,md) % {{{1 +-# +-# %retrieve parameters +-# modelname=md.miscellaneous.name; +-# solution=md.private.solution; +-# isvalgrind=md.debug.valgrind; +-# isgprof=md.debug.gprof; +-# +-# %open file for writing: +-# if ~ispc, +-# fid=fopen([modelname '.queue'],'w'); +-# else +-# fid=fopen([modelname '.bat'],'w'); +-# end +-# +-# %write instructions for launching a job on the cluster +-# if ~ispc, +-# fprintf(fid,'#!/bin/sh\n'); +-# else +-# fprintf(fid,'@echo off\n'); +-# end +-# +-# if ~isvalgrind, +-# if cluster.interactive +-# if ~ispc, +-# fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s ',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +-# else +-# fprintf(fid,'"%s/issm.exe" %s "%s" %s ',cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +-# end +-# else +-# if ~ispc, +-# fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); +-# else +-# fprintf(fid,'"%s/issm.exe" %s "%s" %s 2> %s.errlog >%s.outlog ',cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); +-# end +-# end +-# else +-# if ~ispc, +-# %Add --gen-suppressions=all to get suppression lines +-# fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib); +-# fprintf(fid,'mpiexec -np %i %s --leak-check=full --suppressions=%s %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',... +-# cluster.np,cluster.valgrind,cluster.valgrindsup, cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); +-# else +-# error('valgrind not supported on windows platforms'); +-# end +-# end +-# +-# if isgprof, +-# if ~ispc, +-# fprintf(fid,'\n gprof %s/issm.exe gmon.out > %s.performance',cluster.codepath,modelname); +-# else +-# error('gprof not supported on windows platforms'); +-# end +-# +-# end +-# +-# if ~md.settings.io_gather, +-# if ~ispc, +-# %concatenate the output files: +-# fprintf(fid,'\ncat %s.outbin.* > %s.outbin',modelname,modelname); +-# else +-# error('iogather not supported on windows platforms'); +-# end +-# +-# end +-# +-# %close file: +-# fclose(fid); +-# +-# %in interactive mode, create a run file, and errlog and outlog file +-# if cluster.interactive, +-# fid=fopen([modelname '.errlog'],'w'); fclose(fid); +-# fid=fopen([modelname '.outlog'],'w'); fclose(fid); +-# end +-# +-# +-# end +-# %}}} +-# function LaunchQueueJob(cluster,md,options)% {{{1 +-# +-# if ~ispc, +-# %lauch command, to be executed via ssh +-# launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... +-# ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && source ' md.miscellaneous.name '.queue ']; +-# +-# if ~strcmpi(options.batch,'yes'), +-# +-# %compress the files into one zip. +-# compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.miscellaneous.name '.bin ' md.miscellaneous.name '.queue ' md.miscellaneous.name '.petsc ']; +-# if md.qmu.isdakota, +-# compressstring=[compressstring md.miscellaneous.name '.qmu.in']; +-# end +-# if cluster.interactive, +-# compressstring=[compressstring ' ' md.miscellaneous.name '.errlog ' md.miscellaneous.name '.outlog ']; +-# end +-# system(compressstring); +-# +-# disp('uploading input file and queueing script'); +-# issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[md.private.runtimename '.tar.gz']}); +-# +-# disp('launching solution sequence on remote cluster'); +-# issmssh(cluster.name,cluster.login,cluster.port,launchcommand); +-# else +-# disp('batch mode requested: not launching job interactively'); +-# disp('launch solution sequence on remote cluster by hand'); +-# end +-# else +-# %launch right here, do not compress or archive. +-# system([md.miscellaneous.name '.bat']); +-# end +-# +-# end %}}} +-# function Download(cluster,md)% {{{1 +-# +-# if ~ispc, +-# %some check +-# if isempty(md.private.runtimename), +-# error('supply runtime name for results to be loaded!'); +-# end +-# +-# %Figure out the directory where all the files are in: +-# directory=[cluster.executionpath '/' md.private.runtimename '/']; +-# +-# %What packages are we picking up from remote cluster +-# packages={[md.miscellaneous.name '.outlog'],[md.miscellaneous.name '.errlog']}; +-# if md.qmu.isdakota, +-# packages{end+1}=[md.miscellaneous.name '.qmu.err']; +-# packages{end+1}=[md.miscellaneous.name '.qmu.out']; +-# if isfield(md.qmu.params,'tabular_graphics_data'), +-# if md.qmu.params.tabular_graphics_data==true, +-# packages{end+1}='dakota_tabular.dat'; +-# end +-# end +-# else +-# packages{end+1}=[md.miscellaneous.name '.outbin']; +-# end +-# +-# %copy files from cluster to present directory +-# issmscpin(cluster.name, cluster.login, cluster.port, directory, packages); +-# else +-# %do nothing! +-# end +-# end %}}} +-# +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/pfe.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/pfe.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/pfe.m (revision 12351) +@@ -7,7 +7,7 @@ + + classdef pfe + properties (SetAccess=public) +- % {{{1 ++ % {{{ + name='pfe' + login=''; + numnodes=20; +@@ -28,7 +28,7 @@ + % }}} + end + methods +- function cluster=pfe(varargin) % {{{1 ++ function cluster=pfe(varargin) % {{{ + + %initialize cluster using default settings if provided + if (exist('pfe_settings')==2), pfe_settings; end +@@ -37,7 +37,7 @@ + cluster=AssignObjectFields(pairoptions(varargin{:}),cluster); + end + %}}} +- function disp(cluster) % {{{1 ++ function disp(cluster) % {{{ + % display the object + disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); + disp(sprintf(' name: %s',cluster.name)); +@@ -55,7 +55,7 @@ + disp(sprintf(' hyperthreading: %i',cluster.hyperthreading)); + end + %}}} +- function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ function checkconsistency(cluster,md,solution,analyses) % {{{ + + available_queues={'long','normal','debug'}; + queue_requirements_time=[5*24*60 8*60 2*60]; +@@ -95,19 +95,15 @@ + + end + %}}} +- function BuildQueueScript(cluster,md) % {{{1 ++ function BuildQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{ + +- %retrieve parameters +- modelname=md.miscellaneous.name; +- solution=md.private.solution; +- isvalgrind=md.debug.valgrind; ++ if(isgprof), disp('gprof not supported by cluster, ignoring...'); end + + %compute number of processors + cluster.np=cluster.numnodes*cluster.cpuspernode; + +- %open file for writing: ++ %write queuing script + fid=fopen([modelname '.queue'],'w'); +- + fprintf(fid,'#PBS -S /bin/bash\n'); + % fprintf(fid,'#PBS -N %s\n',modelname); + fprintf(fid,'#PBS -l select=%i:ncpus=%i:model=%s\n',cluster.numnodes,cluster.cpuspernode,cluster.processor); +@@ -117,26 +113,17 @@ + fprintf(fid,'#PBS -m e\n'); + fprintf(fid,'#PBS -o %s.outlog \n',modelname); + fprintf(fid,'#PBS -e %s.errlog \n\n',modelname); +- + fprintf(fid,'. /usr/share/modules/init/bash\n\n'); +- + fprintf(fid,'module load comp-intel/11.1.046\n'); + fprintf(fid,'module load mpi/mpt.1.25\n'); + fprintf(fid,'module load math/intel_mkl_64_10.0.011\n\n'); +- + fprintf(fid,'export PATH="$PATH:."\n\n'); + fprintf(fid,'export MPI_GROUP_MAX=64\n\n'); +- + fprintf(fid,'cd $PBS_O_WORKDIR\n\n'); +- + fprintf(fid,'mpiexec -np %i %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution),modelname); +- +- if ~md.settings.io_gather, +- %concatenate the output files: ++ if ~io_gather, %concatenate the output files: + fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); + end +- +- %close file + fclose(fid); + + %in interactive mode, create a run file, and errlog and outlog file +@@ -147,9 +134,7 @@ + else + fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/issm.exe %s $PBS_O_WORKDIR %s\n',cluster.np,cluster.codepath,EnumToString(solution),modelname); + end +- +- if ~md.settings.io_gather, +- %concatenate the output files: ++ if ~io_gather, %concatenate the output files: + fprintf(fid,'cat %s.outbin.* > %s.outbin',modelname,modelname); + end + fclose(fid); +@@ -159,7 +144,7 @@ + fclose(fid); + end + end %}}} +- function LaunchQueueJob(cluster,md,options)% {{{1 ++ function LaunchQueueJob(cluster,md,options)% {{{ + + %lauch command, to be executed via ssh + if ~cluster.interactive, +@@ -203,7 +188,7 @@ + end + end + %}}} +- function Download(cluster,md)% {{{1 ++ function Download(cluster,md)% {{{ + + %some check + if isempty(md.private.runtimename), +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/castor.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/castor.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/castor.m (revision 12351) +@@ -7,7 +7,7 @@ + + classdef castor + properties (SetAccess=public) +- % {{{1 ++ % {{{ + name='castor' + login='username'; + np =128; +@@ -19,11 +19,11 @@ + %}}} + end + methods +- function cluster=castor(varargin) % {{{1 ++ function cluster=castor(varargin) % {{{ + cluster=AssignObjectFields(pairoptions(varargin{:}),cluster); + end + %}}} +- function disp(cluster) % {{{1 ++ function disp(cluster) % {{{ + % display the object + disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); + disp(sprintf(' name: %s',cluster.name)); +@@ -36,7 +36,7 @@ + disp(sprintf(' executionpath: %s',cluster.executionpath)); + end + %}}} +- function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ function checkconsistency(cluster,md,solution,analyses) % {{{ + + available_queues={'shortc','longc'}; + queue_requirements_time=[180 720]; +@@ -45,15 +45,13 @@ + QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time) + end + %}}} +- function BuildQueueScript(cluster,md) % {{{1 ++ function BuildQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{ + +- %retrieve parameters +- modelname=md.miscellaneous.name; +- solution=md.private.solution; ++ if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end ++ if(isgprof), disp('gprof not supported by cluster, ignoring...'); end + +- %open file for writing: ++ %write queuing script + fid=fopen([modelname '.queue'],'w'); +- + fprintf(fid,'#!/bin/sh\n'); + fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds. + fprintf(fid,'#PBS -N %s\n',modelname); +@@ -63,18 +61,15 @@ + end + fprintf(fid,'#PBS -o %s.outlog \n',modelname); + fprintf(fid,'#PBS -e %s.errlog \n',modelname); +- + fprintf(fid,'export PBS_O_WORKDIR=%s\n',cluster.executionpath); + fprintf(fid,'cd $PBS_O_WORKDIR\n'); + fprintf(fid,'export OMP_NUM_THREADS=1\n'); + fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +- +- %close file + fclose(fid); + + end + %}}} +- function LaunchQueueJob(cluster,md,options)% {{{1 ++ function LaunchQueueJob(cluster,md,options)% {{{ + + %lauch command, to be executed via ssh + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... +@@ -102,7 +97,7 @@ + + end + %}}} +- function Download(cluster,md)% {{{1 ++ function Download(cluster,md)% {{{ + + %some check + if isempty(md.private.runtimename), +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/generic.m (revision 12351) +@@ -6,7 +6,7 @@ + + classdef generic + properties (SetAccess=public) +- % {{{1 ++ % {{{ + name=''; + login=''; + np=1; +@@ -20,7 +20,7 @@ + %}}} + end + methods +- function cluster=generic(varargin) % {{{1 ++ function cluster=generic(varargin) % {{{ + + %use provided options to change fields + options=pairoptions(varargin{:}); +@@ -35,7 +35,7 @@ + cluster=AssignObjectFields(pairoptions(varargin{:}),cluster); + end + %}}} +- function disp(cluster) % {{{1 ++ function disp(cluster) % {{{ + % display the object + disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); + disp(sprintf(' name: %s',cluster.name)); +@@ -49,7 +49,7 @@ + disp(sprintf(' valgrindsup: %s',cluster.valgrindsup)); + end + %}}} +- function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ function checkconsistency(cluster,md,solution,analyses) % {{{ + if cluster.np<1 + checkmessage(['number of processors should be at least 1']); + end +@@ -58,15 +58,9 @@ + end + end + %}}} +- function BuildQueueScript(cluster,md) % {{{1 ++ function BuildQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{ + +- %retrieve parameters +- modelname=md.miscellaneous.name; +- solution=md.private.solution; +- isvalgrind=md.debug.valgrind; +- isgprof=md.debug.gprof; +- +- %open file for writing: ++ %write queuing script + if ~ispc, + fid=fopen([modelname '.queue'],'w'); + else +@@ -114,17 +108,13 @@ + + end + +- if ~md.settings.io_gather, +- if ~ispc, +- %concatenate the output files: ++ if ~io_gather, ++ if ~ispc, %concatenate the output files: + fprintf(fid,'\ncat %s.outbin.* > %s.outbin',modelname,modelname); + else + error('iogather not supported on windows platforms'); + end +- + end +- +- %close file: + fclose(fid); + + %in interactive mode, create a run file, and errlog and outlog file +@@ -132,11 +122,9 @@ + fid=fopen([modelname '.errlog'],'w'); fclose(fid); + fid=fopen([modelname '.outlog'],'w'); fclose(fid); + end +- +- + end + %}}} +- function LaunchQueueJob(cluster,md,options)% {{{1 ++ function LaunchQueueJob(cluster,md,options)% {{{ + + if ~ispc, + %lauch command, to be executed via ssh +@@ -170,7 +158,7 @@ + end + + end %}}} +- function Download(cluster,md)% {{{1 ++ function Download(cluster,md)% {{{ + + if ~ispc, + %some check +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/acenet.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/acenet.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/acenet.m (revision 12351) +@@ -7,7 +7,7 @@ + + classdef acenet + properties (SetAccess=public) +- % {{{1 ++ % {{{ + name='glacdyn.ace-net.ca' + %name='placentia.ace-net.ca' + %name='brasdor.ace-net.ca' +@@ -22,7 +22,7 @@ + %}}} + end + methods +- function cluster=acenet(varargin) % {{{1 ++ function cluster=acenet(varargin) % {{{ + %use provided options to change fields + options=pairoptions(varargin{:}); + +@@ -33,7 +33,7 @@ + cluster=AssignObjectFields(pairoptions(varargin{:}),cluster); + end + %}}} +- function disp(cluster) % {{{1 ++ function disp(cluster) % {{{ + % display the object + disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); + disp(sprintf(' name: %s',cluster.name)); +@@ -46,7 +46,7 @@ + disp(sprintf(' executionpath: %s',cluster.executionpath)); + end + %}}} +- function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ function checkconsistency(cluster,md,solution,analyses) % {{{ + + available_queues={'debug','shortq','longq'}; + queue_requirements_time=[60*1 60*3 60*17]; +@@ -55,54 +55,30 @@ + QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time) + end + %}}} +- function BuildQueueScript(cluster,md) % {{{1 ++ function BuildQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{ + +- %retrieve parameters +- modelname=md.miscellaneous.name; +- solution=md.private.solution; ++ if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end ++ if(isgprof), disp('gprof not supported by cluster, ignoring...'); end + +- %open file for writing: ++ %write queuing script + fid=fopen([modelname '.queue'],'w'); +- +- %write instructions for launching a job on the cluster +- % fprintf(fid,'#!/bin/sh\n'); + fprintf(fid,'#!/bin/bash\n'); +- %fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',... +- % cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); + fprintf(fid,'#$ -cwd\n'); + fprintf(fid,'#$ -N issm\n'); +- %fprintf(fid,'#$ -l h_rt=%i\n',cluster.time); + fprintf(fid,'#$ -l h_rt=10:0:0\n'); +- %fprintf(fid,'#$ -l h_rt=1:0:0,test=true\n'); + fprintf(fid,'#$ -pe ompi* %i\n',cluster.np); + fprintf(fid,'#$ -j y\n'); + fprintf(fid,'module purge\n'); + fprintf(fid,'module load gcc openmpi/gcc\n'); + fprintf(fid,'module load issm\n'); + fprintf(fid,'\n'); +- %fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); + fprintf(fid,'mpiexec -np %i %s/issm.exe %s %s %s 2> %s.errlog >%s.outlog ',... + cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname,modelname,modelname); +- +- % fprintf(fid,'#PBS -l select=%i:ncpus=1\n',cluster.np); +- % fprintf(fid,'#PBS -N %s\n',modelname); +- % fprintf(fid,'#PBS -l walltime=%i\n',time*60); %walltime is in seconds. +- % fprintf(fid,'#PBS -q %s\n',queue); +- % fprintf(fid,'#PBS -o %s.outlog \n',modelname); +- % fprintf(fid,'#PBS -e %s.errlog \n',modelname); +- % fprintf(fid,'export PBS_O_WORKDIR=%s\n',cluster.executionpath); +- % fprintf(fid,'cd $PBS_O_WORKDIR\n'); +- % fprintf(fid,'export OMP_NUM_THREADS=1\n'); +- % fprintf(fid,'ulimit -s unlimited\n'); +- % fprintf(fid,'ulimit -c 0\n'); +- % fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpiexec -np %i %s/issm.exe %s %s %s',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +- +- %close file + fclose(fid); + + end + %}}} +- function LaunchQueueJob(cluster,md,options)% {{{1 ++ function LaunchQueueJob(cluster,md,options)% {{{ + %retrieve parameters + modelname=md.miscellaneous.name; + solution=md.private.solution; +@@ -133,7 +109,7 @@ + + end + %}}} +- function Download(cluster,md)% {{{1 ++ function Download(cluster,md)% {{{ + + %some check + if isempty(md.private.runtimename), +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/none.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/none.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/none.m (revision 12351) +@@ -10,7 +10,7 @@ + name='none' + end + methods +- function cluster=none(varargin) % {{{1 ++ function cluster=none(varargin) % {{{ + error('Cannot assign md.cluster to ''none'': ISSM is not available in serial model anymore'); + end + %}}} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/cosmos.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/cosmos.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/cosmos.m (revision 12351) +@@ -7,7 +7,7 @@ + + classdef cosmos + properties (SetAccess=public) +- % {{{1 ++ % {{{ + name='cosmos' + login='username'; + np=128; +@@ -19,11 +19,11 @@ + %}}} + end + methods +- function cluster=cosmos(varargin) % {{{1 ++ function cluster=cosmos(varargin) % {{{ + cluster=AssignObjectFields(pairoptions(varargin{:}),cluster); + end + %}}} +- function disp(cluster) % {{{1 ++ function disp(cluster) % {{{ + % display the object + disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); + disp(sprintf(' name: %s',cluster.name)); +@@ -36,7 +36,7 @@ + disp(sprintf(' executionpath: %s',cluster.executionpath)); + end + %}}} +- function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ function checkconsistency(cluster,md,solution,analyses) % {{{ + + available_queues={'debug','shortq','longq'}; + queue_requirements_time=[60*1 60*3 60*17]; +@@ -45,15 +45,13 @@ + QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time) + end + %}}} +- function BuildQueueScript(cluster,md) % {{{1 ++ function BuildQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{ + +- %retrieve parameters +- modelname=md.miscellaneous.name; +- solution=md.private.solution; ++ if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end ++ if(isgprof), disp('gprof not supported by cluster, ignoring...'); end + +- %open file for writing: ++ %write queuing script + fid=fopen([modelname '.queue'],'w'); +- + fprintf(fid,'#!/bin/bash\n'); + fprintf(fid,'#PBS -l select=%i:ncpus=1\n',cluster.np); + fprintf(fid,'#PBS -N %s\n',modelname); +@@ -67,13 +65,11 @@ + fprintf(fid,'ulimit -s unlimited\n'); + fprintf(fid,'ulimit -c 0\n'); + fprintf(fid,'/opt/mpich/gm/intel10.1/bin/mpiexec -np %i %s/issm.exe %s %s %s',cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +- +- %close file + fclose(fid); + + end + %}}} +- function LaunchQueueJob(cluster,md,options)% {{{1 ++ function LaunchQueueJob(cluster,md,options)% {{{ + + %lauch command, to be executed via ssh + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... +@@ -101,7 +97,7 @@ + + end + %}}} +- function Download(cluster,md)% {{{1 ++ function Download(cluster,md)% {{{ + + %some check + if isempty(md.private.runtimename), +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/pollux.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/pollux.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/clusters/pollux.m (revision 12351) +@@ -7,7 +7,7 @@ + + classdef pollux + properties (SetAccess=public) +- % {{{1 ++ % {{{ + name='pollux' + login='username'; + np=128; +@@ -19,11 +19,11 @@ + %}}} + end + methods +- function cluster=pollux(varargin) % {{{1 ++ function cluster=pollux(varargin) % {{{ + cluster=AssignObjectFields(pairoptions(varargin{:}),cluster); + end + %}}} +- function disp(cluster) % {{{1 ++ function disp(cluster) % {{{ + % display the object + disp(sprintf('class ''%s'' object ''%s'' = ',class(cluster),inputname(1))); + disp(sprintf(' name: %s',cluster.name)); +@@ -36,7 +36,7 @@ + disp(sprintf(' executionpath: %s',cluster.executionpath)); + end + %}}} +- function checkconsistency(cluster,md,solution,analyses) % {{{1 ++ function checkconsistency(cluster,md,solution,analyses) % {{{ + + available_queues={'shortp','longp'}; + queue_requirements_time=[180 720]; +@@ -45,15 +45,13 @@ + QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time) + end + %}}} +- function BuildQueueScript(cluster,md) % {{{1 ++ function BuildQueueScript(cluster,modelname,solution,io_gather,isvalgrind,isgprof) % {{{ + +- %retrieve parameters +- modelname=md.miscellaneous.name; +- solution=md.private.solution; ++ if(isvalgrind), disp('valgrind not supported by cluster, ignoring...'); end ++ if(isgprof), disp('gprof not supported by cluster, ignoring...'); end + +- %open file for writing: ++ %write queuing script + fid=fopen([modelname '.queue'],'w'); +- + fprintf(fid,'#!/bin/sh\n'); + fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds. + fprintf(fid,'#PBS -N %s\n',modelname); +@@ -63,18 +61,15 @@ + end + fprintf(fid,'#PBS -o %s.outlog \n',modelname); + fprintf(fid,'#PBS -e %s.errlog \n',modelname); +- + fprintf(fid,'export PBS_O_WORKDIR=%s\n',cluster.executionpath); + fprintf(fid,'cd $PBS_O_WORKDIR\n'); + fprintf(fid,'export OMP_NUM_THREADS=1\n'); + fprintf(fid,'dplace -s1 -c0-%i mpiexec -np %i %s/issm.exe %s %s %s',cluster.np-1,cluster.np,cluster.codepath,EnumToString(solution),cluster.executionpath,modelname); +- +- %close file + fclose(fid); + + end + %}}} +- function LaunchQueueJob(cluster,md,options)% {{{1 ++ function LaunchQueueJob(cluster,md,options)% {{{ + + %lauch command, to be executed via ssh + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... +@@ -102,7 +97,7 @@ + + end + %}}} +- function Download(cluster,md)% {{{1 ++ function Download(cluster,md)% {{{ + + %some check + if isempty(md.private.runtimename), +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m (revision 12350) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/model/model.m (revision 12351) +@@ -241,10 +241,9 @@ + if isfield(structmd,'mask'), md.flaim.criterion=structmd.mask; end + if isfield(structmd,'pressureload'), md.diagnostic.icefront=structmd.pressureload; end + if isfield(structmd,'diagnostic_ref'), md.diagnostic.referential=structmd.diagnostic_ref; end +- +- +- +- ++ if isfield(structmd,'npart'); md.qmu.numberofpartitions=structmd.npart; end ++ if isfield(structmd,'part'); md.qmu.partition=structmd.part; end ++ + %Field changes + if (isfield(structmd,'type') & ischar(structmd.type)), + if strcmpi(structmd.type,'2d'), md.mesh.dimension=2; end +@@ -355,9 +354,7 @@ + if ~isfield(structmd,'diagnostic_ref'); + md.diagnostic.referential=NaN*ones(md.mesh.numberofvertices,6); + end +- if isfield(structmd,'npart'); md.qmu.numberofpartitions=structmd.npart; end +- if isfield(structmd,'part'); md.qmu.partition=structmd.part; end +- ++ + end% }}} + function md = setdefaultparameters(md) % {{{1 + Index: /issm/oecreview/Archive/12321-12677/ISSM-12351-12352.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12351-12352.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12351-12352.diff (revision 12679) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/basinzoom.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/basinzoom.m (revision 12351) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/utils/Basins/basinzoom.m (revision 12352) +@@ -37,7 +37,7 @@ + basindeltay=basindeltay*1000; + + %Ok, find basin we are talking about: +-load([issmdir '/projects/ModelData/Names/Names.mat']); ++load([jplsvn() '/projects/ModelData/Names/Names.mat']); + + %Go through names: + found=0; Index: /issm/oecreview/Archive/12321-12677/ISSM-12352-12353.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12352-12353.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12352-12353.diff (revision 12679) @@ -0,0 +1,20 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/xNewDelete.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/xNewDelete.h (revision 12352) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/xNewDelete.h (revision 12353) +@@ -14,6 +14,15 @@ + return aT_p; + }; + ++template ++T* xNewInit(unsigned int size, const T initVal) { ++ T* aT_p=new T[size]; ++ assert(aT_p); ++ for (int i=0; i + void xDelete(T*& aT_p) { + if (aT_p) Index: /issm/oecreview/Archive/12321-12677/ISSM-12353-12354.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12353-12354.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12353-12354.diff (revision 12679) @@ -0,0 +1,51 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DakotaPlugin.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DakotaPlugin.cpp (revision 12353) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DakotaPlugin.cpp (revision 12354) +@@ -56,10 +56,10 @@ + int DakotaPlugin::derived_map_ac(const Dakota::String& driver) { + + int i; +- double* variables=NULL; ++ IssmDouble* variables=NULL; + char** variable_descriptors=NULL; + char* variable_descriptor=NULL; +- double* responses=NULL; ++ IssmDouble* responses=NULL; + + /*increae counter: */ + counter++; +@@ -68,7 +68,7 @@ + *readable variables: */ + + /*First, the variables: */ +- variables=(double*)xmalloc(numACV*sizeof(double)); ++ variables=xNew(numACV); + for(i=0;i(numFns,0.0); + + /*run core solution: */ + SpawnCore(responses,numFns, variables,variable_descriptors,numACV,femmodel,counter); +@@ -96,13 +96,13 @@ + + + /*Free ressources:*/ +- xfree((void**)&variables); ++ xDelete(variables); + for(i=0;i(responses); + + return 0; + } Index: /issm/oecreview/Archive/12321-12677/ISSM-12354-12355.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12354-12355.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12354-12355.diff (revision 12679) @@ -0,0 +1,36 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/MemOps/xMemCpy.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/MemOps/xMemCpy.h (revision 0) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/MemOps/xMemCpy.h (revision 12355) +@@ -0,0 +1,19 @@ ++/* \file xMemCpy.h ++ * \brief: header file for templated memory operations ++ */ ++ ++#ifndef _XMEMCPY_H_ ++#define _XMEMCPY_H_ ++ ++#include ++ ++template ++T* xMemCpy(T* dest, const T* src, unsigned int size) { ++ assert(dest); assert(src); ++ for (int i=0; iclosed=false; + } + /*}}}*/ +-/*FUNCTION Contour::Contour(int pid, int nods, double* x, double* y,bool closed) {{{1*/ +-Contour::Contour(int pid,int pnods, double* px, double* py,bool pclosed){ ++/*FUNCTION Contour::Contour(int pid, int nods, IssmDouble* x, IssmDouble* y,bool closed) {{{1*/ ++Contour::Contour(int pid,int pnods, IssmDouble* px, IssmDouble* py,bool pclosed){ + + this->id=pid; + this->nods=pnods; + this->closed=pclosed; + if(nods){ +- this->x=(double*)xmalloc(nods*sizeof(double)); +- memcpy(this->x,px,nods*sizeof(double)); +- this->y=(double*)xmalloc(nods*sizeof(double)); +- memcpy(this->y,py,nods*sizeof(double)); ++ this->x=xNew(nods); ++ xMemCpy(this->x,px,nods); ++ this->y=xNew(nods); ++ xMemCpy(this->y,py,nods); + } + } + /*}}}*/ + /*FUNCTION Contour::Contour() default constructor {{{1*/ + Contour::~Contour(){ +- xfree((void**)&this->x); +- xfree((void**)&this->y); ++ xDelete(this->x); ++ xDelete(this->y); + } + /*}}}*/ + Index: /issm/oecreview/Archive/12321-12677/ISSM-12356-12357.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12356-12357.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12356-12357.diff (revision 12679) @@ -0,0 +1,12 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12356) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12357) +@@ -9,6 +9,7 @@ + #include "Alloc/alloc.h" + #include "Alloc/alloc_module.h" + #include "Alloc/xNewDelete.h" ++#include "MemOps/xMemCpy.h" + #include "Exceptions/exceptions.h" + #include "Exp/exp.h" + #include "TriMesh/trimesh.h" Index: /issm/oecreview/Archive/12321-12677/ISSM-12360-12361.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12360-12361.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12360-12361.diff (revision 12679) @@ -0,0 +1,13 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/materials.m +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/materials.m (revision 12360) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/materials.m (revision 12361) +@@ -82,7 +82,7 @@ + + fielddisplay(obj,'rho_ice','ice density [kg/m^3]'); + fielddisplay(obj,'rho_water','ocean water density [kg/m^3]'); +- fielddisplay(obj,'freshrho_water','fresh water density [kg/m^3]'); ++ fielddisplay(obj,'rho_freshwater','fresh water density [kg/m^3]'); + fielddisplay(obj,'mu_water','water viscosity [N s/m^2]'); + fielddisplay(obj,'heatcapacity','heat capacity [J/kg/K]'); + fielddisplay(obj,'thermalconductivity','ice thermal conductivity [W/m/K]'); Index: /issm/oecreview/Archive/12321-12677/ISSM-12363-12364.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12363-12364.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12363-12364.diff (revision 12679) @@ -0,0 +1,72 @@ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/dox/issm.dox +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/dox/issm.dox (revision 12363) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/dox/issm.dox (revision 12364) +@@ -45,47 +45,38 @@ + LanguagefilesblankcommentcodeTotal + + +- C++ 50814595167625603487391 ++ C++ 50814595167625603687393 + + +- MATLAB 9266911133053062350839 ++ MATLAB 9256851132283046850547 + + +- C/C++ Header 37827542625980115180 ++ C/C++ Header 37827582612981815188 + + + m4 79978082599336 + + +- Python 5440479914352638 ++ Python 5340061014242434 + + + Objective C 9980370468 + + +- Bourne Shell 64773241361 ++ Perl 32123240284 + + +- Perl 32123240284 ++ Bourne Shell 54775239361 + + + IDL 1184124146 + + +- XML 83712185243 ++ C 123611 + + +- Java 5174261120 ++ SUM: 18902578733397106984166168 + +- +- D 7302730 +- +- +- C 34352160 +- +- +- SUM: 19152590633869107321167096 +- + + + Copyright (C) 2012 +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/getloc.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/getloc.sh (revision 12363) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/scripts/getloc.sh (revision 12364) +@@ -1,6 +1,6 @@ + #!/bin/bash + #get number of lines of code +-cloc-1.55.pl $ISSM_DIR/src $ISSM_DIR/m4 --exclude-dir=.svn --exclude-ext=exp --exclude-lang=make --out=temp ++cloc-1.55.pl $ISSM_DIR/src $ISSM_DIR/m4 --exclude-dir=.svn --exclude-dir=ad --exclude-dir=android --exclude-ext=exp --exclude-lang=make --out=temp + cat temp + ./cloc2html.py + rm temp Index: /issm/oecreview/Archive/12321-12677/ISSM-12364-12365.diff =================================================================== --- /issm/oecreview/Archive/12321-12677/ISSM-12364-12365.diff (revision 12679) +++ /issm/oecreview/Archive/12321-12677/ISSM-12364-12365.diff (revision 12679) @@ -0,0 +1,26551 @@ +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 12365) +@@ -2,7 +2,7 @@ + * \brief objective function that returns a misfit, for a certain parameter. + */ + +-/*include files: {{{1*/ ++/*include files: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12365) +@@ -55,7 +55,7 @@ + } + END + #}}} +-#Build StringToEnumx.cpp {{{1 ++#Build StringToEnumx.cpp {{{ + #Header + cat < $ISSM_DIR/src/c/modules/StringToEnumx/StringToEnumx.cpp + /* +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12365) +@@ -10,7 +10,7 @@ + #include "../modules/StringToEnumx/StringToEnumx.h" + + enum definitions{ +- /*Model fields {{{1*/ ++ /*Model fields {{{*/ + AutodiffForwardEnum, + AutodiffIsautodiffEnum, + AutodiffReverseEnum, +@@ -182,7 +182,7 @@ + TransientNumRequestedOutputsEnum, + TransientRequestedOutputsEnum, + /*}}}*/ +- /*Solutions and Analyses{{{1 */ ++ /*Solutions and Analyses{{{ */ + SolutionTypeEnum, + AnalysisTypeEnum, + ConfigurationTypeEnum, +@@ -219,7 +219,7 @@ + ThermalSolutionEnum, + TransientSolutionEnum, + /*}}}*/ +- /*Approximations {{{1*/ ++ /*Approximations {{{*/ + ApproximationEnum, + HutterApproximationEnum, + MacAyealApproximationEnum, +@@ -230,7 +230,7 @@ + PattynStokesApproximationEnum, + StokesApproximationEnum, + /*}}}*/ +- /*Datasets {{{1*/ ++ /*Datasets {{{*/ + ConstraintsEnum, + LoadsEnum, + MaterialsEnum, +@@ -239,7 +239,7 @@ + VerticesEnum, + ResultsEnum, + /*}}}*/ +- /*Objects {{{1*/ ++ /*Objects {{{*/ + BoolInputEnum, + BoolParamEnum, + ContourEnum, +@@ -288,18 +288,18 @@ + TriaP1InputEnum, + VertexEnum, + /*}}}*/ +- /*Fill {{{1*/ ++ /*Fill {{{*/ + AirEnum, + IceEnum, + MelangeEnum, + WaterEnum, + /*}}}*/ +- /*Rift state {{{1*/ ++ /*Rift state {{{*/ + ClosedEnum, + FreeEnum, + OpenEnum, + /*}}}*/ +- /*Inputs {{{1*/ ++ /*Inputs {{{*/ + AdjointpEnum, + AdjointxEnum, + AdjointyEnum, +@@ -387,12 +387,12 @@ + StressTensorzzEnum, + IceVolumeEnum, + /*}}}*/ +- /*Element Interpolations{{{1*/ ++ /*Element Interpolations{{{*/ + P0Enum, + P1Enum, + P1DGEnum, + /*}}}*/ +- /*Results{{{1*/ ++ /*Results{{{*/ + SaveResultsEnum, + BoolElementResultEnum, + BoolExternalResultEnum, +@@ -413,7 +413,7 @@ + TriaP1ElementResultEnum, + WaterColumnOldEnum, + /*}}}*/ +- /*Responses{{{1*/ ++ /*Responses{{{*/ + MinVelEnum, + MaxVelEnum, + MinVxEnum, +@@ -426,20 +426,20 @@ + MaxVzEnum, + MaxAbsVzEnum, + /*}}}*/ +- /*Convergence{{{1*/ ++ /*Convergence{{{*/ + RelativeEnum, + AbsoluteEnum, + IncrementalEnum, + /*}}}*/ +- /*Grounding Line{{{1*/ ++ /*Grounding Line{{{*/ + AgressiveMigrationEnum, + NoneEnum, + SoftMigrationEnum, + /*}}}*/ +- /*Solver{{{1*/ ++ /*Solver{{{*/ + StokesSolverEnum, + /*}}}*/ +- /*Parameters{{{1*/ ++ /*Parameters{{{*/ + AdjointEnum, + ColinearEnum, + ControlSteadyEnum, +@@ -467,16 +467,16 @@ + SsetEnum, + VerboseEnum, + /*}}}*/ +- /*Interpolation {{{1*/ ++ /*Interpolation {{{*/ + TriangleInterpEnum, + BilinearInterpEnum, + NearestInterpEnum, + /*}}}*/ +- /*Coordinate Systems{{{1*/ ++ /*Coordinate Systems{{{*/ + XYEnum, + XYZPEnum, + /*}}}*/ +- /*Options{{{1*/ ++ /*Options{{{*/ + OptionEnum, + OptionCellEnum, + OptionCharEnum, +@@ -484,7 +484,7 @@ + OptionDoubleEnum, + OptionLogicalEnum, + /*}}}*/ +- /*Rheology law (move too Material) {{{1*/ ++ /*Rheology law (move too Material) {{{*/ + PatersonEnum, + ArrheniusEnum, + /*}}}*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/include/matlab_macros.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/include/matlab_macros.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/include/matlab_macros.h (revision 12365) +@@ -2,7 +2,7 @@ + * \brief: macros used for the matlab bindings + */ + +-/*Header {{{1*/ ++/*Header {{{*/ + #ifndef _MATLAB_MACROS_H_ + #define _MATLAB_MACROS_H_ + +@@ -14,7 +14,7 @@ + /*}}}*/ + + #ifdef _HAVE_MATLAB_ +-/* MODULEBOOT/MODULEEND {{{1*/ ++/* MODULEBOOT/MODULEEND {{{*/ + + /*The following macros hide the error exception handling in a matlab module. Just put + * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions +@@ -35,11 +35,11 @@ + mexErrMsgTxt("An unexpected error occurred");\ + } + //}}} +-/* WRAPPER {{{1*/ ++/* WRAPPER {{{*/ + #define WRAPPER(modulename,...) void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) + + /*}}}*/ +-/* CHECKARGUMENTS {{{1*/ ++/* CHECKARGUMENTS {{{*/ + #define CHECKARGUMENTS(NLHS,NRHS,functionpointer) CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,functionpointer) + /*}}}*/ + #endif +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToSeqMat.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToSeqMat.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToSeqMat.cpp (revision 12365) +@@ -2,7 +2,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 12365) +@@ -14,7 +14,7 @@ + + #include + +-/*FUNCTION OptionDoubleParse {{{1*/ ++/*FUNCTION OptionDoubleParse {{{*/ + OptionDouble* OptionDoubleParse( char* name, const mxArray* prhs[]){ + + OptionDouble *odouble = NULL; +@@ -33,7 +33,7 @@ + + return(odouble); + }/*}}}*/ +-/*FUNCTION OptionLogicalParse {{{1*/ ++/*FUNCTION OptionLogicalParse {{{*/ + OptionLogical* OptionLogicalParse( char* name, const mxArray* prhs[]){ + + OptionLogical *ological = NULL; +@@ -52,7 +52,7 @@ + + return(ological); + }/*}}}*/ +-/*FUNCTION OptionCharParse {{{1*/ ++/*FUNCTION OptionCharParse {{{*/ + OptionChar* OptionCharParse( char* name, const mxArray* prhs[]){ + + OptionChar *ochar = NULL; +@@ -71,7 +71,7 @@ + + return(ochar); + }/*}}}*/ +-/*FUNCTION OptionStructParse {{{1*/ ++/*FUNCTION OptionStructParse {{{*/ + OptionStruct* OptionStructParse( char* name, const mxArray* prhs[]){ + + int i; +@@ -116,7 +116,7 @@ + + return(ostruct); + }/*}}}*/ +-/*FUNCTION OptionCellParse {{{1*/ ++/*FUNCTION OptionCellParse {{{*/ + OptionCell* OptionCellParse( char* name, const mxArray* prhs[]){ + + int i; +@@ -166,7 +166,7 @@ + + return(ocell); + }/*}}}*/ +-/*FUNCTION OptionParse{{{1*/ ++/*FUNCTION OptionParse{{{*/ + Option* OptionParse(char* name, const mxArray* prhs[]){ + + Option *option = NULL; +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 12365) +@@ -14,7 +14,7 @@ + #include "./matlabio.h" + + /*Primitive data types*/ +-/*FUNCTION FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/ + void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){ + + double* outmatrix=NULL; +@@ -50,7 +50,7 @@ + + } + /*}}}*/ +-/*FUNCTION FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/ + void FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){ + + double* outmatrix=NULL; +@@ -93,7 +93,7 @@ + + } + /*}}}*/ +-/*FUNCTION FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/ + void FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){ + + int i,outmatrix_rows,outmatrix_cols; +@@ -135,7 +135,7 @@ + if (pN)*pN=outmatrix_cols; + } + /*}}}*/ +-/*FUNCTION FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/ + void FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){ + + int i,outmatrix_rows,outmatrix_cols; +@@ -177,7 +177,7 @@ + if (pN)*pN=outmatrix_cols; + } + /*}}}*/ +-/*FUNCTION FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/ + void FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){ + + int i; +@@ -242,7 +242,7 @@ + + } + /*}}}*/ +-/*FUNCTION FetchData(double** pvector,int* pM,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(double** pvector,int* pM,const mxArray* dataref){{{*/ + void FetchData(double** pvector,int* pM,const mxArray* dataref){ + + double* outvector=NULL; +@@ -269,7 +269,7 @@ + if (pM)*pM=outvector_rows; + } + /*}}}*/ +-/*FUNCTION FetchData(int** pvector,int* pM,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(int** pvector,int* pM,const mxArray* dataref){{{*/ + void FetchData(int** pvector,int* pM,const mxArray* dataref){ + + int i; +@@ -301,7 +301,7 @@ + if (pM)*pM=outvector_rows; + } + /*}}}*/ +-/*FUNCTION FetchData(bool** pvector,int* pM,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(bool** pvector,int* pM,const mxArray* dataref){{{*/ + void FetchData(bool** pvector,int* pM,const mxArray* dataref){ + + int i; +@@ -333,7 +333,7 @@ + if (pM)*pM=outvector_rows; + } + /*}}}*/ +-/*FUNCTION FetchData(float** pvector,int* pM,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(float** pvector,int* pM,const mxArray* dataref){{{*/ + void FetchData(float** pvector,int* pM,const mxArray* dataref){ + + int i; +@@ -365,7 +365,7 @@ + if (pM)*pM=outvector_rows; + } + /*}}}*/ +-/*FUNCTION FetchData(char** pstring,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(char** pstring,const mxArray* dataref){{{*/ + void FetchData(char** pstring,const mxArray* dataref){ + + char* outstring=NULL; +@@ -387,7 +387,7 @@ + /*Assign output pointers:*/ + *pstring=outstring; + } +-/*FUNCTION FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/ + void FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){ + + int outmatrix_numel,outmatrix_ndims; +@@ -420,7 +420,7 @@ + + } + /*}}}*/ +-/*FUNCTION FetchData(double* pscalar,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(double* pscalar,const mxArray* dataref){{{*/ + void FetchData(double* pscalar,const mxArray* dataref){ + + double scalar; +@@ -437,7 +437,7 @@ + *pscalar=scalar; + } + /*}}}*/ +-/*FUNCTION FetchData(int* pinteger,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(int* pinteger,const mxArray* dataref){{{*/ + void FetchData(int* pinteger,const mxArray* dataref){ + + int integer; +@@ -454,7 +454,7 @@ + *pinteger=integer; + } + /*}}}*/ +-/*FUNCTION FetchData(bool* pboolean,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(bool* pboolean,const mxArray* dataref){{{*/ + void FetchData(bool* pboolean,const mxArray* dataref){ + + bool* mxbool_ptr=NULL; +@@ -473,7 +473,7 @@ + /*}}}*/ + + /*ISSM objects*/ +-/*FUNCTION FetchData(Matrix** pmatrix,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(Matrix** pmatrix,const mxArray* dataref){{{*/ + void FetchData(Matrix** pmatrix,const mxArray* dataref){ + + Matrix* outmatrix=NULL; +@@ -494,7 +494,7 @@ + *pmatrix=outmatrix; + } + /*}}}*/ +-/*FUNCTION FetchData(Vector** pvector,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(Vector** pvector,const mxArray* dataref){{{*/ + void FetchData(Vector** pvector,const mxArray* dataref){ + + Vector* vector=NULL; +@@ -518,7 +518,7 @@ + *pvector=vector; + } + /*}}}*/ +-/*FUNCTION FetchData(BamgGeom** pbamggeom,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(BamgGeom** pbamggeom,const mxArray* dataref){{{*/ + void FetchData(BamgGeom** pbamggeom,const mxArray* dataref){ + + /*Initialize output*/ +@@ -537,7 +537,7 @@ + *pbamggeom=bamggeom; + } + /*}}}*/ +-/*FUNCTION FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){{{*/ + void FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){ + + /*Initialize output*/ +@@ -557,7 +557,7 @@ + *pbamgmesh=bamgmesh; + } + /*}}}*/ +-/*FUNCTION FetchData(BamgOpts** pbamgopts,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(BamgOpts** pbamgopts,const mxArray* dataref){{{*/ + void FetchData(BamgOpts** pbamgopts,const mxArray* dataref){ + + /*Initialize output*/ +@@ -601,7 +601,7 @@ + *pbamgopts=bamgopts; + } + /*}}}*/ +-/*FUNCTION FetchData(Options** poptions,const mxArray* dataref){{{1*/ ++/*FUNCTION FetchData(Options** poptions,const mxArray* dataref){{{*/ + void FetchData(Options** poptions,int istart, int nrhs,const mxArray** pdataref){ + + char *name = NULL; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp (revision 12365) +@@ -16,7 +16,7 @@ + + + /*Primitive data types*/ +-/*FUNCTION WriteData(mxArray** pdataref,double* matrix, int M,int N){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,double* matrix, int M,int N){{{*/ + void WriteData(mxArray** pdataref,double* matrix, int M,int N){ + + mxArray *dataref = NULL; +@@ -41,7 +41,7 @@ + *pdataref=dataref; + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,int* matrix, int M,int N){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,int* matrix, int M,int N){{{*/ + void WriteData(mxArray** pdataref,int* matrix, int M,int N){ + + mxArray* dataref = NULL; +@@ -66,7 +66,7 @@ + *pdataref=dataref; + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,double* vector, int M){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,double* vector, int M){{{*/ + void WriteData(mxArray** pdataref,double* vector, int M){ + + mxArray* dataref = NULL; +@@ -89,27 +89,27 @@ + *pdataref=dataref; + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,double scalar){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,double scalar){{{*/ + void WriteData(mxArray** pdataref,double scalar){ + + *pdataref=mxCreateDoubleScalar(scalar); + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,int integer){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,int integer){{{*/ + void WriteData(mxArray** pdataref,int integer){ + + *pdataref=mxCreateDoubleScalar((double)integer); + + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,int boolean){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,int boolean){{{*/ + void WriteData(mxArray** pdataref,bool boolean){ + + *pdataref=mxCreateDoubleScalar((double)boolean); + + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,char* string){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,char* string){{{*/ + void WriteData(mxArray** pdataref,char* string){ + + *pdataref=mxCreateString(string); +@@ -117,7 +117,7 @@ + /*}}}*/ + + /*ISSM objects*/ +-/*FUNCTION WriteData(mxArray** pdataref,BamgGeom* bamggeom){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,BamgGeom* bamggeom){{{*/ + void WriteData(mxArray** pdataref,BamgGeom* bamggeom){ + + /*Intermediary*/ +@@ -157,7 +157,7 @@ + *pdataref=dataref; + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,BamgMesh* bamgmesh){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,BamgMesh* bamgmesh){{{*/ + void WriteData(mxArray** pdataref,BamgMesh* bamgmesh){ + + /*Intermediary*/ +@@ -215,7 +215,7 @@ + *pdataref=dataref; + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,Matrix* matrix){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,Matrix* matrix){{{*/ + void WriteData(mxArray** pdataref,Matrix* matrix){ + + int i,j; +@@ -258,7 +258,7 @@ + *pdataref=dataref; + } + /*}}}*/ +-/*FUNCTION WriteData(mxArray** pdataref,Vector* vector){{{1*/ ++/*FUNCTION WriteData(mxArray** pdataref,Vector* vector){{{*/ + void WriteData(mxArray** pdataref,Vector* vector){ + + mxArray* dataref=NULL; +@@ -295,7 +295,7 @@ + /*}}}*/ + + /*Toolkit*/ +-/*FUNCTION SetStructureField{{{1*/ ++/*FUNCTION SetStructureField{{{*/ + void SetStructureField(mxArray* dataref,const char* fieldname,int M,int N,double* fieldpointer){ + + mxArray* field = NULL; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp (revision 12365) +@@ -2,7 +2,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp (revision 12365) +@@ -2,7 +2,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp (revision 12365) +@@ -14,7 +14,7 @@ + + #include + +-/*FUNCTION MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/ ++/*FUNCTION MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/ + int MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){ + + int i,j,rows,cols; +@@ -94,7 +94,7 @@ + return 1; + } + /*}}}*/ +-/*FUNCTION MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/ ++/*FUNCTION MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/ + int MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){ + + int i,j,rows,cols; +@@ -174,7 +174,7 @@ + return 1; + } + /*}}}*/ +-/*FUNCTION MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/ ++/*FUNCTION MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/ + int MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){ + + int i,j,rows,cols; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToSeqVec.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToSeqVec.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/matlab/io/MatlabVectorToSeqVec.cpp (revision 12365) +@@ -2,7 +2,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/include/python_macros.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/include/python_macros.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/include/python_macros.h (revision 12365) +@@ -5,7 +5,7 @@ + #ifndef _PYTHON_MACROS_H_ + #define _PYTHON_MACROS_H_ + +-/*Header {{{1*/ ++/*Header {{{*/ + + #ifdef HAVE_CONFIG_H + #include +@@ -15,7 +15,7 @@ + /*}}}*/ + + #ifdef _HAVE_PYTHON_ +-/* MODULEBOOT/MODULEEND {{{1*/ ++/* MODULEBOOT/MODULEEND {{{*/ + + /*The following macros hide the error exception handling in a matlab module. Just put + * MODULEBOOT(); and MODULEEND(); at the beginning and end of a module, and c++ exceptions +@@ -29,7 +29,7 @@ + return output; + //}}} + #if _PYTHON_MAJOR_ >=3 +-/* WRAPPER 3.2 {{{1*/ ++/* WRAPPER 3.2 {{{*/ + #define WRAPPER(modulename,...) \ + \ + static PyObject* modulename(PyObject* self,PyObject* args);\ +@@ -56,7 +56,7 @@ + static PyObject* modulename(PyObject* self,PyObject* args) + /*}}}*/ + #else +-/* WRAPPER 2.7 {{{1*/ ++/* WRAPPER 2.7 {{{*/ + #define WRAPPER(modulename,...) \ + \ + static PyObject* modulename(PyObject* self,PyObject* args);\ +@@ -74,7 +74,7 @@ + static PyObject* modulename(PyObject* self,PyObject* args) + /*}}}*/ + #endif +-/* CHECKARGUMENTS {{{1*/ ++/* CHECKARGUMENTS {{{*/ + #define CHECKARGUMENTS(NLHS,NRHS,functionpointer) CheckNumPythonArguments(args, NRHS,functionpointer) + /*}}}*/ + #endif +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 12365) +@@ -16,7 +16,7 @@ + #include "../../shared/shared.h" + + /*Primitive data types*/ +-/*FUNCTION FetchData(double* pscalar,PyObject* py_float){{{1*/ ++/*FUNCTION FetchData(double* pscalar,PyObject* py_float){{{*/ + void FetchData(double* pscalar,PyObject* py_float){ + + double scalar; +@@ -28,7 +28,7 @@ + *pscalar=scalar; + } + /*}}}*/ +-/*FUNCTION FetchData(int* pinteger,PyObject* py_long){{{1*/ ++/*FUNCTION FetchData(int* pinteger,PyObject* py_long){{{*/ + void FetchData(int* pinteger, PyObject* py_long){ + + int integer; +@@ -40,7 +40,7 @@ + *pinteger=integer; + } + /*}}}*/ +-/*FUNCTION FetchData(bool* pboolean,PyObject* py_boolean){{{1*/ ++/*FUNCTION FetchData(bool* pboolean,PyObject* py_boolean){{{*/ + void FetchData(bool* pboolean,PyObject* py_boolean){ + + bool boolean; +@@ -56,7 +56,7 @@ + + } + /*}}}*/ +-/*FUNCTION FetchData(double** pmatrix,int* pM, int* pN, PyObject* py_matrix){{{1*/ ++/*FUNCTION FetchData(double** pmatrix,int* pM, int* pN, PyObject* py_matrix){{{*/ + void FetchData(double** pmatrix,int* pM,int *pN,PyObject* py_matrix){ + + /*output: */ +@@ -80,7 +80,7 @@ + if(pmatrix)*pmatrix=matrix; + } + /*}}}*/ +-/*FUNCTION FetchData(double** pvector,int* pM, PyObject* py_vector){{{1*/ ++/*FUNCTION FetchData(double** pvector,int* pM, PyObject* py_vector){{{*/ + void FetchData(double** pvector,int* pM,PyObject* py_vector){ + + /*output: */ +@@ -106,7 +106,7 @@ + + /*Python version dependent: */ + #if _PYTHON_MAJOR_ >= 3 +-/*FUNCTION FetchData(char** pstring,PyObject* py_unicode){{{1*/ ++/*FUNCTION FetchData(char** pstring,PyObject* py_unicode){{{*/ + void FetchData(char** pstring,PyObject* py_unicode){ + + PyObject* py_bytes; +@@ -123,7 +123,7 @@ + } + /*}}}*/ + #else +-/*FUNCTION FetchData(char** pstring,PyObject* py_string){{{1*/ ++/*FUNCTION FetchData(char** pstring,PyObject* py_string){{{*/ + void FetchData(char** pstring,PyObject* py_string){ + + char* string=NULL; +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 12365) +@@ -20,14 +20,13 @@ + #include "../../EnumDefinitions/EnumDefinitions.h" + + +-/*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{1*/ ++/*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{*/ + void WriteData(PyObject* py_tuple, int index, char* string){ + + PyTuple_SetItem(py_tuple, index, PyUnicode_FromString(string)); + +-} +-/*}}}*/ +-/*FUNCTION WriteData(PyObject* tuple,int index,Matrix* matrix){{{1*/ ++}/*}}}*/ ++/*FUNCTION WriteData(PyObject* tuple,int index,Matrix* matrix){{{*/ + void WriteData(PyObject* tuple,int index,Matrix* matrix){ + + int M,N; +@@ -44,8 +43,8 @@ + PyTuple_SetItem(tuple, index, array); + + +-} +-/*FUNCTION WriteData(PyObject* py_tuple,int index,Vector* vector){{{1*/ ++}/*}}}*/ ++/*FUNCTION WriteData(PyObject* py_tuple,int index,Vector* vector){{{*/ + void WriteData(PyObject* tuple,int index,Vector* vector){ + + int M; +@@ -63,7 +62,7 @@ + + } + /*}}}*/ +-/*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{1*/ ++/*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{*/ + void WriteData(PyObject* tuple, int index, double* matrix, int M,int N){ + + npy_intp dims[2]={0,0}; +@@ -75,4 +74,4 @@ + + PyTuple_SetItem(tuple, index, array); + +-} ++}/*}}}*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Results.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Results.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Results.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Results class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,20 +24,20 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Results::Results(){{{1*/ ++/*FUNCTION Results::Results(){{{*/ + Results::Results(){ + enum_type=ResultsEnum; + return; + } + /*}}}*/ +-/*FUNCTION Results::~Results(){{{1*/ ++/*FUNCTION Results::~Results(){{{*/ + Results::~Results(){ + return; + } + /*}}}*/ + + /*Object management*/ +-/*FUNCTION Results::SpawnTriaResults{{{1*/ ++/*FUNCTION Results::SpawnTriaResults{{{*/ + Results* Results::SpawnTriaResults(int* indices){ + + /*Intermediary*/ +@@ -63,7 +63,7 @@ + return newresults; + } + /*}}}*/ +-/*FUNCTION Results::Write{{{1*/ ++/*FUNCTION Results::Write{{{*/ + void Results::Write(Parameters* parameters){ + + int i; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Loads.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Loads.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Loads.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Loads class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,20 +24,20 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Loads::Loads(){{{1*/ ++/*FUNCTION Loads::Loads(){{{*/ + Loads::Loads(){ + enum_type=LoadsEnum; + return; + } + /*}}}*/ +-/*FUNCTION Loads::~Loads(){{{1*/ ++/*FUNCTION Loads::~Loads(){{{*/ + Loads::~Loads(){ + return; + } + /*}}}*/ + + /*Numerics:*/ +-/*FUNCTION Loads::Configure{{{1*/ ++/*FUNCTION Loads::Configure{{{*/ + void Loads::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ + + vector::iterator object; +@@ -52,7 +52,7 @@ + + } + /*}}}*/ +-/*FUNCTION Loads::NumberOfLoads{{{1*/ ++/*FUNCTION Loads::NumberOfLoads{{{*/ + int Loads::NumberOfLoads(void){ + + int localloads=0; +@@ -73,7 +73,7 @@ + return numberofloads; + } + /*}}}*/ +-/*FUNCTION Loads::SetCurrentConfiguration{{{1*/ ++/*FUNCTION Loads::SetCurrentConfiguration{{{*/ + void Loads::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ + + vector::iterator object; +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Parameters.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Parameters class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,20 +24,20 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Parameters::Parameters(){{{1*/ ++/*FUNCTION Parameters::Parameters(){{{*/ + Parameters::Parameters(){ + enum_type=ParametersEnum; + return; + } + /*}}}*/ +-/*FUNCTION Parameters::~Parameters(){{{1*/ ++/*FUNCTION Parameters::~Parameters(){{{*/ + Parameters::~Parameters(){ + return; + } + /*}}}*/ + + /*Object management*/ +-/*FUNCTION Parameters::Exist{{{1*/ ++/*FUNCTION Parameters::Exist{{{*/ + bool Parameters::Exist(int enum_type){ + + vector::iterator object; +@@ -50,7 +50,7 @@ + return false; + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{*/ + void Parameters::FindParam(bool* pbool,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -67,7 +67,7 @@ + _error_("could not find parameter %s",EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{*/ + void Parameters::FindParam(int* pinteger,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -84,7 +84,7 @@ + _error_("could not find parameter %s",EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(double* pscalar, int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(double* pscalar, int enum_type){{{*/ + void Parameters::FindParam(double* pscalar, int enum_type){ _assert_(this); + + vector::iterator object; +@@ -101,7 +101,7 @@ + _error_("could not find parameter %s",EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{*/ + void Parameters::FindParam(char** pstring,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -119,7 +119,7 @@ + + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{*/ + void Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -137,7 +137,7 @@ + + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int enum_type){{{*/ + void Parameters::FindParam(int** pintarray,int* pM, int enum_type){ _assert_(this); + + vector::iterator object; +@@ -155,7 +155,7 @@ + + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int* pN,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int* pN,int enum_type){{{*/ + void Parameters::FindParam(int** pintarray,int* pM,int *pN,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -173,7 +173,7 @@ + + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{*/ + void Parameters::FindParam(double** pdoublearray,int* pM, int enum_type){ _assert_(this); + + vector::iterator object; +@@ -191,7 +191,7 @@ + + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){{{*/ + void Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -209,7 +209,7 @@ + + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){{{*/ + void Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -226,7 +226,7 @@ + _error_("could not find parameter %s",EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(Vector** pvec,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(Vector** pvec,int enum_type){{{*/ + void Parameters::FindParam(Vector** pvec,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -244,7 +244,7 @@ + + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(Matrix** pmat,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(Matrix** pmat,int enum_type){{{*/ + void Parameters::FindParam(Matrix** pmat,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -262,7 +262,7 @@ + + } + /*}}}*/ +-/*FUNCTION Parameters::FindParam(FILE** pfid,int enum_type){{{1*/ ++/*FUNCTION Parameters::FindParam(FILE** pfid,int enum_type){{{*/ + void Parameters::FindParam(FILE** pfid,int enum_type){ _assert_(this); + + vector::iterator object; +@@ -280,7 +280,7 @@ + } + /*}}}*/ + +-/*FUNCTION Parameters::SetParam(bool boolean,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(bool boolean,int enum_type);{{{*/ + void Parameters::SetParam(bool boolean,int enum_type){ + + Param* param=NULL; +@@ -292,7 +292,7 @@ + else this->AddObject(new BoolParam(enum_type,boolean)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(int integer,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(int integer,int enum_type);{{{*/ + void Parameters::SetParam(int integer,int enum_type){ + + Param* param=NULL; +@@ -304,7 +304,7 @@ + else this->AddObject(new IntParam(enum_type,integer)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(double scalar,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(double scalar,int enum_type);{{{*/ + void Parameters::SetParam(double scalar,int enum_type){ + + Param* param=NULL; +@@ -316,7 +316,7 @@ + else this->AddObject(new DoubleParam(enum_type,scalar)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(char* string,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(char* string,int enum_type);{{{*/ + void Parameters::SetParam(char* string,int enum_type){ + + Param* param=NULL; +@@ -328,7 +328,7 @@ + else this->AddObject(new StringParam(enum_type,string)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(char** stringarray,int M, int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(char** stringarray,int M, int enum_type);{{{*/ + void Parameters::SetParam(char** stringarray,int M, int enum_type){ + + Param* param=NULL; +@@ -340,7 +340,7 @@ + else this->AddObject(new StringArrayParam(enum_type,stringarray,M)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(double* doublearray,int M,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(double* doublearray,int M,int enum_type);{{{*/ + void Parameters::SetParam(double* doublearray,int M, int enum_type){ + + Param* param=NULL; +@@ -352,7 +352,7 @@ + else this->AddObject(new DoubleVecParam(enum_type,doublearray,M)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(double* doublearray,int M,int N, int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(double* doublearray,int M,int N, int enum_type);{{{*/ + void Parameters::SetParam(double* doublearray,int M, int N, int enum_type){ + + Param* param=NULL; +@@ -364,7 +364,7 @@ + else this->AddObject(new DoubleMatParam(enum_type,doublearray,M,N)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(int* intarray,int M,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(int* intarray,int M,int enum_type);{{{*/ + void Parameters::SetParam(int* intarray,int M, int enum_type){ + + Param* param=NULL; +@@ -376,7 +376,7 @@ + else this->AddObject(new IntVecParam(enum_type,intarray,M)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(int* intarray,int M,int N, int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(int* intarray,int M,int N, int enum_type);{{{*/ + void Parameters::SetParam(int* intarray,int M, int N, int enum_type){ + + Param* param=NULL; +@@ -388,7 +388,7 @@ + else this->AddObject(new IntMatParam(enum_type,intarray,M,N)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(Vector* vector,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(Vector* vector,int enum_type);{{{*/ + void Parameters::SetParam(Vector* vector,int enum_type){ + + Param* param=NULL; +@@ -400,7 +400,7 @@ + else this->AddObject(new VectorParam(enum_type,vector)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(Matrix* matrix,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(Matrix* matrix,int enum_type);{{{*/ + void Parameters::SetParam(Matrix* matrix,int enum_type){ + + Param* param=NULL; +@@ -412,7 +412,7 @@ + else this->AddObject(new MatrixParam(enum_type,matrix)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::SetParam(FILE* fid,int enum_type);{{{1*/ ++/*FUNCTION Parameters::SetParam(FILE* fid,int enum_type);{{{*/ + void Parameters::SetParam(FILE* fid,int enum_type){ + + Param* param=NULL; +@@ -424,7 +424,7 @@ + else this->AddObject(new FileParam(enum_type,fid)); //just add the new parameter. + } + /*}}}*/ +-/*FUNCTION Parameters::UnitConversion(int direction_enum);{{{1*/ ++/*FUNCTION Parameters::UnitConversion(int direction_enum);{{{*/ + void Parameters::UnitConversion(int direction_enum){ + + vector::iterator object; +@@ -438,7 +438,7 @@ + } + /*}}}*/ + +-/*FUNCTION Parameters::FindParamObject{{{1*/ ++/*FUNCTION Parameters::FindParamObject{{{*/ + Object* Parameters::FindParamObject(int enum_type){ + + vector::iterator object; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Results.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Results.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Results.h (revision 12365) +@@ -19,11 +19,11 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Results(); + ~Results(); + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + Results* SpawnTriaResults(int* indices); + void Write(Parameters* parameters); + /*}}}*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Constraints.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Constraints.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Constraints.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Constraints class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,20 +24,20 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Constraints::Constraints(){{{1*/ ++/*FUNCTION Constraints::Constraints(){{{*/ + Constraints::Constraints(){ + enum_type=ConstraintsEnum; + return; + } + /*}}}*/ +-/*FUNCTION Constraints::~Constraints(){{{1*/ ++/*FUNCTION Constraints::~Constraints(){{{*/ + Constraints::~Constraints(){ + return; + } + /*}}}*/ + + /*Numerics: */ +-/*FUNCTION Constraints::NumberOfConstraints{{{1*/ ++/*FUNCTION Constraints::NumberOfConstraints{{{*/ + int Constraints::NumberOfConstraints(void){ + + int localconstraints; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Loads.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Loads.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Loads.h (revision 12365) +@@ -19,11 +19,11 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Loads(); + ~Loads(); + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); + int NumberOfLoads(void); + void SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Parameters.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Parameters.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Parameters.h (revision 12365) +@@ -22,11 +22,11 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Parameters(); + ~Parameters(); + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + bool Exist(int enum_type); + + void FindParam(bool* pinteger,int enum_type); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Nodes.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Nodes.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Nodes.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Nodes class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,20 +24,20 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Nodes::Nodes(){{{1*/ ++/*FUNCTION Nodes::Nodes(){{{*/ + Nodes::Nodes(){ + enum_type=NodesEnum; + return; + } + /*}}}*/ +-/*FUNCTION Nodes::~Nodes(){{{1*/ ++/*FUNCTION Nodes::~Nodes(){{{*/ + Nodes::~Nodes(){ + return; + } + /*}}}*/ + + /*Numerics*/ +-/*FUNCTION Nodes::Configure{{{1*/ ++/*FUNCTION Nodes::Configure{{{*/ + void Nodes::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ + + vector::iterator object; +@@ -52,7 +52,7 @@ + + } + /*}}}*/ +-/*FUNCTION Nodes::DistributeDofs{{{1*/ ++/*FUNCTION Nodes::DistributeDofs{{{*/ + void Nodes::DistributeDofs(int analysis_type,int setenum){ + + extern int num_procs; +@@ -143,7 +143,7 @@ + xfree((void**)&alltruedofs); + } + /*}}}*/ +-/*FUNCTION Nodes::FlagClones{{{1*/ ++/*FUNCTION Nodes::FlagClones{{{*/ + void Nodes::FlagClones(int analysis_type){ + + int i; +@@ -194,7 +194,7 @@ + + } + /*}}}*/ +-/*FUNCTION Nodes::MaxNumDofs{{{1*/ ++/*FUNCTION Nodes::MaxNumDofs{{{*/ + int Nodes::MaxNumDofs(int analysis_type,int setenum){ + + int i; +@@ -224,7 +224,7 @@ + return max; + } + /*}}}*/ +-/*FUNCTION Nodes::NumberOfDofs{{{1*/ ++/*FUNCTION Nodes::NumberOfDofs{{{*/ + int Nodes::NumberOfDofs(int analysis_type,int setenum){ + + int i; +@@ -258,7 +258,7 @@ + return allnumdofs; + } + /*}}}*/ +-/*FUNCTION Nodes::NumberOfNodes(){{{1*/ ++/*FUNCTION Nodes::NumberOfNodes(){{{*/ + int Nodes::NumberOfNodes(void){ + + /*Careful! only use once all clones have been setup for all nodes!: */ +@@ -286,7 +286,7 @@ + return allnumnodes; + } + /*}}}*/ +-/*FUNCTION Nodes::NumberOfNodes(analysis){{{1*/ ++/*FUNCTION Nodes::NumberOfNodes(analysis){{{*/ + int Nodes::NumberOfNodes(int analysis_type){ + + int i; +@@ -325,7 +325,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Nodes::Ranks{{{1*/ ++/*FUNCTION Nodes::Ranks{{{*/ + void Nodes::Ranks(int* ranks,int analysis_type){ + + /*Go through nodes, and for each object, report it cpu: */ +@@ -351,7 +351,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION Nodes::SetCurrentConfiguration{{{1*/ ++/*FUNCTION Nodes::SetCurrentConfiguration{{{*/ + void Nodes::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ + + vector::iterator object; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Constraints.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Constraints.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Constraints.h (revision 12365) +@@ -20,11 +20,11 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Constraints(); + ~Constraints(); + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + int NumberOfConstraints(void); + /*}}}*/ + +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Elements class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,20 +24,20 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Elements::Elements(){{{1*/ ++/*FUNCTION Elements::Elements(){{{*/ + Elements::Elements(){ + enum_type=MeshElementsEnum; + return; + } + /*}}}*/ +-/*FUNCTION Elements::~Elements(){{{1*/ ++/*FUNCTION Elements::~Elements(){{{*/ + Elements::~Elements(){ + return; + } + /*}}}*/ + + /*Object management*/ +-/*FUNCTION Elements::Configure{{{1*/ ++/*FUNCTION Elements::Configure{{{*/ + void Elements::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ + + vector::iterator object; +@@ -52,7 +52,7 @@ + + } + /*}}}*/ +-/*FUNCTION Elements::ProcessResultsUnits{{{1*/ ++/*FUNCTION Elements::ProcessResultsUnits{{{*/ + void Elements::ProcessResultsUnits(void){ + + //Process results to be output in the correct units +@@ -62,7 +62,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Elements::DeleteResults{{{1*/ ++/*FUNCTION Elements::DeleteResults{{{*/ + void Elements::DeleteResults(void){ + + for (int i=0;iSize();i++){ +@@ -71,7 +71,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Elements::ResultsToPatch{{{1*/ ++/*FUNCTION Elements::ResultsToPatch{{{*/ + Patch* Elements::ResultsToPatch(void){ + + /*output: */ +@@ -147,7 +147,7 @@ + return patch; + } + /*}}}*/ +-/*FUNCTION Elements::SetCurrentConfiguration{{{1*/ ++/*FUNCTION Elements::SetCurrentConfiguration{{{*/ + void Elements::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ + + vector::iterator object; +@@ -162,7 +162,7 @@ + + } + /*}}}*/ +-/*FUNCTION Elements::ToResults{{{1*/ ++/*FUNCTION Elements::ToResults{{{*/ + void Elements::ToResults(Results* results,Parameters* parameters){ + + extern int my_rank; +@@ -275,7 +275,7 @@ + delete patch; + } + /*}}}*/ +-/*FUNCTION Elements::NumberOfElements{{{1*/ ++/*FUNCTION Elements::NumberOfElements{{{*/ + int Elements::NumberOfElements(void){ + + int local_nelem=0; +@@ -291,7 +291,7 @@ + return numberofelements; + } + /*}}}*/ +-/*FUNCTION Elements::InputCopy{{{1*/ ++/*FUNCTION Elements::InputCopy{{{*/ + void Elements::InputDuplicate(int input_enum,int output_enum){ + + for(int i=0;iSize();i++){ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Nodes.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Nodes.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Nodes.h (revision 12365) +@@ -12,11 +12,11 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Nodes(); + ~Nodes(); + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); + void DistributeDofs(int analysis_type,int SETENUM); + void FlagClones(int analysis_type); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Elements.h (revision 12365) +@@ -20,11 +20,11 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Elements(); + ~Elements(); + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); + void DeleteResults(void); + void ProcessResultsUnits(void); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Materials.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Materials.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Materials.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Materials class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,20 +24,20 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Materials::Materials(){{{1*/ ++/*FUNCTION Materials::Materials(){{{*/ + Materials::Materials(){ + enum_type=MaterialsEnum; + return; + } + /*}}}*/ +-/*FUNCTION Materials::~Materials(){{{1*/ ++/*FUNCTION Materials::~Materials(){{{*/ + Materials::~Materials(){ + return; + } + /*}}}*/ + + /*Object management*/ +-/*FUNCTION Materials::Configure{{{1*/ ++/*FUNCTION Materials::Configure{{{*/ + void Materials::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ + + vector::iterator object; +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Inputs.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Inputs class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,19 +24,19 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Inputs::Inputs(){{{1*/ ++/*FUNCTION Inputs::Inputs(){{{*/ + Inputs::Inputs(){ + return; + } + /*}}}*/ +-/*FUNCTION Inputs::~Inputs(){{{1*/ ++/*FUNCTION Inputs::~Inputs(){{{*/ + Inputs::~Inputs(){ + return; + } + /*}}}*/ + + /*Object management*/ +-/*FUNCTION Inputs::GetInputValue(bool* pvalue,int enum-type){{{1*/ ++/*FUNCTION Inputs::GetInputValue(bool* pvalue,int enum-type){{{*/ + void Inputs::GetInputValue(bool* pvalue,int enum_type){ + + vector::iterator object; +@@ -64,7 +64,7 @@ + + } + /*}}}*/ +-/*FUNCTION Inputs::GetInputValue(int* pvalue,int enum-type){{{1*/ ++/*FUNCTION Inputs::GetInputValue(int* pvalue,int enum-type){{{*/ + void Inputs::GetInputValue(int* pvalue,int enum_type){ + + vector::iterator object; +@@ -92,7 +92,7 @@ + + } + /*}}}*/ +-/*FUNCTION Inputs::GetInputValue(double* pvalue,int enum-type){{{1*/ ++/*FUNCTION Inputs::GetInputValue(double* pvalue,int enum-type){{{*/ + void Inputs::GetInputValue(double* pvalue,int enum_type){ + + vector::iterator object; +@@ -120,7 +120,7 @@ + + } + /*}}}*/ +-/*FUNCTION Inputs::GetInputAverage{{{1*/ ++/*FUNCTION Inputs::GetInputAverage{{{*/ + void Inputs::GetInputAverage(double* pvalue,int enum_type){ + + vector::iterator object; +@@ -148,7 +148,7 @@ + + } + /*}}}*/ +-/*FUNCTION Inputs::AddInput{{{1*/ ++/*FUNCTION Inputs::AddInput{{{*/ + int Inputs::AddInput(Input* in_input){ + + /*First, go through dataset of inputs and check whether any input +@@ -174,7 +174,7 @@ + return 1; + } + /*}}}*/ +-/*FUNCTION Inputs::ChangeEnum{{{1*/ ++/*FUNCTION Inputs::ChangeEnum{{{*/ + void Inputs::ChangeEnum(int oldenumtype,int newenumtype){ + + /*Go through dataset of inputs and look for input with +@@ -204,7 +204,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Inputs::ConstrainMin{{{1*/ ++/*FUNCTION Inputs::ConstrainMin{{{*/ + void Inputs::ConstrainMin(int constrain_enum, double minimum){ + + Input* constrain_input=NULL; +@@ -218,7 +218,7 @@ + constrain_input->ConstrainMin(minimum); + } + /*}}}*/ +-/*FUNCTION Inputs::InfinityNorm{{{1*/ ++/*FUNCTION Inputs::InfinityNorm{{{*/ + double Inputs::InfinityNorm(int enumtype){ + + /*Output*/ +@@ -239,7 +239,7 @@ + return norm; + } + /*}}}*/ +-/*FUNCTION Inputs::Max{{{1*/ ++/*FUNCTION Inputs::Max{{{*/ + double Inputs::Max(int enumtype){ + + /*Output*/ +@@ -260,7 +260,7 @@ + return max; + } + /*}}}*/ +-/*FUNCTION Inputs::MaxAbs{{{1*/ ++/*FUNCTION Inputs::MaxAbs{{{*/ + double Inputs::MaxAbs(int enumtype){ + + /*Output*/ +@@ -281,7 +281,7 @@ + return max; + } + /*}}}*/ +-/*FUNCTION Inputs::Min{{{1*/ ++/*FUNCTION Inputs::Min{{{*/ + double Inputs::Min(int enumtype){ + + /*Output*/ +@@ -302,7 +302,7 @@ + return min; + } + /*}}}*/ +-/*FUNCTION Inputs::MinAbs{{{1*/ ++/*FUNCTION Inputs::MinAbs{{{*/ + double Inputs::MinAbs(int enumtype){ + + /*Output*/ +@@ -323,7 +323,7 @@ + return min; + } + /*}}}*/ +-/*FUNCTION Inputs::GetInput{{{1*/ ++/*FUNCTION Inputs::GetInput{{{*/ + Input* Inputs::GetInput(int enum_name){ + + vector::iterator object; +@@ -340,7 +340,7 @@ + return NULL; + } + /*}}}*/ +-/*FUNCTION Inputs::DeleteInput{{{1*/ ++/*FUNCTION Inputs::DeleteInput{{{*/ + int Inputs::DeleteInput(int enum_type){ + + vector::iterator object; +@@ -360,7 +360,7 @@ + + } + /*}}}*/ +-/*FUNCTION Inputs::DuplicateInput{{{1*/ ++/*FUNCTION Inputs::DuplicateInput{{{*/ + void Inputs::DuplicateInput(int original_enum,int new_enum){ + + Input* original=NULL; +@@ -378,7 +378,7 @@ + this->AddInput((Input*)copy); + } + /*}}}*/ +-/*FUNCTION Inputs::SpawnTriaInputs{{{1*/ ++/*FUNCTION Inputs::SpawnTriaInputs{{{*/ + Inputs* Inputs::SpawnTriaInputs(int* indices){ + + /*Intermediary*/ +@@ -404,7 +404,7 @@ + return newinputs; + } + /*}}}*/ +-/*FUNCTION Inputs::AXPY{{{1*/ ++/*FUNCTION Inputs::AXPY{{{*/ + void Inputs::AXPY(int MeshYEnum, double scalar, int MeshXEnum){ + + Input* xinput=NULL; +@@ -422,7 +422,7 @@ + yinput->AXPY(xinput,scalar); + } + /*}}}*/ +-/*FUNCTION Inputs::Configure{{{1*/ ++/*FUNCTION Inputs::Configure{{{*/ + void Inputs::Configure(Parameters* parameters){ + + vector::iterator object; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Vertices.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Vertices.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Vertices.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Vertices class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,20 +24,20 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Vertices::Vertices(){{{1*/ ++/*FUNCTION Vertices::Vertices(){{{*/ + Vertices::Vertices(){ + enum_type=VerticesEnum; + return; + } + /*}}}*/ +-/*FUNCTION Vertices::~Vertices(){{{1*/ ++/*FUNCTION Vertices::~Vertices(){{{*/ + Vertices::~Vertices(){ + return; + } + /*}}}*/ + + /*Numerics management*/ +-/*FUNCTION Vertices::DistributeDofs{{{1*/ ++/*FUNCTION Vertices::DistributeDofs{{{*/ + void Vertices::DistributeDofs(int numberofobjects,int numberofdofsperobject){ + + extern int num_procs; +@@ -106,7 +106,7 @@ + xfree((void**)&alltruedofs); + } + /*}}}*/ +-/*FUNCTION Vertices::FlagClones{{{1*/ ++/*FUNCTION Vertices::FlagClones{{{*/ + void Vertices::FlagClones(int numberofobjects){ + + int i; +@@ -147,7 +147,7 @@ + + } + /*}}}*/ +-/*FUNCTION Vertices::NumberOfVertices{{{1*/ ++/*FUNCTION Vertices::NumberOfVertices{{{*/ + int Vertices::NumberOfVertices(void){ + + int i,sid; +@@ -173,7 +173,7 @@ + return max_sid; + } + /*}}}*/ +-/*FUNCTION Vertices::Ranks{{{1*/ ++/*FUNCTION Vertices::Ranks{{{*/ + void Vertices::Ranks(int* ranks){ + + /*Go through a dataset, and for each object, report it cpu: */ +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the DataSet class, and derived classes Inputs and Parameters + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -27,7 +27,7 @@ + /*}}}*/ + + /*Constructors/Destructors*/ +-/*FUNCTION DataSet::DataSet(){{{1*/ ++/*FUNCTION DataSet::DataSet(){{{*/ + DataSet::DataSet(){ + + sorted=0; +@@ -36,7 +36,7 @@ + + } + /*}}}*/ +-/*FUNCTION DataSet::DataSet(int dataset_enum){{{1*/ ++/*FUNCTION DataSet::DataSet(int dataset_enum){{{*/ + DataSet::DataSet(int dataset_enum){ + enum_type=dataset_enum; + +@@ -46,7 +46,7 @@ + + } + /*}}}*/ +-/*FUNCTION DataSet::Copy{{{1*/ ++/*FUNCTION DataSet::Copy{{{*/ + DataSet* DataSet::Copy(void){ + + DataSet* copy=NULL; +@@ -76,7 +76,7 @@ + return copy; + } + /*}}}*/ +-/*FUNCTION DataSet::~DataSet{{{1*/ ++/*FUNCTION DataSet::~DataSet{{{*/ + DataSet::~DataSet(){ + clear(); + xfree((void**)&sorted_ids); +@@ -85,7 +85,7 @@ + /*}}}*/ + + /*Specific methods*/ +-/*FUNCTION DataSet::AddObject{{{1*/ ++/*FUNCTION DataSet::AddObject{{{*/ + int DataSet::AddObject(Object* object){ + + objects.push_back(object); +@@ -93,7 +93,7 @@ + return 1; + } + /*}}}*/ +-/*FUNCTION DataSet::clear{{{1*/ ++/*FUNCTION DataSet::clear{{{*/ + void DataSet::clear(){ + + /* use reverse_iterator for efficiency in matlab memory manager +@@ -111,7 +111,7 @@ + objects.clear(); + } + /*}}}*/ +-/*FUNCTION DataSet::DeleteObject{{{1*/ ++/*FUNCTION DataSet::DeleteObject{{{*/ + int DataSet::DeleteObject(Object* object){ + + vector::iterator iterator; +@@ -126,7 +126,7 @@ + + } + /*}}}*/ +-/*FUNCTION DataSet::DeepEcho{{{1*/ ++/*FUNCTION DataSet::DeepEcho{{{*/ + void DataSet::DeepEcho(){ + + +@@ -144,7 +144,7 @@ + } + } + /*}}}*/ +-/*FUNCTION DataSet::Echo{{{1*/ ++/*FUNCTION DataSet::Echo{{{*/ + void DataSet::Echo(){ + + vector::iterator object; +@@ -162,19 +162,19 @@ + return; + } + /*}}}*/ +-/*FUNCTION DataSet::GetEnum(){{{1*/ ++/*FUNCTION DataSet::GetEnum(){{{*/ + int DataSet::GetEnum(){ + return enum_type; + } + /*}}}*/ +-/*FUNCTION DataSet::GetEnum(int offset){{{1*/ ++/*FUNCTION DataSet::GetEnum(int offset){{{*/ + int DataSet::GetEnum(int offset){ + + return objects[offset]->ObjectEnum(); + + } + /*}}}*/ +-/*FUNCTION DataSet::GetObjectByOffset{{{1*/ ++/*FUNCTION DataSet::GetObjectByOffset{{{*/ + Object* DataSet::GetObjectByOffset(int offset){ + + /*Check index in debugging mode*/ +@@ -185,7 +185,7 @@ + + } + /*}}}*/ +-/*FUNCTION DataSet::GetObjectById{{{1*/ ++/*FUNCTION DataSet::GetObjectById{{{*/ + Object* DataSet::GetObjectById(int* poffset,int eid){ + + int id_offset; +@@ -210,7 +210,7 @@ + return objects[offset]; + } + /*}}}*/ +-/*FUNCTION DataSet::Presort{{{1*/ ++/*FUNCTION DataSet::Presort{{{*/ + void DataSet::Presort(){ + + /*vector of objects is already sorted, just allocate the sorted ids and their +@@ -238,7 +238,7 @@ + sorted=1; + } + /*}}}*/ +-/*FUNCTION DataSet::SetSorting{{{1*/ ++/*FUNCTION DataSet::SetSorting{{{*/ + void DataSet::SetSorting(int* in_sorted_ids,int* in_id_offsets){ + + sorted=1; +@@ -246,14 +246,14 @@ + id_offsets=in_id_offsets; + } + /*}}}*/ +-/*FUNCTION DataSet::Size{{{1*/ ++/*FUNCTION DataSet::Size{{{*/ + int DataSet::Size(void){ + _assert_(this!=NULL); + + return objects.size(); + } + /*}}}*/ +-/*FUNCTION DataSet::Sort{{{1*/ ++/*FUNCTION DataSet::Sort{{{*/ + void DataSet::Sort(){ + + /*Only sort if we are not already sorted: */ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Materials.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Materials.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Materials.h (revision 12365) +@@ -18,11 +18,11 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Materials(); + ~Materials(); + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); + /*}}}*/ + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Inputs.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Inputs.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Inputs.h (revision 12365) +@@ -22,12 +22,12 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Inputs(); + ~Inputs(); + + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + int AddInput(Input* in_input); + void ChangeEnum(int enumtype,int new_enumtype); + void ConstrainMin(int constrain_enum, double minimum); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Vertices.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Vertices.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Vertices.h (revision 12365) +@@ -18,11 +18,11 @@ + + public: + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + Vertices(); + ~Vertices(); + /*}}}*/ +- /*numerics: {{{1*/ ++ /*numerics: {{{*/ + void DistributeDofs(int numberofnodes,int numdofspernode); + void FlagClones(int numberofnodes); + int NumberOfVertices(void); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/DataSet.h (revision 12365) +@@ -38,12 +38,12 @@ + int* sorted_ids; + int* id_offsets; + +- /*constructors, destructors: {{{1*/ ++ /*constructors, destructors: {{{*/ + DataSet(); + DataSet(int enum_type); + ~DataSet(); + /*}}}*/ +- /*management: {{{1*/ ++ /*management: {{{*/ + int GetEnum(); + int GetEnum(int offset); + void Echo(); +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Container/Options.cpp (revision 12365) +@@ -3,7 +3,7 @@ + * \brief: implementation of the Options class, derived from DataSet class + */ + +-/*Headers: {{{1*/ ++/*Headers: {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,19 +24,19 @@ + /*}}}*/ + + /*Object constructors and destructor*/ +-/*FUNCTION Options::Options(){{{1*/ ++/*FUNCTION Options::Options(){{{*/ + Options::Options(){ + return; + } + /*}}}*/ +-/*FUNCTION Options::~Options(){{{1*/ ++/*FUNCTION Options::~Options(){{{*/ + Options::~Options(){ + return; + } + /*}}}*/ + + /*Object management*/ +-/*FUNCTION Options::AddOption{{{1*/ ++/*FUNCTION Options::AddOption{{{*/ + int Options::AddOption(Option* in_option){ + + vector::iterator object; +@@ -67,7 +67,7 @@ + return 1; + } + /*}}}*/ +-/*FUNCTION Options::Get(int* pvalue, char* name){{{1*/ ++/*FUNCTION Options::Get(int* pvalue, char* name){{{*/ + void Options::Get(int* pvalue,const char* name){ + + vector::iterator object; +@@ -86,7 +86,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Options::Get(int* pvalue, char* name,int default_value){{{1*/ ++/*FUNCTION Options::Get(int* pvalue, char* name,int default_value){{{*/ + void Options::Get(int* pvalue,const char* name,int default_value){ + + vector::iterator object; +@@ -105,7 +105,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Options::Get(double* pvalue, char* name){{{1*/ ++/*FUNCTION Options::Get(double* pvalue, char* name){{{*/ + void Options::Get(double* pvalue,const char* name){ + + vector::iterator object; +@@ -124,7 +124,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Options::Get(double* pvalue, char* name,double default_value){{{1*/ ++/*FUNCTION Options::Get(double* pvalue, char* name,double default_value){{{*/ + void Options::Get(double* pvalue,const char* name,double default_value){ + + vector::iterator object; +@@ -143,7 +143,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Options::Get(bool* pvalue, char* name){{{1*/ ++/*FUNCTION Options::Get(bool* pvalue, char* name){{{*/ + void Options::Get(bool* pvalue,const char* name){ + + vector::iterator object; +@@ -162,7 +162,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Options::Get(bool* pvalue, char* name,bool default_value){{{1*/ ++/*FUNCTION Options::Get(bool* pvalue, char* name,bool default_value){{{*/ + void Options::Get(bool* pvalue,const char* name,bool default_value){ + + vector::iterator object; +@@ -181,7 +181,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Options::Get(char** pvalue, char* name){{{1*/ ++/*FUNCTION Options::Get(char** pvalue, char* name){{{*/ + void Options::Get(char** pvalue,const char* name){ + + vector::iterator object; +@@ -203,7 +203,7 @@ + + } + /*}}}*/ +-/*FUNCTION Options::Get(char** pvalue, char* name,char* default_value){{{1*/ ++/*FUNCTION Options::Get(char** pvalue, char* name,char* default_value){{{*/ + void Options::Get(char** pvalue,const char* name,const char* default_value){ + + vector::iterator object; +@@ -228,7 +228,7 @@ + + } + /*}}}*/ +-/*FUNCTION Options::Get(char*** ppvalue,int* numel,char* name){{{1*/ ++/*FUNCTION Options::Get(char*** ppvalue,int* numel,char* name){{{*/ + void Options::Get(char*** ppvalue,int* numel,const char* name){ + + vector::iterator object; +@@ -274,7 +274,7 @@ + + } + /*}}}*/ +-/*FUNCTION Options::Get(double** pvalue,int* numel,const char* name){{{1*/ ++/*FUNCTION Options::Get(double** pvalue,int* numel,const char* name){{{*/ + void Options::Get(double** pvalue,int* numel,const char* name){ + + vector::iterator object; +@@ -293,7 +293,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Options::GetOption{{{1*/ ++/*FUNCTION Options::GetOption{{{*/ + Option* Options::GetOption(const char* name){ + + vector::iterator object; +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h (revision 12365) +@@ -2,7 +2,7 @@ + * \brief: global macros used in the whole code + */ + +-/*Header {{{1*/ ++/*Header {{{*/ + #ifndef _MACROS_H_ + #define _MACROS_H_ + +@@ -15,11 +15,11 @@ + #endif + /*}}}*/ + +-/* _printf_ {{{1*/ ++/* _printf_ {{{*/ + /*Printing macro: only cpu number 0 */ + #define _printf_(flag,...) do { if(flag) PrintfFunction(__VA_ARGS__); }while (0) + /*}}}*/ +-/* _error_ {{{1*/ ++/* _error_ {{{*/ + /*Error exception macro*/ + #ifdef _INTEL_WIN_ + #define _error_(...)\ +@@ -29,7 +29,7 @@ + throw ErrorException(__FILE__,__func__,__LINE__,exprintf(__VA_ARGS__)) + #endif + /*}}}*/ +-/* _assert_ {{{1*/ ++/* _assert_ {{{*/ + /*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/ + #ifdef _ISSM_DEBUG_ + #define _assert_(statement)\ +@@ -39,7 +39,7 @@ + ((void) 0) + #endif + /*}}}*/ +-/* ISSMBOOT/ISSMEND {{{1*/ ++/* ISSMBOOT/ISSMEND {{{*/ + + /*The following macros hide the error exception handling in a matlab module. Just put + * ISSMBOOT(); and ISSMEND(); at the beginning and end of a module, and c++ exceptions +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers*/ +-/*{{{1*/ ++/*{{{*/ + #include "./matrix.h" + #include "../Exceptions/exceptions.h" + #include "../Alloc/alloc.h" +@@ -15,7 +15,7 @@ + #include "../../io/io.h" + /*}}}*/ + +-/*FUNCTION TripleMultiply {{{1*/ ++/*FUNCTION TripleMultiply {{{*/ + int TripleMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int nrowc, int ncolc, int itrnc, double* d, int iaddd){ + /*TripleMultiply Perform triple matrix product a*b*c+d.*/ + +@@ -97,7 +97,7 @@ + + return 1; + }/*}}}*/ +-/*FUNCTION MatrixMuliply {{{1*/ ++/*FUNCTION MatrixMuliply {{{*/ + int MatrixMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int iaddc ){ + /*MatrixMultiply Perform matrix multiplication a*b+c.*/ + int noerr=1; +@@ -166,7 +166,7 @@ + + return noerr; + }/*}}}*/ +-/*FUNCTION MatrixInverse {{{1*/ ++/*FUNCTION MatrixInverse {{{*/ + int MatrixInverse( double* a, int ndim, int nrow, double* b, int nvec, double* pdet ){ + /* MatrixInverse Perform matrix inversion and linear equation solution. + +@@ -343,7 +343,7 @@ + + return noerr; + }/*}}}*/ +-/*FUNCTION Matrix2x2Determinant(double* Adet,double* A) {{{1*/ ++/*FUNCTION Matrix2x2Determinant(double* Adet,double* A) {{{*/ + void Matrix2x2Determinant(double* Adet,double* A){ + /*Compute determinant of a 2x2 matrix*/ + +@@ -351,7 +351,7 @@ + *Adet= A[0]*A[3]-A[2]*A[1]; + } + /*}}}*/ +-/*FUNCTION Matrix2x2Invert(double* Ainv,double* A) {{{1*/ ++/*FUNCTION Matrix2x2Invert(double* Ainv,double* A) {{{*/ + void Matrix2x2Invert(double* Ainv,double* A){ + + /*Intermediaries*/ +@@ -368,7 +368,7 @@ + Ainv[3]= A[0]/det; /* = a/det */ + + }/*}}}*/ +-/*FUNCTION Matrix3x3Determinant(double* Adet,double* A) {{{1*/ ++/*FUNCTION Matrix3x3Determinant(double* Adet,double* A) {{{*/ + void Matrix3x3Determinant(double* Adet,double* A){ + /*Compute determinant of a 3x3 matrix*/ + +@@ -376,7 +376,7 @@ + *Adet= A[0]*A[4]*A[8]-A[0]*A[5]*A[7]-A[3]*A[1]*A[8]+A[3]*A[2]*A[7]+A[6]*A[1]*A[5]-A[6]*A[2]*A[4]; + } + /*}}}*/ +-/*FUNCTION Matrix3x3Invert(double* Ainv,double* A) {{{1*/ ++/*FUNCTION Matrix3x3Invert(double* Ainv,double* A) {{{*/ + void Matrix3x3Invert(double* Ainv,double* A){ + + /*Intermediaries*/ +@@ -398,7 +398,7 @@ + Ainv[8]=(A[0]*A[4]-A[1]*A[3])/det; /* = (a*e-b*d)/det */ + + }/*}}}*/ +-/*FUNCTION MatrixTranspose(double* Adet,double* A) {{{1*/ ++/*FUNCTION MatrixTranspose(double* Adet,double* A) {{{*/ + void MatrixTranspose(double* tA,double* A, int nrows, int ncols){ + /*Transpose a n*m matrix*/ + +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/Synchronize.sh +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 12365) +@@ -7,7 +7,7 @@ + + #Get all lines of Verbosity.cpp + cat Verbosity.h | grep "bool Verbose" | awk '{print $2}' | sed -e "s/(/ /" | awk '{print $1}' | awk '{ printf "%s %s\n", NR, $0 }' >temp +-#Build header of Verbosity.cpp {{{1 ++#Build header of Verbosity.cpp {{{ + cat < Verbosity.cpp + /* + * \file Verbosity.cpp: +@@ -126,7 +126,7 @@ + + done + +-#Add footer of Verbosity.cpp{{{1 ++#Add footer of Verbosity.cpp{{{ + cat <> Verbosity.cpp + + /*Verbosity Setup*/ +@@ -146,7 +146,7 @@ + }/*}}}*/ + END + #}}} +-#Complete verbose.m {{{1 ++#Complete verbose.m {{{ + VERBOSEPATH="$ISSM_DIR/src/m/classes/verbose.m" + cat $VERBOSEPATH | sed "/%BEGINFIELDS/,$ d" > temp_begin + cat $VERBOSEPATH | sed "1,/%ENDFIELDS/d" > temp_end +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 12365) +@@ -9,7 +9,7 @@ + #include + + /*General Gauss points*/ +-/*FUNCTION GaussLegendreLinear {{{1*/ ++/*FUNCTION GaussLegendreLinear {{{*/ + void GaussLegendreLinear( double** pxgaus, double** pxwgt, int ngaus){ + /* Gauss-Legendre quadrature points. + +@@ -86,8 +86,8 @@ + xfree((void **)&beta ); + xfree((void **)&alpha); + } +-}/*}}}1*/ +-/*FUNCTION GaussLegendreTria{{{1*/ ++}/*}}}*/ ++/*FUNCTION GaussLegendreTria{{{*/ + void GaussLegendreTria( int* pngaus, double** pl1, double** pl2, double** pl3, double** pwgt, int iord ) { + /*Gauss quadrature points for the triangle. + +@@ -101,7 +101,7 @@ + double *xgaus=NULL,*xwgt=NULL,*egaus,*ewgt; + + /*Hardcoded Gauss points declaration*/ +- /*p= 1, npoint= 1{{{2*/ ++ /*p= 1, npoint= 1{{{*/ + static double wgt1[]={ + 1.732050807568877}; + static double l11[]={ +@@ -110,8 +110,8 @@ + 0.333333333333333}; + static double l31[]={ + 0.333333333333333}; +- /*}}}2*/ +- /*p= 2, npoint= 3 {{{2*/ ++ /*}}}*/ ++ /*p= 2, npoint= 3 {{{*/ + static double wgt2[]={ + 0.577350269189625, 0.577350269189625, 0.577350269189625}; + static double l12[]={ +@@ -120,8 +120,8 @@ + 0.166666666666667, 0.666666666666667, 0.166666666666667}; + static double l32[]={ + 0.166666666666667, 0.166666666666667, 0.666666666666667}; +- /*}}}2*/ +- /*p= 3, npoint= 4 {{{2*/ ++ /*}}}*/ ++ /*p= 3, npoint= 4 {{{*/ + static double wgt3[]={ + -0.974278579257493, 0.902109795608790, 0.902109795608790, + 0.902109795608790}; +@@ -134,8 +134,8 @@ + static double l33[]={ + 0.333333333333333, 0.200000000000000, 0.200000000000000, + 0.600000000000000}; +- /*}}}2*/ +- /*p= 4, npoint= 6 {{{2*/ ++ /*}}}*/ ++ /*p= 4, npoint= 6 {{{*/ + static double wgt4[]={ + 0.386908262797819, 0.386908262797819, 0.386908262797819, + 0.190442006391807, 0.190442006391807, 0.190442006391807}; +@@ -148,8 +148,8 @@ + static double l34[]={ + 0.445948490915965, 0.445948490915965, 0.108103018168070, + 0.091576213509771, 0.091576213509771, 0.816847572980459}; +- /*}}}2*/ +- /*p= 5, npoint= 7 {{{2*/ ++ /*}}}*/ ++ /*p= 5, npoint= 7 {{{*/ + static double wgt5[]={ + 0.389711431702997, 0.229313399254729, 0.229313399254729, + 0.229313399254729, 0.218133059367230, 0.218133059367230, +@@ -166,8 +166,8 @@ + 0.333333333333333, 0.470142064105115, 0.470142064105115, + 0.059715871789770, 0.101286507323456, 0.101286507323456, + 0.797426985353087}; +- /*}}}2*/ +- /*p= 6, npoint=12 {{{2*/ ++ /*}}}*/ ++ /*p= 6, npoint=12 {{{*/ + static double wgt6[]={ + 0.202279763184836, 0.202279763184836, 0.202279763184836, + 0.088065961139281, 0.088065961139281, 0.088065961139281, +@@ -188,8 +188,8 @@ + 0.063089014491502, 0.063089014491502, 0.873821971016996, + 0.636502499121399, 0.310352451033784, 0.636502499121399, + 0.310352451033784, 0.053145049844817, 0.053145049844817}; +- /*}}}2*/ +- /*p= 7, npoint=13 {{{2*/ ++ /*}}}*/ ++ /*p= 7, npoint=13 {{{*/ + static double wgt7[]={ + -0.259062916308362, 0.304174548458604, 0.304174548458604, + 0.304174548458604, 0.092400122517855, 0.092400122517855, +@@ -214,8 +214,8 @@ + 0.869739794195568, 0.638444188569810, 0.312865496004874, + 0.638444188569810, 0.312865496004874, 0.048690315425316, + 0.048690315425316}; +- /*}}}2*/ +- /*p= 8, npoint=16 {{{2*/ ++ /*}}}*/ ++ /*p= 8, npoint=16 {{{*/ + static double wgt8[]={ + 0.249961964823104, 0.164703541925695, 0.164703541925695, + 0.164703541925695, 0.178777729989794, 0.178777729989794, +@@ -244,8 +244,8 @@ + 0.898905543365938, 0.728492392955404, 0.263112829634638, + 0.728492392955404, 0.263112829634638, 0.008394777409958, + 0.008394777409958}; +- /*}}}2*/ +- /*p= 9, npoint=19 {{{2*/ ++ /*}}}*/ ++ /*p= 9, npoint=19 {{{*/ + static double wgt9[]={ + 0.168244134395468, 0.054273292833345, 0.054273292833345, + 0.054273292833345, 0.134801255248419, 0.134801255248419, +@@ -278,8 +278,8 @@ + 0.910540973211095, 0.741198598784498, 0.221962989160766, + 0.741198598784498, 0.221962989160766, 0.036838412054736, + 0.036838412054736}; +- /*}}}2*/ +- /*p=10, npoint=25 {{{2*/ ++ /*}}}*/ ++ /*p=10, npoint=25 {{{*/ + static double wgt10[]={ + 0.157301373584232, 0.063611224790829, 0.063611224790829, + 0.063611224790829, 0.078498377595183, 0.078498377595183, +@@ -320,8 +320,8 @@ + 0.025003534762686, 0.923655933587500, 0.066803251012200, + 0.923655933587500, 0.066803251012200, 0.009540815400299, + 0.009540815400299}; +- /*}}}2*/ +- /*p=11, npoint=27 {{{2*/ ++ /*}}}*/ ++ /*p=11, npoint=27 {{{*/ + static double wgt11[]={ + 0.001605622060698, 0.001605622060698, 0.001605622060698, + 0.133626914252765, 0.133626914252765, 0.133626914252765, +@@ -362,8 +362,8 @@ + 0.356620648261293, 0.050178138310495, 0.050178138310495, + 0.807489003159792, 0.171488980304042, 0.807489003159792, + 0.171488980304042, 0.021022016536166, 0.021022016536166}; +- /*}}}2*/ +- /*p=12, npoint=33 {{{2*/ ++ /*}}}*/ ++ /*p=12, npoint=33 {{{*/ + static double wgt12[]={ + 0.044567514407799, 0.044567514407799, 0.044567514407799, + 0.075677707051848, 0.075677707051848, 0.075677707051848, +@@ -412,8 +412,8 @@ + 0.281325580989940, 0.022838332222257, 0.022838332222257, + 0.858014033544073, 0.116251915907597, 0.858014033544073, + 0.116251915907597, 0.025734050548330, 0.025734050548330}; +- /*}}}2*/ +- /* p=13, npoint=37 {{{2*/ ++ /*}}}*/ ++ /* p=13, npoint=37 {{{*/ + static double wgt13[]={ + 0.090968907790622, 0.019537784619314, 0.019537784619314, + 0.019537784619314, 0.054427130356344, 0.054427130356344, +@@ -470,8 +470,8 @@ + 0.018100773278807, 0.851409537834241, 0.126357385491669, + 0.851409537834241, 0.126357385491669, 0.022233076674090, + 0.022233076674090}; +- /*}}}2*/ +- /*p=14, npoint=42{{{2*/ ++ /*}}}*/ ++ /*p=14, npoint=42{{{*/ + static double wgt14[]={ + 0.037903474783419, 0.037903474783419, 0.037903474783419, + 0.056791094234956, 0.056791094234956, 0.056791094234956, +@@ -532,8 +532,8 @@ + 0.298372882136258, 0.014646950055654, 0.014646950055654, + 0.879757171370171, 0.118974497696957, 0.879757171370171, + 0.118974497696957, 0.001268330932872, 0.001268330932872}; +- /*}}}2*/ +- /*p=15, npoint=48{{{2*/ ++ /*}}}*/ ++ /*p=15, npoint=48{{{*/ + static double wgt15[]={ + 0.003320126005206, 0.003320126005206, 0.003320126005206, + 0.076641563419124, 0.076641563419124, 0.076641563419124, +@@ -602,8 +602,8 @@ + 0.215599664072284, 0.036843869875878, 0.036843869875878, + 0.883964574092416, 0.103575616576386, 0.883964574092416, + 0.103575616576386, 0.012459809331199, 0.012459809331199}; +- /*}}}2*/ +- /*p=16, npoint=52 {{{2*/ ++ /*}}}*/ ++ /*p=16, npoint=52 {{{*/ + static double wgt16[]={ + 0.081191089584902, 0.011095307165226, 0.011095307165226, + 0.011095307165226, 0.072244353151393, 0.072244353151393, +@@ -680,8 +680,8 @@ + 0.041941786468010, 0.900399064086661, 0.085283615682657, + 0.900399064086661, 0.085283615682657, 0.014317320230681, + 0.014317320230681}; +- /*}}}2*/ +- /*p=17, npoint=61{{{2*/ ++ /*}}}*/ ++ /*p=17, npoint=61{{{*/ + static double wgt17[]={ + 0.057914928034477, 0.008822054327014, 0.008822054327014, + 0.008822054327014, 0.025410682752829, 0.025410682752829, +@@ -770,8 +770,8 @@ + 0.067165782413524, 0.904625504095608, 0.080711313679564, + 0.904625504095608, 0.080711313679564, 0.014663182224828, + 0.014663182224828}; +- /*}}}2*/ +- /* p=18, npoint=70 {{{2*/ ++ /*}}}*/ ++ /* p=18, npoint=70 {{{*/ + + static double wgt18[]={ + 0.053364381350150, 0.015713921277179, 0.015713921277179, +@@ -873,8 +873,8 @@ + 0.014858100590125, 1.014347260005363, 0.020874755282586, + 1.014347260005363, 0.020874755282586,-0.035222015287949, + -0.035222015287949}; +- /*}}}2*/ +- /*p=19, npoint=73 {{{2*/ ++ /*}}}*/ ++ /*p=19, npoint=73 {{{*/ + + static double wgt19[]={ + 0.056995437856306, 0.017893352515055, 0.017893352515055, +@@ -980,8 +980,8 @@ + 0.034647074816760, 0.924344252620784, 0.065494628082938, + 0.924344252620784, 0.065494628082938, 0.010161119296278, + 0.010161119296278}; +- /*}}}2*/ +- /*p=20, npoint=79 {{{2*/ ++ /*}}}*/ ++ /*p=20, npoint=79 {{{*/ + static double wgt20[]={ + 0.057256499746719, 0.001501721280705, 0.001501721280705, + 0.001501721280705, 0.020195803723819, 0.020195803723819, +@@ -1094,7 +1094,7 @@ + 0.026686063258714, 0.929756171556853, 0.059696109149007, + 0.929756171556853, 0.059696109149007, 0.010547719294141, + 0.010547719294141}; +- /*}}}2*/ ++ /*}}}*/ + + static double* wgtp[MAX_TRIA_SYM_ORD]={ + wgt1 ,wgt2 ,wgt3 ,wgt4 ,wgt5 , +@@ -1204,8 +1204,8 @@ + // i,(*pl1 )[i],(*pl2 )[i],(*pl3 )[i],(*pwgt)[i]); + + return; +-}/*}}}1*/ +-/*FUNCTION GaussLegendreTetra{{{1*/ ++}/*}}}*/ ++/*FUNCTION GaussLegendreTetra{{{*/ + void GaussLegendreTetra( int* pngaus, double** pl1, double** pl2, double** pl3, double** pl4, double** pwgt, int iord ) { + /* Gauss quadrature points for the tetrahedron. + +@@ -1223,7 +1223,7 @@ + double *xgaus=NULL,*xwgt=NULL,*egaus,*ewgt,*zgaus,*zwgt; + + /*Hardcoded Gauss points definition*/ +- /*p= 1, npoint= 1 {{{2*/ ++ /*p= 1, npoint= 1 {{{*/ + static double wgt1[]={ + 1.000000000000000}; + static double l11[]={ +@@ -1234,8 +1234,8 @@ + 0.250000000000000}; + static double l41[]={ + 0.250000000000000}; +- /*}}}2*/ +- /*p= 2, npoint= 4 {{{2*/ ++ /*}}}*/ ++ /*p= 2, npoint= 4 {{{*/ + + static double wgt2[]={ + 0.250000000000000, 0.250000000000000, 0.250000000000000, +@@ -1252,8 +1252,8 @@ + static double l42[]={ + 0.138196601125011, 0.138196601125011, 0.138196601125011, + 0.585410196624969}; +- /*}}}2*/ +- /*p= 3, npoint= 5 {{{2*/ ++ /*}}}*/ ++ /*p= 3, npoint= 5 {{{*/ + static double wgt3[]={ + -0.800000000000000, 0.450000000000000, 0.450000000000000, + 0.450000000000000, 0.450000000000000}; +@@ -1269,8 +1269,8 @@ + static double l43[]={ + 0.250000000000000, 0.166666666666667, 0.166666666666667, + 0.166666666666667, 0.500000000000000}; +- /*}}}2*/ +- /*p= 4, npoint=11 {{{2*/ ++ /*}}}*/ ++ /*p= 4, npoint=11 {{{*/ + + static double wgt4[]={ + -0.013155555555556, 0.007622222222222, 0.007622222222222, +@@ -1297,8 +1297,8 @@ + 0.071428571428571, 0.785714285714286, 0.100596423833201, + 0.100596423833201, 0.399403576166799, 0.100596423833201, + 0.399403576166799, 0.399403576166799}; +- /*}}}2*/ +- /*p= 5, npoint=15 {{{2*/ ++ /*}}}*/ ++ /*p= 5, npoint=15 {{{*/ + + static double wgt5[]={ + 0.030283678097089, 0.006026785714286, 0.006026785714286, +@@ -1330,8 +1330,8 @@ + 0.090909090909091, 0.090909090909091, 0.727272727272727, + 0.433449846426336, 0.433449846426336, 0.066550153573664, + 0.433449846426336, 0.066550153573664, 0.066550153573664}; +- /*}}}2*/ +- /*p= 6, npoint=24 {{{2*/ ++ /*}}}*/ ++ /*p= 6, npoint=24 {{{*/ + + static double wgt6[]={ + 0.006653791709695, 0.006653791709695, 0.006653791709695, +@@ -1382,7 +1382,7 @@ + 0.269672331458316, 0.063661001875018, 0.063661001875018, + 0.603005664791649, 0.269672331458316, 0.063661001875018, + 0.063661001875018, 0.063661001875018, 0.063661001875018}; +- /*}}}2*/ ++ /*}}}*/ + + static double* wgtp[MAX_TETRA_SYM_ORD]={wgt1,wgt2,wgt3,wgt4,wgt5,wgt6}; + static double* l1p [MAX_TETRA_SYM_ORD]={l11 ,l12 ,l13 ,l14 ,l15 ,l16 }; +@@ -1469,8 +1469,8 @@ + xfree((void **)&xwgt ); + xfree((void **)&xgaus); + } +-}/*}}}1*/ +-/*FUNCTION GaussLobatto{{{1*/ ++}/*}}}*/ ++/*FUNCTION GaussLobatto{{{*/ + void GaussLobatto( double** pxgaus, double** pxwgt, int ngaus ) { + /*Gauss-Lobatto quadrature points. + +@@ -1578,8 +1578,8 @@ + xfree((void **)&alpha); + } + +-}/*}}}1*/ +-/*FUNCTION GaussRecur{{{1*/ ++}/*}}}*/ ++/*FUNCTION GaussRecur{{{*/ + void GaussRecur( double* zero, double* weight, int n, double* alpha, double* beta ) { + /*Gauss quadrature points from recursion coefficients. + * +@@ -1699,18 +1699,18 @@ + /*Cleanup*/ + xfree((void **)&work); + +-}/*}}}1*/ ++}/*}}}*/ + + /*Element Gauss points TO BE REMOVED*/ +-/*FUNCTION gaussQuad{{{1*/ ++/*FUNCTION gaussQuad{{{*/ + void gaussQuad( double** pxgaus, double** pxwgt, double** pegaus, double** pewgt, int nigaus, int njgaus ) { + /*Gauss quadrature points for the quadrilaterial.*/ + + /*get the gauss points using the product of two line rules */ + GaussLegendreLinear(pxgaus, pxwgt, nigaus); + GaussLegendreLinear(pegaus, pewgt, njgaus); +-}/*}}}1*/ +-/*FUNCTION gaussHexa{{{1*/ ++}/*}}}*/ ++/*FUNCTION gaussHexa{{{*/ + void gaussHexa( double** pxgaus, double** pxwgt, double** pegaus, double** pewgt, double** pzgaus, double** pzwgt, int nigaus, int njgaus, int nkgaus ) { + /*Gauss quadrature points for the hexahedron.*/ + +@@ -1718,4 +1718,4 @@ + GaussLegendreLinear(pxgaus, pxwgt, nigaus); + GaussLegendreLinear(pegaus, pewgt, njgaus); + GaussLegendreLinear(pzgaus, pzwgt, nkgaus); +-}/*}}}1*/ ++}/*}}}*/ +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 12365) +@@ -2,7 +2,7 @@ + * \brief: convert units from the model to IU or from IU to the model. + */ + +-/*headers {{{1*/ ++/*headers {{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/IsInPoly.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/IsInPoly.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Exp/IsInPoly.cpp (revision 12365) +@@ -13,7 +13,7 @@ + #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" + #endif + +-/*IsInPoly {{{1*/ ++/*IsInPoly {{{*/ + int IsInPoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){ + + int i; +@@ -54,7 +54,7 @@ + } + return 1; + }/*}}}*/ +-/*IsOutsidePoly {{{1*/ ++/*IsOutsidePoly {{{*/ + int IsOutsidePoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){ + + int i,j; +@@ -95,7 +95,7 @@ + } + return 1; + }/*}}}*/ +-/*pnpoly{{{1*/ ++/*pnpoly{{{*/ + int pnpoly(int npol, double *xp, double *yp, double x, double y, int edgevalue) { + int i, j, c = 0; + double n1, n2, normp, scalar; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/io.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/io.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/io/io.h (revision 12365) +@@ -5,7 +5,7 @@ + #ifndef _ISSM_IO_H_ + #define _ISSM_IO_H_ + +-#ifdef HAVE_CONFIG_H //config.h {{{1 ++#ifdef HAVE_CONFIG_H //config.h {{{ + #include + #else + #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 12365) +@@ -53,7 +53,7 @@ + xfree((void**)&old_floatingice); + } + +-/*FUNCTION CreateNodesOnFloatingIce {{{1*/ ++/*FUNCTION CreateNodesOnFloatingIce {{{*/ + Vector* CreateNodesOnFloatingIce(Nodes* nodes,int configuration_type){ + + int i,numnods; +@@ -80,7 +80,7 @@ + return vec_nodes_on_floatingice; + } + /*%}}}*/ +-/*FUNCTION PotentialSheetUngrounding {{{1*/ ++/*FUNCTION PotentialSheetUngrounding {{{*/ + double* PotentialSheetUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ + + int i,numberofvertices; +@@ -107,7 +107,7 @@ + return vertices_potentially_ungrounding; + } + /*}}}*/ +-/*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{1*/ ++/*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{*/ + double* PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,double* vertices_potentially_ungrounding){ + + int i,analysis_type; +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 12365) +@@ -14,7 +14,7 @@ + + void CreateParametersDakota(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type){ + +- /*variable declarations: {{{1*/ ++ /*variable declarations: {{{*/ + int i,j,k; + + Parameters* parameters = NULL; +@@ -72,7 +72,7 @@ + iomodel->Constant(&numberofresponses,QmuNumberofresponsesEnum); + iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); + +- /*name of qmu input, error and output files:{{{1*/ ++ /*name of qmu input, error and output files:{{{*/ + qmuinname=(char*)xmalloc((strlen(name)+strlen(".qmu.in")+1)*sizeof(char)); + sprintf(qmuinname,"%s%s",name,".qmu.in"); + parameters->AddObject(new StringParam(QmuInNameEnum,qmuinname)); +@@ -85,21 +85,21 @@ + sprintf(qmuerrname,"%s%s",name,".qmu.err"); + parameters->AddObject(new StringParam(QmuErrNameEnum,qmuerrname)); + /*}}}*/ +- /*Fetch variable descriptors: {{{1*/ ++ /*Fetch variable descriptors: {{{*/ + iomodel->FetchData(&variabledescriptors,&numvariabledescriptors,QmuVariabledescriptorsEnum); + + /*Ok, we have all the variable descriptors. Build a parameter with it: */ + parameters->AddObject(new StringArrayParam(QmuVariabledescriptorsEnum,variabledescriptors,numvariabledescriptors)); + + /*}}}*/ +- /*Fetch response descriptors: {{{1*/ ++ /*Fetch response descriptors: {{{*/ + iomodel->FetchData(&responsedescriptors,&numresponsedescriptors,QmuResponsedescriptorsEnum); + + /*Ok, we have all the response descriptors. Build a parameter with it: */ + parameters->AddObject(new StringArrayParam(QmuResponsedescriptorsEnum,responsedescriptors,numresponsedescriptors)); + parameters->AddObject(new IntParam(QmuNumberofresponsesEnum,numberofresponses)); + /*}}}*/ +- /*Deal with partitioning: {{{1*/ ++ /*Deal with partitioning: {{{*/ + /*partition vertices in iomodel->qmu_npart parts, unless a partition is already present: */ + + parameters->AddObject(iomodel->CopyConstantObject(QmuNumberofpartitionsEnum)); +@@ -115,7 +115,7 @@ + } + parameters->AddObject(new DoubleVecParam(QmuPartitionEnum,dpart,numberofvertices)); + /*}}}*/ +- /*Deal with data needed because of qmu variables: {{{1*/ ++ /*Deal with data needed because of qmu variables: {{{*/ + + for(i=0;iMaxNumDofs(configuration_type,GsetEnum); + +- /*Checks in debugging mode {{{1*/ ++ /*Checks in debugging mode {{{*/ + if(penalty_kflag)_assert_(kflag); + if(penalty_pflag)_assert_(pflag); + /*}}}*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp (revision 12365) +@@ -37,7 +37,7 @@ + + /*If no mesh in input, generate one*/ + if(bamgmesh_in->TrianglesSize[0]==0){ +- /*Mesh generation {{{1*/ ++ /*Mesh generation {{{*/ + + //Step1: generate geometry Gh + if (verbosity>0) printf("Construction of a mesh from a given geometry\n"); +@@ -83,7 +83,7 @@ + /*}}}*/ + } + else{ +- /*Anisotropic mesh adaptation {{{1*/ ++ /*Anisotropic mesh adaptation {{{*/ + + // read background mesh + if (verbosity>0) printf("Anisotropic mesh adaptation\n"); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.h (revision 12365) +@@ -6,7 +6,7 @@ + #define _SEQMAT_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -25,7 +25,7 @@ + int M,N; + double* matrix; + +- /*SeqMat constructors, destructors {{{1*/ ++ /*SeqMat constructors, destructors {{{*/ + SeqMat(); + SeqMat(int M,int N); + SeqMat(int M,int N,double sparsity); +@@ -33,7 +33,7 @@ + SeqMat(int M,int N,int connectivity,int numberofdofspernode); + ~SeqMat(); + /*}}}*/ +- /*SeqMat specific routines {{{1*/ ++ /*SeqMat specific routines {{{*/ + void Echo(void); + void Assemble(void); + double Norm(NormMode norm_type); +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -18,14 +18,14 @@ + /*}}}*/ + + /*SeqVec constructors and destructor*/ +-/*FUNCTION SeqVec::SeqVec(){{{1*/ ++/*FUNCTION SeqVec::SeqVec(){{{*/ + SeqVec::SeqVec(){ + + this->M=0; + this->vector=NULL; + } + /*}}}*/ +-/*FUNCTION SeqVec::SeqVec(int M,bool fromlocalsize){{{1*/ ++/*FUNCTION SeqVec::SeqVec(int M,bool fromlocalsize){{{*/ + SeqVec::SeqVec(int pM,bool fromlocalsize){ + + this->M=pM; +@@ -33,7 +33,7 @@ + if(this->M) this->vector=(double*)xcalloc(pM,sizeof(double)); + } + /*}}}*/ +-/*FUNCTION SeqVec::SeqVec(double* serial_vec,int M){{{1*/ ++/*FUNCTION SeqVec::SeqVec(double* serial_vec,int M){{{*/ + SeqVec::SeqVec(double* buffer,int pM){ + + int i,j; +@@ -46,7 +46,7 @@ + } + } + /*}}}*/ +- /*FUNCTION SeqVec::~SeqVec(){{{1*/ ++ /*FUNCTION SeqVec::~SeqVec(){{{*/ + SeqVec::~SeqVec(){ + xfree((void**)&this->vector); + M=0; +@@ -54,7 +54,7 @@ + /*}}}*/ + + /*SeqVec specific routines: */ +-/*FUNCTION SeqVec::Echo{{{1*/ ++/*FUNCTION SeqVec::Echo{{{*/ + void SeqVec::Echo(void){ + + int i; +@@ -65,14 +65,14 @@ + } + /*}}}*/ + +-/*FUNCTION SeqVec::Assemble{{{1*/ ++/*FUNCTION SeqVec::Assemble{{{*/ + void SeqVec::Assemble(void){ + + /*do nothing*/ + + } + /*}}}*/ +-/*FUNCTION SeqVec::SetValues{{{1*/ ++/*FUNCTION SeqVec::SetValues{{{*/ + void SeqVec::SetValues(int ssize, int* list, double* values, InsMode mode){ + + int i; +@@ -90,7 +90,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqVec::SetValue{{{1*/ ++/*FUNCTION SeqVec::SetValue{{{*/ + void SeqVec::SetValue(int dof, double value, InsMode mode){ + + switch(mode){ +@@ -106,7 +106,7 @@ + } + } + /*}}}*/ +-/*FUNCTION SeqVec::GetValue{{{1*/ ++/*FUNCTION SeqVec::GetValue{{{*/ + void SeqVec::GetValue(double* pvalue,int dof){ + + *pvalue=this->vector[dof]; +@@ -114,28 +114,28 @@ + } + /*}}}*/ + +-/*FUNCTION SeqVec::GetSize{{{1*/ ++/*FUNCTION SeqVec::GetSize{{{*/ + void SeqVec::GetSize(int* pM){ + + *pM=this->M; + + } + /*}}}*/ +-/*FUNCTION SeqVec::GetLocalSize{{{1*/ ++/*FUNCTION SeqVec::GetLocalSize{{{*/ + void SeqVec::GetLocalSize(int* pM){ + + *pM=this->M; + + } + /*}}}*/ +-/*FUNCTION SeqVec::Duplicate{{{1*/ ++/*FUNCTION SeqVec::Duplicate{{{*/ + SeqVec* SeqVec::Duplicate(void){ + + return new SeqVec(this->vector,this->M); + + } + /*}}}*/ +-/*FUNCTION SeqVec::Set{{{1*/ ++/*FUNCTION SeqVec::Set{{{*/ + void SeqVec::Set(double value){ + + int i; +@@ -143,7 +143,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqVec::AXPY{{{1*/ ++/*FUNCTION SeqVec::AXPY{{{*/ + void SeqVec::AXPY(SeqVec* X, double a){ + + int i; +@@ -153,7 +153,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqVec::AYPX{{{1*/ ++/*FUNCTION SeqVec::AYPX{{{*/ + void SeqVec::AYPX(SeqVec* X, double a){ + + int i; +@@ -163,7 +163,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqVec::ToMPISerial{{{1*/ ++/*FUNCTION SeqVec::ToMPISerial{{{*/ + double* SeqVec::ToMPISerial(void){ + + double* buffer=NULL; +@@ -176,7 +176,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqVec::Copy{{{1*/ ++/*FUNCTION SeqVec::Copy{{{*/ + void SeqVec::Copy(SeqVec* to){ + + int i; +@@ -186,7 +186,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqVec::Norm{{{1*/ ++/*FUNCTION SeqVec::Norm{{{*/ + double SeqVec::Norm(NormMode mode){ + + double norm; +@@ -208,7 +208,7 @@ + } + } + /*}}}*/ +-/*FUNCTION SeqVec::Scale{{{1*/ ++/*FUNCTION SeqVec::Scale{{{*/ + void SeqVec::Scale(double scale_factor){ + + int i; +@@ -216,7 +216,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqVec::Dot{{{1*/ ++/*FUNCTION SeqVec::Dot{{{*/ + double SeqVec::Dot(SeqVec* input){ + + int i; +@@ -227,7 +227,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqVec::PointwiseDivide{{{1*/ ++/*FUNCTION SeqVec::PointwiseDivide{{{*/ + void SeqVec::PointwiseDivide(SeqVec* x,SeqVec* y){ + + int i; +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 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -18,7 +18,7 @@ + /*}}}*/ + + /*SeqMat constructors and destructor*/ +-/*FUNCTION SeqMat::SeqMat(){{{1*/ ++/*FUNCTION SeqMat::SeqMat(){{{*/ + SeqMat::SeqMat(){ + + this->M=0; +@@ -26,7 +26,7 @@ + this->matrix=NULL; + } + /*}}}*/ +-/*FUNCTION SeqMat::SeqMat(int M,int N){{{1*/ ++/*FUNCTION SeqMat::SeqMat(int M,int N){{{*/ + SeqMat::SeqMat(int pM,int pN){ + + this->M=pM; +@@ -35,7 +35,7 @@ + if(M*N) this->matrix=(double*)xcalloc(pM*pN,sizeof(double)); + } + /*}}}*/ +-/*FUNCTION SeqMat::SeqMat(int M,int N, double sparsity){{{1*/ ++/*FUNCTION SeqMat::SeqMat(int M,int N, double sparsity){{{*/ + SeqMat::SeqMat(int pM,int pN, double sparsity){ + + this->M=pM; +@@ -44,7 +44,7 @@ + if(M*N) this->matrix=(double*)xcalloc(pM*pN,sizeof(double)); + } + /*}}}*/ +-/*FUNCTION SeqMat(double* serial_mat,int M,int N,double sparsity){{{1*/ ++/*FUNCTION SeqMat(double* serial_mat,int M,int N,double sparsity){{{*/ + SeqMat::SeqMat(double* serial_mat,int pM,int pN,double sparsity){ + + int i,j; +@@ -59,7 +59,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqMat::SeqMat(int M,int N, int connectivity, int numberofdofspernode){{{1*/ ++/*FUNCTION SeqMat::SeqMat(int M,int N, int connectivity, int numberofdofspernode){{{*/ + SeqMat::SeqMat(int pM,int pN, int connectivity,int numberofdofspernode){ + + this->M=pM; +@@ -68,7 +68,7 @@ + if(M*N)this->matrix=(double*)xcalloc(pM*pN,sizeof(double)); + } + /*}}}*/ +-/*FUNCTION SeqMat::~SeqMat(){{{1*/ ++/*FUNCTION SeqMat::~SeqMat(){{{*/ + SeqMat::~SeqMat(){ + + xfree((void**)&this->matrix); +@@ -78,7 +78,7 @@ + /*}}}*/ + + /*SeqMat specific routines: */ +-/*FUNCTION SeqMat::Echo{{{1*/ ++/*FUNCTION SeqMat::Echo{{{*/ + void SeqMat::Echo(void){ + + int i,j; +@@ -91,14 +91,14 @@ + } + } + /*}}}*/ +-/*FUNCTION SeqMat::Assemble{{{1*/ ++/*FUNCTION SeqMat::Assemble{{{*/ + void SeqMat::Assemble(void){ + + /*do nothing*/ + + } + /*}}}*/ +-/*FUNCTION SeqMat::Norm{{{1*/ ++/*FUNCTION SeqMat::Norm{{{*/ + double SeqMat::Norm(NormMode mode){ + + double norm; +@@ -123,7 +123,7 @@ + } + } + /*}}}*/ +-/*FUNCTION SeqMat::GetSize{{{1*/ ++/*FUNCTION SeqMat::GetSize{{{*/ + void SeqMat::GetSize(int* pM,int* pN){ + + *pM=this->M; +@@ -131,7 +131,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqMat::GetLocalSize{{{1*/ ++/*FUNCTION SeqMat::GetLocalSize{{{*/ + void SeqMat::GetLocalSize(int* pM,int* pN){ + + *pM=this->M; +@@ -139,7 +139,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqMat::MatMult{{{1*/ ++/*FUNCTION SeqMat::MatMult{{{*/ + void SeqMat::MatMult(SeqVec* X,SeqVec* AX){ + + int i,j; +@@ -162,7 +162,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqMat::Duplicate{{{1*/ ++/*FUNCTION SeqMat::Duplicate{{{*/ + SeqMat* SeqMat::Duplicate(void){ + + double dummy=0; +@@ -171,7 +171,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqMat::ToSerial{{{1*/ ++/*FUNCTION SeqMat::ToSerial{{{*/ + double* SeqMat::ToSerial(void){ + + double* buffer=NULL; +@@ -184,7 +184,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqMat::SetValues{{{1*/ ++/*FUNCTION SeqMat::SetValues{{{*/ + void SeqMat::SetValues(int m,int* idxm,int n,int* idxn,double* values,InsMode mode){ + + int i,j; +@@ -202,7 +202,7 @@ + + } + /*}}}*/ +-/*FUNCTION SeqMat::Convert{{{1*/ ++/*FUNCTION SeqMat::Convert{{{*/ + void SeqMat::Convert(MatrixType type){ + + /*do nothing*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/issm/SeqVec.h (revision 12365) +@@ -6,7 +6,7 @@ + #define _SEQVEC_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -24,13 +24,13 @@ + double* vector; + int M; + +- /*SeqVec constructors, destructors {{{1*/ ++ /*SeqVec constructors, destructors {{{*/ + SeqVec(); + SeqVec(int M,bool fromlocalsize=false); + SeqVec(double* buffer, int M); + ~SeqVec(); + /*}}}*/ +- /*SeqVec specific routines {{{1*/ ++ /*SeqVec specific routines {{{*/ + void Echo(void); + void Assemble(void); + void SetValues(int ssize, int* list, double* values, InsMode mode); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp (revision 12365) +@@ -19,7 +19,7 @@ + #include "../../../include/include.h" + #include "../../mpi/patches/mpipatches.h" + +-/*NewMat(int M,int N){{{1*/ ++/*NewMat(int M,int N){{{*/ + Mat NewMat(int M,int N){ + + /*output:*/ +@@ -47,7 +47,7 @@ + return outmatrix; + } + /*}}}*/ +-/*NewMat(int M,int N,double sparsity){{{1*/ ++/*NewMat(int M,int N,double sparsity){{{*/ + Mat NewMat(int M,int N,double sparsity){ + + /*output:*/ +@@ -80,7 +80,7 @@ + return outmatrix; + } + /*}}}*/ +-/*NewMat(int M,int N,int connectivity,int numberofdofspernode){{{1*/ ++/*NewMat(int M,int N,int connectivity,int numberofdofspernode){{{*/ + Mat NewMat(int M,int N,int connectivity,int numberofdofspernode){ + + /*output:*/ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Contour.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Contour.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Contour.h (revision 12365) +@@ -6,7 +6,7 @@ + #define _CONTOUR_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #include "./Object.h" + #include "../shared/Exceptions/exceptions.h" + #include "../toolkits/toolkits.h" +@@ -23,12 +23,12 @@ + IssmDouble* y; + bool closed; //is this contour closed? + +- /*Contour constructors, destructors {{{1*/ ++ /*Contour constructors, destructors {{{*/ + Contour(); + Contour(int id, int nods, IssmDouble* x, IssmDouble* y,bool closed); + ~Contour(); + /*}}}*/ +- /*Object virtual functions{{{1*/ ++ /*Object virtual functions{{{*/ + void Echo(void); + void DeepEcho(void); + int Id(void); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12365) +@@ -17,7 +17,7 @@ + #include "../include/include.h" + + /*DofIndexing constructors and destructor*/ +-/*FUNCTION DofIndexing::DofIndexing(){{{1*/ ++/*FUNCTION DofIndexing::DofIndexing(){{{*/ + DofIndexing::DofIndexing(){ + + this->gsize=UNDEF; +@@ -34,12 +34,12 @@ + + } + /*}}}*/ +-/*FUNCTION DofIndexing::DofIndexing(int gsize){{{1*/ ++/*FUNCTION DofIndexing::DofIndexing(int gsize){{{*/ + DofIndexing::DofIndexing(int in_gsize){ + this->Init(in_gsize,NULL); + } + /*}}}*/ +-/*FUNCTION DofIndexing::DofIndexing(DofIndexing* in) -> copy{{{1*/ ++/*FUNCTION DofIndexing::DofIndexing(DofIndexing* in) -> copy{{{*/ + DofIndexing::DofIndexing(DofIndexing* in){ //copy constructor + + int i; +@@ -78,7 +78,7 @@ + + } + /*}}}*/ +-/*FUNCTION DofIndexing::~DofIndexing() {{{1*/ ++/*FUNCTION DofIndexing::~DofIndexing() {{{*/ + DofIndexing::~DofIndexing(){ //destructor + + xfree((void**)&f_set); +@@ -91,7 +91,7 @@ + + } + /*}}}*/ +-/*FUNCTION DofIndexing::Init{{{1*/ ++/*FUNCTION DofIndexing::Init{{{*/ + void DofIndexing::Init(int in_gsize,int* in_doftype){ + + int i; +@@ -118,7 +118,7 @@ + } + } + /*}}}*/ +-/*FUNCTION DofIndexing::InitSet{{{1*/ ++/*FUNCTION DofIndexing::InitSet{{{*/ + void DofIndexing::InitSet(int setenum){ + + int i; +@@ -147,7 +147,7 @@ + /*}}}*/ + + /*Some of the Object functionality: */ +-/*FUNCTION DofIndexing::Echo{{{1*/ ++/*FUNCTION DofIndexing::Echo{{{*/ + void DofIndexing::Echo(void){ + + int i; +@@ -157,7 +157,7 @@ + printf(" clone: %i\n",clone); + } + /*}}}*/ +-/*FUNCTION DofIndexing::DeepEcho{{{1*/ ++/*FUNCTION DofIndexing::DeepEcho{{{*/ + void DofIndexing::DeepEcho(void){ + + int i; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12365) +@@ -16,14 +16,14 @@ + #include "../../include/include.h" + + /*Matice constructors and destructor*/ +-/*FUNCTION Matice::Matice(){{{1*/ ++/*FUNCTION Matice::Matice(){{{*/ + Matice::Matice(){ + this->inputs=NULL; + this->helement=NULL; + return; + } + /*}}}*/ +-/*FUNCTION Matice::Matice(int id, int index, IoModel* iomodel, int num_vertices){{{1*/ ++/*FUNCTION Matice::Matice(int id, int index, IoModel* iomodel, int num_vertices){{{*/ + Matice::Matice(int matice_mid,int index, IoModel* iomodel){ + + /*Intermediaries:*/ +@@ -47,7 +47,7 @@ + + } + /*}}}*/ +-/*FUNCTION Matice::~Matice(){{{1*/ ++/*FUNCTION Matice::~Matice(){{{*/ + Matice::~Matice(){ + delete helement; + delete inputs; +@@ -56,7 +56,7 @@ + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION Matice::Echo {{{1*/ ++/*FUNCTION Matice::Echo {{{*/ + void Matice::Echo(void){ + + printf("Matice:\n"); +@@ -67,7 +67,7 @@ + helement->Echo(); + } + /*}}}*/ +-/*FUNCTION Matice::DeepEcho {{{1*/ ++/*FUNCTION Matice::DeepEcho {{{*/ + void Matice::DeepEcho(void){ + + printf("Matice:\n"); +@@ -78,23 +78,23 @@ + helement->Echo(); + } + /*}}}*/ +-/*FUNCTION Matice::Id {{{1*/ ++/*FUNCTION Matice::Id {{{*/ + int Matice::Id(void){ return mid; } + /*}}}*/ +-/*FUNCTION Matice::MyRank {{{1*/ ++/*FUNCTION Matice::MyRank {{{*/ + int Matice::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION Matice::ObjectEnum{{{1*/ ++/*FUNCTION Matice::ObjectEnum{{{*/ + int Matice::ObjectEnum(void){ + + return MaticeEnum; + + } + /*}}}*/ +-/*FUNCTION Matice::copy {{{1*/ ++/*FUNCTION Matice::copy {{{*/ + Object* Matice::copy() { + + /*Output*/ +@@ -114,7 +114,7 @@ + /*}}}*/ + + /*Matice management*/ +-/*FUNCTION Matice::Configure {{{1*/ ++/*FUNCTION Matice::Configure {{{*/ + void Matice::Configure(Elements* elementsin){ + + /*Take care of hooking up all objects for this element, ie links the objects in the hooks to their respective +@@ -122,12 +122,12 @@ + helement->configure(elementsin); + } + /*}}}*/ +-/*FUNCTION Matice::SetCurrentConfiguration {{{1*/ ++/*FUNCTION Matice::SetCurrentConfiguration {{{*/ + void Matice::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ + + } + /*}}}*/ +-/*FUNCTION Matice::GetB {{{1*/ ++/*FUNCTION Matice::GetB {{{*/ + double Matice::GetB(){ + + /*Output*/ +@@ -137,7 +137,7 @@ + return B; + } + /*}}}*/ +-/*FUNCTION Matice::GetBbar {{{1*/ ++/*FUNCTION Matice::GetBbar {{{*/ + double Matice::GetBbar(){ + + /*Output*/ +@@ -147,7 +147,7 @@ + return Bbar; + } + /*}}}*/ +-/*FUNCTION Matice::GetN {{{1*/ ++/*FUNCTION Matice::GetN {{{*/ + double Matice::GetN(){ + + /*Output*/ +@@ -157,7 +157,7 @@ + return n; + } + /*}}}*/ +-/*FUNCTION Matice::GetVectorFromInputs{{{1*/ ++/*FUNCTION Matice::GetVectorFromInputs{{{*/ + void Matice::GetVectorFromInputs(Vector* vector,int input_enum){ + + /*Intermediaries*/ +@@ -189,7 +189,7 @@ + } + } + /*}}}*/ +-/*FUNCTION Matice::GetViscosity2d {{{1*/ ++/*FUNCTION Matice::GetViscosity2d {{{*/ + void Matice::GetViscosity2d(double* pviscosity, double* epsilon){ + /*From a string tensor and a material object, return viscosity, using Glen's flow law. + B +@@ -253,7 +253,7 @@ + *pviscosity=viscosity; + } + /*}}}*/ +-/*FUNCTION Matice::GetViscosity3d {{{1*/ ++/*FUNCTION Matice::GetViscosity3d {{{*/ + void Matice::GetViscosity3d(double* pviscosity3d, double* epsilon){ + + /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: +@@ -324,7 +324,7 @@ + *pviscosity3d=viscosity3d; + } + /*}}}*/ +-/*FUNCTION Matice::GetViscosity3dStokes {{{1*/ ++/*FUNCTION Matice::GetViscosity3dStokes {{{*/ + void Matice::GetViscosity3dStokes(double* pviscosity3d, double* epsilon){ + /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: + * +@@ -396,7 +396,7 @@ + *pviscosity3d=viscosity3d; + } + /*}}}*/ +-/*FUNCTION Matice::GetViscosityComplement {{{1*/ ++/*FUNCTION Matice::GetViscosityComplement {{{*/ + void Matice::GetViscosityComplement(double* pviscosity_complement, double* epsilon){ + /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: + * +@@ -452,7 +452,7 @@ + *pviscosity_complement=viscosity_complement; + } + /*}}}*/ +-/*FUNCTION Matice::GetViscosityDerivativeEpsSquare{{{1*/ ++/*FUNCTION Matice::GetViscosityDerivativeEpsSquare{{{*/ + void Matice::GetViscosityDerivativeEpsSquare(double* pmu_prime, double* epsilon){ + + /*output: */ +@@ -486,7 +486,7 @@ + *pmu_prime=mu_prime; + } + /*}}}*/ +-/*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{1*/ ++/*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{*/ + void Matice::GetViscosity2dDerivativeEpsSquare(double* pmu_prime, double* epsilon){ + + /*output: */ +@@ -517,7 +517,7 @@ + *pmu_prime=mu_prime; + } + /*}}}*/ +-/*FUNCTION Matice::InputDuplicate{{{1*/ ++/*FUNCTION Matice::InputDuplicate{{{*/ + void Matice::InputDuplicate(int original_enum,int new_enum){ + + /*Call inputs method*/ +@@ -525,7 +525,7 @@ + + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromVector(double* vector, int name, int type) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromVector(double* vector, int name, int type) {{{*/ + void Matice::InputUpdateFromVector(double* vector, int name, int type){ + + /*Intermediaries*/ +@@ -555,17 +555,17 @@ + } + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromVector(int* vector, int name, int type) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromVector(int* vector, int name, int type) {{{*/ + void Matice::InputUpdateFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromVector(bool* vector, int name, int type) {{{*/ + void Matice::InputUpdateFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/ + void Matice::InputUpdateFromVectorDakota(double* vector, int name, int type){ + + /*Intermediaries*/ +@@ -589,7 +589,7 @@ + double values[3]; + for (int i=0;i<3;i++) values[i]=vector[((Tria*)element)->nodes[i]->GetSidList()]; //use sid list, to index into serial oriented vector + this->inputs->AddInput(new TriaP1Input(name,values)); +- /*Special case for rheology B in 2D: Pourave land for this solution{{{2*/ ++ /*Special case for rheology B in 2D: Pourave land for this solution{{{*/ + if(name==MaterialsRheologyBEnum){ + /*Are we in 2D?:*/ + if(element->ObjectEnum()==TriaEnum){ +@@ -616,42 +616,42 @@ + + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{*/ + void Matice::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols,int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/ + void Matice::InputUpdateFromVectorDakota(int* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/ + void Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromConstant(double constant, int name) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromConstant(double constant, int name) {{{*/ + void Matice::InputUpdateFromConstant(double constant, int name){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromConstant(int constant, int name) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromConstant(int constant, int name) {{{*/ + void Matice::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromConstant(bool constant, int name) {{{1*/ ++/*FUNCTION Matice::InputUpdateFromConstant(bool constant, int name) {{{*/ + void Matice::InputUpdateFromConstant(bool constant, int name){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromSolution{{{1*/ ++/*FUNCTION Matice::InputUpdateFromSolution{{{*/ + void Matice::InputUpdateFromSolution(double* solution){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matice::InputUpdateFromIoModel{{{1*/ ++/*FUNCTION Matice::InputUpdateFromIoModel{{{*/ + void Matice::InputUpdateFromIoModel(int index, IoModel* iomodel){ + + int i,j; +@@ -755,7 +755,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION Matice::IsInput{{{1*/ ++/*FUNCTION Matice::IsInput{{{*/ + bool Matice::IsInput(int name){ + if ( + name==MaterialsRheologyBEnum || +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Material.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Material.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Material.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _MATERIAL_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + class Object; + #include "../Object.h" + #include "../../toolkits/toolkits.h" +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12365) +@@ -16,12 +16,12 @@ + #include "../../EnumDefinitions/EnumDefinitions.h" + + /*Matpar constructors and destructor*/ +-/*FUNCTION Matpar::Matpar() {{{1*/ ++/*FUNCTION Matpar::Matpar() {{{*/ + Matpar::Matpar(){ + return; + } +-/*}}}1*/ +-/*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{*/ + Matpar::Matpar(int matpar_mid, IoModel* iomodel){ + + this->mid = matpar_mid; +@@ -45,15 +45,15 @@ + iomodel->Constant(&this->hydro_p,HydrologyPEnum); + iomodel->Constant(&this->hydro_q,HydrologyQEnum); + } +-/*}}}1*/ +-/*FUNCTION Matpar::~Matpar() {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::~Matpar() {{{*/ + Matpar::~Matpar(){ + return; + } +-/*}}}1*/ ++/*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION Matpar::Echo {{{1*/ ++/*FUNCTION Matpar::Echo {{{*/ + void Matpar::Echo(void){ + + printf("Matpar:\n"); +@@ -73,72 +73,72 @@ + printf(" g: %g\n",g); + return; + } +-/*}}}1*/ +-/*FUNCTION Matpar::DeepEcho {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::DeepEcho {{{*/ + void Matpar::DeepEcho(void){ + + this->Echo(); + } +-/*}}}1*/ +-/*FUNCTION Matpar::Id {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::Id {{{*/ + int Matpar::Id(void){ return mid; } +-/*}}}1*/ +-/*FUNCTION Matpar::MyRank {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::MyRank {{{*/ + int Matpar::MyRank(void){ + extern int my_rank; + return my_rank; + } +-/*}}}1*/ +-/*FUNCTION Matpar::ObjectEnum{{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::ObjectEnum{{{*/ + int Matpar::ObjectEnum(void){ + + return MatparEnum; + + } +-/*}}}1*/ +-/*FUNCTION Matpar::copy {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::copy {{{*/ + Object* Matpar::copy() { + return new Matpar(*this); + } +-/*}}}1*/ ++/*}}}*/ + + /*Update virtual functions definitions:*/ +-/*FUNCTION Matpar::InputUpdateFromVector(double* vector, int name, int type) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromVector(double* vector, int name, int type) {{{*/ + void Matpar::InputUpdateFromVector(double* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromVector(int* vector, int name, int type) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromVector(int* vector, int name, int type) {{{*/ + void Matpar::InputUpdateFromVector(int* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromVector(bool* vector, int name, int type) {{{*/ + void Matpar::InputUpdateFromVector(bool* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/ + void Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/ + void Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/ + void Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{*/ + void Matpar::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols,int name, int type){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromConstant(double constant, int name) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromConstant(double constant, int name) {{{*/ + void Matpar::InputUpdateFromConstant(double constant, int name){ + + switch(name){ +@@ -187,132 +187,132 @@ + + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromConstant(int constant, int name) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromConstant(int constant, int name) {{{*/ + void Matpar::InputUpdateFromConstant(int constant, int name){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromConstant(bool constant, int name) {{{1*/ ++/*FUNCTION Matpar::InputUpdateFromConstant(bool constant, int name) {{{*/ + void Matpar::InputUpdateFromConstant(bool constant, int name){ + /*Nothing updated yet*/ + } + /*}}}*/ +-/*FUNCTION Matpar::InputUpdateFromSolution{{{1*/ ++/*FUNCTION Matpar::InputUpdateFromSolution{{{*/ + void Matpar::InputUpdateFromSolution(double* solution){ + /*Nothing updated yet*/ + } + /*}}}*/ + + /*Matpar management: */ +-/*FUNCTION Matpar::Configure {{{1*/ ++/*FUNCTION Matpar::Configure {{{*/ + void Matpar::Configure(Elements* elementsin){ + + /*nothing done yet!*/ + + } + /*}}}*/ +-/*FUNCTION Matpar::GetBeta {{{1*/ ++/*FUNCTION Matpar::GetBeta {{{*/ + double Matpar::GetBeta(){ + return beta; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetG {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetG {{{*/ + double Matpar::GetG(){ + return g; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetHeatCapacity {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetHeatCapacity {{{*/ + double Matpar::GetHeatCapacity(){ + return heatcapacity; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetLatentHeat {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetLatentHeat {{{*/ + double Matpar::GetLatentHeat(){ + return latentheat; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetMeltingPoint {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetMeltingPoint {{{*/ + double Matpar::GetMeltingPoint(){ + return meltingpoint; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetReferenceTemperature {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetReferenceTemperature {{{*/ + double Matpar::GetReferenceTemperature(){ + return referencetemperature; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetMixedLayerCapacity {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetMixedLayerCapacity {{{*/ + double Matpar::GetMixedLayerCapacity(){ + return mixed_layer_capacity; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetRhoIce {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetRhoIce {{{*/ + double Matpar::GetRhoIce(){ + + return rho_ice; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetRhoWater {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetRhoWater {{{*/ + double Matpar::GetRhoWater(){ + return rho_water; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetRhoFreshwater {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetRhoFreshwater {{{*/ + double Matpar::GetRhoFreshwater(){ + return rho_freshwater; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetMuWater {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetMuWater {{{*/ + double Matpar::GetMuWater(){ + return mu_water; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetThermalConductivity {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetThermalConductivity {{{*/ + double Matpar::GetThermalConductivity(){ + return thermalconductivity; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetThermalExchangeVelocity {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetThermalExchangeVelocity {{{*/ + double Matpar::GetThermalExchangeVelocity(){ + return thermal_exchange_velocity; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetKn {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetKn {{{*/ + double Matpar::GetKn(){ + return kn; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetHydrologyP {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetHydrologyP {{{*/ + double Matpar::GetHydrologyP(){ + return hydro_p; + } +-/*}}}1*/ +-/*FUNCTION Matqar::GetHydrologyQ {{{1*/ ++/*}}}*/ ++/*FUNCTION Matqar::GetHydrologyQ {{{*/ + double Matpar::GetHydrologyQ(){ + return hydro_q; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetHydrologyCR {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetHydrologyCR {{{*/ + double Matpar::GetHydrologyCR(){ + return hydro_CR; + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetHydrologyN {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetHydrologyN {{{*/ + double Matpar::GetHydrologyN(){ + return hydro_n; + } +-/*}}}1*/ +-/*FUNCTION Matpar::TMeltingPoint {{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::TMeltingPoint {{{*/ + double Matpar::TMeltingPoint(double pressure){ + return meltingpoint-beta*pressure; + } +-/*}}}1*/ +-/*FUNCTION Matpar::PureIceEnthalpy{{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::PureIceEnthalpy{{{*/ + double Matpar::PureIceEnthalpy(double pressure){ + return heatcapacity*(TMeltingPoint(pressure)-referencetemperature); + } +-/*}}}1*/ +-/*FUNCTION Matpar::GetEnthalpyDiffusionParameter{{{1*/ ++/*}}}*/ ++/*FUNCTION Matpar::GetEnthalpyDiffusionParameter{{{*/ + double Matpar::GetEnthalpyDiffusionParameter(double enthalpy,double pressure){ + if(enthalpycoord1=this->coord1; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _DOUBLEVECPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -27,12 +27,12 @@ + int M; + + public: +- /*DoubleVecParam constructors, destructors: {{{1*/ ++ /*DoubleVecParam constructors, destructors: {{{*/ + DoubleVecParam(); + DoubleVecParam(int enum_type,IssmDouble* values,int M); + ~DoubleVecParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -40,7 +40,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param virtual functions definitions: {{{1*/ ++ /*Param virtual functions definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("DoubleVec param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("DoubleVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _DOUBLEPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -27,12 +27,12 @@ + IssmDouble value; + + public: +- /*DoubleParam constructors, destructors: {{{1*/ ++ /*DoubleParam constructors, destructors: {{{*/ + DoubleParam(); + DoubleParam(int enum_type,IssmDouble value); + ~DoubleParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -40,7 +40,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool); + void GetParameterValue(int* pinteger); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,31 +20,31 @@ + /*}}}*/ + + /*FileParam constructors and destructor*/ +-/*FUNCTION FileParam::FileParam(){{{1*/ ++/*FUNCTION FileParam::FileParam(){{{*/ + FileParam::FileParam(){ + return; + } + /*}}}*/ +-/*FUNCTION FileParam::FileParam(int enum_type,FILE *value){{{1*/ ++/*FUNCTION FileParam::FileParam(int enum_type,FILE *value){{{*/ + FileParam::FileParam(int in_enum_type,FILE* in_value){ + + enum_type=in_enum_type; + value=in_value; + } + /*}}}*/ +-/*FUNCTION FileParam::~FileParam(){{{1*/ ++/*FUNCTION FileParam::~FileParam(){{{*/ + FileParam::~FileParam(){ + return; + } + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION FileParam::Echo {{{1*/ ++/*FUNCTION FileParam::Echo {{{*/ + void FileParam::Echo(void){ + this->DeepEcho(); + } + /*}}}*/ +-/*FUNCTION FileParam::DeepEcho{{{1*/ ++/*FUNCTION FileParam::DeepEcho{{{*/ + void FileParam::DeepEcho(void){ + + printf("FileParam:\n"); +@@ -52,23 +52,23 @@ + printf(" value: %p\n",this->value); + } + /*}}}*/ +-/*FUNCTION FileParam::Id{{{1*/ ++/*FUNCTION FileParam::Id{{{*/ + int FileParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION FileParam::MyRank{{{1*/ ++/*FUNCTION FileParam::MyRank{{{*/ + int FileParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION FileParam::ObjectEnum{{{1*/ ++/*FUNCTION FileParam::ObjectEnum{{{*/ + int FileParam::ObjectEnum(void){ + + return FileParamEnum; + + } + /*}}}*/ +-/*FUNCTION FileParam::copy{{{1*/ ++/*FUNCTION FileParam::copy{{{*/ + Object* FileParam::copy() { + + return new FileParam(this->enum_type,this->value); +@@ -77,12 +77,12 @@ + /*}}}*/ + + /*FileParam virtual functions definitions: */ +-/*FUNCTION FileParam::GetParameterName{{{1*/ ++/*FUNCTION FileParam::GetParameterName{{{*/ + void FileParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION FileParam::UnitConversion{{{1*/ ++/*FUNCTION FileParam::UnitConversion{{{*/ + void FileParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _DOUBLEMATARRAYPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -29,12 +29,12 @@ + int* ndim_array; //n-dimensions -f matrices in the array + + public: +- /*DoubleMatArrayParam constructors, destructors: {{{1*/ ++ /*DoubleMatArrayParam constructors, destructors: {{{*/ + DoubleMatArrayParam(); + DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array); + ~DoubleMatArrayParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -42,7 +42,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("DoubleMatArray param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("DoubleMatArray param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _DOUBLEMATPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -28,12 +28,12 @@ + int N; + + public: +- /*DoubleMatParam constructors, destructors: {{{1*/ ++ /*DoubleMatParam constructors, destructors: {{{*/ + DoubleMatParam(); + DoubleMatParam(int enum_type,IssmDouble* value,int M,int N); + ~DoubleMatParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -41,7 +41,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("DoubleMat param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("DoubleMat param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/Param.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/Param.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/Param.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _PARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + + #ifdef HAVE_CONFIG_H + #include +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/FileParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _FILEPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -26,12 +26,12 @@ + FILE* value; + + public: +- /*FileParam constructors, destructors: {{{1*/ ++ /*FileParam constructors, destructors: {{{*/ + FileParam(); + FileParam(int enum_type,FILE* fid); + ~FileParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -39,7 +39,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){ _error_("FileParam of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*IntVecParam constructors and destructor*/ +-/*FUNCTION IntVecParam::IntVecParam(){{{1*/ ++/*FUNCTION IntVecParam::IntVecParam(){{{*/ + IntVecParam::IntVecParam(){ + return; + } + /*}}}*/ +-/*FUNCTION IntVecParam::IntVecParam(int enum_type,int* values,int M){{{1*/ ++/*FUNCTION IntVecParam::IntVecParam(int enum_type,int* values,int M){{{*/ + IntVecParam::IntVecParam(int in_enum_type,int* in_values, int in_M){ + + enum_type=in_enum_type; +@@ -38,7 +38,7 @@ + else values=NULL; + } + /*}}}*/ +-/*FUNCTION IntVecParam::IntVecParam(int enum_type,double* values,int M){{{1*/ ++/*FUNCTION IntVecParam::IntVecParam(int enum_type,double* values,int M){{{*/ + IntVecParam::IntVecParam(int in_enum_type,double* in_values, int in_M){ + + enum_type=in_enum_type; +@@ -51,7 +51,7 @@ + else values=NULL; + } + /*}}}*/ +-/*FUNCTION IntVecParam::~IntVecParam(){{{1*/ ++/*FUNCTION IntVecParam::~IntVecParam(){{{*/ + IntVecParam::~IntVecParam(){ + xfree((void**)&values); + return; +@@ -59,7 +59,7 @@ + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION IntVecParam::Echo {{{1*/ ++/*FUNCTION IntVecParam::Echo {{{*/ + void IntVecParam::Echo(void){ + + printf("IntVecParam:\n"); +@@ -68,7 +68,7 @@ + + } + /*}}}*/ +-/*FUNCTION IntVecParam::DeepEcho{{{1*/ ++/*FUNCTION IntVecParam::DeepEcho{{{*/ + void IntVecParam::DeepEcho(void){ + + int i; +@@ -81,23 +81,23 @@ + } + } + /*}}}*/ +-/*FUNCTION IntVecParam::Id{{{1*/ ++/*FUNCTION IntVecParam::Id{{{*/ + int IntVecParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION IntVecParam::MyRank{{{1*/ ++/*FUNCTION IntVecParam::MyRank{{{*/ + int IntVecParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION IntVecParam::ObjectEnum{{{1*/ ++/*FUNCTION IntVecParam::ObjectEnum{{{*/ + int IntVecParam::ObjectEnum(void){ + + return IntVecParamEnum; + + } + /*}}}*/ +-/*FUNCTION IntVecParam::copy{{{1*/ ++/*FUNCTION IntVecParam::copy{{{*/ + Object* IntVecParam::copy() { + + return new IntVecParam(this->enum_type,this->values,this->M); +@@ -106,7 +106,7 @@ + /*}}}*/ + + /*IntVecParam virtual functions definitions: */ +-/*FUNCTION IntVecParam::GetParameterValue{{{1*/ ++/*FUNCTION IntVecParam::GetParameterValue{{{*/ + void IntVecParam::GetParameterValue(int** pintarray,int* pM){ + int* output=NULL; + +@@ -120,12 +120,12 @@ + *pintarray=output; + } + /*}}}*/ +-/*FUNCTION IntVecParam::GetParameterName{{{1*/ ++/*FUNCTION IntVecParam::GetParameterName{{{*/ + void IntVecParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION IntVecParam::SetValue{{{1*/ ++/*FUNCTION IntVecParam::SetValue{{{*/ + void IntVecParam::SetValue(int* intarray,int in_M){ + + /*avoid leak: */ +@@ -140,7 +140,7 @@ + this->M=in_M; + } + /*}}}*/ +-/*FUNCTION IntVecParam::UnitConversion{{{1*/ ++/*FUNCTION IntVecParam::UnitConversion{{{*/ + void IntVecParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,31 +20,31 @@ + /*}}}*/ + + /*IntParam constructors and destructor*/ +-/*FUNCTION IntParam::IntParam(){{{1*/ ++/*FUNCTION IntParam::IntParam(){{{*/ + IntParam::IntParam(){ + return; + } + /*}}}*/ +-/*FUNCTION IntParam::IntParam(int enum_type,IssmInt value){{{1*/ ++/*FUNCTION IntParam::IntParam(int enum_type,IssmInt value){{{*/ + IntParam::IntParam(int in_enum_type,IssmInt in_value){ + + enum_type=in_enum_type; + value=in_value; + } + /*}}}*/ +-/*FUNCTION IntParam::~IntParam(){{{1*/ ++/*FUNCTION IntParam::~IntParam(){{{*/ + IntParam::~IntParam(){ + return; + } + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION IntParam::Echo {{{1*/ ++/*FUNCTION IntParam::Echo {{{*/ + void IntParam::Echo(void){ + this->DeepEcho(); + } + /*}}}*/ +-/*FUNCTION IntParam::DeepEcho{{{1*/ ++/*FUNCTION IntParam::DeepEcho{{{*/ + void IntParam::DeepEcho(void){ + + printf("IntParam:\n"); +@@ -52,23 +52,23 @@ + printf(" value: %i\n",this->value); + } + /*}}}*/ +-/*FUNCTION IntParam::Id{{{1*/ ++/*FUNCTION IntParam::Id{{{*/ + int IntParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION IntParam::MyRank{{{1*/ ++/*FUNCTION IntParam::MyRank{{{*/ + int IntParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION IntParam::ObjectEnum{{{1*/ ++/*FUNCTION IntParam::ObjectEnum{{{*/ + int IntParam::ObjectEnum(void){ + + return IntParamEnum; + + } + /*}}}*/ +-/*FUNCTION IntParam::copy{{{1*/ ++/*FUNCTION IntParam::copy{{{*/ + Object* IntParam::copy() { + + return new IntParam(this->enum_type,this->value); +@@ -77,12 +77,12 @@ + /*}}}*/ + + /*IntParam virtual functions definitions: */ +-/*FUNCTION IntParam::GetParameterName{{{1*/ ++/*FUNCTION IntParam::GetParameterName{{{*/ + void IntParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION IntParam::UnitConversion{{{1*/ ++/*FUNCTION IntParam::UnitConversion{{{*/ + void IntParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,31 +20,31 @@ + /*}}}*/ + + /*BoolParam constructors and destructor*/ +-/*FUNCTION BoolParam::BoolParam(){{{1*/ ++/*FUNCTION BoolParam::BoolParam(){{{*/ + BoolParam::BoolParam(){ + return; + } + /*}}}*/ +-/*FUNCTION BoolParam::BoolParam(int enum_type,IssmBool value){{{1*/ ++/*FUNCTION BoolParam::BoolParam(int enum_type,IssmBool value){{{*/ + BoolParam::BoolParam(int in_enum_type,IssmBool in_value){ + + enum_type=in_enum_type; + value=in_value; + } + /*}}}*/ +-/*FUNCTION BoolParam::~BoolParam(){{{1*/ ++/*FUNCTION BoolParam::~BoolParam(){{{*/ + BoolParam::~BoolParam(){ + return; + } + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION BoolParam::Echo {{{1*/ ++/*FUNCTION BoolParam::Echo {{{*/ + void BoolParam::Echo(void){ + this->DeepEcho(); + } + /*}}}*/ +-/*FUNCTION BoolParam::DeepEcho{{{1*/ ++/*FUNCTION BoolParam::DeepEcho{{{*/ + void BoolParam::DeepEcho(void){ + + printf("BoolParam:\n"); +@@ -52,23 +52,23 @@ + printf(" value: %s\n",this->value?"true":"false"); + } + /*}}}*/ +-/*FUNCTION BoolParam::Id{{{1*/ ++/*FUNCTION BoolParam::Id{{{*/ + int BoolParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION BoolParam::MyRank{{{1*/ ++/*FUNCTION BoolParam::MyRank{{{*/ + int BoolParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION BoolParam::ObjectEnum{{{1*/ ++/*FUNCTION BoolParam::ObjectEnum{{{*/ + int BoolParam::ObjectEnum(void){ + + return BoolParamEnum; + + } + /*}}}*/ +-/*FUNCTION BoolParam::copy{{{1*/ ++/*FUNCTION BoolParam::copy{{{*/ + Object* BoolParam::copy() { + + return new BoolParam(this->enum_type,this->value); +@@ -77,12 +77,12 @@ + /*}}}*/ + + /*BoolParam virtual functions definitions: */ +-/*FUNCTION BoolParam::GetParameterName{{{1*/ ++/*FUNCTION BoolParam::GetParameterName{{{*/ + void BoolParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION BoolParam::UnitConversion{{{1*/ ++/*FUNCTION BoolParam::UnitConversion{{{*/ + void BoolParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*IntMatParam constructors and destructor*/ +-/*FUNCTION IntMatParam::IntMatParam(){{{1*/ ++/*FUNCTION IntMatParam::IntMatParam(){{{*/ + IntMatParam::IntMatParam(){ + return; + } + /*}}}*/ +-/*FUNCTION IntMatParam::IntMatParam(int enum_type,IssmIntMat value){{{1*/ ++/*FUNCTION IntMatParam::IntMatParam(int enum_type,IssmIntMat value){{{*/ + IntMatParam::IntMatParam(int in_enum_type,int* in_value, int in_M,int in_N){ + + enum_type=in_enum_type; +@@ -36,7 +36,7 @@ + memcpy(value,in_value,M*N*sizeof(int)); + } + /*}}}*/ +-/*FUNCTION IntMatParam::~IntMatParam(){{{1*/ ++/*FUNCTION IntMatParam::~IntMatParam(){{{*/ + IntMatParam::~IntMatParam(){ + xfree((void**)&value); + return; +@@ -44,7 +44,7 @@ + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION IntMatParam::Echo {{{1*/ ++/*FUNCTION IntMatParam::Echo {{{*/ + void IntMatParam::Echo(void){ + + printf("IntMatParam:\n"); +@@ -53,7 +53,7 @@ + + } + /*}}}*/ +-/*FUNCTION IntMatParam::DeepEcho{{{1*/ ++/*FUNCTION IntMatParam::DeepEcho{{{*/ + void IntMatParam::DeepEcho(void){ + + int i,j; +@@ -68,23 +68,23 @@ + } + } + /*}}}*/ +-/*FUNCTION IntMatParam::Id{{{1*/ ++/*FUNCTION IntMatParam::Id{{{*/ + int IntMatParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION IntMatParam::MyRank{{{1*/ ++/*FUNCTION IntMatParam::MyRank{{{*/ + int IntMatParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION IntMatParam::ObjectEnum{{{1*/ ++/*FUNCTION IntMatParam::ObjectEnum{{{*/ + int IntMatParam::ObjectEnum(void){ + + return IntMatParamEnum; + + } + /*}}}*/ +-/*FUNCTION IntMatParam::copy{{{1*/ ++/*FUNCTION IntMatParam::copy{{{*/ + Object* IntMatParam::copy() { + + return new IntMatParam(this->enum_type,this->value,this->M,this->N); +@@ -93,7 +93,7 @@ + /*}}}*/ + + /*IntMatParam virtual functions definitions: */ +-/*FUNCTION IntMatParam::GetParameterValue{{{1*/ ++/*FUNCTION IntMatParam::GetParameterValue{{{*/ + void IntMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){ + int* output=NULL; + +@@ -106,12 +106,12 @@ + *pintarray=output; + } + /*}}}*/ +-/*FUNCTION IntMatParam::GetParameterName{{{1*/ ++/*FUNCTION IntMatParam::GetParameterName{{{*/ + void IntMatParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION IntMatParam::SetValue{{{1*/ ++/*FUNCTION IntMatParam::SetValue{{{*/ + void IntMatParam::SetValue(int* intarray,int in_M,int in_N){ + + /*avoid leak: */ +@@ -124,7 +124,7 @@ + this->N=in_N; + } + /*}}}*/ +-/*FUNCTION IntMatParam::UnitConversion{{{1*/ ++/*FUNCTION IntMatParam::UnitConversion{{{*/ + void IntMatParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntVecParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _INTVECPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -27,13 +27,13 @@ + int M; + + public: +- /*IntVecParam constructors, destructors: {{{1*/ ++ /*IntVecParam constructors, destructors: {{{*/ + IntVecParam(); + IntVecParam(int enum_type,int* values,int M); + IntVecParam(int enum_type,double* values,int M); + ~IntVecParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -41,7 +41,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param virtual functions definitions: {{{1*/ ++ /*Param virtual functions definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("IntVec param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("IntVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _INTPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -27,12 +27,12 @@ + IssmInt value; + + public: +- /*IntParam constructors, destructors: {{{1*/ ++ /*IntParam constructors, destructors: {{{*/ + IntParam(); + IntParam(int enum_type,IssmInt value); + ~IntParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -40,7 +40,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("Int param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){*pinteger=value;} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/BoolParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _BOOLPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -26,12 +26,12 @@ + int enum_type; + IssmBool value; + +- /*BoolParam constructors, destructors: {{{1*/ ++ /*BoolParam constructors, destructors: {{{*/ + BoolParam(); + BoolParam(int enum_type,IssmBool value); + ~BoolParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -39,7 +39,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){*pbool=value;} + void GetParameterValue(int* pinteger){_error_("Bool param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _INTMATPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -28,12 +28,12 @@ + int N; + + public: +- /*IntMatParam constructors, destructors: {{{1*/ ++ /*IntMatParam constructors, destructors: {{{*/ + IntMatParam(); + IntMatParam(int enum_type,int* value,int M,int N); + ~IntMatParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -41,7 +41,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("IntMat param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("IntMat param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*VectorParam constructors and destructor*/ +-/*FUNCTION VectorParam::VectorParam(){{{1*/ ++/*FUNCTION VectorParam::VectorParam(){{{*/ + VectorParam::VectorParam(){ + return; + } + /*}}}*/ +-/*FUNCTION VectorParam::VectorParam(int enum_type,IssmVector value){{{1*/ ++/*FUNCTION VectorParam::VectorParam(int enum_type,IssmVector value){{{*/ + VectorParam::VectorParam(int in_enum_type,Vector* in_value){ + + enum_type=in_enum_type; +@@ -38,14 +38,14 @@ + } + } + /*}}}*/ +-/*FUNCTION VectorParam::~VectorParam(){{{1*/ ++/*FUNCTION VectorParam::~VectorParam(){{{*/ + VectorParam::~VectorParam(){ + xdelete(&value); + } + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION VectorParam::Echo {{{1*/ ++/*FUNCTION VectorParam::Echo {{{*/ + void VectorParam::Echo(void){ + + printf("VectorParam:\n"); +@@ -53,7 +53,7 @@ + + } + /*}}}*/ +-/*FUNCTION VectorParam::DeepEcho{{{1*/ ++/*FUNCTION VectorParam::DeepEcho{{{*/ + void VectorParam::DeepEcho(void){ + + int i; +@@ -62,23 +62,23 @@ + value->Echo(); + } + /*}}}*/ +-/*FUNCTION VectorParam::Id{{{1*/ ++/*FUNCTION VectorParam::Id{{{*/ + int VectorParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION VectorParam::MyRank{{{1*/ ++/*FUNCTION VectorParam::MyRank{{{*/ + int VectorParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION VectorParam::ObjectEnum{{{1*/ ++/*FUNCTION VectorParam::ObjectEnum{{{*/ + int VectorParam::ObjectEnum(void){ + + return VectorParamEnum; + + } + /*}}}*/ +-/*FUNCTION VectorParam::copy{{{1*/ ++/*FUNCTION VectorParam::copy{{{*/ + Object* VectorParam::copy() { + + return new VectorParam(this->enum_type,this->value); +@@ -87,7 +87,7 @@ + /*}}}*/ + + /*VectorParam virtual functions definitions: */ +-/*FUNCTION VectorParam::GetParameterValue{{{1*/ ++/*FUNCTION VectorParam::GetParameterValue{{{*/ + void VectorParam::GetParameterValue(Vector** poutput){ + Vector* output=NULL; + +@@ -98,12 +98,12 @@ + *poutput=output; + } + /*}}}*/ +-/*FUNCTION VectorParam::GetParameterName{{{1*/ ++/*FUNCTION VectorParam::GetParameterName{{{*/ + void VectorParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION VectorParam::SetValue{{{1*/ ++/*FUNCTION VectorParam::SetValue{{{*/ + void VectorParam::SetValue(Vector* vector){ + + /*avoid leak: */ +@@ -114,7 +114,7 @@ + vector->Copy(value); + } + /*}}}*/ +-/*FUNCTION VectorParam::UnitConversion{{{1*/ ++/*FUNCTION VectorParam::UnitConversion{{{*/ + void VectorParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -19,12 +19,12 @@ + #include "../../include/include.h" + /*}}}*/ + +-/*FUNCTION DoubleTransientMatParam::DoubleTransientMatParam(int enum_type,IssmDoubleMat value){{{1*/ ++/*FUNCTION DoubleTransientMatParam::DoubleTransientMatParam(int enum_type,IssmDoubleMat value){{{*/ + DoubleTransientMatParam::DoubleTransientMatParam(int in_enum_type,double* in_value, int in_M,int in_N):DoubleMatParam(in_enum_type,in_value,in_M,in_N){ + } + /*}}}*/ + +-/*FUNCTION DoubleTransientMatParam::UnitConversion{{{1*/ ++/*FUNCTION DoubleTransientMatParam::UnitConversion{{{*/ + void DoubleTransientMatParam::UnitConversion(int direction_enum){ + ::UnitConversion(this->value,(this->M-1)*this->N,direction_enum,this->enum_type); + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*MatrixParam constructors and destructor*/ +-/*FUNCTION MatrixParam::MatrixParam(){{{1*/ ++/*FUNCTION MatrixParam::MatrixParam(){{{*/ + MatrixParam::MatrixParam(){ + return; + } + /*}}}*/ +-/*FUNCTION MatrixParam::MatrixParam(int enum_type,Matrix* value){{{1*/ ++/*FUNCTION MatrixParam::MatrixParam(int enum_type,Matrix* value){{{*/ + MatrixParam::MatrixParam(int in_enum_type,Matrix* in_value){ + + enum_type=in_enum_type; +@@ -36,14 +36,14 @@ + } + } + /*}}}*/ +-/*FUNCTION MatrixParam::~MatrixParam(){{{1*/ ++/*FUNCTION MatrixParam::~MatrixParam(){{{*/ + MatrixParam::~MatrixParam(){ + xdelete(&value); + } + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION MatrixParam::Echo {{{1*/ ++/*FUNCTION MatrixParam::Echo {{{*/ + void MatrixParam::Echo(void){ + + printf("MatrixParam:\n"); +@@ -51,7 +51,7 @@ + + } + /*}}}*/ +-/*FUNCTION MatrixParam::DeepEcho{{{1*/ ++/*FUNCTION MatrixParam::DeepEcho{{{*/ + void MatrixParam::DeepEcho(void){ + + int i; +@@ -60,23 +60,23 @@ + this->value->Echo(); + } + /*}}}*/ +-/*FUNCTION MatrixParam::Id{{{1*/ ++/*FUNCTION MatrixParam::Id{{{*/ + int MatrixParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION MatrixParam::MyRank{{{1*/ ++/*FUNCTION MatrixParam::MyRank{{{*/ + int MatrixParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION MatrixParam::ObjectEnum{{{1*/ ++/*FUNCTION MatrixParam::ObjectEnum{{{*/ + int MatrixParam::ObjectEnum(void){ + + return MatrixParamEnum; + + } + /*}}}*/ +-/*FUNCTION MatrixParam::copy{{{1*/ ++/*FUNCTION MatrixParam::copy{{{*/ + Object* MatrixParam::copy() { + + return new MatrixParam(this->enum_type,this->value); +@@ -85,7 +85,7 @@ + /*}}}*/ + + /*MatrixParam virtual functions definitions: */ +-/*FUNCTION MatrixParam::GetParameterValue{{{1*/ ++/*FUNCTION MatrixParam::GetParameterValue{{{*/ + void MatrixParam::GetParameterValue(Matrix** poutput){ + Matrix* output=NULL; + +@@ -95,12 +95,12 @@ + *poutput=output; + } + /*}}}*/ +-/*FUNCTION MatrixParam::GetParameterName{{{1*/ ++/*FUNCTION MatrixParam::GetParameterName{{{*/ + void MatrixParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION MatrixParam::SetValue{{{1*/ ++/*FUNCTION MatrixParam::SetValue{{{*/ + void MatrixParam::SetValue(Matrix* matrix){ + + /*avoid leak: */ +@@ -110,7 +110,7 @@ + value=matrix->Duplicate(); + } + /*}}}*/ +-/*FUNCTION MatrixParam::UnitConversion{{{1*/ ++/*FUNCTION MatrixParam::UnitConversion{{{*/ + void MatrixParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*StringArrayParam constructors and destructor*/ +-/*FUNCTION StringArrayParam::StringArrayParam(){{{1*/ ++/*FUNCTION StringArrayParam::StringArrayParam(){{{*/ + StringArrayParam::StringArrayParam(){ + return; + } + /*}}}*/ +-/*FUNCTION StringArrayParam::StringArrayParam(int enum_type,char** in_values,int in_numstrings){{{1*/ ++/*FUNCTION StringArrayParam::StringArrayParam(int enum_type,char** in_values,int in_numstrings){{{*/ + StringArrayParam::StringArrayParam(int in_enum_type,char** in_values, int in_numstrings){ + + int i; +@@ -48,7 +48,7 @@ + + } + /*}}}*/ +-/*FUNCTION StringArrayParam::~StringArrayParam(){{{1*/ ++/*FUNCTION StringArrayParam::~StringArrayParam(){{{*/ + StringArrayParam::~StringArrayParam(){ + + int i; +@@ -63,12 +63,12 @@ + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION StringArrayParam::Echo {{{1*/ ++/*FUNCTION StringArrayParam::Echo {{{*/ + void StringArrayParam::Echo(void){ + this->DeepEcho(); + } + /*}}}*/ +-/*FUNCTION StringArrayParam::DeepEcho{{{1*/ ++/*FUNCTION StringArrayParam::DeepEcho{{{*/ + void StringArrayParam::DeepEcho(void){ + + int i; +@@ -82,23 +82,23 @@ + } + } + /*}}}*/ +-/*FUNCTION StringArrayParam::Id{{{1*/ ++/*FUNCTION StringArrayParam::Id{{{*/ + int StringArrayParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION StringArrayParam::MyRank{{{1*/ ++/*FUNCTION StringArrayParam::MyRank{{{*/ + int StringArrayParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION StringArrayParam::ObjectEnum{{{1*/ ++/*FUNCTION StringArrayParam::ObjectEnum{{{*/ + int StringArrayParam::ObjectEnum(void){ + + return StringArrayParamEnum; + + } + /*}}}*/ +-/*FUNCTION StringArrayParam::copy{{{1*/ ++/*FUNCTION StringArrayParam::copy{{{*/ + Object* StringArrayParam::copy() { + + return new StringArrayParam(this->enum_type,this->value,this->numstrings); +@@ -107,7 +107,7 @@ + /*}}}*/ + + /*StringArrayParam virtual functions definitions: */ +-/*FUNCTION StringArrayParam::GetParameterValue{{{1*/ ++/*FUNCTION StringArrayParam::GetParameterValue{{{*/ + void StringArrayParam::GetParameterValue(char*** pstringarray,int* pM){ + + int i; +@@ -138,12 +138,12 @@ + *pstringarray=outstrings; + } + /*}}}*/ +-/*FUNCTION StringArrayParam::GetParameterName{{{1*/ ++/*FUNCTION StringArrayParam::GetParameterName{{{*/ + void StringArrayParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION StringArrayParam::SetValue{{{1*/ ++/*FUNCTION StringArrayParam::SetValue{{{*/ + void StringArrayParam::SetValue(char** stringarray,int M){ + + int i; +@@ -172,7 +172,7 @@ + } + } + /*}}}*/ +-/*FUNCTION StringArrayParam::UnitConversion{{{1*/ ++/*FUNCTION StringArrayParam::UnitConversion{{{*/ + void StringArrayParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*StringParam constructors and destructor*/ +-/*FUNCTION StringParam::StringParam(){{{1*/ ++/*FUNCTION StringParam::StringParam(){{{*/ + StringParam::StringParam(){ + return; + } + /*}}}*/ +-/*FUNCTION StringParam::StringParam(int enum_type,IssmString value){{{1*/ ++/*FUNCTION StringParam::StringParam(int enum_type,IssmString value){{{*/ + StringParam::StringParam(int in_enum_type,char* in_value){ + + enum_type=in_enum_type; +@@ -35,42 +35,42 @@ + + } + /*}}}*/ +-/*FUNCTION StringParam::~StringParam(){{{1*/ ++/*FUNCTION StringParam::~StringParam(){{{*/ + StringParam::~StringParam(){ + xfree((void**)&value); + } + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION StringParam::Echo {{{1*/ ++/*FUNCTION StringParam::Echo {{{*/ + void StringParam::Echo(void){ + this->DeepEcho(); + } + /*}}}*/ +-/*FUNCTION StringParam::DeepEcho{{{1*/ ++/*FUNCTION StringParam::DeepEcho{{{*/ + void StringParam::DeepEcho(void){ + printf("StringParam:\n"); + printf(" enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type)); + printf(" value: %s\n",this->value); + } + /*}}}*/ +-/*FUNCTION StringParam::Id{{{1*/ ++/*FUNCTION StringParam::Id{{{*/ + int StringParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION StringParam::MyRank{{{1*/ ++/*FUNCTION StringParam::MyRank{{{*/ + int StringParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION StringParam::ObjectEnum{{{1*/ ++/*FUNCTION StringParam::ObjectEnum{{{*/ + int StringParam::ObjectEnum(void){ + + return StringParamEnum; + + } + /*}}}*/ +-/*FUNCTION StringParam::copy{{{1*/ ++/*FUNCTION StringParam::copy{{{*/ + Object* StringParam::copy() { + + return new StringParam(this->enum_type,this->value); +@@ -79,7 +79,7 @@ + /*}}}*/ + + /*StringParam virtual functions definitions: */ +-/*FUNCTION StringParam::GetParameterValue{{{1*/ ++/*FUNCTION StringParam::GetParameterValue{{{*/ + void StringParam::GetParameterValue(char** pstring){ + + char* outstring=NULL; +@@ -94,12 +94,12 @@ + + } + /*}}}*/ +-/*FUNCTION StringParam::GetParameterName{{{1*/ ++/*FUNCTION StringParam::GetParameterName{{{*/ + void StringParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION StringParam::SetValue{{{1*/ ++/*FUNCTION StringParam::SetValue{{{*/ + void StringParam::SetValue(char* string){ + + int stringsize; +@@ -114,7 +114,7 @@ + + } + /*}}}*/ +-/*FUNCTION StringParam::UnitConversion{{{1*/ ++/*FUNCTION StringParam::UnitConversion{{{*/ + void StringParam::UnitConversion(int direction_enum){ + /*do nothing, no unit conversion*/ + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/VectorParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _VECTORPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -27,12 +27,12 @@ + Vector* value; + + public: +- /*VectorParam constructors, destructors: {{{1*/ ++ /*VectorParam constructors, destructors: {{{*/ + VectorParam(); + VectorParam(int enum_type,Vector* value); + ~VectorParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -40,7 +40,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("Vector param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("Vector param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*DoubleVecParam constructors and destructor*/ +-/*FUNCTION DoubleVecParam::DoubleVecParam(){{{1*/ ++/*FUNCTION DoubleVecParam::DoubleVecParam(){{{*/ + DoubleVecParam::DoubleVecParam(){ + return; + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::DoubleVecParam(int enum_type,IssmDoubleVec values,int M){{{1*/ ++/*FUNCTION DoubleVecParam::DoubleVecParam(int enum_type,IssmDoubleVec values,int M){{{*/ + DoubleVecParam::DoubleVecParam(int in_enum_type,double* in_values, int in_M){ + + enum_type=in_enum_type; +@@ -35,7 +35,7 @@ + memcpy(values,in_values,M*sizeof(double)); + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::~DoubleVecParam(){{{1*/ ++/*FUNCTION DoubleVecParam::~DoubleVecParam(){{{*/ + DoubleVecParam::~DoubleVecParam(){ + xfree((void**)&values); + return; +@@ -43,7 +43,7 @@ + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION DoubleVecParam::Echo {{{1*/ ++/*FUNCTION DoubleVecParam::Echo {{{*/ + void DoubleVecParam::Echo(void){ + + printf("DoubleVecParam:\n"); +@@ -52,7 +52,7 @@ + + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::DeepEcho{{{1*/ ++/*FUNCTION DoubleVecParam::DeepEcho{{{*/ + void DoubleVecParam::DeepEcho(void){ + + int i; +@@ -65,23 +65,23 @@ + } + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::Id{{{1*/ ++/*FUNCTION DoubleVecParam::Id{{{*/ + int DoubleVecParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION DoubleVecParam::MyRank{{{1*/ ++/*FUNCTION DoubleVecParam::MyRank{{{*/ + int DoubleVecParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::ObjectEnum{{{1*/ ++/*FUNCTION DoubleVecParam::ObjectEnum{{{*/ + int DoubleVecParam::ObjectEnum(void){ + + return DoubleVecParamEnum; + + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::copy{{{1*/ ++/*FUNCTION DoubleVecParam::copy{{{*/ + Object* DoubleVecParam::copy() { + + return new DoubleVecParam(this->enum_type,this->values,this->M); +@@ -90,7 +90,7 @@ + /*}}}*/ + + /*DoubleVecParam virtual functions definitions: */ +-/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ ++/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{*/ + void DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){ + double* output=NULL; + int M; +@@ -104,7 +104,7 @@ + *pdoublearray=output; + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ ++/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{*/ + void DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ + double* output=NULL; + int M; +@@ -121,17 +121,17 @@ + *pdoublearray=output; + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{1*/ ++/*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{*/ + void DoubleVecParam::GetParameterValue(int** pintarray,int* pM){ + _error_("DoubleVec param of enum %i (%s) cannot return an array of int",enum_type,EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::GetParameterName{{{1*/ ++/*FUNCTION DoubleVecParam::GetParameterName{{{*/ + void DoubleVecParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::SetValue{{{1*/ ++/*FUNCTION DoubleVecParam::SetValue{{{*/ + void DoubleVecParam::SetValue(double* doublearray,int in_M){ + + /*avoid leak: */ +@@ -143,7 +143,7 @@ + this->M=in_M; + } + /*}}}*/ +-/*FUNCTION DoubleVecParam::UnitConversion{{{1*/ ++/*FUNCTION DoubleVecParam::UnitConversion{{{*/ + void DoubleVecParam::UnitConversion(int direction_enum){ + ::UnitConversion(this->values,this->M,direction_enum,this->enum_type); + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _DOUBLETRANSIENTMATPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -22,10 +22,10 @@ + class DoubleTransientMatParam: public DoubleMatParam{ + + public: +- /*DoubleTransientMatParam constructors, destructors: {{{1*/ ++ /*DoubleTransientMatParam constructors, destructors: {{{*/ + DoubleTransientMatParam(int enum_type,IssmDouble* value,int M,int N); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + void UnitConversion(int direction_enum); + /*}}}*/ + }; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/MatrixParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _MATRIXPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -27,12 +27,12 @@ + Matrix* value; + + public: +- /*MatrixParam constructors, destructors: {{{1*/ ++ /*MatrixParam constructors, destructors: {{{*/ + MatrixParam(); + MatrixParam(int enum_type,Matrix* value); + ~MatrixParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -40,7 +40,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("Matrix param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("Matrix param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12365) +@@ -17,31 +17,31 @@ + #include "../../include/include.h" + + /*DoubleParam constructors and destructor*/ +-/*FUNCTION DoubleParam::DoubleParam(){{{1*/ ++/*FUNCTION DoubleParam::DoubleParam(){{{*/ + DoubleParam::DoubleParam(){ + return; + } + /*}}}*/ +-/*FUNCTION DoubleParam::DoubleParam(int enum_type,IssmDouble value){{{1*/ ++/*FUNCTION DoubleParam::DoubleParam(int enum_type,IssmDouble value){{{*/ + DoubleParam::DoubleParam(int in_enum_type,IssmDouble in_value){ + + enum_type=in_enum_type; + value=in_value; + } + /*}}}*/ +-/*FUNCTION DoubleParam::~DoubleParam(){{{1*/ ++/*FUNCTION DoubleParam::~DoubleParam(){{{*/ + DoubleParam::~DoubleParam(){ + return; + } + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION DoubleParam::Echo {{{1*/ ++/*FUNCTION DoubleParam::Echo {{{*/ + void DoubleParam::Echo(void){ + this->DeepEcho(); + } + /*}}}*/ +-/*FUNCTION DoubleParam::DeepEcho{{{1*/ ++/*FUNCTION DoubleParam::DeepEcho{{{*/ + void DoubleParam::DeepEcho(void){ + + printf("DoubleParam:\n"); +@@ -49,23 +49,23 @@ + printf(" value: %g\n",this->value); + } + /*}}}*/ +-/*FUNCTION DoubleParam::Id{{{1*/ ++/*FUNCTION DoubleParam::Id{{{*/ + int DoubleParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION DoubleParam::MyRank{{{1*/ ++/*FUNCTION DoubleParam::MyRank{{{*/ + int DoubleParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION DoubleParam::ObjectEnum{{{1*/ ++/*FUNCTION DoubleParam::ObjectEnum{{{*/ + int DoubleParam::ObjectEnum(void){ + + return DoubleParamEnum; + + } + /*}}}*/ +-/*FUNCTION DoubleParam::copy{{{1*/ ++/*FUNCTION DoubleParam::copy{{{*/ + Object* DoubleParam::copy() { + + return new DoubleParam(this->enum_type,this->value); +@@ -74,42 +74,42 @@ + /*}}}*/ + + /*DoubleParam virtual functions definitions: */ +-/*FUNCTION DoubleParam::GetParameterName{{{1*/ ++/*FUNCTION DoubleParam::GetParameterName{{{*/ + void DoubleParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{1*/ ++/*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{*/ + void DoubleParam::GetParameterValue(int* pinteger){ + _error_("Double param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{1*/ ++/*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{*/ + void DoubleParam::GetParameterValue(bool* pbool){ + _error_("Double param of enum %i (%s) cannot return an bool",enum_type,EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{1*/ ++/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{*/ + void DoubleParam::GetParameterValue(int** pintarray,int* pM){ + _error_("Double param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/ ++/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{*/ + void DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){ + _error_("Double param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ ++/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{*/ + void DoubleParam::GetParameterValue(double** pdoublearray,int* pM){ + _error_("Double param of enum %i (%s) cannot return an array of double",enum_type,EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/ ++/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{*/ + void DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ + _error_("Double param of enum %i (%s) cannot return an array of double",enum_type,EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION DoubleParam::UnitConversion{{{1*/ ++/*FUNCTION DoubleParam::UnitConversion{{{*/ + void DoubleParam::UnitConversion(int direction_enum){ + ::UnitConversion(&this->value,1,direction_enum,this->enum_type); + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringArrayParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _STRINGARRAYPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -29,12 +29,12 @@ + + + public: +- /*StringArrayParam constructors, destructors: {{{1*/ ++ /*StringArrayParam constructors, destructors: {{{*/ + StringArrayParam(); + StringArrayParam(int enum_type,char** values, int numstrings); + ~StringArrayParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -42,7 +42,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("StringArray param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("StringArray param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*DoubleMatArrayParam constructors and destructor*/ +-/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(){{{1*/ ++/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(){{{*/ + DoubleMatArrayParam::DoubleMatArrayParam(){ + return; + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array){{{1*/ ++/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array){{{*/ + DoubleMatArrayParam::DoubleMatArrayParam(int in_enum_type,double** in_array, int in_M, int* in_mdim_array, int* in_ndim_array){ + + int i; +@@ -63,7 +63,7 @@ + } + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::~DoubleMatArrayParam(){{{1*/ ++/*FUNCTION DoubleMatArrayParam::~DoubleMatArrayParam(){{{*/ + DoubleMatArrayParam::~DoubleMatArrayParam(){ + + int i; +@@ -83,7 +83,7 @@ + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION DoubleMatArrayParam::Echo {{{1*/ ++/*FUNCTION DoubleMatArrayParam::Echo {{{*/ + void DoubleMatArrayParam::Echo(void){ + + printf("DoubleMatArrayParam:\n"); +@@ -93,7 +93,7 @@ + + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::DeepEcho{{{1*/ ++/*FUNCTION DoubleMatArrayParam::DeepEcho{{{*/ + void DoubleMatArrayParam::DeepEcho(void){ + + int i,j,k; +@@ -117,23 +117,23 @@ + } + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::Id{{{1*/ ++/*FUNCTION DoubleMatArrayParam::Id{{{*/ + int DoubleMatArrayParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::MyRank{{{1*/ ++/*FUNCTION DoubleMatArrayParam::MyRank{{{*/ + int DoubleMatArrayParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::ObjectEnum{{{1*/ ++/*FUNCTION DoubleMatArrayParam::ObjectEnum{{{*/ + int DoubleMatArrayParam::ObjectEnum(void){ + + return DoubleMatArrayParamEnum; + + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::copy{{{1*/ ++/*FUNCTION DoubleMatArrayParam::copy{{{*/ + Object* DoubleMatArrayParam::copy() { + + return new DoubleMatArrayParam(this->enum_type,this->array, this->M, this->mdim_array,this->ndim_array); +@@ -142,7 +142,7 @@ + /*}}}*/ + + /*DoubleMatArrayParam virtual functions definitions: */ +-/*FUNCTION DoubleMatArrayParam::GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){{{1*/ ++/*FUNCTION DoubleMatArrayParam::GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){{{*/ + void DoubleMatArrayParam::GetParameterValue(double*** pout_array, int* pout_M,int** pout_mdim_array, int** pout_ndim_array){ + + int i,m,n; +@@ -195,12 +195,12 @@ + + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::GetParameterName{{{1*/ ++/*FUNCTION DoubleMatArrayParam::GetParameterName{{{*/ + void DoubleMatArrayParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::SetValue(double** array, int M, int* mdim_array, int* ndim_array){{{1*/ ++/*FUNCTION DoubleMatArrayParam::SetValue(double** array, int M, int* mdim_array, int* ndim_array){{{*/ + void DoubleMatArrayParam::SetValue(double** in_array, int in_M, int* in_mdim_array, int* in_ndim_array){ + + int i,m,n; +@@ -238,7 +238,7 @@ + + } + /*}}}*/ +-/*FUNCTION DoubleMatArrayParam::UnitConversion{{{1*/ ++/*FUNCTION DoubleMatArrayParam::UnitConversion{{{*/ + void DoubleMatArrayParam::UnitConversion(int direction_enum){ + /*go through all matrices and convert: */ + for (int i=0;iM;i++){ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/StringParam.h (revision 12365) +@@ -7,7 +7,7 @@ + #define _STRINGPARAM_H_ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -27,12 +27,12 @@ + char* value; + + public: +- /*StringParam constructors, destructors: {{{1*/ ++ /*StringParam constructors, destructors: {{{*/ + StringParam(); + StringParam(int enum_type,char* value); + ~StringParam(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1 */ ++ /*Object virtual functions definitions:{{{ */ + void Echo(); + void DeepEcho(); + int Id(); +@@ -40,7 +40,7 @@ + int ObjectEnum(); + Object* copy(); + /*}}}*/ +- /*Param vritual function definitions: {{{1*/ ++ /*Param vritual function definitions: {{{*/ + int InstanceEnum(){return enum_type;} + void GetParameterValue(bool* pbool){_error_("String param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} + void GetParameterValue(int* pinteger){_error_("String param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*header files: */ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,12 +20,12 @@ + /*}}}*/ + + /*DoubleMatParam constructors and destructor*/ +-/*FUNCTION DoubleMatParam::DoubleMatParam(){{{1*/ ++/*FUNCTION DoubleMatParam::DoubleMatParam(){{{*/ + DoubleMatParam::DoubleMatParam(){ + return; + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::DoubleMatParam(int enum_type,IssmDoubleMat value){{{1*/ ++/*FUNCTION DoubleMatParam::DoubleMatParam(int enum_type,IssmDoubleMat value){{{*/ + DoubleMatParam::DoubleMatParam(int in_enum_type,double* in_value, int in_M,int in_N){ + + enum_type=in_enum_type; +@@ -36,7 +36,7 @@ + memcpy(value,in_value,M*N*sizeof(double)); + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::~DoubleMatParam(){{{1*/ ++/*FUNCTION DoubleMatParam::~DoubleMatParam(){{{*/ + DoubleMatParam::~DoubleMatParam(){ + xfree((void**)&value); + return; +@@ -44,7 +44,7 @@ + /*}}}*/ + + /*Object virtual functions definitions:*/ +-/*FUNCTION DoubleMatParam::Echo {{{1*/ ++/*FUNCTION DoubleMatParam::Echo {{{*/ + void DoubleMatParam::Echo(void){ + + printf("DoubleMatParam:\n"); +@@ -53,7 +53,7 @@ + + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::DeepEcho{{{1*/ ++/*FUNCTION DoubleMatParam::DeepEcho{{{*/ + void DoubleMatParam::DeepEcho(void){ + + int i,j; +@@ -68,23 +68,23 @@ + } + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::Id{{{1*/ ++/*FUNCTION DoubleMatParam::Id{{{*/ + int DoubleMatParam::Id(void){ return -1; } + /*}}}*/ +-/*FUNCTION DoubleMatParam::MyRank{{{1*/ ++/*FUNCTION DoubleMatParam::MyRank{{{*/ + int DoubleMatParam::MyRank(void){ + extern int my_rank; + return my_rank; + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::ObjectEnum{{{1*/ ++/*FUNCTION DoubleMatParam::ObjectEnum{{{*/ + int DoubleMatParam::ObjectEnum(void){ + + return DoubleMatParamEnum; + + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::copy{{{1*/ ++/*FUNCTION DoubleMatParam::copy{{{*/ + Object* DoubleMatParam::copy() { + + return new DoubleMatParam(this->enum_type,this->value,this->M,this->N); +@@ -93,7 +93,7 @@ + /*}}}*/ + + /*DoubleMatParam virtual functions definitions: */ +-/*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/ ++/*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{*/ + void DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ + double* output=NULL; + +@@ -106,17 +106,17 @@ + *pdoublearray=output; + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/ ++/*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{*/ + void DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){ + _error_("DoubleMat of enum %i (%s) cannot return an array of int",enum_type,EnumToStringx(enum_type)); + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::GetParameterName{{{1*/ ++/*FUNCTION DoubleMatParam::GetParameterName{{{*/ + void DoubleMatParam::GetParameterName(char**pname){ + EnumToStringx(pname,this->enum_type); + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::SetValue{{{1*/ ++/*FUNCTION DoubleMatParam::SetValue{{{*/ + void DoubleMatParam::SetValue(double* doublearray,int in_M,int in_N){ + + /*avoid leak: */ +@@ -129,14 +129,14 @@ + this->N=in_N; + } + /*}}}*/ +-/*FUNCTION DoubleMatParam::UnitConversion{{{1*/ ++/*FUNCTION DoubleMatParam::UnitConversion{{{*/ + void DoubleMatParam::UnitConversion(int direction_enum){ + ::UnitConversion(this->value,this->M*this->N,direction_enum,this->enum_type); + } + /*}}}*/ + + /*diverse: */ +-/*FUNCTION DoubleMatParam::GetPointer{{{1*/ ++/*FUNCTION DoubleMatParam::GetPointer{{{*/ + double* DoubleMatParam::GetPointer(void){ + return this->value; + } +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Geometry.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Geometry.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Geometry.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -19,14 +19,14 @@ + /*}}}*/ + + /*Constructors/destructor/copy*/ +-/*FUNCTION KML_Geometry::KML_Geometry(){{{1*/ ++/*FUNCTION KML_Geometry::KML_Geometry(){{{*/ + KML_Geometry::KML_Geometry(){ + + ; + + } + /*}}}*/ +-/*FUNCTION KML_Geometry::~KML_Geometry(){{{1*/ ++/*FUNCTION KML_Geometry::~KML_Geometry(){{{*/ + KML_Geometry::~KML_Geometry(){ + + ; +@@ -35,7 +35,7 @@ + /*}}}*/ + + /*Other*/ +-/*FUNCTION KML_Geometry::Echo {{{1*/ ++/*FUNCTION KML_Geometry::Echo {{{*/ + void KML_Geometry::Echo(){ + + this->KML_Object::Echo(); +@@ -44,7 +44,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_Geometry::DeepEcho {{{1*/ ++/*FUNCTION KML_Geometry::DeepEcho {{{*/ + void KML_Geometry::DeepEcho(){ + + char indent[81]=""; +@@ -55,7 +55,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_Geometry::DeepEcho {{{1*/ ++/*FUNCTION KML_Geometry::DeepEcho {{{*/ + void KML_Geometry::DeepEcho(const char* indent){ + + this->KML_Object::DeepEcho(indent); +@@ -64,7 +64,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_Geometry::Write {{{1*/ ++/*FUNCTION KML_Geometry::Write {{{*/ + void KML_Geometry::Write(FILE* filout,const char* indent){ + + KML_Object::Write(filout,indent); +@@ -73,7 +73,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_Geometry::Read {{{1*/ ++/*FUNCTION KML_Geometry::Read {{{*/ + void KML_Geometry::Read(FILE* fid,char* kstr){ + + /* process field within opening and closing tags */ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Icon.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Icon.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Icon.h (revision 12365) +@@ -12,7 +12,7 @@ + #define KML_ICON_HQUERY_LENGTH 800 + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #include "../../include/include.h" + #include "../../shared/Exceptions/exceptions.h" + #include "../../EnumDefinitions/EnumDefinitions.h" +@@ -33,11 +33,11 @@ + char vformat[KML_ICON_VFORMAT_LENGTH+1]; + char hquery[KML_ICON_HQUERY_LENGTH+1]; + +- /*KML_Icon constructors, destructors {{{1*/ ++ /*KML_Icon constructors, destructors {{{*/ + KML_Icon(); + ~KML_Icon(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1*/ ++ /*Object virtual functions definitions:{{{*/ + void Echo(); + void DeepEcho(); + void DeepEcho(const char* indent); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Point.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Point.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Point.h (revision 12365) +@@ -8,7 +8,7 @@ + #define KML_POINT_ALTMODE_LENGTH 18 + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #include "../../include/include.h" + #include "../../shared/Exceptions/exceptions.h" + #include "../../EnumDefinitions/EnumDefinitions.h" +@@ -24,11 +24,11 @@ + char altmode[KML_POINT_ALTMODE_LENGTH+1]; + double coords[3]; + +- /*KML_Point constructors, destructors {{{1*/ ++ /*KML_Point constructors, destructors {{{*/ + KML_Point(); + ~KML_Point(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1*/ ++ /*Object virtual functions definitions:{{{*/ + void Echo(); + void DeepEcho(); + void DeepEcho(const char* indent); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_LinearRing.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_LinearRing.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_LinearRing.h (revision 12365) +@@ -8,7 +8,7 @@ + #define KML_LINEARRING_ALTMODE_LENGTH 18 + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #include "../../include/include.h" + #include "../../shared/Exceptions/exceptions.h" + #include "../../EnumDefinitions/EnumDefinitions.h" +@@ -26,11 +26,11 @@ + int ncoord; + double (*coords)[3]; + +- /*KML_LinearRing constructors, destructors {{{1*/ ++ /*KML_LinearRing constructors, destructors {{{*/ + KML_LinearRing(); + ~KML_LinearRing(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1*/ ++ /*Object virtual functions definitions:{{{*/ + void Echo(); + void DeepEcho(); + void DeepEcho(const char* indent); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,7 +20,7 @@ + /*}}}*/ + + /*Constructors/destructor/copy*/ +-/*FUNCTION KML_ColorStyle::KML_ColorStyle(){{{1*/ ++/*FUNCTION KML_ColorStyle::KML_ColorStyle(){{{*/ + KML_ColorStyle::KML_ColorStyle(){ + + strcpy(color ,"ffffffff"); +@@ -28,7 +28,7 @@ + + } + /*}}}*/ +-/*FUNCTION KML_ColorStyle::~KML_ColorStyle(){{{1*/ ++/*FUNCTION KML_ColorStyle::~KML_ColorStyle(){{{*/ + KML_ColorStyle::~KML_ColorStyle(){ + + ; +@@ -37,7 +37,7 @@ + /*}}}*/ + + /*Other*/ +-/*FUNCTION KML_ColorStyle::Echo {{{1*/ ++/*FUNCTION KML_ColorStyle::Echo {{{*/ + void KML_ColorStyle::Echo(){ + + bool flag=true; +@@ -50,7 +50,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_ColorStyle::DeepEcho {{{1*/ ++/*FUNCTION KML_ColorStyle::DeepEcho {{{*/ + void KML_ColorStyle::DeepEcho(){ + + char indent[81]=""; +@@ -60,7 +60,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_ColorStyle::DeepEcho {{{1*/ ++/*FUNCTION KML_ColorStyle::DeepEcho {{{*/ + void KML_ColorStyle::DeepEcho(const char* indent){ + + bool flag=true; +@@ -73,7 +73,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_ColorStyle::Write {{{1*/ ++/*FUNCTION KML_ColorStyle::Write {{{*/ + void KML_ColorStyle::Write(FILE* filout,const char* indent){ + + KML_SubStyle::Write(filout,indent); +@@ -86,7 +86,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_ColorStyle::Read {{{1*/ ++/*FUNCTION KML_ColorStyle::Read {{{*/ + void KML_ColorStyle::Read(FILE* fid,char* kstr){ + + /* process field within opening and closing tags */ +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Placemark.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Placemark.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Placemark.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,14 +20,14 @@ + /*}}}*/ + + /*Constructors/destructor/copy*/ +-/*FUNCTION KML_Placemark::KML_Placemark(){{{1*/ ++/*FUNCTION KML_Placemark::KML_Placemark(){{{*/ + KML_Placemark::KML_Placemark(){ + + geometry =new DataSet; + + } + /*}}}*/ +-/*FUNCTION KML_Placemark::~KML_Placemark(){{{1*/ ++/*FUNCTION KML_Placemark::~KML_Placemark(){{{*/ + KML_Placemark::~KML_Placemark(){ + + if (geometry) { +@@ -39,7 +39,7 @@ + /*}}}*/ + + /*Other*/ +-/*FUNCTION KML_Placemark::Echo {{{1*/ ++/*FUNCTION KML_Placemark::Echo {{{*/ + void KML_Placemark::Echo(){ + + bool flag=true; +@@ -52,7 +52,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Placemark::DeepEcho {{{1*/ ++/*FUNCTION KML_Placemark::DeepEcho {{{*/ + void KML_Placemark::DeepEcho(){ + + char indent[81]=""; +@@ -62,7 +62,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Placemark::DeepEcho {{{1*/ ++/*FUNCTION KML_Placemark::DeepEcho {{{*/ + void KML_Placemark::DeepEcho(const char* indent){ + + int i; +@@ -89,7 +89,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Placemark::Write {{{1*/ ++/*FUNCTION KML_Placemark::Write {{{*/ + void KML_Placemark::Write(FILE* filout,const char* indent){ + + int i; +@@ -116,7 +116,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Placemark::Read {{{1*/ ++/*FUNCTION KML_Placemark::Read {{{*/ + void KML_Placemark::Read(FILE* fid,char* kstr){ + + char* kstri; +@@ -188,7 +188,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Placemark::WriteExp {{{1*/ ++/*FUNCTION KML_Placemark::WriteExp {{{*/ + void KML_Placemark::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ + + int i; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Unknown.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,7 +20,7 @@ + /*}}}*/ + + /*Constructors/destructor/copy*/ +-/*FUNCTION KML_Unknown::KML_Unknown(){{{1*/ ++/*FUNCTION KML_Unknown::KML_Unknown(){{{*/ + KML_Unknown::KML_Unknown(){ + + name =NULL; +@@ -28,7 +28,7 @@ + + } + /*}}}*/ +-/*FUNCTION KML_Unknown::~KML_Unknown(){{{1*/ ++/*FUNCTION KML_Unknown::~KML_Unknown(){{{*/ + KML_Unknown::~KML_Unknown(){ + + if (name ) xfree((void**)&name); +@@ -38,7 +38,7 @@ + /*}}}*/ + + /*Other*/ +-/*FUNCTION KML_Unknown::Echo {{{1*/ ++/*FUNCTION KML_Unknown::Echo {{{*/ + void KML_Unknown::Echo(){ + + bool flag=true; +@@ -54,7 +54,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Unknown::DeepEcho {{{1*/ ++/*FUNCTION KML_Unknown::DeepEcho {{{*/ + void KML_Unknown::DeepEcho(){ + + char indent[81]=""; +@@ -64,7 +64,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Unknown::DeepEcho {{{1*/ ++/*FUNCTION KML_Unknown::DeepEcho {{{*/ + void KML_Unknown::DeepEcho(const char* indent){ + + char* valuei; +@@ -94,7 +94,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Unknown::Write {{{1*/ ++/*FUNCTION KML_Unknown::Write {{{*/ + void KML_Unknown::Write(FILE* filout,const char* indent){ + + char* valuei; +@@ -126,7 +126,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Unknown::Read {{{1*/ ++/*FUNCTION KML_Unknown::Read {{{*/ + void KML_Unknown::Read(FILE* fid,char* kstr){ + + char* kstri; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,7 +20,7 @@ + /*}}}*/ + + /*Constructors/destructor/copy*/ +-/*FUNCTION KML_GroundOverlay::KML_GroundOverlay(){{{1*/ ++/*FUNCTION KML_GroundOverlay::KML_GroundOverlay(){{{*/ + KML_GroundOverlay::KML_GroundOverlay(){ + + altitude = 0.; +@@ -30,7 +30,7 @@ + + } + /*}}}*/ +-/*FUNCTION KML_GroundOverlay::~KML_GroundOverlay(){{{1*/ ++/*FUNCTION KML_GroundOverlay::~KML_GroundOverlay(){{{*/ + KML_GroundOverlay::~KML_GroundOverlay(){ + + if (llbox) { +@@ -42,7 +42,7 @@ + /*}}}*/ + + /*Other*/ +-/*FUNCTION KML_GroundOverlay::Echo {{{1*/ ++/*FUNCTION KML_GroundOverlay::Echo {{{*/ + void KML_GroundOverlay::Echo(){ + + bool flag=true; +@@ -58,7 +58,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_GroundOverlay::DeepEcho {{{1*/ ++/*FUNCTION KML_GroundOverlay::DeepEcho {{{*/ + void KML_GroundOverlay::DeepEcho(){ + + char indent[81]=""; +@@ -69,7 +69,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_GroundOverlay::DeepEcho {{{1*/ ++/*FUNCTION KML_GroundOverlay::DeepEcho {{{*/ + void KML_GroundOverlay::DeepEcho(const char* indent){ + + char indent2[81]; +@@ -92,7 +92,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_GroundOverlay::Write {{{1*/ ++/*FUNCTION KML_GroundOverlay::Write {{{*/ + void KML_GroundOverlay::Write(FILE* filout,const char* indent){ + + char indent2[81]; +@@ -119,7 +119,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_GroundOverlay::Read {{{1*/ ++/*FUNCTION KML_GroundOverlay::Read {{{*/ + void KML_GroundOverlay::Read(FILE* fid,char* kstr){ + + char* kstri; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Feature.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Feature.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Feature.h (revision 12365) +@@ -11,7 +11,7 @@ + #define KML_FEATURE_STYLEURL_LENGTH 80 + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #include "../../include/include.h" + #include "../../shared/Exceptions/exceptions.h" + #include "../../EnumDefinitions/EnumDefinitions.h" +@@ -33,11 +33,11 @@ + char styleurl[KML_FEATURE_STYLEURL_LENGTH+1]; + DataSet* style; + +- /*KML_Feature constructors, destructors {{{1*/ ++ /*KML_Feature constructors, destructors {{{*/ + KML_Feature(); + ~KML_Feature(); + /*}}}*/ +- /*Object virtual functions definitions:{{{1*/ ++ /*Object virtual functions definitions:{{{*/ + void Echo(); + void DeepEcho(); + void DeepEcho(const char* indent); +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Style.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Style.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Style.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,7 +20,7 @@ + /*}}}*/ + + /*Constructors/destructor/copy*/ +-/*FUNCTION KML_Style::KML_Style(){{{1*/ ++/*FUNCTION KML_Style::KML_Style(){{{*/ + KML_Style::KML_Style(){ + + icon =NULL; +@@ -32,7 +32,7 @@ + + } + /*}}}*/ +-/*FUNCTION KML_Style::~KML_Style(){{{1*/ ++/*FUNCTION KML_Style::~KML_Style(){{{*/ + KML_Style::~KML_Style(){ + + if (list) { +@@ -68,7 +68,7 @@ + /*}}}*/ + + /*Other*/ +-/*FUNCTION KML_Style::Echo {{{1*/ ++/*FUNCTION KML_Style::Echo {{{*/ + void KML_Style::Echo(){ + + bool flag=true; +@@ -87,7 +87,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_Style::DeepEcho {{{1*/ ++/*FUNCTION KML_Style::DeepEcho {{{*/ + void KML_Style::DeepEcho(){ + + char indent[81]=""; +@@ -98,7 +98,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_Style::DeepEcho {{{1*/ ++/*FUNCTION KML_Style::DeepEcho {{{*/ + void KML_Style::DeepEcho(const char* indent){ + + char indent2[81]; +@@ -139,7 +139,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_Style::Write {{{1*/ ++/*FUNCTION KML_Style::Write {{{*/ + void KML_Style::Write(FILE* filout,const char* indent){ + + char indent2[81]; +@@ -174,7 +174,7 @@ + } + /*}}}*/ + +-/*FUNCTION KML_Style::Read {{{1*/ ++/*FUNCTION KML_Style::Read {{{*/ + void KML_Style::Read(FILE* fid,char* kstr){ + + char* kstri; +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KMLFileReadUtils.h +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KMLFileReadUtils.h (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KMLFileReadUtils.h (revision 12365) +@@ -5,7 +5,7 @@ + #ifndef _KMLFILEREADUTILS_H + #define _KMLFILEREADUTILS_H + +-/*Headers:{{{1*/ ++/*Headers:{{{*/ + #include "../../include/include.h" + #include "../../shared/Exceptions/exceptions.h" + #include "../../EnumDefinitions/EnumDefinitions.h" +Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Comment.cpp +=================================================================== +--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Comment.cpp (revision 12364) ++++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/objects/KML/KML_Comment.cpp (revision 12365) +@@ -3,7 +3,7 @@ + */ + + /*Headers:*/ +-/*{{{1*/ ++/*{{{*/ + #ifdef HAVE_CONFIG_H + #include + #else +@@ -20,14 +20,14 @@ + /*}}}*/ + + /*Constructors/destructor/copy*/ +-/*FUNCTION KML_Comment::KML_Comment(){{{1*/ ++/*FUNCTION KML_Comment::KML_Comment(){{{*/ + KML_Comment::KML_Comment(){ + + value =NULL; + + } + /*}}}*/ +-/*FUNCTION KML_Comment::~KML_Comment(){{{1*/ ++/*FUNCTION KML_Comment::~KML_Comment(){{{*/ + KML_Comment::~KML_Comment(){ + + if (value ) xfree((void**)&value); +@@ -36,7 +36,7 @@ + /*}}}*/ + + /*Other*/ +-/*FUNCTION KML_Comment::Echo {{{1*/ ++/*FUNCTION KML_Comment::Echo {{{*/ + void KML_Comment::Echo(){ + + bool flag=true; +@@ -47,7 +47,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Comment::DeepEcho {{{1*/ ++/*FUNCTION KML_Comment::DeepEcho {{{*/ + void KML_Comment::DeepEcho(){ + + char indent[81]=""; +@@ -57,7 +57,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Comment::DeepEcho {{{1*/ ++/*FUNCTION KML_Comment::DeepEcho {{{*/ + void KML_Comment::DeepEcho(const char* indent){ + + bool flag=true; +@@ -68,7 +68,7 @@ + return; + } + /*}}}*/ +-/*FUNCTION KML_Comment::Write {{{1*/ ++/*FUNCTION KML_Comment::Write {{{*/ + void KML_Comment::Write(FILE* filout,const char* indent){ + + if (strncmp(&value[0] ,"