Changeset 18301 for issm/trunk/src/c/classes/matrix/ElementVector.cpp

Timestamp:

07/30/14 14:22:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 18299

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/matrix/ElementVector.cpp (modified) (12 diffs)

issm/trunk/src/c/classes/matrix/ElementVector.cpp

@@ -18 +18 @@
 
 /*ElementVector constructors and destructor*/
-/*FUNCTION ElementVector::ElementVector(){{{*/
-ElementVector::ElementVector(){
+ElementVector::ElementVector(){/*{{{*/
 
         this->nrows=0;
@@ -29 +28 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){{{*/
-ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){
+ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){/*{{{*/
 
         /*intermediaries*/
@@ -114 +112 @@
 }
 /*}}}*/
-/*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 +126 @@
 }
 /*}}}*/
-/*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 +143 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::~ElementVector(){{{*/
-ElementVector::~ElementVector(){
+ElementVector::~ElementVector(){/*{{{*/
 
         xDelete<IssmDouble>(this->values);
@@ -158 +153 @@
 
 /*ElementVector specific routines: */
-/*FUNCTION ElementVector::AddToGlobal(Vector<IssmDouble>* pf){{{*/
-void ElementVector::AddToGlobal(Vector<IssmDouble>* pf){
+void ElementVector::AddToGlobal(Vector<IssmDouble>* pf){/*{{{*/
 
         int i;
@@ -182 +176 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::InsertIntoGlobal(Vector<IssmDouble>* pf){{{*/
-void ElementVector::InsertIntoGlobal(Vector<IssmDouble>* pf){
+void ElementVector::InsertIntoGlobal(Vector<IssmDouble>* pf){/*{{{*/
 
         int i;
@@ -203 +196 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::CheckConsistency{{{*/
-void ElementVector::CheckConsistency(void){
+void ElementVector::CheckConsistency(void){/*{{{*/
         /*Check element matrix values, only in debugging mode*/
 #ifdef _ISSM_DEBUG_ 
@@ -214 +206 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::Echo{{{*/
-void ElementVector::Echo(void){
+void ElementVector::Echo(void){/*{{{*/
 
         int i;
@@ -239 +230 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::Init{{{*/
-void ElementVector::Init(ElementVector* pe){
+void ElementVector::Init(ElementVector* pe){/*{{{*/
 
         _assert_(pe);
@@ -265 +255 @@
 }
 /*}}}*/
-/*FUNCTION ElementVector::SetValue{{{*/
-void ElementVector::SetValue(IssmDouble scalar){
+void ElementVector::SetValue(IssmDouble scalar){/*{{{*/
 
         int i;
@@ -274 +263 @@
 }
 /*}}}*/
-/*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|