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

Timestamp:

10/30/13 21:15:33 (11 years ago)

Author:

Eric.Larour

Message:

CHG: make external results active, otherwise we have an issue with MPI type in ADOLC related operations.

File:

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

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

@@ -2864 +2864 @@
 /*}}}*/
 /*FUNCTION Penta::ResultToVector{{{*/
-void Penta::ResultToVector(Vector<IssmPDouble>* vector,int output_enum){
+void Penta::ResultToVector(Vector<IssmDouble>* vector,int output_enum){
 
         Input* input=this->inputs->GetInput(output_enum);
@@ -2875 +2875 @@
                 case P1Enum:{
                         IssmDouble  values[NUMVERTICES];
-                        IssmPDouble pvalues[NUMVERTICES]; 
                         int         connectivity[NUMVERTICES];
                         int         sidlist[NUMVERTICES];
@@ -2882 +2881 @@
                         this->GetConnectivityList(&connectivity[0]);
                         this->GetInputListOnVertices(&values[0],output_enum);
-                        for(int i=0;i<NUMVERTICES;i++) pvalues[i] = reCast<IssmPDouble>(values[i])/reCast<IssmPDouble>(connectivity[i]);
-
-                        vector->SetValues(NUMVERTICES,&sidlist[0],&pvalues[0],ADD_VAL);
+                        for(int i=0;i<NUMVERTICES;i++) values[i] = values[i]/reCast<IssmDouble>(connectivity[i]);
+
+                        vector->SetValues(NUMVERTICES,&sidlist[0],&values[0],ADD_VAL);
                         break;
                                         }