Changeset 16956

Timestamp:

11/26/13 14:42:13 (11 years ago)

Author:

seroussi

Message:

CHG: finished coupling SSAFS

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.h (modified) (1 diff)
• Penta.cpp (modified) (1 diff)
• Penta.h (modified) (1 diff)
• Seg.h (modified) (1 diff)
• Tria.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -195 +195 @@
                 virtual ElementVector*  NewElementVector(int approximation_enum=NoneApproximationEnum)=0;
                 virtual ElementMatrix*  NewElementMatrix(int approximation_enum=NoneApproximationEnum)=0;
+                virtual ElementMatrix*  NewElementMatrixCoupling(int number_nodes,int approximation_enum=NoneApproximationEnum)=0;
                 virtual void   InputScale(int enum_type,IssmDouble scale_factor)=0;
                 virtual void   GetVectorFromInputs(Vector<IssmDouble>* vector, int name_enum)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2446 +2446 @@
 ElementMatrix* Penta::NewElementMatrix(int approximation_enum){
         return new ElementMatrix(nodes,this->NumberofNodes(),this->parameters,approximation_enum);
+}
+/*}}}*/
+/*FUNCTION Penta::NewElementMatrixCoupling{{{*/
+ElementMatrix* Penta::NewElementMatrixCoupling(int number_nodes,int approximation_enum){
+        return new ElementMatrix(nodes,number_nodes,this->parameters,approximation_enum);
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -250 +250 @@
                 ElementVector* NewElementVector(int approximation_enum);
                 ElementMatrix* NewElementMatrix(int approximation_enum);
+                ElementMatrix* NewElementMatrixCoupling(int number_nodes,int approximation_enum);
                 void           NodalFunctions(IssmDouble* basis,Gauss* gauss);
                 void           NodalFunctionsP1(IssmDouble* basis,Gauss* gauss);

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -152 +152 @@
                 ElementVector* NewElementVector(int approximation_enum);
                 ElementMatrix* NewElementMatrix(int approximation_enum);
+                ElementMatrix* NewElementMatrixCoupling(int number_nodes,int approximation_enum){_error_("not implemented yet");};
                 int         VertexConnectivity(int vertexindex){_error_("not implemented yet");};
                 void        VerticalSegmentIndices(int** pindices,int* pnumseg){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -283 +283 @@
                 ElementVector* NewElementVector(int approximation_enum);
                 ElementMatrix* NewElementMatrix(int approximation_enum);
+                ElementMatrix* NewElementMatrixCoupling(int number_nodes,int approximation_enum){_error_("not implemented yet");};
                 void           NodalFunctions(IssmDouble* basis,Gauss* gauss);
                 void           NodalFunctionsP1(IssmDouble* basis,Gauss* gauss){_error_("not implemented yet");};