Changeset 17679

Timestamp:

04/08/14 16:00:17 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing GetVectorFromInputs, which assumes P1 interpolation only

Location:

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

Files:

• PentaInput.cpp (modified) (1 diff)
• TetraInput.cpp (modified) (1 diff)
• TriaInput.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp

@@ -454 +454 @@
 /*FUNCTION PentaInput::GetVectorFromInputs{{{*/
 void PentaInput::GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){
-
-        const int numnodes=this->NumberofNodes();
-        vector->SetValues(numnodes,doflist,this->values,INS_VAL);
-
+        const int numvertices=6;
+        vector->SetValues(numvertices,doflist,this->values,INS_VAL);
 } /*}}}*/
 /*FUNCTION PentaInput::Configure{{{*/

issm/trunk-jpl/src/c/classes/Inputs/TetraInput.cpp

@@ -342 +342 @@
 /*FUNCTION TetraInput::GetVectorFromInputs{{{*/
 void TetraInput::GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){
-
-        const int numnodes=this->NumberofNodes();
-        vector->SetValues(numnodes,doflist,this->values,INS_VAL);
-
+        const int numvertices=4;
+        vector->SetValues(numvertices,doflist,this->values,INS_VAL);
 } /*}}}*/
 /*FUNCTION TetraInput::PointwiseMin{{{*/

issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

@@ -351 +351 @@
 /*FUNCTION TriaInput::GetVectorFromInputs{{{*/
 void TriaInput::GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){
-
-        const int numnodes=this->NumberofNodes();
-        vector->SetValues(numnodes,doflist,this->values,INS_VAL);
-
+        const int numvertices=3;
+        vector->SetValues(numvertices,doflist,this->values,INS_VAL);
 } /*}}}*/
 /*FUNCTION TriaInput::PointwiseMin{{{*/