Index: ../trunk-jpl/src/c/include/types.h =================================================================== --- ../trunk-jpl/src/c/include/types.h (revision 13413) +++ ../trunk-jpl/src/c/include/types.h (revision 13414) @@ -39,6 +39,4 @@ typedef IssmDouble IssmPDouble; #endif -typedef bool IssmBool; - #endif //ifndef _TYPES_H_ Index: ../trunk-jpl/src/c/classes/objects/Contour.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Contour.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Contour.h (revision 13414) @@ -82,12 +82,6 @@ return id; } /*}}}*/ - /*FUNCTION MyRank{{{*/ - int MyRank(void){ - extern int my_rank; - return my_rank; - } - /*}}}*/ /*FUNCTION ObjectEnum{{{*/ int ObjectEnum(void){ return ContourEnum; Index: ../trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp (revision 13414) @@ -81,12 +81,6 @@ /*FUNCTION Matdamageice::Id {{{*/ int Matdamageice::Id(void){ return mid; } /*}}}*/ -/*FUNCTION Matdamageice::MyRank {{{*/ -int Matdamageice::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Matdamageice::ObjectEnum{{{*/ int Matdamageice::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Materials/Matice.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Materials/Matice.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Materials/Matice.cpp (revision 13414) @@ -81,12 +81,6 @@ /*FUNCTION Matice::Id {{{*/ int Matice::Id(void){ return mid; } /*}}}*/ -/*FUNCTION Matice::MyRank {{{*/ -int Matice::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Matice::ObjectEnum{{{*/ int Matice::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 13414) @@ -84,12 +84,6 @@ /*FUNCTION Matpar::Id {{{*/ int Matpar::Id(void){ return mid; } /*}}}*/ -/*FUNCTION Matpar::MyRank {{{*/ -int Matpar::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Matpar::ObjectEnum{{{*/ int Matpar::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Materials/Matdamageice.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Materials/Matdamageice.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Materials/Matdamageice.h (revision 13414) @@ -27,7 +27,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Materials/Matice.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Materials/Matice.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Materials/Matice.h (revision 13414) @@ -14,8 +14,8 @@ class Matice: public Material{ private: - int mid; - Hook* helement; + int mid; + Hook *helement; public: /*Matice constructors, destructors: {{{*/ @@ -27,7 +27,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Materials/Matpar.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 13414) @@ -42,12 +42,11 @@ ~Matpar(); /*Object virtual functions definitions:{{{ */ - void Echo(); - void DeepEcho(); - int Id(); - int MyRank(); - int ObjectEnum(); - Object* copy(); + void Echo(); + void DeepEcho(); + int Id(); + int ObjectEnum(); + Object *copy(); /*}}}*/ /*Update virtual functions resolution: {{{*/ void InputUpdateFromVector(IssmDouble* vector, int name, int type); Index: ../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.h (revision 13414) @@ -28,7 +28,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13414) @@ -83,12 +83,6 @@ /*FUNCTION ControlInput::Id{{{*/ int ControlInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION ControlInput::MyRank{{{*/ -int ControlInput::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION ControlInput::ObjectEnum{{{*/ int ControlInput::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/ControlInput.h (revision 13414) @@ -33,7 +33,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13414) @@ -54,12 +54,6 @@ /*FUNCTION DatasetInput::Id{{{*/ int DatasetInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DatasetInput::MyRank{{{*/ -int DatasetInput::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION DatasetInput::ObjectEnum{{{*/ int DatasetInput::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.h (revision 13414) @@ -16,10 +16,9 @@ class DatasetInput: public Input{ public: - int enum_type; + int enum_type; + Inputs *inputs; - Inputs* inputs; - /*DatasetInput constructors, destructors: {{{*/ DatasetInput(); DatasetInput(int enum_type); @@ -29,7 +28,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 13414) @@ -47,12 +47,6 @@ /*FUNCTION IntInput::Id{{{*/ int IntInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntInput::MyRank{{{*/ -int IntInput::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION IntInput::ObjectEnum{{{*/ int IntInput::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 13414) @@ -22,8 +22,8 @@ return; } /*}}}*/ -/*FUNCTION BoolInput::BoolInput(IssmDouble* values){{{*/ -BoolInput::BoolInput(int in_enum_type,IssmBool in_value){ +/*FUNCTION BoolInput::BoolInput(int in_enum_type,bool in_value){{{*/ +BoolInput::BoolInput(int in_enum_type,bool in_value){ enum_type=in_enum_type; value=in_value; @@ -52,12 +52,6 @@ /*FUNCTION BoolInput::Id{{{*/ int BoolInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION BoolInput::MyRank{{{*/ -int BoolInput::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION BoolInput::ObjectEnum{{{*/ int BoolInput::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Inputs/IntInput.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/IntInput.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/IntInput.h (revision 13414) @@ -29,7 +29,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/BoolInput.h (revision 13414) @@ -17,21 +17,20 @@ public: /*just hold 3 values for 3 vertices: */ - int enum_type; - IssmBool value; + int enum_type; + bool value; /*BoolInput constructors, destructors: {{{*/ BoolInput(); - BoolInput(int enum_type,IssmBool value); + BoolInput(int enum_type,bool value); ~BoolInput(); /*}}}*/ /*Object virtual functions definitions:{{{ */ - void Echo(); - void DeepEcho(); - int Id(); - int MyRank(); - int ObjectEnum(); - Object* copy(); + void Echo(); + void DeepEcho(); + int Id(); + int ObjectEnum(); + Object *copy(); /*}}}*/ /*BoolInput management: {{{*/ int InstanceEnum(); Index: ../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13414) @@ -63,12 +63,6 @@ /*FUNCTION TriaP1Input::Id{{{*/ int TriaP1Input::Id(void){ return -1; } /*}}}*/ -/*FUNCTION TriaP1Input::MyRank{{{*/ -int TriaP1Input::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION TriaP1Input::ObjectEnum{{{*/ int TriaP1Input::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.h (revision 13414) @@ -17,7 +17,7 @@ public: /*just hold 3 values for 3 vertices: */ - int enum_type; + int enum_type; IssmDouble values[3]; /*TriaP1Input constructors, destructors: {{{*/ @@ -26,12 +26,11 @@ ~TriaP1Input(); /*}}}*/ /*Object virtual functions definitions:{{{ */ - void Echo(); - void DeepEcho(); - int Id(); - int MyRank(); - int ObjectEnum(); - Object* copy(); + void Echo(); + void DeepEcho(); + int Id(); + int ObjectEnum(); + Object *copy(); /*}}}*/ /*TriaP1Input management: {{{*/ int InstanceEnum(); Index: ../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 13414) @@ -78,12 +78,6 @@ /*FUNCTION TransientInput::Id{{{*/ int TransientInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION TransientInput::MyRank{{{*/ -int TransientInput::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION TransientInput::ObjectEnum{{{*/ int TransientInput::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 13414) @@ -63,12 +63,6 @@ /*FUNCTION PentaP1Input::Id{{{*/ int PentaP1Input::Id(void){ return -1; } /*}}}*/ -/*FUNCTION PentaP1Input::MyRank{{{*/ -int PentaP1Input::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION PentaP1Input::ObjectEnum{{{*/ int PentaP1Input::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 13414) @@ -52,12 +52,6 @@ /*FUNCTION DoubleInput::Id{{{*/ int DoubleInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleInput::MyRank{{{*/ -int DoubleInput::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION DoubleInput::ObjectEnum{{{*/ int DoubleInput::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/TransientInput.h (revision 13414) @@ -16,11 +16,11 @@ class TransientInput: public Input{ public: - int enum_type; - int numtimesteps; - Inputs* inputs; - IssmDouble* timesteps; - Parameters* parameters; //to find current time. + int enum_type; + int numtimesteps; + Inputs *inputs; + IssmDouble *timesteps; + Parameters *parameters; //to find current time. /*TransientInput constructors, destructors: {{{*/ TransientInput(); @@ -32,7 +32,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.h (revision 13414) @@ -17,7 +17,7 @@ public: /*just hold 6 values for 6 vertices: */ - int enum_type; + int enum_type; IssmDouble values[6]; /*PentaP1Input constructors, destructors: {{{*/ @@ -26,12 +26,11 @@ ~PentaP1Input(); /*}}}*/ /*Object virtual functions definitions:{{{ */ - void Echo(); - void DeepEcho(); - int Id(); - int MyRank(); - int ObjectEnum(); - Object* copy(); + void Echo(); + void DeepEcho(); + int Id(); + int ObjectEnum(); + Object *copy(); /*}}}*/ /*PentaP1Input management: {{{*/ int InstanceEnum(); Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Icon.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Icon.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Icon.h (revision 13414) @@ -44,10 +44,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Point.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Point.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Point.h (revision 13414) @@ -36,10 +36,6 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_LinearRing.h (revision 13414) @@ -38,10 +38,6 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Feature.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Feature.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Feature.h (revision 13414) @@ -44,10 +44,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.h (revision 13414) @@ -29,10 +29,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.h (revision 13414) @@ -35,10 +35,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Attribute.h (revision 13414) @@ -30,10 +30,6 @@ virtual void DeepEcho(); virtual void DeepEcho(const char* indent); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_PolyStyle.h (revision 13414) @@ -32,10 +32,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Object.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Object.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Object.h (revision 13414) @@ -31,10 +31,6 @@ virtual void DeepEcho(); virtual void DeepEcho(const char* indent); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.h (revision 13414) @@ -29,10 +29,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_LineString.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_LineString.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_LineString.h (revision 13414) @@ -38,10 +38,6 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Overlay.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Overlay.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Overlay.h (revision 13414) @@ -36,10 +36,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Container.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Container.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Container.h (revision 13414) @@ -33,10 +33,6 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Polygon.h (revision 13414) @@ -40,10 +40,6 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Geometry.h (revision 13414) @@ -29,10 +29,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_ColorStyle.h (revision 13414) @@ -35,9 +35,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Placemark.h (revision 13414) @@ -34,10 +34,6 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Unknown.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Unknown.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Unknown.h (revision 13414) @@ -32,10 +32,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_GroundOverlay.h (revision 13414) @@ -36,10 +36,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Style.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Style.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Style.h (revision 13414) @@ -38,10 +38,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Comment.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Comment.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Comment.h (revision 13414) @@ -30,10 +30,6 @@ virtual void DeepEcho(); virtual void DeepEcho(const char* indent); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_MultiGeometry.h (revision 13414) @@ -34,10 +34,6 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_LineStyle.h (revision 13414) @@ -31,10 +31,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Folder.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Folder.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Folder.h (revision 13414) @@ -30,10 +30,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_Document.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_Document.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_Document.h (revision 13414) @@ -30,10 +30,6 @@ void Write(FILE* fid,const char* indent); void Read(FILE* fid,char* kstr); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/KML/KML_File.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/KML/KML_File.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/KML/KML_File.h (revision 13414) @@ -31,10 +31,6 @@ void Read(FILE* fid,char* kstr); void WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp); int Id(){_error_("Not implemented yet.");}; - int MyRank(){_error_("Not implemented yet.");}; - void Marshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int MarshallSize(){_error_("Not implemented yet.");}; - void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.h (revision 13414) @@ -22,9 +22,9 @@ class DoubleVecParam: public Param{ private: - int enum_type; - IssmDouble* values; - int M; + int enum_type; + IssmDouble *values; + int M; public: /*DoubleVecParam constructors, destructors: {{{*/ @@ -36,7 +36,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.h (revision 13414) @@ -22,10 +22,10 @@ class DoubleMatParam: public Param{ protected: - int enum_type; - IssmDouble* value; - int M; - int N; + int enum_type; + IssmDouble *value; + int M; + int N; public: /*DoubleMatParam constructors, destructors: {{{*/ @@ -37,7 +37,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/GenericParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/GenericParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/GenericParam.h (revision 13414) @@ -48,7 +48,6 @@ } void Echo() {DeepEcho();}; int Id(){ return -1; }; - int MyRank() { extern int my_rank; return my_rank;} ; int ObjectEnum() {return AdolcParamEnum;}; // the "copy" has to implement the base class abstract function Index: ../trunk-jpl/src/c/classes/objects/Params/FileParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/FileParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/FileParam.h (revision 13414) @@ -35,7 +35,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp (revision 13414) @@ -84,12 +84,6 @@ /*FUNCTION IntVecParam::Id{{{*/ int IntVecParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntVecParam::MyRank{{{*/ -int IntVecParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION IntVecParam::ObjectEnum{{{*/ int IntVecParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp (revision 13414) @@ -25,8 +25,8 @@ return; } /*}}}*/ -/*FUNCTION BoolParam::BoolParam(int enum_type,IssmBool value){{{*/ -BoolParam::BoolParam(int in_enum_type,IssmBool in_value){ +/*FUNCTION BoolParam::BoolParam(int enum_type,bool value){{{*/ +BoolParam::BoolParam(int in_enum_type,bool in_value){ enum_type=in_enum_type; value=in_value; @@ -55,12 +55,6 @@ /*FUNCTION BoolParam::Id{{{*/ int BoolParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION BoolParam::MyRank{{{*/ -int BoolParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION BoolParam::ObjectEnum{{{*/ int BoolParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp (revision 13414) @@ -71,12 +71,6 @@ /*FUNCTION IntMatParam::Id{{{*/ int IntMatParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntMatParam::MyRank{{{*/ -int IntMatParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION IntMatParam::ObjectEnum{{{*/ int IntMatParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/IntParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/IntParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/IntParam.h (revision 13414) @@ -36,7 +36,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/StringParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/StringParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/StringParam.cpp (revision 13414) @@ -57,12 +57,6 @@ /*FUNCTION StringParam::Id{{{*/ int StringParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION StringParam::MyRank{{{*/ -int StringParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION StringParam::ObjectEnum{{{*/ int StringParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/VectorParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/VectorParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/VectorParam.h (revision 13414) @@ -36,7 +36,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp (revision 13414) @@ -68,12 +68,6 @@ /*FUNCTION DoubleVecParam::Id{{{*/ int DoubleVecParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleVecParam::MyRank{{{*/ -int DoubleVecParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION DoubleVecParam::ObjectEnum{{{*/ int DoubleVecParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/MatrixParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/MatrixParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/MatrixParam.h (revision 13414) @@ -36,7 +36,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/StringArrayParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/StringArrayParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/StringArrayParam.h (revision 13414) @@ -38,7 +38,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp (revision 13414) @@ -71,12 +71,6 @@ /*FUNCTION DoubleMatParam::Id{{{*/ int DoubleMatParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleMatParam::MyRank{{{*/ -int DoubleMatParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION DoubleMatParam::ObjectEnum{{{*/ int DoubleMatParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/TransientParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/TransientParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/TransientParam.h (revision 13414) @@ -2,7 +2,6 @@ * \brief: header file for triavertexinput object */ - #ifndef _TRANSIENTPARAM_H_ #define _TRANSIENTPARAM_H_ @@ -22,10 +21,10 @@ class TransientParam: public Param{ protected: - int enum_type; - int N; - IssmDouble* values; - IssmDouble* timesteps; + int enum_type; + int N; + IssmDouble *values; + IssmDouble *timesteps; public: /*TransientParam constructors, destructors: {{{*/ @@ -37,7 +36,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/FileParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/FileParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/FileParam.cpp (revision 13414) @@ -55,12 +55,6 @@ /*FUNCTION FileParam::Id{{{*/ int FileParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION FileParam::MyRank{{{*/ -int FileParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION FileParam::ObjectEnum{{{*/ int FileParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/DoubleParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/DoubleParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/DoubleParam.h (revision 13414) @@ -23,7 +23,7 @@ private: /*just hold 3 values for 3 vertices: */ - int enum_type; + int enum_type; IssmDouble value; public: @@ -36,7 +36,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.h (revision 13414) @@ -22,11 +22,11 @@ class DoubleMatArrayParam: public Param{ private: - int enum_type; - IssmDouble** array; //array of matrices - int M; //size of array - int* mdim_array; //m-dimensions of matrices in the array - int* ndim_array; //n-dimensions -f matrices in the array + int enum_type; + IssmDouble **array; //array of matrices + int M; //size of array + int *mdim_array; //m-dimensions of matrices in the array + int *ndim_array; //n-dimensions -f matrices in the array public: /*DoubleMatArrayParam constructors, destructors: {{{*/ @@ -38,7 +38,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/IntParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/IntParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/IntParam.cpp (revision 13414) @@ -55,12 +55,6 @@ /*FUNCTION IntParam::Id{{{*/ int IntParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntParam::MyRank{{{*/ -int IntParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION IntParam::ObjectEnum{{{*/ int IntParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/IntVecParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/IntVecParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/IntVecParam.h (revision 13414) @@ -37,7 +37,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/BoolParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/BoolParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/BoolParam.h (revision 13414) @@ -24,18 +24,17 @@ public: /*just hold 3 values for 3 vertices: */ int enum_type; - IssmBool value; + bool value; /*BoolParam constructors, destructors: {{{*/ BoolParam(); - BoolParam(int enum_type,IssmBool value); + BoolParam(int enum_type,bool value); ~BoolParam(); /*}}}*/ /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/IntMatParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/IntMatParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/IntMatParam.h (revision 13414) @@ -37,7 +37,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp (revision 13414) @@ -65,12 +65,6 @@ /*FUNCTION VectorParam::Id{{{*/ int VectorParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION VectorParam::MyRank{{{*/ -int VectorParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION VectorParam::ObjectEnum{{{*/ int VectorParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp (revision 13414) @@ -63,12 +63,6 @@ /*FUNCTION MatrixParam::Id{{{*/ int MatrixParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION MatrixParam::MyRank{{{*/ -int MatrixParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION MatrixParam::ObjectEnum{{{*/ int MatrixParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp (revision 13414) @@ -85,12 +85,6 @@ /*FUNCTION StringArrayParam::Id{{{*/ int StringArrayParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION StringArrayParam::MyRank{{{*/ -int StringArrayParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION StringArrayParam::ObjectEnum{{{*/ int StringArrayParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp (revision 13414) @@ -73,12 +73,6 @@ /*FUNCTION TransientParam::Id{{{*/ int TransientParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION TransientParam::MyRank{{{*/ -int TransientParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION TransientParam::ObjectEnum{{{*/ int TransientParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp (revision 13414) @@ -52,12 +52,6 @@ /*FUNCTION DoubleParam::Id{{{*/ int DoubleParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleParam::MyRank{{{*/ -int DoubleParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION DoubleParam::ObjectEnum{{{*/ int DoubleParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp (revision 13414) @@ -120,12 +120,6 @@ /*FUNCTION DoubleMatArrayParam::Id{{{*/ int DoubleMatArrayParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::MyRank{{{*/ -int DoubleMatArrayParam::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION DoubleMatArrayParam::ObjectEnum{{{*/ int DoubleMatArrayParam::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Params/StringParam.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Params/StringParam.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Params/StringParam.h (revision 13414) @@ -23,8 +23,8 @@ private: /*just hold 3 values for 3 vertices: */ - int enum_type; - char* value; + int enum_type; + char *value; public: /*StringParam constructors, destructors: {{{*/ @@ -36,7 +36,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Segment.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Segment.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Segment.h (revision 13414) @@ -14,31 +14,30 @@ class Segment: public Object{ public: - int eid; + int eid; doubletype x1; doubletype y1; doubletype x2; doubletype y2; - /*Segment constructors, destructors :*/ /*FUNCTION Segment() default constructor {{{*/ Segment(){ - this->eid=UNDEF; - this->x1=UNDEF; - this->y1=UNDEF; - this->x2=UNDEF; - this->y2=UNDEF; + this->eid = UNDEF; + this->x1 = UNDEF; + this->y1 = UNDEF; + this->x2 = UNDEF; + this->y2 = UNDEF; } /*}}}*/ /*FUNCTION Segment(int eid, doubletype x1,doubletype y1,doubletype x2, doubletype y2){{{*/ Segment(int segment_eid, doubletype segment_x1,doubletype segment_y1,doubletype segment_x2, doubletype segment_y2){ - this->eid=segment_eid; - this->x1=segment_x1; - this->y1=segment_y1; - this->x2=segment_x2; - this->y2=segment_y2; + this->eid = segment_eid; + this->x1 = segment_x1; + this->y1 = segment_y1; + this->x2 = segment_x2; + this->y2 = segment_y2; } /*}}}*/ @@ -66,13 +65,6 @@ /*FUNCTION Id{{{*/ int Id(void){ return eid; } /*}}}*/ - /*FUNCTION MyRank{{{*/ - int MyRank(void){ - extern int my_rank; - - return my_rank; - } - /*}}}*/ /*FUNCTION ObjectEnum{{{*/ int ObjectEnum(void){ @@ -83,9 +75,7 @@ /*FUNCTION copy {{{*/ Object* copy() { return new Segment(this->eid,this->x1,this->y1,this->x2,this->y2); - } - /*}}}*/ }; Index: ../trunk-jpl/src/c/classes/objects/Options/GenericOption.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Options/GenericOption.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Options/GenericOption.h (revision 13414) @@ -28,12 +28,12 @@ public: - char* name; - OptionType value; + char *name; + OptionType value; - int numel; //in case OptionType is an array - int ndims; //in case OptionType is a multi-dimensional array: */ - int* size; + int numel; //in case OptionType is an array + int ndims; //in case OptionType is a multi-dimensional array: */ + int *size; /*GenericOption constructors, destructors*/ GenericOption(){ /*{{{*/ @@ -80,7 +80,6 @@ _printLine_(indent << " value: " << value);; } /*}}}*/ int Id(){_error_("Not implemented yet");}; - int MyRank(){_error_("Not implemented yet");}; int ObjectEnum(){return GenericOptionEnum;}; Object* copy(){_error_("Not implemented yet");}; Index: ../trunk-jpl/src/c/classes/objects/Options/Option.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Options/Option.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Options/Option.h (revision 13414) @@ -16,21 +16,18 @@ class Option: public Object { public: - - /*Option constructors, destructors {{{*/ + /*Option constructors, destructors*/ Option(){}; ~Option(){}; - /*}}}*/ - /*Object virtual functions definitions:{{{*/ + + /*Object virtual functions definitions*/ virtual void Echo()= 0; virtual void DeepEcho()= 0; virtual void DeepEcho(char *indent)=0; int Id(){_error_("Not implemented yet"); }; - int MyRank(){_error_("Not implemented yet"); }; int ObjectEnum(){return OptionEnum; }; Object *copy(){_error_("Not implemented yet"); }; - /*}}}*/ /*virtual functions: */ virtual char* Name()=0; @@ -40,4 +37,3 @@ }; #endif /* _OPTIONOBJECT_H */ - Index: ../trunk-jpl/src/c/classes/objects/Vertex.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Vertex.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Vertex.cpp (revision 13414) @@ -85,12 +85,6 @@ /*FUNCTION Vertex::Id{{{*/ int Vertex::Id(void){ return id; } /*}}}*/ -/*FUNCTION Vertex::MyRank {{{*/ -int Vertex::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Vertex::ObjectEnum{{{*/ int Vertex::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Loads/Icefront.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Icefront.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Icefront.h (revision 13414) @@ -47,7 +47,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp (revision 13414) @@ -182,12 +182,6 @@ return id; } /*}}}*/ -/*FUNCTION Numericalflux::MyRank {{{*/ -int Numericalflux::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Numericalflux::ObjectEnum{{{*/ int Numericalflux::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp (revision 13414) @@ -78,12 +78,6 @@ /*FUNCTION Penpair::Id {{{*/ int Penpair::Id(void){ return id; } /*}}}*/ -/*FUNCTION Penpair::MyRank {{{*/ -int Penpair::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Penpair::ObjectEnum{{{*/ int Penpair::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Loads/Riftfront.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Riftfront.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Riftfront.h (revision 13414) @@ -31,21 +31,21 @@ Element **elements; /*computational: */ - int penalty_lock; - bool active; - bool frozen; - int counter; - bool prestable; - bool material_converged; - IssmDouble normal[2]; - IssmDouble length; - IssmDouble fraction; - int state; - - Parameters* parameters; //pointer to solution parameters - Inputs* inputs; + int penalty_lock; + bool active; + bool frozen; + int counter; + bool prestable; + bool material_converged; + IssmDouble normal[2]; + IssmDouble length; + IssmDouble fraction; + int state; + Parameters *parameters; //pointer to solution parameters + Inputs *inputs; + /*Riftfrontconstructors,destructors: {{{*/ Riftfront(); Riftfront(int riftfront_id,int i, IoModel* iomodel,int analysis_type); @@ -55,7 +55,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Loads/Numericalflux.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Numericalflux.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Numericalflux.h (revision 13414) @@ -19,21 +19,19 @@ class Numericalflux: public Load { public: - int id; + int id; int analysis_type; /*Hooks*/ - Hook* helement; - Hook* hnodes; + Hook *helement; + Hook *hnodes; /*Corresponding fields*/ - Element* element; - Node** nodes; + Element *element; + Node **nodes; + Parameters *parameters; + Inputs *inputs; - Parameters *parameters; - Inputs *inputs; - - /*Numericalflux constructors,destructors {{{*/ Numericalflux(); Numericalflux(int numericalflux_id,int i, IoModel* iomodel,int analysis_type); @@ -43,7 +41,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Loads/Penpair.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Penpair.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Penpair.h (revision 13414) @@ -16,14 +16,12 @@ class Penpair: public Load{ private: - int id; - int analysis_type; - - Hook* hnodes; //hook to 2 nodes - Node** nodes; + int id; + int analysis_type; + Hook *hnodes; //hook to 2 nodes + Node **nodes; + Parameters *parameters; //pointer to solution parameters - Parameters* parameters; //pointer to solution parameters - public: /*Penpair constructors, destructors: {{{*/ @@ -35,7 +33,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Loads/Load.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Load.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Load.h (revision 13414) @@ -4,7 +4,6 @@ * It is derived from Load, so DataSets can contain them. */ - #ifndef _LOAD_H_ #define _LOAD_H_ @@ -24,8 +23,6 @@ public: virtual ~Load(){}; - - /*Virtual functions: {{{*/ virtual void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0; virtual void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0; virtual void CreateKMatrix(Matrix* Kff, Matrix* Kfs)=0; @@ -35,6 +32,5 @@ virtual void PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs, IssmDouble kmax)=0; virtual void PenaltyCreatePVector(Vector* pf, IssmDouble kmax)=0; virtual bool InAnalysis(int analysis_type)=0; - /*}}}*/ }; #endif Index: ../trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp (revision 13414) @@ -125,12 +125,6 @@ /*FUNCTION Pengrid::Id {{{*/ int Pengrid::Id(void){ return id; } /*}}}*/ -/*FUNCTION Pengrid::MyRank {{{*/ -int Pengrid::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Pengrid::ObjectEnum{{{*/ int Pengrid::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 13414) @@ -156,12 +156,6 @@ /*FUNCTION Icefront::Id {{{*/ int Icefront::Id(void){ return id; } /*}}}*/ -/*FUNCTION Icefront::MyRank {{{*/ -int Icefront::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Icefront::ObjectEnum{{{*/ int Icefront::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Loads/Pengrid.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Pengrid.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Pengrid.h (revision 13414) @@ -48,7 +48,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 13414) @@ -185,12 +185,6 @@ /*FUNCTION Riftfront::Id {{{*/ int Riftfront::Id(void){ return id; } /*}}}*/ -/*FUNCTION Riftfront::MyRank {{{*/ -int Riftfront::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Riftfront::ObjectEnum{{{*/ int Riftfront::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Vertex.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Vertex.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Vertex.h (revision 13414) @@ -42,7 +42,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ExternalResults/GenericExternalResult.h (revision 13414) @@ -98,10 +98,6 @@ int Id(void){ /*{{{*/ return -1; } /*}}}*/ - int MyRank(void){ /*{{{*/ - extern int my_rank; - return my_rank; - } /*}}}*/ int ObjectEnum(void){ /*{{{*/ _error_("template ObjectEnum not implemented for this ResultType\n"); } /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Node.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Node.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Node.cpp (revision 13414) @@ -57,20 +57,20 @@ //intialize inputs, and add as many inputs per element as requested: this->inputs=new Inputs(); if (iomodel->Data(MeshVertexonbedEnum)) - this->inputs->AddInput(new BoolInput(MeshVertexonbedEnum,reCast(iomodel->Data(MeshVertexonbedEnum)[io_index]))); + this->inputs->AddInput(new BoolInput(MeshVertexonbedEnum,reCast(iomodel->Data(MeshVertexonbedEnum)[io_index]))); if (iomodel->Data(MeshVertexonsurfaceEnum)) - this->inputs->AddInput(new BoolInput(MeshVertexonsurfaceEnum,reCast(iomodel->Data(MeshVertexonsurfaceEnum)[io_index]))); + this->inputs->AddInput(new BoolInput(MeshVertexonsurfaceEnum,reCast(iomodel->Data(MeshVertexonsurfaceEnum)[io_index]))); if (iomodel->Data(MaskVertexonfloatingiceEnum)) - this->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,reCast(iomodel->Data(MaskVertexonfloatingiceEnum)[io_index]))); + this->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,reCast(iomodel->Data(MaskVertexonfloatingiceEnum)[io_index]))); if (iomodel->Data(MaskVertexongroundediceEnum)) - this->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,reCast(iomodel->Data(MaskVertexongroundediceEnum)[io_index]))); + this->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,reCast(iomodel->Data(MaskVertexongroundediceEnum)[io_index]))); if (analysis_type==DiagnosticHorizAnalysisEnum) this->inputs->AddInput(new IntInput(ApproximationEnum,reCast(iomodel->Data(FlowequationVertexEquationEnum)[io_index]))); /*set single point constraints: */ /*spc all nodes on water*/ if (!iomodel->Data(MaskVertexonwaterEnum)) _error_("iomodel->nodeonwater is NULL"); - if (reCast(iomodel->Data(MaskVertexonwaterEnum)[io_index])){ + if (reCast(iomodel->Data(MaskVertexonwaterEnum)[io_index])){ for(k=1;k<=gsize;k++){ this->FreezeDof(k); } @@ -136,7 +136,7 @@ if (dim==3){ /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */ _assert_(iomodel->Data(MeshVertexonbedEnum)); - if (!(reCast(iomodel->Data(MeshVertexonbedEnum)[io_index]))){ + if (!(reCast(iomodel->Data(MeshVertexonbedEnum)[io_index]))){ for(k=1;k<=gsize;k++){ this->FreezeDof(k); } @@ -187,13 +187,6 @@ /*FUNCTION Node::Id{{{*/ int Node::Id(void){ return id; } /*}}}*/ -/*FUNCTION Node::MyRank{{{*/ -int Node::MyRank(void){ - extern int my_rank; - - return my_rank; -} -/*}}}*/ /*FUNCTION Node::ObjectEnum{{{*/ int Node::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.h (revision 13414) @@ -32,7 +32,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.h (revision 13414) @@ -31,7 +31,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.h (revision 13414) @@ -33,7 +33,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/Constraints/Constraint.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Constraints/Constraint.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Constraints/Constraint.h (revision 13414) @@ -4,7 +4,6 @@ * It is derived from Object, so DataSets can contain them. */ - #ifndef _CONSTRAINT_H_ #define _CONSTRAINT_H_ @@ -23,6 +22,5 @@ virtual void ConstrainNode(Nodes* nodes,Parameters* parameters)=0; virtual bool InAnalysis(int analysis_type)=0; - }; #endif Index: ../trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp (revision 13414) @@ -65,12 +65,6 @@ /*FUNCTION SpcDynamic::Id {{{*/ int SpcDynamic::Id(void){ return sid; } /*}}}*/ -/*FUNCTION SpcDynamic::MyRank {{{*/ -int SpcDynamic::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION SpcDynamic::ObjectEnum{{{*/ int SpcDynamic::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp (revision 13414) @@ -68,12 +68,6 @@ /*FUNCTION SpcStatic::Id {{{*/ int SpcStatic::Id(void){ return sid; } /*}}}*/ -/*FUNCTION SpcStatic::MyRank {{{*/ -int SpcStatic::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION SpcStatic::ObjectEnum{{{*/ int SpcStatic::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp (revision 13414) @@ -80,12 +80,6 @@ /*FUNCTION SpcTransient::Id {{{*/ int SpcTransient::Id(void){ return sid; } /*}}}*/ -/*FUNCTION SpcTransient::MyRank {{{*/ -int SpcTransient::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION SpcTransient::ObjectEnum{{{*/ int SpcTransient::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/Node.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Node.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Node.h (revision 13414) @@ -39,12 +39,11 @@ ~Node(); /*}}}*/ /*Object virtual functions definitions:{{{ */ - void Echo(); - void DeepEcho(); - int Id(); - int MyRank(); - int ObjectEnum(); - Object* copy(){_error_("Not implemented yet (similar to Elements)");}; + void Echo(); + void DeepEcho(); + int Id(); + int ObjectEnum(); + Object *copy() {_error_("Not implemented yet (similar to Elements)"); }; /*}}}*/ /*Update virtual functions definitions: {{{*/ void InputUpdateFromVector(IssmDouble* vector, int name, int type); Index: ../trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.h (revision 13414) @@ -31,7 +31,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp (revision 13414) @@ -60,12 +60,6 @@ /*FUNCTION PentaP1ElementResult::Id{{{*/ int PentaP1ElementResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION PentaP1ElementResult::MyRank{{{*/ -int PentaP1ElementResult::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION PentaP1ElementResult::ObjectEnum{{{*/ int PentaP1ElementResult::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp (revision 13414) @@ -57,12 +57,6 @@ /*FUNCTION DoubleElementResult::Id{{{*/ int DoubleElementResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleElementResult::MyRank{{{*/ -int DoubleElementResult::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION DoubleElementResult::ObjectEnum{{{*/ int DoubleElementResult::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp (revision 13414) @@ -57,12 +57,6 @@ /*FUNCTION BoolElementResult::Id{{{*/ int BoolElementResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION BoolElementResult::MyRank{{{*/ -int BoolElementResult::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION BoolElementResult::ObjectEnum{{{*/ int BoolElementResult::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.h (revision 13414) @@ -32,7 +32,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.h (revision 13414) @@ -33,7 +33,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/ElementResults/ElementResultLocal.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/ElementResultLocal.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/ElementResultLocal.h (revision 13414) @@ -8,4 +8,3 @@ class Parameters; #endif //ifndef _ELEMENTRESULTLOCAL_H_ - Index: ../trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.h (revision 13414) @@ -33,7 +33,6 @@ void Echo(); void DeepEcho(); int Id(); - int MyRank(); int ObjectEnum(); Object* copy(); /*}}}*/ Index: ../trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp (revision 13414) @@ -59,12 +59,6 @@ /*FUNCTION TriaP1ElementResult::Id{{{*/ int TriaP1ElementResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION TriaP1ElementResult::MyRank{{{*/ -int TriaP1ElementResult::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION TriaP1ElementResult::ObjectEnum{{{*/ int TriaP1ElementResult::ObjectEnum(void){ Index: ../trunk-jpl/src/c/classes/objects/ElementResults/ElementResult.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/ElementResults/ElementResult.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/ElementResults/ElementResult.h (revision 13414) @@ -2,7 +2,6 @@ * \brief abstract class for ElementResult object */ - #ifndef _ELEMENTRESULT_H_ #define _ELEMENTRESULT_H_ @@ -16,7 +15,6 @@ public: virtual ~ElementResult(){}; - virtual ElementResult* SpawnTriaElementResult(int* indices)=0; virtual IssmDouble GetTime(void)=0; virtual int GetStep(void)=0; Index: ../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 13414) @@ -2039,12 +2039,6 @@ this->inputs->AddInput(new TriaP1Input(BedEnum,&b[0])); } /*}}}*/ -/*FUNCTION Tria::MyRank {{{*/ -int Tria::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Tria::NodalValue {{{*/ int Tria::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum,bool process_units){ Index: ../trunk-jpl/src/c/classes/objects/Elements/Tria.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Elements/Tria.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Elements/Tria.h (revision 13414) @@ -28,17 +28,17 @@ public: - int id; - int sid; + int id; + int sid; - Node **nodes; // 3 nodes - Material *material; // 1 material ice - Matpar *matpar; // 1 material parameter - int horizontalneighborsids[3]; + Node **nodes; // 3 nodes + Material *material; // 1 material ice + Matpar *matpar; // 1 material parameter + int horizontalneighborsids[3]; - Parameters *parameters; //pointer to solution parameters - Inputs *inputs; - Results *results; + Parameters *parameters; //pointer to solution parameters + Inputs *inputs; + Results *results; /*Tria constructors, destructors {{{*/ Tria(); @@ -46,12 +46,11 @@ ~Tria(); /*}}}*/ /*Object virtual functions definitions:{{{ */ - void Echo(); - void DeepEcho(); - int Id(); - int MyRank(); - int ObjectEnum(); - Object* copy(); + void Echo(); + void DeepEcho(); + int Id(); + int ObjectEnum(); + Object *copy(); /*}}}*/ /*Update virtual functions resolution: {{{*/ void InputUpdateFromSolution(IssmDouble* solutiong); Index: ../trunk-jpl/src/c/classes/objects/Elements/Penta.cpp =================================================================== --- ../trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 13414) @@ -2252,12 +2252,6 @@ return minlength; } /*}}}*/ -/*FUNCTION Penta::MyRank {{{*/ -int Penta::MyRank(void){ - extern int my_rank; - return my_rank; -} -/*}}}*/ /*FUNCTION Penta::NodalValue {{{*/ int Penta::NodalValue(IssmDouble* pvalue, int index, int natureofdataenum,bool process_units){ Index: ../trunk-jpl/src/c/classes/objects/Elements/Penta.h =================================================================== --- ../trunk-jpl/src/c/classes/objects/Elements/Penta.h (revision 13413) +++ ../trunk-jpl/src/c/classes/objects/Elements/Penta.h (revision 13414) @@ -33,15 +33,15 @@ int id; int sid; - Node **nodes; // 6 nodes - Material *material; // 1 material ice - Matpar *matpar; // 1 material parameter - Penta **verticalneighbors; // 2 neighbors: first one under, second one above + Node **nodes; // 6 nodes + Material *material; // 1 material ice + Matpar *matpar; // 1 material parameter + Penta **verticalneighbors; // 2 neighbors: first one under, second one above int horizontalneighborsids[3]; - Parameters *parameters; //pointer to solution parameters + Parameters *parameters; //pointer to solution parameters Inputs *inputs; - Results *results; + Results *results; /*Penta constructors and destructor: {{{*/ Penta(); @@ -49,12 +49,11 @@ ~Penta(); /*}}}*/ /*Object virtual functions definitions: {{{*/ - Object* copy(); - void DeepEcho(); - void Echo(); - int ObjectEnum(); - int Id(); - int MyRank(); + Object *copy(); + void DeepEcho(); + void Echo(); + int ObjectEnum(); + int Id(); /*}}}*/ /*Update virtual functions definitions: {{{*/ void InputUpdateFromConstant(bool constant, int name); Index: ../trunk-jpl/src/c/classes/kriging/Quadtree.h =================================================================== --- ../trunk-jpl/src/c/classes/kriging/Quadtree.h (revision 13413) +++ ../trunk-jpl/src/c/classes/kriging/Quadtree.h (revision 13414) @@ -28,7 +28,6 @@ void Echo(); void DeepEcho() {_error_("not implemented yet"); }; int Id() {_error_("not implemented yet"); }; - int MyRank() {_error_("not implemented yet"); }; int ObjectEnum(){_error_("not implemented yet"); }; Object *copy() {_error_("not implemented yet"); }; Index: ../trunk-jpl/src/c/classes/kriging/Observation.h =================================================================== --- ../trunk-jpl/src/c/classes/kriging/Observation.h (revision 13413) +++ ../trunk-jpl/src/c/classes/kriging/Observation.h (revision 13414) @@ -25,7 +25,6 @@ void Echo(); void DeepEcho() {_error_("Not implemented yet"); }; int Id() {_error_("Not implemented yet"); }; - int MyRank() {_error_("Not implemented yet"); }; int ObjectEnum(){_error_("Not implemented yet"); }; Object *copy() {_error_("Not implemented yet"); }; Index: ../trunk-jpl/src/c/classes/kriging/ExponentialVariogram.h =================================================================== --- ../trunk-jpl/src/c/classes/kriging/ExponentialVariogram.h (revision 13413) +++ ../trunk-jpl/src/c/classes/kriging/ExponentialVariogram.h (revision 13414) @@ -24,7 +24,6 @@ void Echo(); void DeepEcho(){_error_("Not implemented yet");}; int Id(){_error_("Not implemented yet");}; - int MyRank(){_error_("Not implemented yet");}; int ObjectEnum(){_error_("Not implemented yet");}; Object* copy(){_error_("Not implemented yet");}; Index: ../trunk-jpl/src/c/classes/kriging/GaussianVariogram.h =================================================================== --- ../trunk-jpl/src/c/classes/kriging/GaussianVariogram.h (revision 13413) +++ ../trunk-jpl/src/c/classes/kriging/GaussianVariogram.h (revision 13414) @@ -25,7 +25,6 @@ void Echo(); void DeepEcho(){_error_("Not implemented yet");}; int Id(){_error_("Not implemented yet");}; - int MyRank(){_error_("Not implemented yet");}; int ObjectEnum(){_error_("Not implemented yet");}; Object* copy(){_error_("Not implemented yet");}; Index: ../trunk-jpl/src/c/classes/kriging/SphericalVariogram.h =================================================================== --- ../trunk-jpl/src/c/classes/kriging/SphericalVariogram.h (revision 13413) +++ ../trunk-jpl/src/c/classes/kriging/SphericalVariogram.h (revision 13414) @@ -24,7 +24,6 @@ void Echo(); void DeepEcho(){_error_("Not implemented yet");}; int Id(){_error_("Not implemented yet");}; - int MyRank(){_error_("Not implemented yet");}; int ObjectEnum(){_error_("Not implemented yet");}; Object* copy(){_error_("Not implemented yet");}; Index: ../trunk-jpl/src/c/classes/kriging/PowerVariogram.h =================================================================== --- ../trunk-jpl/src/c/classes/kriging/PowerVariogram.h (revision 13413) +++ ../trunk-jpl/src/c/classes/kriging/PowerVariogram.h (revision 13414) @@ -24,7 +24,6 @@ void Echo(); void DeepEcho(){_error_("Not implemented yet");}; int Id(){_error_("Not implemented yet");}; - int MyRank(){_error_("Not implemented yet");}; int ObjectEnum(){_error_("Not implemented yet");}; Object* copy(){_error_("Not implemented yet");}; Index: ../trunk-jpl/src/c/classes/bamg/BamgQuadtree.h =================================================================== --- ../trunk-jpl/src/c/classes/bamg/BamgQuadtree.h (revision 13413) +++ ../trunk-jpl/src/c/classes/bamg/BamgQuadtree.h (revision 13414) @@ -33,7 +33,6 @@ void Echo() {_error_("not implemented yet"); }; void DeepEcho() {_error_("not implemented yet"); }; int Id() {_error_("not implemented yet"); }; - int MyRank() {_error_("not implemented yet"); }; int ObjectEnum() {_error_("not implemented yet"); }; Object *copy() {_error_("not implemented yet"); }; };