Changeset 12330 for issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp (modified) (5 diffs)

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

@@ -16 +16 @@
 #include "../../objects/objects.h"
                 
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-void OutputResultsx(mxArray** pdataref, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){
-#else 
 void OutputResultsx(                    Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){
-#endif
 
         extern int  my_rank;
@@ -31 +27 @@
         bool        dakota_analysis         = false;
         
-        #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-        const char **fnames      = NULL;
-        mwSize       onebyone[2] = {0,0};
-        mwSize       ndim        = 2;
-        int          nfields=0;
-        #endif
-
         /*retrieve parameters: */
         parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
@@ -43 +32 @@
         if(dakota_analysis){
                 //no need to output anything, Dakota analysis has different outputs
-                #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-                *pdataref=mxCreateStructArray( ndim,onebyone,nfields,fnames);
-                #endif
                 return; 
         }
@@ -56 +42 @@
         /*Results do not include the type of solution being run . In parallel, we output results to a filename, 
          *therefore, we need to include the solutiontype into the filename: */
-        #ifdef _PARALLEL_
         if(my_rank==0){
                 parameters->FindParam(&solutiontype,SolutionTypeEnum);
@@ -88 +73 @@
                 parameters->SetParam(fid,OutputFilePointerEnum);
         }
-        #endif
 
-        /*Write results to disk (in parallel), or to memory (in serial mode): */
-        #if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-                results->Write(pdataref);
-        #else
-                results->Write(parameters);
-        #endif
+        /*Write results to disk: */
+        results->Write(parameters);
 
         /*Delete and reinitialize results, in parallel: */
-        #ifdef _PARALLEL_
-                results->clear();
+        results->clear();
 
-                /*Close output file? :*/
-                /*WARNING: issm.cpp is taking care of it for now (quick fix)
-                if((step==1) && (time==0)){
-                        if(io_gather){
-                                if(my_rank==0) pfclose(fid,outputfilename);
-                        }
-                        else pfclose(fid,cpu_outputfilename);
-                }
-                */
-        #endif
+        /*Close output file? :*/
+        /*WARNING: issm.cpp is taking care of it for now (quick fix)
+          if((step==1) && (time==0)){
+          if(io_gather){
+          if(my_rank==0) pfclose(fid,outputfilename);
+          }
+          else pfclose(fid,cpu_outputfilename);
+          }
+        */
 }