Changeset 4163

Timestamp:

06/23/10 11:39:53 (15 years ago)

Author:

Eric.Larour

Message:

Starting the new matlab array output

Location:

issm/trunk/src/c/modules/OutputResultsx

Files:

• FileWriteResults.cpp (added)
• MatlabWriteResults.cpp (added)
• OutputResultsx.cpp (modified) (2 diffs)
• OutputResultsx.h (modified) (1 diff)

issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -16 +16 @@
 #include "../../objects/objects.h"
                 
+#ifdef _SERIAL_
+void OutputResultsx(mxArray** pdataref, DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results){
+#else
 void OutputResultsx(DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results){
+#endif
 
-        int         i;
-        extern int  my_rank;
-        char       *filename     = NULL;
         int         solutiontype;
-        FILE       *fid          = NULL;
+        
 
         /*First, configure elements*/
@@ -37 +38 @@
         #endif
 
-        //Recover file name: 
-        parameters->FindParam(&filename,OutputFileNameEnum);
+        /*Write data to matlab structure or filename: */
+        #ifdef _SERIAL_
+                MatlabWriteResults();
+        #else
+                FileWriteResults();
+        #endif
+}
 
-        //Open filename for writing only on cpu 0
-        if(my_rank==0)fid=pfopen(filename,"wb");
 
-        for(i=0;i<results->Size();i++){
-                ExternalResult* result=(ExternalResult*)results->GetObjectByOffset(i);
-
-                /*write result to disk: */
-                result->WriteData(fid);
-        }
-
-        /*Close file: */
-        if(my_rank==0)pfclose(fid,filename);
-
-        /*Free ressources:*/
-        xfree((void**)&filename);
-}

issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.h

@@ -6 +6 @@
 #define _OUTPUTRESULTS_H
 
+#ifdef HAVE_CONFIG_H
+        #include "config.h"
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
 class DataSet;
 class Parameters;
 
+#ifdef _SERIAL_
+void OutputResultsx(mxArray** pdataref, DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results);
+#else
+void OutputResultsx(DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results);
+#endif
+
 /* local prototypes: */
 void ElementResultsToPatch(DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results);
-
-void OutputResultsx(DataSet* elements, DataSet* loads, DataSet* nodes, DataSet* vertices, DataSet* materials, Parameters* parameters,DataSet* results);
+void FileWriteResults(Parameters* parameters, DataSet* results);
+void MatlabWriteResults(mxArray** pdataref, Parameters* parameters, DataSet* results);
 
 #endif  /* _OUTPUTRESULTS_H */