Changeset 16589

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.

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Element.h (modified) (1 diff)
• Elements/Penta.cpp (modified) (3 diffs)
• Elements/Penta.h (modified) (1 diff)
• Elements/Seg.h (modified) (1 diff)
• Elements/Tria.cpp (modified) (3 diffs)
• Elements/Tria.h (modified) (1 diff)
• ExternalResults/GenericExternalResult.h (modified) (3 diffs)
• FemModel.cpp (modified) (2 diffs)

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

@@ -60 +60 @@
                 virtual void   ComputeStrainRate(Vector<IssmDouble>* eps)=0;
                 virtual void   ResultInterpolation(int* pinterpolation,int output_enum)=0;
-                virtual void   ResultToVector(Vector<IssmPDouble>* vector,int output_enum)=0;
+                virtual void   ResultToVector(Vector<IssmDouble>* vector,int output_enum)=0;
                 virtual void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finite_element)=0;
                 virtual void   InputDuplicate(int original_enum,int new_enum)=0;

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;
                                         }

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

@@ -96 +96 @@
 
                 void   ResultInterpolation(int* pinterpolation,int output_enum);
-                void   ResultToVector(Vector<IssmPDouble>* vector,int output_enum);
+                void   ResultToVector(Vector<IssmDouble>* vector,int output_enum);
                 void   PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm);
                 void   ResetCoordinateSystem(void);

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

@@ -112 +112 @@
                 void        PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){_error_("not implemented yet");};
                 void        ResultInterpolation(int* pinterpolation,int output_enum){_error_("not implemented");};
-                void        ResultToVector(Vector<IssmPDouble>* vector,int output_enum){_error_("not implemented");};
+                void        ResultToVector(Vector<IssmDouble>* vector,int output_enum){_error_("not implemented");};
                 void        ResetCoordinateSystem(void){_error_("not implemented yet");};
                 void          SmbGradients(){_error_("not implemented yet");};

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

@@ -2464 +2464 @@
 /*}}}*/
 /*FUNCTION Tria::ResultToVector{{{*/
-void Tria::ResultToVector(Vector<IssmPDouble>* vector,int output_enum){
+void Tria::ResultToVector(Vector<IssmDouble>* vector,int output_enum){
 
         Input* input=this->inputs->GetInput(output_enum);
@@ -2475 +2475 @@
                 case P1Enum:{
                         IssmDouble  values[NUMVERTICES];
-                        IssmPDouble pvalues[NUMVERTICES]; 
                         int         connectivity[NUMVERTICES];
                         int         sidlist[NUMVERTICES];
@@ -2482 +2481 @@
                         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;
                                         }

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

@@ -103 +103 @@
                 void        PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm);
                 void        ResultInterpolation(int* pinterpolation,int output_enum);
-                void        ResultToVector(Vector<IssmPDouble>* vector,int output_enum);
+                void        ResultToVector(Vector<IssmDouble>* vector,int output_enum);
                 void        ResetCoordinateSystem(void);
                 void          SmbGradients();

issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

@@ -383 +383 @@
         return new GenericExternalResult<Vector<IssmPDouble>*>(this->id,StringToEnumx(this->result_name),this->value,this->step,this->time);
 } /*}}}*/
+#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)  //We hook off this specific specialization when not running ADOLC, otherwise we get a redeclaration with the next specialization. 
 template <> inline void GenericExternalResult<Vector<IssmPDouble>*>::WriteData(FILE* fid,bool io_gather){ /*{{{*/
 
@@ -420 +421 @@
 }
 /*}}}*/
+#endif
 template <> inline int GenericExternalResult<Vector<IssmPDouble>*>::ObjectEnum(void){ /*{{{*/
         return NoneEnum;
@@ -425 +427 @@
 } /*}}}*/
 
+/*Specifics instantiations for Vector<IssmDouble>*/
+template <> inline void GenericExternalResult<Vector<IssmDouble>*>::WriteData(FILE* fid,bool io_gather){ /*{{{*/
+
+        int i;
+        char *name   = NULL;
+        int   length,rows,cols=1;
+        IssmDouble*  serialvalues = NULL;
+        IssmPDouble* pserialvalues = NULL;
+
+        if(!io_gather){
+                _error_("not supported yet");
+        }
+
+        /*Serialize vector*/
+        serialvalues = this->value->ToMPISerial();
+        this->value->GetSize(&rows);
+        
+        pserialvalues=xNew<IssmPDouble>(rows);
+        for(i=0;i<rows;i++)pserialvalues[i]=reCast<IssmPDouble>(serialvalues[i]);
+
+        if(IssmComm::GetRank()==0){
+                /*First write name: */
+                length=(strlen(this->result_name)+1)*sizeof(char);
+                fwrite(&length,sizeof(int),1,fid);
+                fwrite(this->result_name,length,1,fid);
+
+                /*Now write time and step: */
+                IssmPDouble passiveDouble=reCast<IssmPDouble>(time);
+                fwrite(&passiveDouble,sizeof(IssmPDouble),1,fid);
+                fwrite(&step,sizeof(int),1,fid);
+
+                /*writing a IssmDouble array, type is 3:*/
+                int type=3;
+                fwrite(&type,sizeof(int),1,fid);
+                fwrite(&rows,sizeof(int),1,fid);
+                fwrite(&cols,sizeof(int),1,fid);
+                fwrite(pserialvalues,cols*rows*sizeof(IssmPDouble),1,fid);
+        }
+
+        /*Clean up*/
+        xDelete<IssmPDouble>(pserialvalues);
+        xDelete<IssmDouble>(serialvalues);
+
+}
+/*}}}*/
+
 #endif  /* _EXTERNAL_RESULTOBJECT_H */

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -562 +562 @@
 
                                         }
-                                        Vector<IssmPDouble> *vector_result = new Vector<IssmPDouble>(this->vertices->NumberOfVertices());
+                                        Vector<IssmDouble> *vector_result = new Vector<IssmDouble>(this->vertices->NumberOfVertices());
 
                                         /*Fill in vector*/
@@ -571 +571 @@
                                         vector_result->Assemble();
 
-                                        results->AddResult(new GenericExternalResult<Vector<IssmPDouble>*>(results->Size()+1,output_enum,vector_result,step,time));
+                                        results->AddResult(new GenericExternalResult<Vector<IssmDouble>*>(results->Size()+1,output_enum,vector_result,step,time));
                                         isvec = true;
                                         break;