Changeset 17493 for issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp

Timestamp:

03/20/14 05:57:57 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on MINI elements FS

File:

• issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp (modified) (5 diffs)

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

@@ -238 +238 @@
 int Tetra::GetNumberOfVertices(void){
         return NUMVERTICES;
+}
+/*}}}*/
+/*FUNCTION Tetra::GetNumberOfNodesPressure         THIS ONE (and corresponding TetraRef function){{{*/
+int Tetra::GetNumberOfNodesPressure(void){
+        return this->NumberofNodesPressure();
+}
+/*}}}*/
+/*FUNCTION Tetra::GetNumberOfNodesVelocity;{{{*/
+int Tetra::GetNumberOfNodesVelocity(void){
+        return this->NumberofNodesVelocity();
 }
 /*}}}*/
@@ -548 +558 @@
 }
 /*}}}*/
+/*FUNCTION Tetra::NodalFunctionsVelocity{{{*/
+void Tetra::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){
+
+        _assert_(gauss->Enum()==GaussTetraEnum);
+        this->GetNodalFunctionsVelocity(basis,(GaussTetra*)gauss);
+
+}
+/*}}}*/
+/*FUNCTION Tetra::NodalFunctionsPressure{{{*/
+void Tetra::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){
+
+        _assert_(gauss->Enum()==GaussTetraEnum);
+        this->GetNodalFunctionsPressure(basis,(GaussTetra*)gauss);
+
+}
+/*}}}*/
 /*FUNCTION Tetra::NodalFunctionsDerivatives{{{*/
 void Tetra::NodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
@@ -553 +579 @@
         _assert_(gauss->Enum()==GaussTetraEnum);
         this->GetNodalFunctionsDerivatives(dbasis,xyz_list,(GaussTetra*)gauss);
+
+}
+/*}}}*/
+/*FUNCTION Tetra::NodalFunctionsDerivativesVelocity{{{*/
+void Tetra::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
+
+        _assert_(gauss->Enum()==GaussTetraEnum);
+        this->GetNodalFunctionsDerivativesVelocity(dbasis,xyz_list,(GaussTetra*)gauss);
 
 }
@@ -575 +609 @@
 
         for(int i=0;i<3;i++) normal[i]=normal[i]/norm;
+}
+/*}}}*/
+/*FUNCTION Tetra::NumberofNodesPressure{{{*/
+int Tetra::NumberofNodesPressure(void){
+        return TetraRef::NumberofNodesPressure();
+}
+/*}}}*/
+/*FUNCTION Tetra::NumberofNodesVelocity{{{*/
+int Tetra::NumberofNodesVelocity(void){
+        return TetraRef::NumberofNodesVelocity();
 }
 /*}}}*/
@@ -752 +796 @@
                         tetra_node_ids[9]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+5]+1;
                         break;
+                case MINIEnum: case MINIcondensedEnum:
+                        numnodes         = 9;
+                        tetra_node_ids   = xNew<int>(numnodes);
+                        tetra_node_ids[0]=iomodel->nodecounter+iomodel->elements[4*index+0];
+                        tetra_node_ids[1]=iomodel->nodecounter+iomodel->elements[4*index+1];
+                        tetra_node_ids[2]=iomodel->nodecounter+iomodel->elements[4*index+2];
+                        tetra_node_ids[3]=iomodel->nodecounter+iomodel->elements[4*index+3];
+                        tetra_node_ids[4]=iomodel->nodecounter+iomodel->numberofvertices+index+1;
+
+                        tetra_node_ids[5]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+0];
+                        tetra_node_ids[6]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+1];
+                        tetra_node_ids[7]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+2];
+                        tetra_node_ids[8]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+iomodel->elements[4*index+3];
+                        break;
+                        numnodes        = 14;
+                        tetra_node_ids   = xNew<int>(numnodes);
+                        tetra_node_ids[0]=iomodel->nodecounter+iomodel->elements[4*index+0];
+                        tetra_node_ids[1]=iomodel->nodecounter+iomodel->elements[4*index+1];
+                        tetra_node_ids[2]=iomodel->nodecounter+iomodel->elements[4*index+2];
+                        tetra_node_ids[3]=iomodel->nodecounter+iomodel->elements[4*index+3];
+                        tetra_node_ids[4]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+0]+1;
+                        tetra_node_ids[5]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+1]+1;
+                        tetra_node_ids[6]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+2]+1;
+                        tetra_node_ids[7]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+3]+1;
+                        tetra_node_ids[8]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+4]+1;
+                        tetra_node_ids[9]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->elementtoedgeconnectivity[6*index+5]+1;
+
+                        tetra_node_ids[10]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[4*index+0];
+                        tetra_node_ids[11]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[4*index+1];
+                        tetra_node_ids[12]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[4*index+2];
+                        tetra_node_ids[13]=iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+iomodel->elements[4*index+3];
+                        break;
                 default:
                         _error_("Finite element "<<EnumToStringx(finiteelement_type)<<" not supported yet");