Index: /issm/trunk-jpl/src/c/classes/Nodes.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Nodes.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/classes/Nodes.cpp	(revision 18063)
@@ -19,12 +19,10 @@
 
 /*Object constructors and destructor*/
-/*FUNCTION Nodes::Nodes(){{{*/
-Nodes::Nodes(){
+Nodes::Nodes(){/*{{{*/
 	enum_type=NodesEnum;
 	return;
 }
 /*}}}*/
-/*FUNCTION Nodes::~Nodes(){{{*/
-Nodes::~Nodes(){
+Nodes::~Nodes(){/*{{{*/
 	return;
 }
@@ -32,6 +30,5 @@
 
 /*Numerics*/
-/*FUNCTION Nodes::DistributeDofs{{{*/
-void  Nodes::DistributeDofs(int analysis_type,int setenum){
+void  Nodes::DistributeDofs(int analysis_type,int setenum){/*{{{*/
 
 	int  i;
@@ -122,6 +119,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::FlagClones{{{*/
-void  Nodes::FlagClones(int analysis_type){
+void  Nodes::FlagClones(int analysis_type){/*{{{*/
 
 	int i;
@@ -168,6 +164,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::MaxNumDofs{{{*/
-int   Nodes::MaxNumDofs(int analysis_type,int setenum){
+int   Nodes::MaxNumDofs(int analysis_type,int setenum){/*{{{*/
 
 	int max=0;
@@ -194,6 +189,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::MaximymId{{{*/
-int Nodes::MaximumId(){
+int   Nodes::MaximumId(){/*{{{*/
 
 	int max=-1;
@@ -225,6 +219,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::NumberOfDofs{{{*/
-int   Nodes::NumberOfDofs(int analysis_type,int setenum){
+int   Nodes::NumberOfDofs(int analysis_type,int setenum){/*{{{*/
 
 	int   allnumdofs;
@@ -238,6 +231,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::NumberOfDofsLocal{{{*/
-int   Nodes::NumberOfDofsLocal(int analysis_type,int setenum){
+int   Nodes::NumberOfDofsLocal(int analysis_type,int setenum){/*{{{*/
 
 	int   numdofs=0;
@@ -261,6 +253,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::NumberOfNodes(){{{*/
-int Nodes::NumberOfNodes(void){
+int   Nodes::NumberOfNodes(void){/*{{{*/
 
 	/*Careful! only use once all clones have been setup for all nodes!: */
@@ -283,6 +274,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::NumberOfNodes(analysis){{{*/
-int Nodes::NumberOfNodes(int analysis_type){
+int   Nodes::NumberOfNodes(int analysis_type){/*{{{*/
 
 	int i;
@@ -315,6 +305,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::Ranks{{{*/
-void   Nodes::Ranks(int* ranks,int analysis_type){
+void  Nodes::Ranks(int* ranks,int analysis_type){/*{{{*/
 
 	int my_rank;
@@ -338,6 +327,5 @@
 }
 /*}}}*/
-/*FUNCTION Nodes::RequiresDofReindexing{{{*/
-bool Nodes::RequiresDofReindexing(int analysis_type){
+bool Nodes::RequiresDofReindexing(int analysis_type){/*{{{*/
 
 	int flag = 0;
Index: /issm/trunk-jpl/src/c/classes/Profiler.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Profiler.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/classes/Profiler.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Profiler constructors and destructors:*/
-/*FUNCTION Profiler::Profiler() default constructor {{{*/
-Profiler::Profiler(){
+Profiler::Profiler(){/*{{{*/
 		 this->time=new Parameters();
 		 this->flops=new Parameters();
@@ -24,6 +23,5 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::~Profiler(){{{*/
-Profiler::~Profiler(){
+Profiler::~Profiler(){/*{{{*/
 	delete time;
 	delete flops;
@@ -33,6 +31,5 @@
 
 /*Object virtual functions definitions:*/
-/*FUNCTION Profiler::Echo{{{*/
-void Profiler::Echo(void){
+void Profiler::Echo(void){/*{{{*/
 
 	_printf_("Profiler:\n");
@@ -42,6 +39,5 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::DeepEcho{{{*/
-void Profiler::DeepEcho(void){
+void Profiler::DeepEcho(void){/*{{{*/
 
 	_printf_("Profiler:\n");
@@ -51,9 +47,7 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::Id{{{*/
-int    Profiler::Id(void){ return -1; }
+int    Profiler::Id(void){ return -1; }/*{{{*/
 /*}}}*/
-/*FUNCTION Profiler::ObjectEnum{{{*/
-int Profiler::ObjectEnum(void){
+int Profiler::ObjectEnum(void){/*{{{*/
 
 	return ProfilerEnum;
@@ -63,6 +57,5 @@
 
 /*Profiler routines:*/
-/*FUNCTION Profiler::Tag {{{*/
-void  Profiler::Tag(int tagenum,bool dontmpisync){
+void  Profiler::Tag(int tagenum,bool dontmpisync){/*{{{*/
 
 	IssmDouble t;
@@ -98,6 +91,5 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::DeltaTime {{{*/
-IssmDouble  Profiler::DeltaTime(int inittag, int finaltag){
+IssmDouble  Profiler::DeltaTime(int inittag, int finaltag){/*{{{*/
 
 	IssmDouble init, final;
@@ -112,6 +104,5 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::DeltaFlops {{{*/
-IssmDouble  Profiler::DeltaFlops(int inittag, int finaltag){
+IssmDouble  Profiler::DeltaFlops(int inittag, int finaltag){/*{{{*/
 
 	IssmDouble init, final;
@@ -122,6 +113,5 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::DeltaTimeModHour {{{*/
-int Profiler::DeltaTimeModHour(int inittag, int finishtag){
+int Profiler::DeltaTimeModHour(int inittag, int finishtag){/*{{{*/
 
 	IssmDouble init, finish;
@@ -137,6 +127,5 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::DeltaTimeModMin {{{*/
-int Profiler::DeltaTimeModMin(int inittag, int finishtag){
+int Profiler::DeltaTimeModMin(int inittag, int finishtag){/*{{{*/
 
 	IssmDouble init, finish;
@@ -151,6 +140,5 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::DeltaTimeModSec {{{*/
-int Profiler::DeltaTimeModSec(int inittag, int finishtag){
+int Profiler::DeltaTimeModSec(int inittag, int finishtag){/*{{{*/
 
 	IssmDouble init, finish;
@@ -165,6 +153,5 @@
 }
 /*}}}*/
-/*FUNCTION Profiler::Memory {{{*/
-IssmDouble  Profiler::Memory(int tag){
+IssmDouble  Profiler::Memory(int tag){/*{{{*/
 
 	IssmDouble m;
Index: /issm/trunk-jpl/src/c/classes/Segment.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Segment.h	(revision 18062)
+++ /issm/trunk-jpl/src/c/classes/Segment.h	(revision 18063)
@@ -23,6 +23,5 @@
 
 		/*Segment constructors, destructors :*/
-		/*FUNCTION Segment() default constructor {{{*/
-		Segment(){
+		Segment(){/*{{{*/
 			this->eid = UNDEF;
 			this->x1  = UNDEF;
@@ -32,6 +31,5 @@
 		}
 		/*}}}*/
-		/*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){
+		Segment(int segment_eid, doubletype segment_x1,doubletype segment_y1,doubletype segment_x2, doubletype segment_y2){/*{{{*/
 
 			this->eid = segment_eid;
@@ -43,12 +41,10 @@
 		}
 		/*}}}*/
-		/*FUNCTION ~Segment(){{{*/
-		~Segment(){
+		~Segment(){/*{{{*/
 		}
 		/*}}}*/
 
 		/*Object virtual functions definitions:*/
-		/*FUNCTION Echo{{{*/
-		void Echo(void){
+		void Echo(void){/*{{{*/
 
 			_printf_("Segment:\n");
@@ -59,14 +55,11 @@
 		}
 		/*}}}*/
-		/*FUNCTION DeepEcho{{{*/
-		void DeepEcho(void){
+		void DeepEcho(void){/*{{{*/
 			this->Echo();
 		}
 		/*}}}*/
-		/*FUNCTION Id{{{*/
-		int    Id(void){ return eid; }
+		int    Id(void){ return eid; }/*{{{*/
 		/*}}}*/
-		/*FUNCTION ObjectEnum{{{*/
-		int ObjectEnum(void){
+		int ObjectEnum(void){/*{{{*/
 
 			return SegmentEnum;
@@ -74,6 +67,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION copy {{{*/
-		Object* copy() {
+		Object* copy() {/*{{{*/
 			return new Segment(this->eid,this->x1,this->y1,this->x2,this->y2);
 		}
Index: /issm/trunk-jpl/src/c/classes/Vertex.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Vertex.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/classes/Vertex.cpp	(revision 18063)
@@ -16,11 +16,9 @@
 
 /*Vertex constructors and destructor:*/
-/*FUNCTION Vertex::Vertex() {{{*/
-Vertex::Vertex(){
-	return;
-}
-/*}}}*/
-/*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{*/
-Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){
+Vertex::Vertex(){/*{{{*/
+	return;
+}
+/*}}}*/
+Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){/*{{{*/
 
 	this->id           = vertex_id;
@@ -49,6 +47,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::~Vertex() {{{*/
-Vertex::~Vertex(){
+Vertex::~Vertex(){/*{{{*/
 	return;
 }
@@ -56,6 +53,5 @@
 
 /*Object virtual functions definitions:*/
-/*FUNCTION Vertex::Echo{{{*/
-void Vertex::Echo(void){
+void Vertex::Echo(void){/*{{{*/
 
 	_printf_("Vertex:\n");
@@ -73,14 +69,11 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::DeepEcho{{{*/
-void Vertex::DeepEcho(void){
+void Vertex::DeepEcho(void){/*{{{*/
 	this->Echo();
 }
 /*}}}*/
-/*FUNCTION Vertex::Id{{{*/
-int    Vertex::Id(void){ return id; }
-/*}}}*/
-/*FUNCTION Vertex::ObjectEnum{{{*/
-int Vertex::ObjectEnum(void){
+int Vertex::Id(void){ return id; }/*{{{*/
+/*}}}*/
+int Vertex::ObjectEnum(void){/*{{{*/
 
 	return VertexEnum;
@@ -88,6 +81,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::copy {{{*/
-Object* Vertex::copy() {
+Object* Vertex::copy() {/*{{{*/
 
 	return new Vertex(*this); 
@@ -97,30 +89,23 @@
 
 /*Vertex management: */
-/*FUNCTION Vertex::Connectivity{{{*/
-int    Vertex::Connectivity(void){return connectivity;}
-/*}}}*/
-/*FUNCTION Vertex::GetX {{{*/
-IssmDouble Vertex::GetX(){
+int        Vertex::Connectivity(void){return connectivity;}/*{{{*/
+/*}}}*/
+IssmDouble Vertex::GetX(){/*{{{*/
 	return this->x;
 }
 /*}}}*/
-/*FUNCTION Vertex::GetY {{{*/
-IssmDouble Vertex::GetY(){
+IssmDouble Vertex::GetY(){/*{{{*/
 	return this->y;
 }
 /*}}}*/
-/*FUNCTION Vertex::GetZ {{{*/
-IssmDouble Vertex::GetZ(){
+IssmDouble Vertex::GetZ(){/*{{{*/
 	return this->z;
 }
 /*}}}*/
-/*FUNCTION Vertex::Sid{{{*/
-int    Vertex::Sid(void){ return sid; }
-/*}}}*/
-/*FUNCTION Vertex::Pid{{{*/
-int    Vertex::Pid(void){ return pid; }
-/*}}}*/
-/*FUNCTION Vertex::UpdatePosition {{{*/
-void  Vertex::UpdatePosition(Vector<IssmDouble>* vx,Vector<IssmDouble>* vy,Vector<IssmDouble>* vz,Parameters* parameters,IssmDouble* surface,IssmDouble* bed){
+int        Vertex::Sid(void){ return sid; }/*{{{*/
+/*}}}*/
+int        Vertex::Pid(void){ return pid; }/*{{{*/
+/*}}}*/
+void       Vertex::UpdatePosition(Vector<IssmDouble>* vx,Vector<IssmDouble>* vy,Vector<IssmDouble>* vz,Parameters* parameters,IssmDouble* surface,IssmDouble* bed){/*{{{*/
 
 	IssmDouble oldy,newy,vely;
@@ -155,6 +140,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::DistributePids{{{*/
-void  Vertex::DistributePids(int* ppidcount){
+void       Vertex::DistributePids(int* ppidcount){/*{{{*/
 
 	/*retrieve current pid*/
@@ -172,6 +156,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::OffsetPids{{{*/
-void  Vertex::OffsetPids(int pidcount){
+void       Vertex::OffsetPids(int pidcount){/*{{{*/
 
 	/*This vertex is a clone, don't offset the pids*/
@@ -182,6 +165,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::ShowTruePids{{{*/
-void  Vertex::ShowTruePids(int* truepids){
+void       Vertex::ShowTruePids(int* truepids){/*{{{*/
 
 	/*Are we a clone? : */
@@ -192,6 +174,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::UpdateClonePids{{{*/
-void  Vertex::UpdateClonePids(int* alltruepids){
+void       Vertex::UpdateClonePids(int* alltruepids){/*{{{*/
 
 	/*If we are not a clone, don't update, we already have pids: */
@@ -203,6 +184,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::SetClone {{{*/
-void  Vertex::SetClone(int* minranks){
+void       Vertex::SetClone(int* minranks){/*{{{*/
 
 	int my_rank;
@@ -222,6 +202,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::ToXYZ {{{*/
-void  Vertex::ToXYZ(Matrix<IssmDouble>* matrix){
+void       Vertex::ToXYZ(Matrix<IssmDouble>* matrix){/*{{{*/
 
 	IssmDouble xyz[3];
@@ -240,6 +219,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertex::VertexCoordinates {{{*/
-void  Vertex::VertexCoordinates(Vector<IssmDouble>* vx,Vector<IssmDouble>* vy,Vector<IssmDouble>* vz){
+void       Vertex::VertexCoordinates(Vector<IssmDouble>* vx,Vector<IssmDouble>* vy,Vector<IssmDouble>* vz){/*{{{*/
 
 	if (this->clone==true) return;
Index: /issm/trunk-jpl/src/c/classes/Vertices.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Vertices.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/classes/Vertices.cpp	(revision 18063)
@@ -24,12 +24,10 @@
 
 /*Object constructors and destructor*/
-/*FUNCTION Vertices::Vertices(){{{*/
-Vertices::Vertices(){
+Vertices::Vertices(){/*{{{*/
 	enum_type=VerticesEnum;
 	return;
 }
 /*}}}*/
-/*FUNCTION Vertices::~Vertices(){{{*/
-Vertices::~Vertices(){
+Vertices::~Vertices(){/*{{{*/
 	return;
 }
@@ -37,6 +35,5 @@
 
 /*Numerics management*/
-/*FUNCTION Vertices::DistributePids{{{*/
-void  Vertices::DistributePids(int numberofobjects){
+void  Vertices::DistributePids(int numberofobjects){/*{{{*/
 
 	int num_procs;
@@ -102,6 +99,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertices::FlagClones{{{*/
-void  Vertices::FlagClones(int numberofobjects){
+void  Vertices::FlagClones(int numberofobjects){/*{{{*/
 
 	int i;
@@ -142,6 +138,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertices::NumberOfVertices{{{*/
-int Vertices::NumberOfVertices(void){
+int Vertices::NumberOfVertices(void){/*{{{*/
 
 	int i,sid;
@@ -166,6 +161,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertices::Ranks{{{*/
-void   Vertices::Ranks(int* ranks){
+void   Vertices::Ranks(int* ranks){/*{{{*/
 
 	int my_rank;
@@ -184,6 +178,5 @@
 }
 /*}}}*/
-/*FUNCTION Vertices::ToXYZ{{{*/
-IssmDouble* Vertices::ToXYZ(void){
+IssmDouble* Vertices::ToXYZ(void){/*{{{*/
 
 	/*intermediary: */
Index: /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp	(revision 18063)
@@ -18,6 +18,5 @@
 
 /*ElementVector constructors and destructor*/
-/*FUNCTION ElementVector::ElementVector(){{{*/
-ElementVector::ElementVector(){
+ElementVector::ElementVector(){/*{{{*/
 
 	this->nrows=0;
@@ -29,6 +28,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){{{*/
-ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){
+ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){/*{{{*/
 
 	/*intermediaries*/
@@ -114,6 +112,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){{{*/
-ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){
+ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){/*{{{*/
 
 	/*Concatenate all matrices*/
@@ -129,6 +126,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{*/
-ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){
+ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){/*{{{*/
 
 	/*get Vector size and properties*/
@@ -147,6 +143,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::~ElementVector(){{{*/
-ElementVector::~ElementVector(){
+ElementVector::~ElementVector(){/*{{{*/
 
 	xDelete<IssmDouble>(this->values);
@@ -158,6 +153,5 @@
 
 /*ElementVector specific routines: */
-/*FUNCTION ElementVector::AddToGlobal(Vector<IssmDouble>* pf){{{*/
-void ElementVector::AddToGlobal(Vector<IssmDouble>* pf){
+void ElementVector::AddToGlobal(Vector<IssmDouble>* pf){/*{{{*/
 
 	int i;
@@ -182,6 +176,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::InsertIntoGlobal(Vector<IssmDouble>* pf){{{*/
-void ElementVector::InsertIntoGlobal(Vector<IssmDouble>* pf){
+void ElementVector::InsertIntoGlobal(Vector<IssmDouble>* pf){/*{{{*/
 
 	int i;
@@ -203,6 +196,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::CheckConsistency{{{*/
-void ElementVector::CheckConsistency(void){
+void ElementVector::CheckConsistency(void){/*{{{*/
 	/*Check element matrix values, only in debugging mode*/
 #ifdef _ISSM_DEBUG_ 
@@ -214,6 +206,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::Echo{{{*/
-void ElementVector::Echo(void){
+void ElementVector::Echo(void){/*{{{*/
 
 	int i;
@@ -239,6 +230,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::Init{{{*/
-void ElementVector::Init(ElementVector* pe){
+void ElementVector::Init(ElementVector* pe){/*{{{*/
 
 	_assert_(pe);
@@ -265,6 +255,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::SetValue{{{*/
-void ElementVector::SetValue(IssmDouble scalar){
+void ElementVector::SetValue(IssmDouble scalar){/*{{{*/
 
 	int i;
@@ -274,6 +263,5 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::StaticCondensation{{{*/
-void ElementVector::StaticCondensation(ElementMatrix* Ke,int bsize,int* bindices){
+void ElementVector::StaticCondensation(ElementMatrix* Ke,int bsize,int* bindices){/*{{{*/
 	/* 
 	 * | Kii  Kib | | Ui |    |Fi|
Index: /issm/trunk-jpl/src/c/datastructures/DataSet.cpp
===================================================================
--- /issm/trunk-jpl/src/c/datastructures/DataSet.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/datastructures/DataSet.cpp	(revision 18063)
@@ -24,6 +24,5 @@
 
 /*Constructors/Destructors*/
-/*FUNCTION DataSet::DataSet(){{{*/
-DataSet::DataSet(){
+DataSet::DataSet(){/*{{{*/
 
 	sorted=0;
@@ -33,6 +32,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::DataSet(int dataset_enum){{{*/
-DataSet::DataSet(int dataset_enum){
+DataSet::DataSet(int dataset_enum){/*{{{*/
 	enum_type=dataset_enum;
 
@@ -43,6 +41,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::Copy{{{*/
-DataSet*   DataSet::Copy(void){
+DataSet*   DataSet::Copy(void){/*{{{*/
 
 	vector<Object*>::iterator object;
@@ -72,6 +69,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::~DataSet{{{*/
-DataSet::~DataSet(){
+DataSet::~DataSet(){/*{{{*/
 	clear();
 	xDelete<int>(sorted_ids);
@@ -81,6 +77,5 @@
 
 /*Specific methods*/
-/*FUNCTION DataSet::AddObject{{{*/
-int  DataSet::AddObject(Object* object){
+int  DataSet::AddObject(Object* object){/*{{{*/
 
 	_assert_(this);
@@ -90,6 +85,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::clear{{{*/
-void  DataSet::clear(){
+void  DataSet::clear(){/*{{{*/
 
 /*  use reverse_iterator for efficiency in matlab memory manager
@@ -108,6 +102,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::DeleteObject{{{*/
-int  DataSet::DeleteObject(Object* object){
+int  DataSet::DeleteObject(Object* object){/*{{{*/
 
 	vector<Object*>::iterator iterator;
@@ -123,6 +116,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::DeepEcho{{{*/
-void DataSet::DeepEcho(){
+void DataSet::DeepEcho(){/*{{{*/
 
 	vector<Object*>::iterator object;
@@ -140,6 +132,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::Echo{{{*/
-void DataSet::Echo(){
+void DataSet::Echo(){/*{{{*/
 
 	vector<Object*>::iterator object;
@@ -158,11 +149,9 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::GetEnum(){{{*/
-int  DataSet::GetEnum(){
+int  DataSet::GetEnum(){/*{{{*/
 	return enum_type;
 }
 /*}}}*/
-/*FUNCTION DataSet::GetEnum(int offset){{{*/
-int   DataSet::GetEnum(int offset){
+int   DataSet::GetEnum(int offset){/*{{{*/
 
 	return objects[offset]->ObjectEnum();
@@ -170,6 +159,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::GetObjectByOffset{{{*/
-Object* DataSet::GetObjectByOffset(int offset){
+Object* DataSet::GetObjectByOffset(int offset){/*{{{*/
 
 	/*Check index in debugging mode*/
@@ -182,6 +170,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::GetObjectById{{{*/
-Object* DataSet::GetObjectById(int* poffset,int eid){
+Object* DataSet::GetObjectById(int* poffset,int eid){/*{{{*/
 
 	int id_offset;
@@ -206,6 +193,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::Presort{{{*/
-void DataSet::Presort(){
+void DataSet::Presort(){/*{{{*/
 
 	/*vector of objects is already sorted, just allocate the sorted ids and their
@@ -232,6 +218,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::Size{{{*/
-int  DataSet::Size(void){
+int  DataSet::Size(void){/*{{{*/
 	_assert_(this!=NULL);
 
@@ -239,6 +224,5 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::Sort{{{*/
-void DataSet::Sort(){
+void DataSet::Sort(){/*{{{*/
 
 	/*Only sort if we are not already sorted: */
Index: /issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KMLFileReadUtils.cpp	(revision 18063)
@@ -16,6 +16,5 @@
 /*}}}*/
 
-/*FUNCTION  KMLFileToken(FILE* fid,int* pncom=NULL,char*** ppcom=NULL) {{{*/
-char* KMLFileToken(FILE* fid,
+char* KMLFileToken(FILE* fid,/*{{{*/
 				   int* pncom=NULL,char*** ppcom=NULL){
 
@@ -144,6 +143,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenComment(FILE* fid) {{{*/
-char* KMLFileTokenComment(FILE* fid){
+char* KMLFileTokenComment(FILE* fid){/*{{{*/
 
 /*  check for comment in the file and read it  */
@@ -208,6 +206,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenBuffer {{{*/
-void KMLFileTokenBuffer(char** pbuffer,int* pibuf,int* pbuflen,
+void KMLFileTokenBuffer(char** pbuffer,int* pibuf,int* pbuflen,/*{{{*/
 						int c,
 						int bufblk){
@@ -237,6 +234,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTagName {{{*/
-char* KMLFileTagName(char* pname,
+char* KMLFileTagName(char* pname,/*{{{*/
 					 char* ktag){
 
@@ -245,6 +241,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTagName {{{*/
-char* KMLFileTagName(char* pname,int *m,int maxlen,
+char* KMLFileTagName(char* pname,int *m,int maxlen,/*{{{*/
 					 char* ktag){
 
@@ -290,6 +285,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTagAttrib {{{*/
-int KMLFileTagAttrib(KML_Object* kobj,
+int KMLFileTagAttrib(KML_Object* kobj,/*{{{*/
 					 char* ktag){
 
@@ -339,6 +333,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenParse {{{*/
-int KMLFileTokenParse(int* pival,
+int KMLFileTokenParse(int* pival,/*{{{*/
 					  char* ktag,
 					  FILE* fid){
@@ -375,6 +368,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenParse {{{*/
-int KMLFileTokenParse(bool* pbval, char* ktag, FILE* fid){
+int KMLFileTokenParse(bool* pbval, char* ktag, FILE* fid){/*{{{*/
 
 	int     ival;
@@ -410,6 +402,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenParse {{{*/
-char* KMLFileTokenParse(char* pstr,
+char* KMLFileTokenParse(char* pstr,/*{{{*/
 						char* ktag,
 						FILE* fid){
@@ -420,6 +411,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenParse {{{*/
-char* KMLFileTokenParse(char* pstr,int *m,int maxlen,
+char* KMLFileTokenParse(char* pstr,int *m,int maxlen,/*{{{*/
 						char* ktag,
 						FILE* fid){
@@ -472,6 +462,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenParse {{{*/
-int KMLFileTokenParse(float* pfval,
+int KMLFileTokenParse(float* pfval,/*{{{*/
 					  char* ktag,
 					  FILE* fid){
@@ -507,6 +496,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenParse {{{*/
-int KMLFileTokenParse(double* pdval,
+int KMLFileTokenParse(double* pdval,/*{{{*/
 					  char* ktag,
 					  FILE* fid){
@@ -542,6 +530,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenParse {{{*/
-int KMLFileTokenParse(double **pdval,int* m,int maxlen,
+int KMLFileTokenParse(double **pdval,int* m,int maxlen,/*{{{*/
 					  char* ktag,
 					  FILE* fid){
@@ -610,6 +597,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTokenParse {{{*/
-int KMLFileTokenParse(double **pdval,int* m,int n,int maxlen,
+int KMLFileTokenParse(double **pdval,int* m,int n,int maxlen,/*{{{*/
 					  char* ktag,
 					  FILE* fid){
@@ -682,6 +668,5 @@
 }
 /*}}}*/
-/*FUNCTION  KMLFileTagSkip {{{*/
-int KMLFileTagSkip(char* ktag, FILE* fid){
+int KMLFileTagSkip(char* ktag, FILE* fid){/*{{{*/
 
 	char*   kstr;
Index: /issm/trunk-jpl/src/c/kml/KML_Attribute.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Attribute.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Attribute.cpp	(revision 18063)
@@ -16,6 +16,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Attribute::KML_Attribute(){{{*/
-KML_Attribute::KML_Attribute(){
+KML_Attribute::KML_Attribute(){/*{{{*/
 
 	name      =NULL;
@@ -24,6 +23,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Attribute::~KML_Attribute(){{{*/
-KML_Attribute::~KML_Attribute(){
+KML_Attribute::~KML_Attribute(){/*{{{*/
 
 	if (name      ) xDelete<char>(name);
@@ -34,6 +32,5 @@
 
 /*Other*/
-/*FUNCTION KML_Attribute::Echo {{{*/
-void  KML_Attribute::Echo(){
+void  KML_Attribute::Echo(){/*{{{*/
 
 	int   i;
@@ -48,6 +45,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Attribute::DeepEcho {{{*/
-void  KML_Attribute::DeepEcho(){
+void  KML_Attribute::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -58,6 +54,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Attribute::DeepEcho {{{*/
-void  KML_Attribute::DeepEcho(const char* indent){
+void  KML_Attribute::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -72,6 +67,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Attribute::Write {{{*/
-void  KML_Attribute::Write(FILE* filout,const char* indent){
+void  KML_Attribute::Write(FILE* filout,const char* indent){/*{{{*/
 
 //  attributes always written in keyword line of kml_object
@@ -82,6 +76,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Attribute::Read {{{*/
-void  KML_Attribute::Read(FILE* fid,char* kstr){
+void  KML_Attribute::Read(FILE* fid,char* kstr){/*{{{*/
 
 //  attributes always read in keyword line of kml_object
@@ -92,6 +85,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Attribute::Alloc {{{*/
-void  KML_Attribute::Alloc(const char* namei,const char* valuei){
+void  KML_Attribute::Alloc(const char* namei,const char* valuei){/*{{{*/
 
 	name =xNew<char>(strlen(namei )+1);
@@ -104,6 +96,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Attribute::Add {{{*/
-void  KML_Attribute::Add(DataSet* attrib){
+void  KML_Attribute::Add(DataSet* attrib){/*{{{*/
 
 	attrib->AddObject((Object*)this);
@@ -112,6 +103,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Attribute::Get {{{*/
-void  KML_Attribute::Get(char** pvalueo,char* deflt){
+void  KML_Attribute::Get(char** pvalueo,char* deflt){/*{{{*/
 
 	if (!value || !strlen(value)) {
Index: /issm/trunk-jpl/src/c/kml/KML_ColorStyle.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_ColorStyle.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_ColorStyle.cpp	(revision 18063)
@@ -18,6 +18,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_ColorStyle::KML_ColorStyle(){{{*/
-KML_ColorStyle::KML_ColorStyle(){
+KML_ColorStyle::KML_ColorStyle(){/*{{{*/
 
 	strcpy(color     ,"ffffffff");
@@ -26,6 +25,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_ColorStyle::~KML_ColorStyle(){{{*/
-KML_ColorStyle::~KML_ColorStyle(){
+KML_ColorStyle::~KML_ColorStyle(){/*{{{*/
 
 	;
@@ -35,6 +33,5 @@
 
 /*Other*/
-/*FUNCTION KML_ColorStyle::Echo {{{*/
-void  KML_ColorStyle::Echo(){
+void  KML_ColorStyle::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -48,6 +45,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_ColorStyle::DeepEcho {{{*/
-void  KML_ColorStyle::DeepEcho(){
+void  KML_ColorStyle::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -58,6 +54,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_ColorStyle::DeepEcho {{{*/
-void  KML_ColorStyle::DeepEcho(const char* indent){
+void  KML_ColorStyle::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -69,6 +64,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_ColorStyle::Write {{{*/
-void  KML_ColorStyle::Write(FILE* filout,const char* indent){
+void  KML_ColorStyle::Write(FILE* filout,const char* indent){/*{{{*/
 
 	KML_SubStyle::Write(filout,indent);
@@ -82,6 +76,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_ColorStyle::Read {{{*/
-void  KML_ColorStyle::Read(FILE* fid,char* kstr){
+void  KML_ColorStyle::Read(FILE* fid,char* kstr){/*{{{*/
 
 /*  process field within opening and closing tags  */
Index: /issm/trunk-jpl/src/c/kml/KML_Comment.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Comment.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Comment.cpp	(revision 18063)
@@ -16,6 +16,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Comment::KML_Comment(){{{*/
-KML_Comment::KML_Comment(){
+KML_Comment::KML_Comment(){/*{{{*/
 
 	value     =NULL;
@@ -23,6 +22,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Comment::~KML_Comment(){{{*/
-KML_Comment::~KML_Comment(){
+KML_Comment::~KML_Comment(){/*{{{*/
 
 	if (value     ) xDelete<char>(value);
@@ -32,6 +30,5 @@
 
 /*Other*/
-/*FUNCTION KML_Comment::Echo {{{*/
-void  KML_Comment::Echo(){
+void  KML_Comment::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -43,6 +40,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Comment::DeepEcho {{{*/
-void  KML_Comment::DeepEcho(){
+void  KML_Comment::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -53,6 +49,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Comment::DeepEcho {{{*/
-void  KML_Comment::DeepEcho(const char* indent){
+void  KML_Comment::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -64,6 +59,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Comment::Write {{{*/
-void  KML_Comment::Write(FILE* filout,const char* indent){
+void  KML_Comment::Write(FILE* filout,const char* indent){/*{{{*/
 
 	if (strncmp(&value[0]              ,"<!--",4))
@@ -76,6 +70,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Comment::Read {{{*/
-void  KML_Comment::Read(FILE* fid,char* kstr){
+void  KML_Comment::Read(FILE* fid,char* kstr){/*{{{*/
 
 //  comments always read as part of KMLFileToken
@@ -86,6 +79,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Comment::Alloc {{{*/
-void  KML_Comment::Alloc(const char* valuei){
+void  KML_Comment::Alloc(const char* valuei){/*{{{*/
 
 	value=xNew<char>(strlen(valuei)+1);
@@ -95,6 +87,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Comment::Add {{{*/
-void  KML_Comment::Add(DataSet* commnt){
+void  KML_Comment::Add(DataSet* commnt){/*{{{*/
 
 	commnt->AddObject((Object*)this);
@@ -103,6 +94,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Comment::Get {{{*/
-void  KML_Comment::Get(char** pvalueo){
+void  KML_Comment::Get(char** pvalueo){/*{{{*/
 
 	*pvalueo=xNew<char>(strlen(value)+1);
Index: /issm/trunk-jpl/src/c/kml/KML_Container.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Container.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Container.cpp	(revision 18063)
@@ -21,6 +21,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Container::KML_Container(){{{*/
-KML_Container::KML_Container(){
+KML_Container::KML_Container(){/*{{{*/
 
 	feature   =new DataSet;
@@ -28,6 +27,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Container::~KML_Container(){{{*/
-KML_Container::~KML_Container(){
+KML_Container::~KML_Container(){/*{{{*/
 
 	if (feature) {
@@ -40,6 +38,5 @@
 
 /*Other*/
-/*FUNCTION KML_Container::Echo {{{*/
-void  KML_Container::Echo(){
+void  KML_Container::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -52,6 +49,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Container::DeepEcho {{{*/
-void  KML_Container::DeepEcho(){
+void  KML_Container::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -62,6 +58,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Container::DeepEcho {{{*/
-void  KML_Container::DeepEcho(const char* indent){
+void  KML_Container::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -88,6 +83,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Container::Write {{{*/
-void  KML_Container::Write(FILE* filout,const char* indent){
+void  KML_Container::Write(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
@@ -108,6 +102,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Container::Read {{{*/
-void  KML_Container::Read(FILE* fid,char* kstr){
+void  KML_Container::Read(FILE* fid,char* kstr){/*{{{*/
 
 	KML_Object*  kobj;
@@ -154,6 +147,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Container::WriteExp {{{*/
-void  KML_Container::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_Container::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	int   i;
Index: /issm/trunk-jpl/src/c/kml/KML_Document.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Document.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Document.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Document::KML_Document(){{{*/
-KML_Document::KML_Document(){
+KML_Document::KML_Document(){/*{{{*/
 
 	;
@@ -24,6 +23,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Document::~KML_Document(){{{*/
-KML_Document::~KML_Document(){
+KML_Document::~KML_Document(){/*{{{*/
 
 	;
@@ -33,6 +31,5 @@
 
 /*Other*/
-/*FUNCTION KML_Document::Echo {{{*/
-void  KML_Document::Echo(){
+void  KML_Document::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -44,6 +41,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Document::DeepEcho {{{*/
-void  KML_Document::DeepEcho(){
+void  KML_Document::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -54,6 +50,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Document::DeepEcho {{{*/
-void  KML_Document::DeepEcho(const char* indent){
+void  KML_Document::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -65,6 +60,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Document::Write {{{*/
-void  KML_Document::Write(FILE* filout,const char* indent){
+void  KML_Document::Write(FILE* filout,const char* indent){/*{{{*/
 
 	fprintf(filout,"%s<Document",indent);
@@ -80,6 +74,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Document::Read {{{*/
-void  KML_Document::Read(FILE* fid,char* kstr){
+void  KML_Document::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/kml/KML_Feature.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Feature.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Feature.cpp	(revision 18063)
@@ -27,6 +27,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Feature::KML_Feature(){{{*/
-KML_Feature::KML_Feature(){
+KML_Feature::KML_Feature(){/*{{{*/
 
 	memcpy(name,"",(strlen("")+1)*sizeof(char));
@@ -41,6 +40,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Feature::~KML_Feature(){{{*/
-KML_Feature::~KML_Feature(){
+KML_Feature::~KML_Feature(){/*{{{*/
 
 	if (style) {
@@ -53,6 +51,5 @@
 
 /*Other*/
-/*FUNCTION KML_Feature::Echo {{{*/
-void  KML_Feature::Echo(){
+void  KML_Feature::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -71,6 +68,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Feature::DeepEcho {{{*/
-void  KML_Feature::DeepEcho(){
+void  KML_Feature::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -81,6 +77,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Feature::DeepEcho {{{*/
-void  KML_Feature::DeepEcho(const char* indent){
+void  KML_Feature::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -114,6 +109,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Feature::Write {{{*/
-void  KML_Feature::Write(FILE* filout,const char* indent){
+void  KML_Feature::Write(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
@@ -145,6 +139,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Feature::Read {{{*/
-void  KML_Feature::Read(FILE* fid,char* kstr){
+void  KML_Feature::Read(FILE* fid,char* kstr){/*{{{*/
 
 	KML_Object*  kobj;
Index: /issm/trunk-jpl/src/c/kml/KML_File.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_File.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_File.cpp	(revision 18063)
@@ -18,6 +18,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_File::KML_File(){{{*/
-KML_File::KML_File(){
+KML_File::KML_File(){/*{{{*/
 
 	;
@@ -25,6 +24,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_File::~KML_File(){{{*/
-KML_File::~KML_File(){
+KML_File::~KML_File(){/*{{{*/
 
 	;
@@ -34,6 +32,5 @@
 
 /*Other*/
-/*FUNCTION KML_File::Echo {{{*/
-void  KML_File::Echo(){
+void  KML_File::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -45,6 +42,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_File::DeepEcho {{{*/
-void  KML_File::DeepEcho(){
+void  KML_File::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -55,6 +51,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_File::DeepEcho {{{*/
-void  KML_File::DeepEcho(const char* indent){
+void  KML_File::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -66,6 +61,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_File::Write {{{*/
-void  KML_File::Write(FILE* filout,const char* indent){
+void  KML_File::Write(FILE* filout,const char* indent){/*{{{*/
 
 	fprintf(filout,"%s<kml",indent);
@@ -81,6 +75,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_File::Read {{{*/
-void  KML_File::Read(FILE* fid,char* kstr){
+void  KML_File::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
@@ -120,6 +113,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_File::WriteExp {{{*/
-void  KML_File::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_File::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	int   i;
Index: /issm/trunk-jpl/src/c/kml/KML_Folder.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Folder.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Folder.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Folder::KML_Folder(){{{*/
-KML_Folder::KML_Folder(){
+KML_Folder::KML_Folder(){/*{{{*/
 
 	;
@@ -24,6 +23,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Folder::~KML_Folder(){{{*/
-KML_Folder::~KML_Folder(){
+KML_Folder::~KML_Folder(){/*{{{*/
 
 	;
@@ -33,6 +31,5 @@
 
 /*Other*/
-/*FUNCTION KML_Folder::Echo {{{*/
-void  KML_Folder::Echo(){
+void  KML_Folder::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -44,6 +41,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Folder::DeepEcho {{{*/
-void  KML_Folder::DeepEcho(){
+void  KML_Folder::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -54,6 +50,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Folder::DeepEcho {{{*/
-void  KML_Folder::DeepEcho(const char* indent){
+void  KML_Folder::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -65,6 +60,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Folder::Write {{{*/
-void  KML_Folder::Write(FILE* filout,const char* indent){
+void  KML_Folder::Write(FILE* filout,const char* indent){/*{{{*/
 
 	fprintf(filout,"%s<Folder",indent);
@@ -80,6 +74,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Folder::Read {{{*/
-void  KML_Folder::Read(FILE* fid,char* kstr){
+void  KML_Folder::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/kml/KML_Geometry.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Geometry.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Geometry.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Geometry::KML_Geometry(){{{*/
-KML_Geometry::KML_Geometry(){
+KML_Geometry::KML_Geometry(){/*{{{*/
 
 	;
@@ -24,6 +23,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Geometry::~KML_Geometry(){{{*/
-KML_Geometry::~KML_Geometry(){
+KML_Geometry::~KML_Geometry(){/*{{{*/
 
 	;
@@ -33,6 +31,5 @@
 
 /*Other*/
-/*FUNCTION KML_Geometry::Echo {{{*/
-void  KML_Geometry::Echo(){
+void  KML_Geometry::Echo(){/*{{{*/
 
 	this->KML_Object::Echo();
@@ -41,6 +38,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Geometry::DeepEcho {{{*/
-void  KML_Geometry::DeepEcho(){
+void  KML_Geometry::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -51,6 +47,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Geometry::DeepEcho {{{*/
-void  KML_Geometry::DeepEcho(const char* indent){
+void  KML_Geometry::DeepEcho(const char* indent){/*{{{*/
 
 	this->KML_Object::DeepEcho(indent);
@@ -59,6 +54,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Geometry::Write {{{*/
-void  KML_Geometry::Write(FILE* filout,const char* indent){
+void  KML_Geometry::Write(FILE* filout,const char* indent){/*{{{*/
 
 	KML_Object::Write(filout,indent);
@@ -67,6 +61,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Geometry::Read {{{*/
-void  KML_Geometry::Read(FILE* fid,char* kstr){
+void  KML_Geometry::Read(FILE* fid,char* kstr){/*{{{*/
 
 /*  process field within opening and closing tags  */
Index: /issm/trunk-jpl/src/c/kml/KML_GroundOverlay.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_GroundOverlay.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_GroundOverlay.cpp	(revision 18063)
@@ -19,6 +19,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_GroundOverlay::KML_GroundOverlay(){{{*/
-KML_GroundOverlay::KML_GroundOverlay(){
+KML_GroundOverlay::KML_GroundOverlay(){/*{{{*/
 
 	altitude  = 0.;
@@ -29,6 +28,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_GroundOverlay::~KML_GroundOverlay(){{{*/
-KML_GroundOverlay::~KML_GroundOverlay(){
+KML_GroundOverlay::~KML_GroundOverlay(){/*{{{*/
 
 	if (llbox) {
@@ -41,6 +39,5 @@
 
 /*Other*/
-/*FUNCTION KML_GroundOverlay::Echo {{{*/
-void  KML_GroundOverlay::Echo(){
+void  KML_GroundOverlay::Echo(){/*{{{*/
 
 	_printf_("KML_GroundOverlay:\n");
@@ -52,6 +49,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_GroundOverlay::DeepEcho {{{*/
-void  KML_GroundOverlay::DeepEcho(){
+void  KML_GroundOverlay::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -62,6 +58,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_GroundOverlay::DeepEcho {{{*/
-void  KML_GroundOverlay::DeepEcho(const char* indent){
+void  KML_GroundOverlay::DeepEcho(const char* indent){/*{{{*/
 
 	char  indent2[81];
@@ -81,6 +76,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_GroundOverlay::Write {{{*/
-void  KML_GroundOverlay::Write(FILE* filout,const char* indent){
+void  KML_GroundOverlay::Write(FILE* filout,const char* indent){/*{{{*/
 
 	char  indent2[81];
@@ -107,6 +101,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_GroundOverlay::Read {{{*/
-void  KML_GroundOverlay::Read(FILE* fid,char* kstr){
+void  KML_GroundOverlay::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/kml/KML_Icon.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Icon.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Icon.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Icon::KML_Icon(){{{*/
-KML_Icon::KML_Icon(){
+KML_Icon::KML_Icon(){/*{{{*/
 
 	strcpy(href      ,"");
@@ -31,6 +30,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Icon::~KML_Icon(){{{*/
-KML_Icon::~KML_Icon(){
+KML_Icon::~KML_Icon(){/*{{{*/
 
 	;
@@ -40,6 +38,5 @@
 
 /*Other*/
-/*FUNCTION KML_Icon::Echo {{{*/
-void  KML_Icon::Echo(){
+void  KML_Icon::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -60,6 +57,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Icon::DeepEcho {{{*/
-void  KML_Icon::DeepEcho(){
+void  KML_Icon::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -70,6 +66,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Icon::DeepEcho {{{*/
-void  KML_Icon::DeepEcho(const char* indent){
+void  KML_Icon::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -90,6 +85,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Icon::Write {{{*/
-void  KML_Icon::Write(FILE* filout,const char* indent){
+void  KML_Icon::Write(FILE* filout,const char* indent){/*{{{*/
 
 	fprintf(filout,"%s<Icon",indent);
@@ -119,6 +113,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Icon::Read {{{*/
-void  KML_Icon::Read(FILE* fid,char* kstr){
+void  KML_Icon::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/kml/KML_LatLonBox.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_LatLonBox.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_LatLonBox.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_LatLonBox::KML_LatLonBox(){{{*/
-KML_LatLonBox::KML_LatLonBox(){
+KML_LatLonBox::KML_LatLonBox(){/*{{{*/
 
 	north     = 0.;
@@ -28,6 +27,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LatLonBox::~KML_LatLonBox(){{{*/
-KML_LatLonBox::~KML_LatLonBox(){
+KML_LatLonBox::~KML_LatLonBox(){/*{{{*/
 
 	;
@@ -37,6 +35,5 @@
 
 /*Other*/
-/*FUNCTION KML_LatLonBox::Echo {{{*/
-void  KML_LatLonBox::Echo(){
+void  KML_LatLonBox::Echo(){/*{{{*/
 
 	_printf_("KML_LatLonBox:\n");
@@ -50,6 +47,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LatLonBox::DeepEcho {{{*/
-void  KML_LatLonBox::DeepEcho(){
+void  KML_LatLonBox::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -60,6 +56,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LatLonBox::DeepEcho {{{*/
-void  KML_LatLonBox::DeepEcho(const char* indent){
+void  KML_LatLonBox::DeepEcho(const char* indent){/*{{{*/
 
 	_printf_(indent << "KML_LatLonBox:\n");
@@ -73,6 +68,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LatLonBox::Write {{{*/
-void  KML_LatLonBox::Write(FILE* filout,const char* indent){
+void  KML_LatLonBox::Write(FILE* filout,const char* indent){/*{{{*/
 
 	fprintf(filout,"%s<LatLonBox",indent);
@@ -94,6 +88,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LatLonBox::Read {{{*/
-void  KML_LatLonBox::Read(FILE* fid,char* kstr){
+void  KML_LatLonBox::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/kml/KML_LineString.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_LineString.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_LineString.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_LineString::KML_LineString(){{{*/
-KML_LineString::KML_LineString(){
+KML_LineString::KML_LineString(){/*{{{*/
 
 	extrude   =false;
@@ -29,6 +28,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineString::~KML_LineString(){{{*/
-KML_LineString::~KML_LineString(){
+KML_LineString::~KML_LineString(){/*{{{*/
 
 	if (coords) xDelete<double>(coords);
@@ -41,6 +39,5 @@
 
 /*Other*/
-/*FUNCTION KML_LineString::Echo {{{*/
-void  KML_LineString::Echo(){
+void  KML_LineString::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -57,6 +54,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineString::DeepEcho {{{*/
-void  KML_LineString::DeepEcho(){
+void  KML_LineString::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -67,6 +63,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineString::DeepEcho {{{*/
-void  KML_LineString::DeepEcho(const char* indent){
+void  KML_LineString::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -86,6 +81,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineString::Write {{{*/
-void  KML_LineString::Write(FILE* filout,const char* indent){
+void  KML_LineString::Write(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
@@ -114,6 +108,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineString::Read {{{*/
-void  KML_LineString::Read(FILE* fid,char* kstr){
+void  KML_LineString::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
@@ -171,6 +164,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineString::WriteExp {{{*/
-void  KML_LineString::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_LineString::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	int     i;
Index: /issm/trunk-jpl/src/c/kml/KML_LineStyle.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_LineStyle.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_LineStyle.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_LineStyle::KML_LineStyle(){{{*/
-KML_LineStyle::KML_LineStyle(){
+KML_LineStyle::KML_LineStyle(){/*{{{*/
 
 	width     =1.;
@@ -24,6 +23,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineStyle::~KML_LineStyle(){{{*/
-KML_LineStyle::~KML_LineStyle(){
+KML_LineStyle::~KML_LineStyle(){/*{{{*/
 
 	;
@@ -33,6 +31,5 @@
 
 /*Other*/
-/*FUNCTION KML_LineStyle::Echo {{{*/
-void  KML_LineStyle::Echo(){
+void  KML_LineStyle::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -46,6 +43,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineStyle::DeepEcho {{{*/
-void  KML_LineStyle::DeepEcho(){
+void  KML_LineStyle::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -56,6 +52,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineStyle::DeepEcho {{{*/
-void  KML_LineStyle::DeepEcho(const char* indent){
+void  KML_LineStyle::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -69,6 +64,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineStyle::Write {{{*/
-void  KML_LineStyle::Write(FILE* filout,const char* indent){
+void  KML_LineStyle::Write(FILE* filout,const char* indent){/*{{{*/
 
 	fprintf(filout,"%s<LineStyle",indent);
@@ -86,6 +80,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LineStyle::Read {{{*/
-void  KML_LineStyle::Read(FILE* fid,char* kstr){
+void  KML_LineStyle::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/kml/KML_LinearRing.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_LinearRing.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_LinearRing.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_LinearRing::KML_LinearRing(){{{*/
-KML_LinearRing::KML_LinearRing(){
+KML_LinearRing::KML_LinearRing(){/*{{{*/
 
 	extrude   =false;
@@ -29,6 +28,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LinearRing::~KML_LinearRing(){{{*/
-KML_LinearRing::~KML_LinearRing(){
+KML_LinearRing::~KML_LinearRing(){/*{{{*/
 
 	if (coords) xDelete<double>(coords);
@@ -41,6 +39,5 @@
 
 /*Other*/
-/*FUNCTION KML_LinearRing::Echo {{{*/
-void  KML_LinearRing::Echo(){
+void  KML_LinearRing::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -57,6 +54,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LinearRing::DeepEcho {{{*/
-void  KML_LinearRing::DeepEcho(){
+void  KML_LinearRing::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -67,6 +63,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LinearRing::DeepEcho {{{*/
-void  KML_LinearRing::DeepEcho(const char* indent){
+void  KML_LinearRing::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -86,6 +81,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LinearRing::Write {{{*/
-void  KML_LinearRing::Write(FILE* filout,const char* indent){
+void  KML_LinearRing::Write(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
@@ -114,6 +108,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LinearRing::Read {{{*/
-void  KML_LinearRing::Read(FILE* fid,char* kstr){
+void  KML_LinearRing::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char  *kstri = NULL;
@@ -160,6 +153,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_LinearRing::WriteExp {{{*/
-void  KML_LinearRing::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_LinearRing::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	int     i;
Index: /issm/trunk-jpl/src/c/kml/KML_MultiGeometry.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_MultiGeometry.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_MultiGeometry.cpp	(revision 18063)
@@ -22,6 +22,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_MultiGeometry::KML_MultiGeometry(){{{*/
-KML_MultiGeometry::KML_MultiGeometry(){
+KML_MultiGeometry::KML_MultiGeometry(){/*{{{*/
 
 	geometry  =new DataSet;
@@ -29,6 +28,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_MultiGeometry::~KML_MultiGeometry(){{{*/
-KML_MultiGeometry::~KML_MultiGeometry(){
+KML_MultiGeometry::~KML_MultiGeometry(){/*{{{*/
 
 	if (geometry) {
@@ -41,6 +39,5 @@
 
 /*Other*/
-/*FUNCTION KML_MultiGeometry::Echo {{{*/
-void  KML_MultiGeometry::Echo(){
+void  KML_MultiGeometry::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -54,6 +51,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_MultiGeometry::DeepEcho {{{*/
-void  KML_MultiGeometry::DeepEcho(){
+void  KML_MultiGeometry::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -64,6 +60,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_MultiGeometry::DeepEcho {{{*/
-void  KML_MultiGeometry::DeepEcho(const char* indent){
+void  KML_MultiGeometry::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -91,6 +86,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_MultiGeometry::Write {{{*/
-void  KML_MultiGeometry::Write(FILE* filout,const char* indent){
+void  KML_MultiGeometry::Write(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
@@ -118,6 +112,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_MultiGeometry::Read {{{*/
-void  KML_MultiGeometry::Read(FILE* fid,char* kstr){
+void  KML_MultiGeometry::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
@@ -189,6 +182,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_MultiGeometry::WriteExp {{{*/
-void  KML_MultiGeometry::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_MultiGeometry::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	int   i;
Index: /issm/trunk-jpl/src/c/kml/KML_Object.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Object.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Object.cpp	(revision 18063)
@@ -32,6 +32,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Object::KML_Object(){{{*/
-KML_Object::KML_Object(){
+KML_Object::KML_Object(){/*{{{*/
 
 	attrib    =new DataSet;
@@ -41,6 +40,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::~KML_Object(){{{*/
-KML_Object::~KML_Object(){
+KML_Object::~KML_Object(){/*{{{*/
 
 	if (attrib) {
@@ -61,6 +59,5 @@
 
 /*Other*/
-/*FUNCTION KML_Object::Echo {{{*/
-void  KML_Object::Echo(){
+void  KML_Object::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -73,6 +70,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::DeepEcho {{{*/
-void  KML_Object::DeepEcho(){
+void  KML_Object::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -83,6 +79,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::DeepEcho {{{*/
-void  KML_Object::DeepEcho(const char* indent){
+void  KML_Object::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -125,6 +120,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::Write {{{*/
-void  KML_Object::Write(FILE* filout,const char* indent){
+void  KML_Object::Write(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
@@ -147,6 +141,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::Read {{{*/
-void  KML_Object::Read(FILE* fid,char* kstr){
+void  KML_Object::Read(FILE* fid,char* kstr){/*{{{*/
 
 	KML_Object*  kobj;
@@ -275,6 +268,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::WriteExp {{{*/
-void  KML_Object::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_Object::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	;
@@ -283,6 +275,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::AddAttrib {{{*/
-void  KML_Object::AddAttrib(const char* name,const char* value){
+void  KML_Object::AddAttrib(const char* name,const char* value){/*{{{*/
 
 	KML_Attribute* katt=NULL;
@@ -295,6 +286,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::WriteAttrib {{{*/
-void  KML_Object::WriteAttrib(FILE* filout,const char* indent){
+void  KML_Object::WriteAttrib(FILE* filout,const char* indent){/*{{{*/
 
 //  attributes always written in keyword line of kml_object
@@ -309,6 +299,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::AddCommnt {{{*/
-void  KML_Object::AddCommnt(int ncom,char** pcom){
+void  KML_Object::AddCommnt(int ncom,char** pcom){/*{{{*/
 
 	int   i;
@@ -324,6 +313,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::AddCommnt {{{*/
-void  KML_Object::AddCommnt(char* value){
+void  KML_Object::AddCommnt(char* value){/*{{{*/
 
 	KML_Comment* kcom=NULL;
@@ -336,6 +324,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Object::WriteCommnt {{{*/
-void  KML_Object::WriteCommnt(FILE* filout,const char* indent){
+void  KML_Object::WriteCommnt(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
Index: /issm/trunk-jpl/src/c/kml/KML_Overlay.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Overlay.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Overlay.cpp	(revision 18063)
@@ -18,6 +18,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Overlay::KML_Overlay(){{{*/
-KML_Overlay::KML_Overlay(){
+KML_Overlay::KML_Overlay(){/*{{{*/
 
 	strcpy(color     ,"ffffffff");
@@ -29,6 +28,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Overlay::~KML_Overlay(){{{*/
-KML_Overlay::~KML_Overlay(){
+KML_Overlay::~KML_Overlay(){/*{{{*/
 
 	if (icon) {
@@ -41,6 +39,5 @@
 
 /*Other*/
-/*FUNCTION KML_Overlay::Echo {{{*/
-void  KML_Overlay::Echo(){
+void  KML_Overlay::Echo(){/*{{{*/
 
 	KML_Feature::Echo();
@@ -50,6 +47,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Overlay::DeepEcho {{{*/
-void  KML_Overlay::DeepEcho(){
+void  KML_Overlay::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -60,6 +56,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Overlay::DeepEcho {{{*/
-void  KML_Overlay::DeepEcho(const char* indent){
+void  KML_Overlay::DeepEcho(const char* indent){/*{{{*/
 
 	char  indent2[81];
@@ -77,6 +72,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Overlay::Write {{{*/
-void  KML_Overlay::Write(FILE* filout,const char* indent){
+void  KML_Overlay::Write(FILE* filout,const char* indent){/*{{{*/
 
 	char  indent2[81];
@@ -97,6 +91,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Overlay::Read {{{*/
-void  KML_Overlay::Read(FILE* fid,char* kstr){
+void  KML_Overlay::Read(FILE* fid,char* kstr){/*{{{*/
 
 /*  process field within opening and closing tags  */
Index: /issm/trunk-jpl/src/c/kml/KML_Placemark.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Placemark.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Placemark.cpp	(revision 18063)
@@ -23,6 +23,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Placemark::KML_Placemark(){{{*/
-KML_Placemark::KML_Placemark(){
+KML_Placemark::KML_Placemark(){/*{{{*/
 
 	geometry  =new DataSet;
@@ -30,6 +29,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Placemark::~KML_Placemark(){{{*/
-KML_Placemark::~KML_Placemark(){
+KML_Placemark::~KML_Placemark(){/*{{{*/
 
 	if (geometry) {
@@ -42,6 +40,5 @@
 
 /*Other*/
-/*FUNCTION KML_Placemark::Echo {{{*/
-void  KML_Placemark::Echo(){
+void  KML_Placemark::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -55,6 +52,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Placemark::DeepEcho {{{*/
-void  KML_Placemark::DeepEcho(){
+void  KML_Placemark::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -65,6 +61,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Placemark::DeepEcho {{{*/
-void  KML_Placemark::DeepEcho(const char* indent){
+void  KML_Placemark::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -92,6 +87,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Placemark::Write {{{*/
-void  KML_Placemark::Write(FILE* filout,const char* indent){
+void  KML_Placemark::Write(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
@@ -119,6 +113,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Placemark::Read {{{*/
-void  KML_Placemark::Read(FILE* fid,char* kstr){
+void  KML_Placemark::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
@@ -190,6 +183,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Placemark::WriteExp {{{*/
-void  KML_Placemark::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_Placemark::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	int   i;
Index: /issm/trunk-jpl/src/c/kml/KML_Point.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Point.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Point.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Point::KML_Point(){{{*/
-KML_Point::KML_Point(){
+KML_Point::KML_Point(){/*{{{*/
 
 	extrude   =false;
@@ -29,6 +28,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::~KML_Point(){{{*/
-KML_Point::~KML_Point(){
+KML_Point::~KML_Point(){/*{{{*/
 
 	;
@@ -38,6 +36,5 @@
 
 /*Other*/
-/*FUNCTION KML_Point::Echo {{{*/
-void  KML_Point::Echo(){
+void  KML_Point::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -53,6 +50,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::DeepEcho {{{*/
-void  KML_Point::DeepEcho(){
+void  KML_Point::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -63,6 +59,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::DeepEcho {{{*/
-void  KML_Point::DeepEcho(const char* indent){
+void  KML_Point::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -78,6 +73,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::Write {{{*/
-void  KML_Point::Write(FILE* filout,const char* indent){
+void  KML_Point::Write(FILE* filout,const char* indent){/*{{{*/
 
 	fprintf(filout,"%s<Point",indent);
@@ -98,6 +92,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::Read {{{*/
-void  KML_Point::Read(FILE* fid,char* kstr){
+void  KML_Point::Read(FILE* fid,char* kstr){/*{{{*/
 
 	double*      pcoords=&coords[0];
@@ -146,6 +139,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::WriteExp {{{*/
-void  KML_Point::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_Point::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	int     i;
Index: /issm/trunk-jpl/src/c/kml/KML_PolyStyle.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_PolyStyle.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_PolyStyle.cpp	(revision 18063)
@@ -19,6 +19,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_PolyStyle::KML_PolyStyle(){{{*/
-KML_PolyStyle::KML_PolyStyle(){
+KML_PolyStyle::KML_PolyStyle(){/*{{{*/
 
 	fill      =true;
@@ -27,6 +26,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_PolyStyle::~KML_PolyStyle(){{{*/
-KML_PolyStyle::~KML_PolyStyle(){
+KML_PolyStyle::~KML_PolyStyle(){/*{{{*/
 
 	;
@@ -36,6 +34,5 @@
 
 /*Other*/
-/*FUNCTION KML_PolyStyle::Echo {{{*/
-void  KML_PolyStyle::Echo(){
+void  KML_PolyStyle::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -50,6 +47,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_PolyStyle::DeepEcho {{{*/
-void  KML_PolyStyle::DeepEcho(){
+void  KML_PolyStyle::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -60,6 +56,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_PolyStyle::DeepEcho {{{*/
-void  KML_PolyStyle::DeepEcho(const char* indent){
+void  KML_PolyStyle::DeepEcho(const char* indent){/*{{{*/
 
 	bool  flag=true;
@@ -74,6 +69,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_PolyStyle::Write {{{*/
-void  KML_PolyStyle::Write(FILE* filout,const char* indent){
+void  KML_PolyStyle::Write(FILE* filout,const char* indent){/*{{{*/
 
 	fprintf(filout,"%s<PolyStyle",indent);
@@ -92,6 +86,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_PolyStyle::Read {{{*/
-void  KML_PolyStyle::Read(FILE* fid,char* kstr){
+void  KML_PolyStyle::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/kml/KML_Polygon.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Polygon.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Polygon.cpp	(revision 18063)
@@ -18,6 +18,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Polygon::KML_Polygon(){{{*/
-KML_Polygon::KML_Polygon(){
+KML_Polygon::KML_Polygon(){/*{{{*/
 
 	extrude   =false;
@@ -30,6 +29,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Polygon::~KML_Polygon(){{{*/
-KML_Polygon::~KML_Polygon(){
+KML_Polygon::~KML_Polygon(){/*{{{*/
 
 	if (inner) {
@@ -47,6 +45,5 @@
 
 /*Other*/
-/*FUNCTION KML_Polygon::Echo {{{*/
-void  KML_Polygon::Echo(){
+void  KML_Polygon::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -64,6 +61,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Polygon::DeepEcho {{{*/
-void  KML_Polygon::DeepEcho(){
+void  KML_Polygon::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -74,6 +70,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Polygon::DeepEcho {{{*/
-void  KML_Polygon::DeepEcho(const char* indent){
+void  KML_Polygon::DeepEcho(const char* indent){/*{{{*/
 
 	int   i;
@@ -112,6 +107,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Polygon::Write {{{*/
-void  KML_Polygon::Write(FILE* filout,const char* indent){
+void  KML_Polygon::Write(FILE* filout,const char* indent){/*{{{*/
 
 	int   i;
@@ -152,6 +146,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Polygon::Read {{{*/
-void  KML_Polygon::Read(FILE* fid,char* kstr){
+void  KML_Polygon::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
@@ -259,6 +252,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Polygon::WriteExp {{{*/
-void  KML_Polygon::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
+void  KML_Polygon::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){/*{{{*/
 
 	int   i;
Index: /issm/trunk-jpl/src/c/kml/KML_Style.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Style.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Style.cpp	(revision 18063)
@@ -19,6 +19,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Style::KML_Style(){{{*/
-KML_Style::KML_Style(){
+KML_Style::KML_Style(){/*{{{*/
 
 	icon      =NULL;
@@ -31,6 +30,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Style::~KML_Style(){{{*/
-KML_Style::~KML_Style(){
+KML_Style::~KML_Style(){/*{{{*/
 
 	if (list) {
@@ -63,6 +61,5 @@
 
 /*Other*/
-/*FUNCTION KML_Style::Echo {{{*/
-void  KML_Style::Echo(){
+void  KML_Style::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -81,6 +78,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Style::DeepEcho {{{*/
-void  KML_Style::DeepEcho(){
+void  KML_Style::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -91,6 +87,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Style::DeepEcho {{{*/
-void  KML_Style::DeepEcho(const char* indent){
+void  KML_Style::DeepEcho(const char* indent){/*{{{*/
 
 	char  indent2[81];
@@ -131,6 +126,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Style::Write {{{*/
-void  KML_Style::Write(FILE* filout,const char* indent){
+void  KML_Style::Write(FILE* filout,const char* indent){/*{{{*/
 
 	char  indent2[81];
@@ -165,6 +159,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Style::Read {{{*/
-void  KML_Style::Read(FILE* fid,char* kstr){
+void  KML_Style::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/kml/KML_StyleSelector.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_StyleSelector.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_StyleSelector.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_StyleSelector::KML_StyleSelector(){{{*/
-KML_StyleSelector::KML_StyleSelector(){
+KML_StyleSelector::KML_StyleSelector(){/*{{{*/
 
 	;
@@ -24,6 +23,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_StyleSelector::~KML_StyleSelector(){{{*/
-KML_StyleSelector::~KML_StyleSelector(){
+KML_StyleSelector::~KML_StyleSelector(){/*{{{*/
 
 	;
@@ -33,6 +31,5 @@
 
 /*Other*/
-/*FUNCTION KML_StyleSelector::Echo {{{*/
-void  KML_StyleSelector::Echo(){
+void  KML_StyleSelector::Echo(){/*{{{*/
 
 	KML_Object::Echo();
@@ -41,6 +38,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_StyleSelector::DeepEcho {{{*/
-void  KML_StyleSelector::DeepEcho(){
+void  KML_StyleSelector::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -51,6 +47,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_StyleSelector::DeepEcho {{{*/
-void  KML_StyleSelector::DeepEcho(const char* indent){
+void  KML_StyleSelector::DeepEcho(const char* indent){/*{{{*/
 
 	KML_Object::DeepEcho(indent);
@@ -59,6 +54,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_StyleSelector::Write {{{*/
-void  KML_StyleSelector::Write(FILE* filout,const char* indent){
+void  KML_StyleSelector::Write(FILE* filout,const char* indent){/*{{{*/
 
 	KML_Object::Write(filout,indent);
@@ -67,6 +61,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_StyleSelector::Read {{{*/
-void  KML_StyleSelector::Read(FILE* fid,char* kstr){
+void  KML_StyleSelector::Read(FILE* fid,char* kstr){/*{{{*/
 
 /*  process field within opening and closing tags  */
Index: /issm/trunk-jpl/src/c/kml/KML_SubStyle.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_SubStyle.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_SubStyle.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_SubStyle::KML_SubStyle(){{{*/
-KML_SubStyle::KML_SubStyle(){
+KML_SubStyle::KML_SubStyle(){/*{{{*/
 
 	;
@@ -24,6 +23,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_SubStyle::~KML_SubStyle(){{{*/
-KML_SubStyle::~KML_SubStyle(){
+KML_SubStyle::~KML_SubStyle(){/*{{{*/
 
 	;
@@ -33,6 +31,5 @@
 
 /*Other*/
-/*FUNCTION KML_SubStyle::Echo {{{*/
-void  KML_SubStyle::Echo(){
+void  KML_SubStyle::Echo(){/*{{{*/
 
 	KML_Object::Echo();
@@ -41,6 +38,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_SubStyle::DeepEcho {{{*/
-void  KML_SubStyle::DeepEcho(){
+void  KML_SubStyle::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -51,6 +47,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_SubStyle::DeepEcho {{{*/
-void  KML_SubStyle::DeepEcho(const char* indent){
+void  KML_SubStyle::DeepEcho(const char* indent){/*{{{*/
 
 	KML_Object::DeepEcho(indent);
@@ -59,6 +54,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_SubStyle::Write {{{*/
-void  KML_SubStyle::Write(FILE* filout,const char* indent){
+void  KML_SubStyle::Write(FILE* filout,const char* indent){/*{{{*/
 
 	KML_Object::Write(filout,indent);
@@ -67,6 +61,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_SubStyle::Read {{{*/
-void  KML_SubStyle::Read(FILE* fid,char* kstr){
+void  KML_SubStyle::Read(FILE* fid,char* kstr){/*{{{*/
 
 /*  process field within opening and closing tags  */
Index: /issm/trunk-jpl/src/c/kml/KML_Unknown.cpp
===================================================================
--- /issm/trunk-jpl/src/c/kml/KML_Unknown.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/kml/KML_Unknown.cpp	(revision 18063)
@@ -17,6 +17,5 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Unknown::KML_Unknown(){{{*/
-KML_Unknown::KML_Unknown(){
+KML_Unknown::KML_Unknown(){/*{{{*/
 
 	name      =NULL;
@@ -25,6 +24,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Unknown::~KML_Unknown(){{{*/
-KML_Unknown::~KML_Unknown(){
+KML_Unknown::~KML_Unknown(){/*{{{*/
 
 	if (name      ) xDelete<char>(name);
@@ -35,6 +33,5 @@
 
 /*Other*/
-/*FUNCTION KML_Unknown::Echo {{{*/
-void  KML_Unknown::Echo(){
+void  KML_Unknown::Echo(){/*{{{*/
 
 	bool  flag=true;
@@ -53,6 +50,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Unknown::DeepEcho {{{*/
-void  KML_Unknown::DeepEcho(){
+void  KML_Unknown::DeepEcho(){/*{{{*/
 
 	char  indent[81]="";
@@ -63,6 +59,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Unknown::DeepEcho {{{*/
-void  KML_Unknown::DeepEcho(const char* indent){
+void  KML_Unknown::DeepEcho(const char* indent){/*{{{*/
 
 	char*        valuei;
@@ -93,6 +88,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Unknown::Write {{{*/
-void  KML_Unknown::Write(FILE* filout,const char* indent){
+void  KML_Unknown::Write(FILE* filout,const char* indent){/*{{{*/
 
 	char*        valuei;
@@ -125,6 +119,5 @@
 }
 /*}}}*/
-/*FUNCTION KML_Unknown::Read {{{*/
-void  KML_Unknown::Read(FILE* fid,char* kstr){
+void  KML_Unknown::Read(FILE* fid,char* kstr){/*{{{*/
 
 	char*        kstri;
Index: /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp	(revision 18063)
@@ -56,6 +56,5 @@
 }
 
-/*FUNCTION ContactFSLevelset{{{*/
-IssmDouble*    ContactFSLevelset(Elements* elements,Vertices* vertices){ 
+IssmDouble*    ContactFSLevelset(Elements* elements,Vertices* vertices){ /*{{{*/
 
 	Vector<IssmDouble>* vertexgrounded = NULL;
@@ -108,6 +107,5 @@
 }
 /*}}}*/
-/*FUNCTION PotentialUngrounding {{{*/
-IssmDouble*    PotentialUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ 
+IssmDouble*    PotentialUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ /*{{{*/
 
 	int                 i,numberofvertices;
@@ -135,6 +133,5 @@
 }
 /*}}}*/
-/*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{*/
-IssmDouble*    PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,IssmDouble* vertices_potentially_ungrounding){ 
+IssmDouble*    PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,IssmDouble* vertices_potentially_ungrounding){ /*{{{*/
 	int                 i,analysis_type;
 	int                 nflipped,local_nflipped;
Index: /issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp	(revision 18063)
@@ -11,6 +11,5 @@
 #include <gsl/gsl_linalg.h>
 #endif
-/*FUNCTION Krigingx{{{*/
-int Krigingx(double** ppredictions,double **perror,double* obs_x, double* obs_y, double* obs_list, int obs_length,double* x_interp,double* y_interp,int n_interp,Options* options){
+int   Krigingx(double** ppredictions,double **perror,double* obs_x, double* obs_y, double* obs_list, int obs_length,double* x_interp,double* y_interp,int n_interp,Options* options){/*{{{*/
 
 	/*output*/
@@ -189,6 +188,5 @@
 	return 1;
 }/*}}}*/
-/*FUNCTION Krigingxt{{{*/
-void* Krigingxt(void* vpthread_handle){
+void* Krigingxt(void* vpthread_handle){/*{{{*/
 
 	/*gate variables :*/
@@ -236,6 +234,5 @@
 	return NULL;
 }/*}}}*/
-/*FUNCTION NearestNeighbort{{{*/
-void* NearestNeighbort(void* vpthread_handle){
+void* NearestNeighbort(void* vpthread_handle){/*{{{*/
 
 	/*gate variables :*/
@@ -282,6 +279,5 @@
 	return NULL;
 }/*}}}*/
-/*FUNCTION idwt{{{*/
-void* idwt(void* vpthread_handle){
+void* idwt(void* vpthread_handle){/*{{{*/
 
 	/*gate variables :*/
@@ -328,6 +324,5 @@
 	return NULL;
 }/*}}}*/
-/*FUNCTION v4t{{{*/
-void* v4t(void* vpthread_handle){
+void* v4t(void* vpthread_handle){/*{{{*/
 
 	/*gate variables :*/
@@ -373,6 +368,5 @@
 	return NULL;
 }/*}}}*/
-/*FUNCTION Distancest{{{*/
-void* Distancest(void* vpthread_handle){
+void* Distancest(void* vpthread_handle){/*{{{*/
 
 	/*gate variables :*/
Index: /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/modules/Krigingx/pKrigingx.cpp	(revision 18063)
@@ -9,6 +9,5 @@
 #include "../../shared/io/io.h"
 
-/*FUNCTION pKrigingx{{{*/
-int pKrigingx(double** ppredictions,double **perror,double* obs_x, double* obs_y, double* obs_list, int obs_length,double* x_interp,double* y_interp,int n_interp,Options* options){
+int pKrigingx(double** ppredictions,double **perror,double* obs_x, double* obs_y, double* obs_list, int obs_length,double* x_interp,double* y_interp,int n_interp,Options* options){/*{{{*/
 
 #ifdef _HAVE_MPI_
Index: /issm/trunk-jpl/src/c/shared/Elements/DrainageFunctionWaterfraction.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Elements/DrainageFunctionWaterfraction.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/shared/Elements/DrainageFunctionWaterfraction.cpp	(revision 18063)
@@ -7,5 +7,4 @@
 #include "../Exceptions/exceptions.h"
 
-/*FUNCTION IssmDouble DrainageFunctionWaterfraction()*/
 IssmDouble DrainageFunctionWaterfraction(IssmDouble waterfraction, IssmDouble dt=0.){
 	/* DrainageFunctionWaterfraction returns how much of the waterfraction is drained per year */
Index: /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp	(revision 18063)
@@ -15,6 +15,5 @@
 /*}}}*/
 
-/*FUNCTION TripleMultiply {{{*/
-int TripleMultiply(IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int nrowc, int ncolc, int itrnc, IssmDouble* d, int iaddd){
+int TripleMultiply(IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int nrowc, int ncolc, int itrnc, IssmDouble* d, int iaddd){/*{{{*/
 	/*TripleMultiply    Perform triple matrix product a*b*c+d.*/
 
@@ -77,6 +76,5 @@
 	return 1;
 }/*}}}*/
-/*FUNCTION MatrixMuliply {{{*/
-int MatrixMultiply(IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int iaddc ){
+int MatrixMultiply(IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int iaddc ){/*{{{*/
 	/*MatrixMultiply    Perform matrix multiplication a*b+c.*/
 	int noerr=1;
@@ -139,6 +137,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION MatrixInverse {{{*/
-int MatrixInverse( IssmDouble* a, int ndim, int nrow, IssmDouble* b, int nvec, IssmDouble* pdet ){
+int MatrixInverse( IssmDouble* a, int ndim, int nrow, IssmDouble* b, int nvec, IssmDouble* pdet ){/*{{{*/
 	/* MatrixInverse    Perform matrix inversion and linear equation solution.
 
@@ -312,6 +309,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION Matrix2x2Determinant(IssmDouble* Adet,IssmDouble* A) {{{*/
-void Matrix2x2Determinant(IssmDouble* Adet,IssmDouble* A){
+void Matrix2x2Determinant(IssmDouble* Adet,IssmDouble* A){/*{{{*/
 	/*Compute determinant of a 2x2 matrix*/
 
@@ -320,6 +316,5 @@
 }
 /*}}}*/
-/*FUNCTION Matrix2x2Invert(IssmDouble* Ainv,IssmDouble* A) {{{*/
-void Matrix2x2Invert(IssmDouble* Ainv,IssmDouble* A){
+void Matrix2x2Invert(IssmDouble* Ainv,IssmDouble* A){/*{{{*/
 
 	/*Intermediaries*/
@@ -337,6 +332,5 @@
 
 }/*}}}*/
-/*FUNCTION Matrix3x3Determinant(IssmDouble* Adet,IssmDouble* A) {{{*/
-void Matrix3x3Determinant(IssmDouble* Adet,IssmDouble* A){
+void Matrix3x3Determinant(IssmDouble* Adet,IssmDouble* A){/*{{{*/
 	/*Compute determinant of a 3x3 matrix*/
 
@@ -345,6 +339,5 @@
 }
 /*}}}*/
-/*FUNCTION Matrix3x3Invert(IssmDouble* Ainv,IssmDouble* A) {{{*/
-void Matrix3x3Invert(IssmDouble* Ainv,IssmDouble* A){
+void Matrix3x3Invert(IssmDouble* Ainv,IssmDouble* A){/*{{{*/
 
 	/*Intermediaries*/
@@ -367,6 +360,5 @@
 
 }/*}}}*/
-/*FUNCTION Matrix3x3Solve(IssmDouble* X,IssmDouble* A,IssmDouble* B) {{{*/
-void Matrix3x3Solve(IssmDouble* X,IssmDouble* A,IssmDouble* B){
+void Matrix3x3Solve(IssmDouble* X,IssmDouble* A,IssmDouble* B){/*{{{*/
 
 	IssmDouble Ainv[3][3];
@@ -376,6 +368,5 @@
 
 }/*}}}*/
-/*FUNCTION Matrix4x4Solve(IssmDouble* X,IssmDouble* A,IssmDouble *B) {{{*/
-void Matrix4x4Solve(IssmDouble* X,IssmDouble* A,IssmDouble *B){
+void Matrix4x4Solve(IssmDouble* X,IssmDouble* A,IssmDouble *B){/*{{{*/
 	_error_("STOP");
 }/*}}}*/
Index: /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp	(revision 18063)
@@ -9,6 +9,5 @@
 
 /*General Gauss points*/
-/*FUNCTION GaussLegendreLinear {{{*/
-void GaussLegendreLinear( IssmPDouble** pxgaus, IssmPDouble** pxwgt, int ngaus){
+void GaussLegendreLinear( IssmPDouble** pxgaus, IssmPDouble** pxwgt, int ngaus){/*{{{*/
 	/* Gauss-Legendre quadrature points.
 
@@ -93,6 +92,5 @@
 	}
 }/*}}}*/
-/*FUNCTION GaussLegendreTria{{{*/
-void GaussLegendreTria( int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pwgt, int iord ) {
+void GaussLegendreTria( int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pwgt, int iord ) {/*{{{*/
 	/*Gauss quadrature points for the triangle.
 
@@ -1210,6 +1208,5 @@
 	return;
 }/*}}}*/
-/*FUNCTION GaussLegendreTetra{{{*/
-void GaussLegendreTetra( int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pl4, IssmDouble** pwgt, int iord ) {
+void GaussLegendreTetra( int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pl4, IssmDouble** pwgt, int iord ) {/*{{{*/
 	/* Gauss quadrature points for the tetrahedron.
 
@@ -1473,6 +1470,5 @@
 	}
 }/*}}}*/
-/*FUNCTION GaussLobatto{{{*/
-void GaussLobatto( IssmPDouble** pxgaus, IssmPDouble** pxwgt, int ngaus ) {
+void GaussLobatto( IssmPDouble** pxgaus, IssmPDouble** pxwgt, int ngaus ) {/*{{{*/
 	/*Gauss-Lobatto quadrature points.
 
@@ -1575,6 +1571,5 @@
 
 }/*}}}*/
-/*FUNCTION GaussRecur{{{*/
-void GaussRecur( IssmPDouble* zero, IssmPDouble* weight, int n, IssmPDouble* alpha, IssmPDouble* beta ) {
+void GaussRecur( IssmPDouble* zero, IssmPDouble* weight, int n, IssmPDouble* alpha, IssmPDouble* beta ) {/*{{{*/
 	/*Gauss quadrature points from recursion coefficients.
 	 *
@@ -1698,6 +1693,5 @@
 
 /*Element Gauss points TO BE REMOVED*/
-/*FUNCTION gaussQuad{{{*/
-void gaussQuad( IssmPDouble** pxgaus, IssmPDouble** pxwgt, IssmPDouble** pegaus, IssmPDouble** pewgt, int nigaus, int njgaus ) {
+void gaussQuad( IssmPDouble** pxgaus, IssmPDouble** pxwgt, IssmPDouble** pegaus, IssmPDouble** pewgt, int nigaus, int njgaus ) {/*{{{*/
 	/*Gauss quadrature points for the quadrilaterial.*/
 
@@ -1706,6 +1700,5 @@
 	GaussLegendreLinear(pegaus, pewgt, njgaus);
 }/*}}}*/
-/*FUNCTION gaussHexa{{{*/
-void gaussHexa( IssmPDouble** pxgaus, IssmPDouble** pxwgt, IssmPDouble** pegaus, IssmPDouble** pewgt, IssmPDouble** pzgaus, IssmPDouble ** pzwgt, int nigaus, int njgaus, int nkgaus ) {
+void gaussHexa( IssmPDouble** pxgaus, IssmPDouble** pxwgt, IssmPDouble** pegaus, IssmPDouble** pewgt, IssmPDouble** pzgaus, IssmPDouble ** pzwgt, int nigaus, int njgaus, int nkgaus ) {/*{{{*/
 	/*Gauss quadrature points for the hexahedron.*/
 
Index: /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh	(revision 18062)
+++ /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh	(revision 18063)
@@ -116,6 +116,5 @@
 /*Verbosity Setup*/
 static int verbositylevel=-1;
-/*FUNCTION SetVerbosityLevel {{{*/
-void SetVerbosityLevel(int level){
+void SetVerbosityLevel(int level){/*{{{*/
 
 	if(level<0) _error_("vebosity level should be a positive integer (user provided " << level << ")");
@@ -124,6 +123,5 @@
 
 }/*}}}*/
-/*FUNCTION GetVerbosityLevel {{{*/
-int  GetVerbosityLevel(void){
+int  GetVerbosityLevel(void){/*{{{*/
 	_assert_(verbositylevel>=0);
 	return verbositylevel;
Index: /issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp	(revision 18063)
@@ -31,6 +31,5 @@
 /*Verbosity Setup*/
 static int verbositylevel=-1;
-/*FUNCTION SetVerbosityLevel {{{*/
-void SetVerbosityLevel(int level){
+void SetVerbosityLevel(int level){/*{{{*/
 
 	if(level<0) _error_("vebosity level should be a positive integer (user provided " << level << ")");
@@ -39,6 +38,5 @@
 
 }/*}}}*/
-/*FUNCTION GetVerbosityLevel {{{*/
-int  GetVerbosityLevel(void){
+int  GetVerbosityLevel(void){/*{{{*/
 	_assert_(verbositylevel>=0);
 	return verbositylevel;
Index: /issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp	(revision 18063)
@@ -10,6 +10,5 @@
 
 #define RIFTPENALTYPAIRSWIDTH 8
-/*FUNCTION IsGridOnRift{{{*/
-int IsGridOnRift(int* riftsegments, int nriftsegs, int node){
+int IsGridOnRift(int* riftsegments, int nriftsegs, int node){/*{{{*/
 
 	/*Does this node belong to 4 elements, or just 2? If it belongs to 4 elements, it is inside a rift, 
@@ -33,6 +32,5 @@
 	}
 }/*}}}*/
-/*FUNCTION GridElementsList{{{*/
-int GridElementsList(int** pGridElements, int* pNumGridElements,int node,int* index,int nel){
+int GridElementsList(int** pGridElements, int* pNumGridElements,int node,int* index,int nel){/*{{{*/
 
 	/*From a node, recover all the elements that are connected to it: */
@@ -87,6 +85,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION IsNeighbor{{{*/
-int IsNeighbor(int el1,int el2,int* index){
+int IsNeighbor(int el1,int el2,int* index){/*{{{*/
 	/*From a triangulation held in index, figure out if elements 1 and 2 have two nodes in common: */
 	int i,j;
@@ -104,6 +101,5 @@
 	}
 }/*}}}*/
-/*FUNCTION IsOnRift{{{*/
-int IsOnRift(int el,int nriftsegs,int* riftsegments){
+int IsOnRift(int el,int nriftsegs,int* riftsegments){/*{{{*/
 	/*From a list of elements segments, figure out if el belongs to it: */
 	int i;
@@ -115,6 +111,5 @@
 	return 0;
 }/*}}}*/
-/*FUNCTION RiftSegmentsFromSegments{{{*/
-void RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel,int* index,int nsegs,int* segments){
+void RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel,int* index,int nsegs,int* segments){/*{{{*/
 
 	int i,counter;
@@ -181,6 +176,5 @@
 	*pnriftsegs=nriftsegs;
 }/*}}}*/
-/*FUNCTION DetermineGridElementListOnOneSideOfRift{{{*/
-int DetermineGridElementListOnOneSideOfRift(int* pNumGridElementListOnOneSideOfRift, int** pGridElementListOnOneSideOfRift, int segmentnumber, int nriftsegs, int* riftsegments, int node,int* index,int nel){
+int DetermineGridElementListOnOneSideOfRift(int* pNumGridElementListOnOneSideOfRift, int** pGridElementListOnOneSideOfRift, int segmentnumber, int nriftsegs, int* riftsegments, int node,int* index,int nel){/*{{{*/
 
 	int noerr=1;
@@ -245,6 +239,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION UpdateSegments{{{*/
-int UpdateSegments(int** psegments,int** psegmentmarkerlist, int* pnsegs,int* index, double* x,double* y,int* riftsegments,int nriftsegs,int nods,int nel){
+int UpdateSegments(int** psegments,int** psegmentmarkerlist, int* pnsegs,int* index, double* x,double* y,int* riftsegments,int nriftsegs,int nods,int nel){/*{{{*/
 
 	int noerr=1;
@@ -344,6 +337,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION FindElement{{{*/
-int FindElement(int A,int B,int* index,int nel){
+int FindElement(int A,int B,int* index,int nel){/*{{{*/
 
 	int el=-1;
@@ -356,6 +348,5 @@
 	return el;
 }/*}}}*/
-/*FUNCTION SplitRiftSegments{{{*/
-int SplitRiftSegments(int** psegments,int** psegmentmarkerlist, int* pnumsegs, int* pnumrifts,int** priftsnumsegs,int*** priftssegments,int numrifts,int nods,int nel){
+int SplitRiftSegments(int** psegments,int** psegmentmarkerlist, int* pnumsegs, int* pnumrifts,int** priftsnumsegs,int*** priftssegments,int numrifts,int nods,int nel){/*{{{*/
 
 	/*Using segment markers, wring out the rift segments from the segments. Rift markers are 
@@ -443,6 +434,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION PairRiftElements{{{*/
-int PairRiftElements(int** priftsnumpairs,int*** priftspairs,int numrifts,int* riftsnumsegments,int** riftssegments,double* x,double* y){
+int PairRiftElements(int** priftsnumpairs,int*** priftspairs,int numrifts,int* riftsnumsegments,int** riftssegments,double* x,double* y){/*{{{*/
 
 	int noerr=1;
@@ -490,6 +480,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION IsRiftPresent{{{*/
-int IsRiftPresent(int* priftflag,int* pnumrifts,int* segmentmarkerlist,int nsegs){
+int IsRiftPresent(int* priftflag,int* pnumrifts,int* segmentmarkerlist,int nsegs){/*{{{*/
 
 	int i;
@@ -517,6 +506,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION OrderRifts{{{*/
-int OrderRifts(int** priftstips,int** riftssegments,int** riftspairs,int numrifts,int* riftsnumsegments,double* x,double* y,int nods,int nels){
+int OrderRifts(int** priftstips,int** riftssegments,int** riftspairs,int numrifts,int* riftsnumsegments,double* x,double* y,int nods,int nels){/*{{{*/
 
 	int noerr=1;
@@ -672,6 +660,5 @@
 	return noerr;
 }/*}}}*/
-/*FUNCTION PenaltyPairs{{{*/
-int PenaltyPairs(double*** priftspenaltypairs,int** priftsnumpenaltypairs,int numrifts,int** riftssegments,
+int PenaltyPairs(double*** priftspenaltypairs,int** priftsnumpenaltypairs,int numrifts,int** riftssegments,/*{{{*/
 		int* riftsnumsegs,int** riftspairs,int* riftstips,double* x,double* y){
 
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 18062)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 18063)
@@ -45,6 +45,5 @@
 
 		/*IssmMpiDenseMat constructors, destructors*/
-		/*FUNCTION IssmMpiDenseMat(){{{*/
-		IssmMpiDenseMat(){
+		IssmMpiDenseMat(){/*{{{*/
 			this->M=0;
 			this->N=0;
@@ -54,17 +53,14 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiDenseMat(int M,int N){{{*/
-		IssmMpiDenseMat(int Min,int Nin){
+		IssmMpiDenseMat(int Min,int Nin){/*{{{*/
 			this->Init(Min,Nin);
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiDenseMat(int M,int N, doubletype sparsity){{{*/
-		IssmMpiDenseMat(int pM,int pN, doubletype sparsity){
+		IssmMpiDenseMat(int pM,int pN, doubletype sparsity){/*{{{*/
 			/*no sparsity involved here, we are fully dense, so just use the previous constructor: */
 			this->Init(pM,pN);
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiDenseMat(int m,int n,int M,int N,int* d_nnz,int* o_nnz){{{*/
-		IssmMpiDenseMat(int min,int nin,int Min,int Nin,int* d_nnz,int* o_nnz){
+		IssmMpiDenseMat(int min,int nin,int Min,int Nin,int* d_nnz,int* o_nnz){/*{{{*/
 			/*not needed, we are fully dense!: */
 
@@ -82,6 +78,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiDenseMat(doubletype* serial_mat,int M,int N,doubletype sparsity){{{*/
-		IssmMpiDenseMat(doubletype* serial_mat,int Min,int Nin,doubletype sparsity){
+		IssmMpiDenseMat(doubletype* serial_mat,int Min,int Nin,doubletype sparsity){/*{{{*/
 
 			/*Here, we assume that the serial_mat is local to the local cpu, and that it has 
@@ -99,12 +94,10 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiDenseMat(int M,int N, int connectivity, int numberofdofspernode){{{*/
-		IssmMpiDenseMat(int pM,int pN, int connectivity,int numberofdofspernode){
+		IssmMpiDenseMat(int pM,int pN, int connectivity,int numberofdofspernode){/*{{{*/
 			/*not needed, we are fully dense!: */
 			this->Init(pM,pN);
 		}
 		/*}}}*/
-		/*FUNCTION ~IssmMpiDenseMat(){{{*/
-		~IssmMpiDenseMat(){
+		~IssmMpiDenseMat(){/*{{{*/
 			xDelete<doubletype>(this->matrix);
 			M=0;
@@ -114,6 +107,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiDenseMat::Init(int Min,int Nin){{{*/
-		void Init(int Min,int Nin){
+		void Init(int Min,int Nin){/*{{{*/
 
 			this->buckets=new DataSet();
@@ -134,6 +126,5 @@
 
 		/*IssmMpiDenseMat specific routines */
-		/*FUNCTION Echo{{{*/
-		void Echo(void){
+		void Echo(void){/*{{{*/
 
 			int my_rank;
@@ -158,6 +149,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Assemble{{{*/
-		void Assemble(){
+		void Assemble(){/*{{{*/
 
 			int           i,j;
@@ -313,6 +303,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Norm{{{*/
-		doubletype Norm(NormMode mode){
+		doubletype Norm(NormMode mode){/*{{{*/
 
 			doubletype norm,local_norm;
@@ -352,18 +341,15 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetSize{{{*/
-		void GetSize(int* pM,int* pN){
+		void GetSize(int* pM,int* pN){/*{{{*/
 			*pM=M;
 			*pN=N;
 		}
 		/*}}}*/
-		/*FUNCTION GetLocalSize{{{*/
-		void GetLocalSize(int* pM,int* pN){
+		void GetLocalSize(int* pM,int* pN){/*{{{*/
 			*pM=m;
 			*pN=N;
 		}
 		/*}}}*/
-		/*FUNCTION MatMult{{{*/
-		void MatMult(IssmAbsVec<doubletype>* Xin,IssmAbsVec<doubletype>* AXin){
+		void MatMult(IssmAbsVec<doubletype>* Xin,IssmAbsVec<doubletype>* AXin){/*{{{*/
 
 			int         i,j;
@@ -392,6 +378,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Duplicate{{{*/
-		IssmMpiDenseMat<doubletype>* Duplicate(void){
+		IssmMpiDenseMat<doubletype>* Duplicate(void){/*{{{*/
 
 			IssmMpiDenseMat<doubletype>* dup=new IssmMpiDenseMat<doubletype>(this->matrix,this->M,this->N,0);
@@ -400,11 +385,9 @@
 		}
 		/*}}}*/
-		/*FUNCTION ToSerial{{{*/
-		doubletype* ToSerial(void){
+		doubletype* ToSerial(void){/*{{{*/
 			_error_("not supported yet!");
 		}
 		/*}}}*/
-		/*FUNCTION SetValues{{{*/
-		void SetValues(int min,int* idxm,int nin,int* idxn,doubletype* values,InsMode mode){
+		void SetValues(int min,int* idxm,int nin,int* idxn,doubletype* values,InsMode mode){/*{{{*/
 
 			/*we need to store all the values we collect here in order to Assemble later. 
@@ -417,11 +400,9 @@
 		}
 		/*}}}*/
-		/*FUNCTION Convert{{{*/
-		void Convert(MatrixType type){
+		void Convert(MatrixType type){/*{{{*/
 			_error_("not supported yet!");
 		}
 		/*}}}*/		
-		/*FUNCTION BucketsBuildScatterBuffers{{{*/
-		void BucketsBuildScatterBuffers(int** pnumvalues_forcpu,int** prow_indices_forcpu,int** pcol_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu,DataSet** bucketsforcpu,int num_procs){
+		void BucketsBuildScatterBuffers(int** pnumvalues_forcpu,int** prow_indices_forcpu,int** pcol_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu,DataSet** bucketsforcpu,int num_procs){/*{{{*/
 
 			/*intermediary: */
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h	(revision 18062)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h	(revision 18063)
@@ -45,6 +45,5 @@
 		DataSet*    buckets;  /*here, we store buckets of values that we will Assemble into a global matrix.*/
 		/*IssmMpiSparseMat constructors, destructors*/
-		/*FUNCTION IssmMpiSparseMat(){{{*/
-		IssmMpiSparseMat(){
+		IssmMpiSparseMat(){/*{{{*/
 			this->M=0;
 			this->N=0;
@@ -54,17 +53,14 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiSparseMat(int M,int N){{{*/
-		IssmMpiSparseMat(int Min,int Nin){
+		IssmMpiSparseMat(int Min,int Nin){/*{{{*/
 			this->Init(Min,Nin);
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiSparseMat(int M,int N, doubletype sparsity){{{*/
-		IssmMpiSparseMat(int pM,int pN, doubletype sparsity){
+		IssmMpiSparseMat(int pM,int pN, doubletype sparsity){/*{{{*/
 			/*no sparsity involved here, the sparsity pattern is resolve during the assemble phase: */
 			this->Init(pM,pN);
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiSparseMat(int m,int n,int M,int N,int* d_nnz,int* o_nnz){{{*/
-		IssmMpiSparseMat(int min,int nin,int Min,int Nin,int* d_nnz,int* o_nnz){
+		IssmMpiSparseMat(int min,int nin,int Min,int Nin,int* d_nnz,int* o_nnz){/*{{{*/
 
 			int i;
@@ -89,12 +85,10 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiSparseMat(int M,int N, int connectivity, int numberofdofspernode){{{*/
-		IssmMpiSparseMat(int pM,int pN, int connectivity,int numberofdofspernode){
+		IssmMpiSparseMat(int pM,int pN, int connectivity,int numberofdofspernode){/*{{{*/
 			/*this is not needed, sparsity pattern is resolved at assemble phase: */
 			this->Init(pM,pN);
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiSparseMat::Init(int Min,int Nin){{{*/
-		void Init(int Min,int Nin){
+		void Init(int Min,int Nin){/*{{{*/
 			
 			int i;
@@ -120,6 +114,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION ~IssmMpiSparseMat(){{{*/
-		~IssmMpiSparseMat(){
+		~IssmMpiSparseMat(){/*{{{*/
 			int i;
 
@@ -138,6 +131,5 @@
 
 		/*IssmMpiSparseMat specific routines */
-		/*FUNCTION Echo{{{*/
-		void Echo(void){
+		void Echo(void){/*{{{*/
 
 			/*Do a synchronized dump across all the rows: */
@@ -157,6 +149,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Assemble{{{*/
-		void Assemble(){
+		void Assemble(){/*{{{*/
 
 			int           i,j;
@@ -369,6 +360,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Norm{{{*/
-		doubletype Norm(NormMode mode){
+		doubletype Norm(NormMode mode){/*{{{*/
 
 			doubletype norm,local_norm;
@@ -402,18 +392,15 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetSize{{{*/
-		void GetSize(int* pM,int* pN){
+		void GetSize(int* pM,int* pN){/*{{{*/
 			*pM=M;
 			*pN=N;
 		}
 		/*}}}*/
-		/*FUNCTION GetLocalSize{{{*/
-		void GetLocalSize(int* pM,int* pN){
+		void GetLocalSize(int* pM,int* pN){/*{{{*/
 			*pM=m;
 			*pN=N;
 		}
 		/*}}}*/
-		/*FUNCTION MatMult{{{*/
-		void MatMult(IssmAbsVec<doubletype>* Xin,IssmAbsVec<doubletype>* AXin){
+		void MatMult(IssmAbsVec<doubletype>* Xin,IssmAbsVec<doubletype>* AXin){/*{{{*/
 
 			/*A check on the types: */
@@ -437,6 +424,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Duplicate{{{*/
-		IssmMpiSparseMat<doubletype>* Duplicate(void){
+		IssmMpiSparseMat<doubletype>* Duplicate(void){/*{{{*/
 
 			_error_("not supported yet!");
@@ -444,11 +430,9 @@
 		}
 		/*}}}*/
-		/*FUNCTION ToSerial{{{*/
-		doubletype* ToSerial(void){
+		doubletype* ToSerial(void){/*{{{*/
 			_error_("not supported yet!");
 		}
 		/*}}}*/
-		/*FUNCTION SetValues{{{*/
-		void SetValues(int min,int* idxm,int nin,int* idxn,doubletype* values,InsMode mode){
+		void SetValues(int min,int* idxm,int nin,int* idxn,doubletype* values,InsMode mode){/*{{{*/
 
 			/*we need to store all the values we collect here in order to Assemble later. 
@@ -461,11 +445,9 @@
 		}
 		/*}}}*/
-		/*FUNCTION Convert{{{*/
-		void Convert(MatrixType type){
+		void Convert(MatrixType type){/*{{{*/
 			_error_("not supported yet!");
 		}
 		/*}}}*/		
-		/*FUNCTION BucketsBuildScatterBuffers{{{*/
-		void BucketsBuildScatterBuffers(int** pnumvalues_forcpu,int** prow_indices_forcpu,int** pcol_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu,DataSet** bucketsforcpu,int num_procs){
+		void BucketsBuildScatterBuffers(int** pnumvalues_forcpu,int** prow_indices_forcpu,int** pcol_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu,DataSet** bucketsforcpu,int num_procs){/*{{{*/
 
 			/*intermediary: */
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h	(revision 18062)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h	(revision 18063)
@@ -42,6 +42,5 @@
 
 		/*IssmMpiVec constructors, destructors*/
-		/*FUNCTION IssmMpiVec(){{{*/
-		IssmMpiVec(){
+		IssmMpiVec(){/*{{{*/
 
 			this->M=0;
@@ -51,21 +50,17 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiVec(int M){{{*/
-		IssmMpiVec(int Min){
+		IssmMpiVec(int Min){/*{{{*/
 			this->Init(Min,false);
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiVec(int m,int M){{{*/
-		IssmMpiVec(int min, int Min){
+		IssmMpiVec(int min, int Min){/*{{{*/
 			this->Init(min,true);
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiVec(int M,bool fromlocalsize){{{*/
-		IssmMpiVec(int Min, bool fromlocalsize){
+		IssmMpiVec(int Min, bool fromlocalsize){/*{{{*/
 			this->Init(Min,fromlocalsize);
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiVec(doubletype* serial_vec,int M){{{*/
-		IssmMpiVec(doubletype* buffer,int Min){
+		IssmMpiVec(doubletype* buffer,int Min){/*{{{*/
 
 			this->Init(Min,false);
@@ -77,6 +72,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiVec(doubletype* serial_vec,int M,int m){{{*/
-		IssmMpiVec(doubletype* buffer,int Min,int min){
+		IssmMpiVec(doubletype* buffer,int Min,int min){/*{{{*/
 
 			this->vector=NULL;
@@ -91,6 +85,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmMpiVec::Init(int Min,bool fromlocalsize){{{*/
-		void Init(int Min,bool fromlocalsize){
+		void Init(int Min,bool fromlocalsize){/*{{{*/
 
 			this->buckets=new DataSet();
@@ -112,6 +105,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION ~IssmMpiVec(){{{*/
-		~IssmMpiVec(){
+		~IssmMpiVec(){/*{{{*/
 			xDelete<doubletype>(this->vector);
 			this->M=0;
@@ -122,6 +114,5 @@
 
 		/*IssmMpiVec specific routines*/
-		/*FUNCTION Echo{{{*/
-		void Echo(void){
+		void Echo(void){/*{{{*/
 
 			int i,j;
@@ -140,6 +131,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Assemble{{{*/
-		void Assemble(){
+		void Assemble(){/*{{{*/
 
 			int           i,j;
@@ -285,6 +275,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION SetValues{{{*/
-		void SetValues(int ssize, int* list, doubletype* values, InsMode mode){
+		void SetValues(int ssize, int* list, doubletype* values, InsMode mode){/*{{{*/
 
 			/*we need to store all the values we collect here in order to Assemble later. 
@@ -297,6 +286,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION SetValue{{{*/
-		void SetValue(int dof, doubletype value, InsMode mode){
+		void SetValue(int dof, doubletype value, InsMode mode){/*{{{*/
 
 			/*we need to store the value we collect here in order to Assemble later. 
@@ -308,11 +296,9 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetValue{{{*/
-		void GetValue(doubletype* pvalue,int dof){
+		void GetValue(doubletype* pvalue,int dof){/*{{{*/
 			_error_("Get value on a MpiVec vector not implemented yet!");
 		}
 		/*}}}*/
-		/*FUNCTION GetSize{{{*/
-		void GetSize(int* pM){
+		void GetSize(int* pM){/*{{{*/
 
 			*pM=this->M;
@@ -320,6 +306,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetLocalSize{{{*/
-		void GetLocalSize(int* pM){
+		void GetLocalSize(int* pM){/*{{{*/
 
 			*pM=this->m;
@@ -327,6 +312,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Duplicate{{{*/
-		IssmMpiVec<doubletype>* Duplicate(void){
+		IssmMpiVec<doubletype>* Duplicate(void){/*{{{*/
 
 			return new IssmMpiVec<doubletype>(this->vector,this->M,this->m);
@@ -334,6 +318,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Set{{{*/
-		void Set(doubletype value){
+		void Set(doubletype value){/*{{{*/
 
 			int i;
@@ -342,6 +325,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION AXPY{{{*/
-		void AXPY(IssmAbsVec<doubletype>* Xin, doubletype a){
+		void AXPY(IssmAbsVec<doubletype>* Xin, doubletype a){/*{{{*/
 
 			int i;
@@ -357,6 +339,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION AYPX{{{*/
-		void AYPX(IssmAbsVec<doubletype>* Xin, doubletype a){
+		void AYPX(IssmAbsVec<doubletype>* Xin, doubletype a){/*{{{*/
 			int i;
 
@@ -371,6 +352,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION ToMPISerial{{{*/
-		doubletype* ToMPISerial(void){
+		doubletype* ToMPISerial(void){/*{{{*/
 
 			/*communicator info: */
@@ -416,6 +396,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Copy{{{*/
-		void Copy(IssmAbsVec<doubletype>* toin){
+		void Copy(IssmAbsVec<doubletype>* toin){/*{{{*/
 
 			int i;
@@ -431,6 +410,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Norm{{{*/
-		doubletype Norm(NormMode mode){
+		doubletype Norm(NormMode mode){/*{{{*/
 
 			doubletype local_norm;
@@ -459,6 +437,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Scale{{{*/
-		void Scale(doubletype scale_factor){
+		void Scale(doubletype scale_factor){/*{{{*/
 
 			int i;
@@ -467,6 +444,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Dot{{{*/
-		doubletype Dot(IssmAbsVec<doubletype>* inputin){
+		doubletype Dot(IssmAbsVec<doubletype>* inputin){/*{{{*/
 
 			int i;
@@ -488,6 +464,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION PointwiseDivide{{{*/
-		void PointwiseDivide(IssmAbsVec<doubletype>* xin,IssmAbsVec<doubletype>* yin){
+		void PointwiseDivide(IssmAbsVec<doubletype>* xin,IssmAbsVec<doubletype>* yin){/*{{{*/
 
 			int i;
@@ -504,6 +479,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION BucketsBuildScatterBuffers{{{*/
-		void BucketsBuildScatterBuffers(int** pnumvalues_forcpu,int** prow_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu,DataSet** bucketsforcpu,int num_procs){
+		void BucketsBuildScatterBuffers(int** pnumvalues_forcpu,int** prow_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu,DataSet** bucketsforcpu,int num_procs){/*{{{*/
 
 			/*intermediary: */
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h	(revision 18062)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h	(revision 18063)
@@ -37,6 +37,5 @@
 
 		/*IssmSeqVec constructors, destructors*/
-		/*FUNCTION IssmSeqVec(){{{*/
-		IssmSeqVec(){
+		IssmSeqVec(){/*{{{*/
 
 			this->M=0;
@@ -44,6 +43,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmSeqVec(int M){{{*/
-		IssmSeqVec(int pM){
+		IssmSeqVec(int pM){/*{{{*/
 
 			this->M=pM;
@@ -52,6 +50,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmSeqVec(int m,int M){{{*/
-		IssmSeqVec(int pm,int pM){
+		IssmSeqVec(int pm,int pM){/*{{{*/
 
 			this->M=pM;
@@ -60,6 +57,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmSeqVec(int M,bool fromlocalsize){{{*/
-		IssmSeqVec(int pM,bool fromlocalsize){
+		IssmSeqVec(int pM,bool fromlocalsize){/*{{{*/
 
 			this->M=pM;
@@ -68,6 +64,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IssmSeqVec(doubletype* serial_vec,int M){{{*/
-		IssmSeqVec(doubletype* buffer,int pM){
+		IssmSeqVec(doubletype* buffer,int pM){/*{{{*/
 
 			this->M=pM;
@@ -79,6 +74,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION ~IssmSeqVec(){{{*/
-		~IssmSeqVec(){
+		~IssmSeqVec(){/*{{{*/
 			if(this->M)xDelete<doubletype>(this->vector);
 			M=0;
@@ -87,6 +81,5 @@
 
 		/*IssmSeqVec specific routines*/
-		/*FUNCTION Echo{{{*/
-		void Echo(void){
+		void Echo(void){/*{{{*/
 
 			int i;
@@ -97,6 +90,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Assemble{{{*/
-		void Assemble(void){
+		void Assemble(void){/*{{{*/
 
 			/*do nothing*/
@@ -104,6 +96,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION SetValues{{{*/
-		void SetValues(int ssize, int* list, doubletype* values, InsMode mode){
+		void SetValues(int ssize, int* list, doubletype* values, InsMode mode){/*{{{*/
 
 			int i;
@@ -122,6 +113,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION SetValue{{{*/
-		void SetValue(int dof, doubletype value, InsMode mode){
+		void SetValue(int dof, doubletype value, InsMode mode){/*{{{*/
 
 			switch(mode){
@@ -138,6 +128,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetValue{{{*/
-		void GetValue(doubletype* pvalue,int dof){
+		void GetValue(doubletype* pvalue,int dof){/*{{{*/
 
 			*pvalue=this->vector[dof];
@@ -145,6 +134,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetSize{{{*/
-		void GetSize(int* pM){
+		void GetSize(int* pM){/*{{{*/
 
 			*pM=this->M;
@@ -152,6 +140,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetLocalSize{{{*/
-		void GetLocalSize(int* pM){
+		void GetLocalSize(int* pM){/*{{{*/
 
 			*pM=this->M;
@@ -159,6 +146,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Duplicate{{{*/
-		IssmSeqVec<doubletype>* Duplicate(void){
+		IssmSeqVec<doubletype>* Duplicate(void){/*{{{*/
 
 			return new IssmSeqVec<doubletype>(this->vector,this->M);
@@ -166,6 +152,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Set{{{*/
-		void Set(doubletype value){
+		void Set(doubletype value){/*{{{*/
 
 			int i;
@@ -174,6 +159,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION AXPY{{{*/
-		void AXPY(IssmAbsVec<doubletype>* Xin, doubletype a){
+		void AXPY(IssmAbsVec<doubletype>* Xin, doubletype a){/*{{{*/
 
 			int i;
@@ -189,6 +173,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION AYPX{{{*/
-		void AYPX(IssmAbsVec<doubletype>* Xin, doubletype a){
+		void AYPX(IssmAbsVec<doubletype>* Xin, doubletype a){/*{{{*/
 
 			int i;
@@ -204,6 +187,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION ToMPISerial{{{*/
-		doubletype* ToMPISerial(void){
+		doubletype* ToMPISerial(void){/*{{{*/
 
 			doubletype* buffer=NULL;
@@ -217,6 +199,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Copy{{{*/
-		void Copy(IssmAbsVec<doubletype>* toin){
+		void Copy(IssmAbsVec<doubletype>* toin){/*{{{*/
 
 			int i;
@@ -232,6 +213,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Norm{{{*/
-		doubletype Norm(NormMode mode){
+		doubletype Norm(NormMode mode){/*{{{*/
 
 			doubletype norm;
@@ -255,6 +235,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Scale{{{*/
-		void Scale(doubletype scale_factor){
+		void Scale(doubletype scale_factor){/*{{{*/
 
 			int i;
@@ -263,6 +242,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Dot{{{*/
-		doubletype Dot(IssmAbsVec<doubletype>* inputin){
+		doubletype Dot(IssmAbsVec<doubletype>* inputin){/*{{{*/
 
 			int i;
@@ -279,6 +257,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION PointwiseDivide{{{*/
-		void PointwiseDivide(IssmAbsVec<doubletype>* xin,IssmAbsVec<doubletype>* yin){
+		void PointwiseDivide(IssmAbsVec<doubletype>* xin,IssmAbsVec<doubletype>* yin){/*{{{*/
 
 			int i;
Index: /issm/trunk-jpl/src/c/toolkits/objects/Matrix.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/objects/Matrix.h	(revision 18062)
+++ /issm/trunk-jpl/src/c/toolkits/objects/Matrix.h	(revision 18063)
@@ -36,11 +36,9 @@
 
 		/*Matrix constructors, destructors*/
-		/*FUNCTION Matrix(){{{*/
-		Matrix(){
-			InitCheckAndSetType();
-		}
-		/*}}}*/
-		/*FUNCTION Matrix(int M,int N){{{*/
-		Matrix(int M,int N){
+		Matrix(){/*{{{*/
+			InitCheckAndSetType();
+		}
+		/*}}}*/
+		Matrix(int M,int N){/*{{{*/
 
 			InitCheckAndSetType();
@@ -57,6 +55,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Matrix(int m,int n,int M,int N,int* d_nnz,int* o_nnz){{{*/
-		Matrix(int m,int n,int M,int N,int* d_nnz,int* o_nnz){
+		Matrix(int m,int n,int M,int N,int* d_nnz,int* o_nnz){/*{{{*/
 
 			InitCheckAndSetType();
@@ -73,6 +70,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Matrix(int M,int N,IssmDouble sparsity){{{*/
-		Matrix(int M,int N,double sparsity){
+		Matrix(int M,int N,double sparsity){/*{{{*/
 
 			InitCheckAndSetType();
@@ -88,6 +84,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity){{{*/
-		Matrix(IssmPDouble* serial_mat,int M,int N,IssmPDouble sparsity){
+		Matrix(IssmPDouble* serial_mat,int M,int N,IssmPDouble sparsity){/*{{{*/
 
 			InitCheckAndSetType();
@@ -104,6 +99,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Matrix(int M,int N,int connectivity,int numberofdofspernode){{{*/
-		Matrix(int M,int N,int connectivity,int numberofdofspernode){
+		Matrix(int M,int N,int connectivity,int numberofdofspernode){/*{{{*/
 
 			InitCheckAndSetType();
@@ -120,6 +114,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION ~Matrix(){{{*/
-		~Matrix(){
+		~Matrix(){/*{{{*/
 
 			if(type==PetscMatType){
@@ -132,6 +125,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION InitCheckAndSetType(){{{*/
-		void InitCheckAndSetType(void){
+		void InitCheckAndSetType(void){/*{{{*/
 
 			char* toolkittype=NULL;
@@ -165,6 +157,5 @@
 
 		/*Matrix specific routines:*/
-		/*FUNCTION Echo{{{*/
-		void Echo(void){
+		void Echo(void){/*{{{*/
 			_assert_(this);
 
@@ -180,6 +171,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION AllocationInfo{{{*/
-		void AllocationInfo(void){
+		void AllocationInfo(void){/*{{{*/
 			_assert_(this);
 			if(type==PetscMatType){
@@ -193,6 +183,5 @@
 			}
 		}/*}}}*/
-		/*FUNCTION Assemble{{{*/
-		void Assemble(void){
+		void Assemble(void){/*{{{*/
 
 			if(type==PetscMatType){
@@ -206,6 +195,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Norm{{{*/
-		IssmDouble Norm(NormMode norm_type){
+		IssmDouble Norm(NormMode norm_type){/*{{{*/
 
 			IssmDouble norm=0;
@@ -223,6 +211,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetSize{{{*/
-		void GetSize(int* pM,int* pN){
+		void GetSize(int* pM,int* pN){/*{{{*/
 
 			if(type==PetscMatType){
@@ -237,6 +224,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetLocalSize{{{*/
-		void GetLocalSize(int* pM,int* pN){
+		void GetLocalSize(int* pM,int* pN){/*{{{*/
 
 			if(type==PetscMatType){
@@ -251,6 +237,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION MatMult{{{*/
-		void MatMult(Vector<doubletype>* X,Vector<doubletype>* AX){
+		void MatMult(Vector<doubletype>* X,Vector<doubletype>* AX){/*{{{*/
 
 			if(type==PetscMatType){
@@ -265,6 +250,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Duplicate{{{*/
-		Matrix<doubletype>* Duplicate(void){
+		Matrix<doubletype>* Duplicate(void){/*{{{*/
 
 			Matrix<doubletype>* output=new Matrix<doubletype>();
@@ -282,6 +266,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION ToSerial{{{*/
-		doubletype* ToSerial(void){
+		doubletype* ToSerial(void){/*{{{*/
 
 			doubletype* output=NULL;
@@ -299,6 +282,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION SetValues{{{*/
-		void SetValues(int m,int* idxm,int n,int* idxn,IssmDouble* values,InsMode mode){
+		void SetValues(int m,int* idxm,int n,int* idxn,IssmDouble* values,InsMode mode){/*{{{*/
 
 			if(type==PetscMatType){
@@ -312,6 +294,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Convert{{{*/
-		void Convert(MatrixType newtype){
+		void Convert(MatrixType newtype){/*{{{*/
 
 			if(type==PetscMatType){
Index: /issm/trunk-jpl/src/c/toolkits/objects/Vector.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/objects/Vector.h	(revision 18062)
+++ /issm/trunk-jpl/src/c/toolkits/objects/Vector.h	(revision 18063)
@@ -128,6 +128,5 @@
 
 		/*Vector specific routines*/
-		/*FUNCTION Echo{{{*/
-		void Echo(void){_assert_(this);
+		void Echo(void){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -140,6 +139,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Assemble{{{*/
-		void Assemble(void){_assert_(this);
+		void Assemble(void){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -152,6 +150,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION SetValues{{{*/
-		void SetValues(int ssize, int* list, doubletype* values, InsMode mode){ _assert_(this);
+		void SetValues(int ssize, int* list, doubletype* values, InsMode mode){ _assert_(this);/*{{{*/
 			if(type==PetscVecType){
 				#ifdef _HAVE_PETSC_
@@ -163,6 +160,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION SetValue{{{*/
-		void SetValue(int dof, doubletype value, InsMode mode){_assert_(this);
+		void SetValue(int dof, doubletype value, InsMode mode){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -175,6 +171,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetValue{{{*/
-		void GetValue(doubletype* pvalue,int dof){_assert_(this);
+		void GetValue(doubletype* pvalue,int dof){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -187,6 +182,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetSize{{{*/
-		void GetSize(int* pM){_assert_(this);
+		void GetSize(int* pM){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -199,6 +193,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION IsEmpty{{{*/
-		bool IsEmpty(void){
+		bool IsEmpty(void){/*{{{*/
 			int M;
 
@@ -212,6 +205,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION GetLocalSize{{{*/
-		void GetLocalSize(int* pM){_assert_(this);
+		void GetLocalSize(int* pM){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -224,6 +216,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Duplicate{{{*/
-		Vector<doubletype>* Duplicate(void){_assert_(this);
+		Vector<doubletype>* Duplicate(void){_assert_(this);/*{{{*/
 
 			Vector<doubletype>* output=NULL;
@@ -242,6 +233,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Set{{{*/
-		void Set(doubletype value){_assert_(this);
+		void Set(doubletype value){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -254,6 +244,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION AXPY{{{*/
-		void AXPY(Vector* X, doubletype a){_assert_(this);
+		void AXPY(Vector* X, doubletype a){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -266,6 +255,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION AYPX{{{*/
-		void AYPX(Vector* X, doubletype a){_assert_(this);
+		void AYPX(Vector* X, doubletype a){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -277,6 +265,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION ToMPISerial{{{*/
-		doubletype* ToMPISerial(void){
+		doubletype* ToMPISerial(void){/*{{{*/
 
 			doubletype* vec_serial=NULL;
@@ -294,6 +281,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Copy{{{*/
-		void Copy(Vector* to){_assert_(this);
+		void Copy(Vector* to){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -305,6 +291,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Max{{{*/
-		doubletype Max(void){_assert_(this);
+		doubletype Max(void){_assert_(this);/*{{{*/
 
 			doubletype max=0;
@@ -319,6 +304,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Norm{{{*/
-		doubletype Norm(NormMode norm_type){_assert_(this);
+		doubletype Norm(NormMode norm_type){_assert_(this);/*{{{*/
 
 			doubletype norm=0;
@@ -333,6 +317,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Scale{{{*/
-		void Scale(doubletype scale_factor){_assert_(this);
+		void Scale(doubletype scale_factor){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
@@ -344,6 +327,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION Dot{{{*/
-		doubletype Dot(Vector* vector){_assert_(this);
+		doubletype Dot(Vector* vector){_assert_(this);/*{{{*/
 
 			doubletype dot;
@@ -358,6 +340,5 @@
 		}
 		/*}}}*/
-		/*FUNCTION PointwiseDivide{{{*/
-		void PointwiseDivide(Vector* x,Vector* y){_assert_(this);
+		void PointwiseDivide(Vector* x,Vector* y){_assert_(this);/*{{{*/
 
 			if(type==PetscVecType){
Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp	(revision 18063)
@@ -19,6 +19,5 @@
 
 /*PetscMat constructors and destructor*/
-/*FUNCTION PetscMat::PetscMat(){{{*/
-PetscMat::PetscMat(){
+PetscMat::PetscMat(){/*{{{*/
 	this->matrix=NULL;
 	#ifdef _HAVE_ADOLC_
@@ -28,18 +27,15 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::PetscMat(int M,int N){{{*/
-PetscMat::PetscMat(int M,int N){
+PetscMat::PetscMat(int M,int N){/*{{{*/
 
 	this->matrix=NewMat(M,N,IssmComm::GetComm());
 }
 /*}}}*/
-/*FUNCTION PetscMat::PetscMat(int M,int N, IssmDouble sparsity){{{*/
-PetscMat::PetscMat(int M,int N, IssmDouble sparsity){
+PetscMat::PetscMat(int M,int N, IssmDouble sparsity){/*{{{*/
 
 	this->matrix=NewMat(M,N,sparsity,IssmComm::GetComm());
 }
 /*}}}*/
-/*FUNCTION PetscMat::PetscMat(int m,int n,int M,int N,int* d_nnz,int* o_nnz){{{*/
-PetscMat::PetscMat(int m,int n,int M,int N,int* d_nnz,int* o_nnz){
+PetscMat::PetscMat(int m,int n,int M,int N,int* d_nnz,int* o_nnz){/*{{{*/
 
 	MatCreate(IssmComm::GetComm(),&this->matrix);
@@ -51,6 +47,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::PetscMat(IssmDouble* serial_mat,int M,int N,IssmDouble sparsity){{{*/
-PetscMat::PetscMat(IssmDouble* serial_mat,int M,int N,IssmDouble sparsity){
+PetscMat::PetscMat(IssmDouble* serial_mat,int M,int N,IssmDouble sparsity){/*{{{*/
 
 	int     i;
@@ -74,6 +69,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::PetscMat(int M,int N, int connectivity, int numberofdofspernode){{{*/
-PetscMat::PetscMat(int M,int N, int connectivity,int numberofdofspernode){
+PetscMat::PetscMat(int M,int N, int connectivity,int numberofdofspernode){/*{{{*/
 
 	this->matrix=NewMat(M,N,connectivity,numberofdofspernode,IssmComm::GetComm());
@@ -81,6 +75,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::~PetscMat(){{{*/
-PetscMat::~PetscMat(){
+PetscMat::~PetscMat(){/*{{{*/
 	MatFree(&this->matrix);
 }
@@ -88,6 +81,5 @@
 
 /*PetscMat specific routines: */
-/*FUNCTION PetscMat::AllocationInfo{{{*/
-void PetscMat::AllocationInfo(void){
+void PetscMat::AllocationInfo(void){/*{{{*/
 
 	MatInfo info;
@@ -103,12 +95,10 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::Echo{{{*/
-void PetscMat::Echo(void){
+void PetscMat::Echo(void){/*{{{*/
 
 	MatView(this->matrix,PETSC_VIEWER_STDOUT_WORLD);
 }
 /*}}}*/
-/*FUNCTION PetscMat::Assemble{{{*/
-void PetscMat::Assemble(void){
+void PetscMat::Assemble(void){/*{{{*/
 
 	_assert_(this->matrix);
@@ -118,6 +108,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::Norm{{{*/
-IssmDouble PetscMat::Norm(NormMode mode){
+IssmDouble PetscMat::Norm(NormMode mode){/*{{{*/
 
 	IssmDouble norm=0;
@@ -129,6 +118,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::GetSize{{{*/
-void PetscMat::GetSize(int* pM,int* pN){
+void PetscMat::GetSize(int* pM,int* pN){/*{{{*/
 
 	_assert_(this->matrix);
@@ -136,6 +124,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::GetLocalSize{{{*/
-void PetscMat::GetLocalSize(int* pM,int* pN){
+void PetscMat::GetLocalSize(int* pM,int* pN){/*{{{*/
 
 	_assert_(this->matrix);
@@ -144,6 +131,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::MatMult{{{*/
-void PetscMat::MatMult(PetscVec* X,PetscVec* AX){
+void PetscMat::MatMult(PetscVec* X,PetscVec* AX){/*{{{*/
 
 	_assert_(this->matrix);
@@ -153,6 +139,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::Duplicate{{{*/
-PetscMat* PetscMat::Duplicate(void){
+PetscMat* PetscMat::Duplicate(void){/*{{{*/
 
 	PetscMat* output=new PetscMat();
@@ -164,6 +149,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::ToSerial{{{*/
-IssmDouble* PetscMat::ToSerial(void){
+IssmDouble* PetscMat::ToSerial(void){/*{{{*/
 
 	 IssmDouble* output=NULL;
@@ -174,6 +158,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::SetValues{{{*/
-void PetscMat::SetValues(int m,int* idxm,int n,int* idxn,IssmDouble* values,InsMode mode){
+void PetscMat::SetValues(int m,int* idxm,int n,int* idxn,IssmDouble* values,InsMode mode){/*{{{*/
 
 	PetscErrorCode ierr;
@@ -183,6 +166,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscMat::Convert{{{*/
-void PetscMat::Convert(MatrixType type){
+void PetscMat::Convert(MatrixType type){/*{{{*/
 
 	MatConvert(this->matrix,ISSMToPetscMatrixType(type),MAT_REUSE_MATRIX,&this->matrix);
Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp	(revision 18062)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp	(revision 18063)
@@ -19,6 +19,5 @@
 
 /*PetscVec constructors and destructor*/
-/*FUNCTION PetscVec::PetscVec(){{{*/
-PetscVec::PetscVec(){
+PetscVec::PetscVec(){/*{{{*/
 	this->vector=NULL;
 	#ifdef _HAVE_ADOLC_
@@ -27,6 +26,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::PetscVec(int M,bool fromlocalsize){{{*/
-PetscVec::PetscVec(int M,bool fromlocalsize){
+PetscVec::PetscVec(int M,bool fromlocalsize){/*{{{*/
 
 	this->vector=NewVec(M,IssmComm::GetComm(),fromlocalsize);
@@ -34,6 +32,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::PetscVec(int m,int M){{{*/
-PetscVec::PetscVec(int m,int M){
+PetscVec::PetscVec(int m,int M){/*{{{*/
 
 	VecCreate(IssmComm::GetComm(),&this->vector);
@@ -44,6 +41,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::PetscVec(Vec petsc_vec){{{*/
-PetscVec::PetscVec(Vec petsc_vec){
+PetscVec::PetscVec(Vec petsc_vec){/*{{{*/
 
 	if(petsc_vec==NULL){
@@ -58,6 +54,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::PetscVec(IssmDouble* serial_vec,int M){{{*/
-PetscVec::PetscVec(IssmDouble* serial_vec,int M){
+PetscVec::PetscVec(IssmDouble* serial_vec,int M){/*{{{*/
 
 	int* idxm=NULL;
@@ -73,6 +68,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::~PetscVec(){{{*/
-PetscVec::~PetscVec(){
+PetscVec::~PetscVec(){/*{{{*/
     VecFree(&this->vector);
 }
@@ -80,6 +74,5 @@
 
 /*PetscVec specific routines: */
-/*FUNCTION PetscVec::Echo{{{*/
-void PetscVec::Echo(void){
+void PetscVec::Echo(void){/*{{{*/
 
 	_assert_(this->vector);
@@ -87,6 +80,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::Assemble{{{*/
-void PetscVec::Assemble(void){
+void PetscVec::Assemble(void){/*{{{*/
 
 	_assert_(this->vector);
@@ -96,6 +88,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::SetValues{{{*/
-void PetscVec::SetValues(int ssize, int* list, IssmDouble* values, InsMode mode){
+void PetscVec::SetValues(int ssize, int* list, IssmDouble* values, InsMode mode){/*{{{*/
 
 	_assert_(this->vector);
@@ -104,6 +95,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::SetValue{{{*/
-void PetscVec::SetValue(int dof, IssmDouble value, InsMode mode){
+void PetscVec::SetValue(int dof, IssmDouble value, InsMode mode){/*{{{*/
 
 	_assert_(this->vector);
@@ -112,6 +102,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::GetValue{{{*/
-void PetscVec::GetValue(IssmDouble* pvalue,int dof){
+void PetscVec::GetValue(IssmDouble* pvalue,int dof){/*{{{*/
 
 	_assert_(this->vector);
@@ -120,6 +109,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::GetSize{{{*/
-void PetscVec::GetSize(int* pM){
+void PetscVec::GetSize(int* pM){/*{{{*/
 
 	_assert_(this->vector);
@@ -128,6 +116,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::GetLocalSize{{{*/
-void PetscVec::GetLocalSize(int* pM){
+void PetscVec::GetLocalSize(int* pM){/*{{{*/
 
 	_assert_(this->vector);
@@ -136,6 +123,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::Duplicate{{{*/
-PetscVec* PetscVec::Duplicate(void){
+PetscVec* PetscVec::Duplicate(void){/*{{{*/
 
 	_assert_(this->vector);
@@ -148,6 +134,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::Set{{{*/
-void PetscVec::Set(IssmDouble value){
+void PetscVec::Set(IssmDouble value){/*{{{*/
 
 	_assert_(this->vector);
@@ -156,6 +141,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::AXPY{{{*/
-void PetscVec::AXPY(PetscVec* X, IssmDouble a){
+void PetscVec::AXPY(PetscVec* X, IssmDouble a){/*{{{*/
 
 	_assert_(this->vector);
@@ -164,6 +148,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::AYPX{{{*/
-void PetscVec::AYPX(PetscVec* X, IssmDouble a){
+void PetscVec::AYPX(PetscVec* X, IssmDouble a){/*{{{*/
 
 	_assert_(this->vector);
@@ -172,6 +155,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::ToMPISerial{{{*/
-IssmDouble* PetscVec::ToMPISerial(void){
+IssmDouble* PetscVec::ToMPISerial(void){/*{{{*/
 
 	IssmDouble* vec_serial=NULL;
@@ -181,6 +163,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::Copy{{{*/
-void PetscVec::Copy(PetscVec* to){
+void PetscVec::Copy(PetscVec* to){/*{{{*/
 
 	if(this->vector) VecCopy(this->vector,to->vector);
@@ -188,6 +169,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::Max{{{*/
-IssmDouble PetscVec::Max(void){
+IssmDouble PetscVec::Max(void){/*{{{*/
 
 	_assert_(this->vector);
@@ -199,6 +179,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::Norm{{{*/
-IssmDouble PetscVec::Norm(NormMode mode){
+IssmDouble PetscVec::Norm(NormMode mode){/*{{{*/
 
 	IssmDouble norm=0;
@@ -209,6 +188,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::Scale{{{*/
-void PetscVec::Scale(IssmDouble scale_factor){
+void PetscVec::Scale(IssmDouble scale_factor){/*{{{*/
 
 	_assert_(this->vector);
@@ -217,6 +195,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::Dot{{{*/
-IssmDouble PetscVec::Dot(PetscVec* input){
+IssmDouble PetscVec::Dot(PetscVec* input){/*{{{*/
 
 	IssmDouble dot;
@@ -227,6 +204,5 @@
 }
 /*}}}*/
-/*FUNCTION PetscVec::PointwiseDivide{{{*/
-void PetscVec::PointwiseDivide(PetscVec* x,PetscVec* y){
+void PetscVec::PointwiseDivide(PetscVec* x,PetscVec* y){/*{{{*/
 
 	_assert_(this->vector);