Changeset 4167

Timestamp:

06/23/10 12:28:36 (15 years ago)

Author:

Eric.Larour

Message:

some debugging

Location:

issm/trunk/src/c

Files:

• modules/OutputResultsx/FileWriteResults.cpp (modified) (1 diff)
• modules/OutputResultsx/MatlabWriteResults.cpp (modified) (1 diff)
• objects/ExternalResults/BoolExternalResult.cpp (modified) (1 diff)
• objects/ExternalResults/DoubleExternalResult.cpp (modified) (1 diff)
• objects/ExternalResults/DoubleMatExternalResult.cpp (modified) (1 diff)
• objects/ExternalResults/DoubleVecExternalResult.cpp (modified) (1 diff)
• objects/ExternalResults/IntExternalResult.cpp (modified) (1 diff)

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

@@ -9 +9 @@
 #endif
 
+#include "../../io/io.h"
+#include "../../objects/objects.h"
+#include "../../shared/shared.h"
+#include "../../include/include.h"
+
+
 void FileWriteResults(Parameters* parameters, DataSet* results){
 
+        int         i;
         extern int  my_rank;
         char       *filename     = NULL;

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

@@ -35 +35 @@
         for(i=0;i<nfields;i++){
                 ExternalResult* result=(ExternalResult*)results->GetObjectByOffset(i);
-                fnames[i]=results->GetResultName();
+                fnames[i]=result->GetResultName();
         }
 

issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp

@@ -184 +184 @@
 /*FUNCTION BoolExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
 #ifdef _SERIAL_
-char* BoolExternalResult::SetMatlabField(mxArray* dataref){
+void BoolExternalResult::SetMatlabField(mxArray* dataref){
 
         char* name=NULL;

issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp

@@ -180 +180 @@
 /*FUNCTION DoubleExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
 #ifdef _SERIAL_
-char* DoubleExternalResult::SetMatlabField(mxArray* dataref){
+void DoubleExternalResult::SetMatlabField(mxArray* dataref){
 
         char* name=NULL;

issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

@@ -206 +206 @@
 /*FUNCTION DoubleMatExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
 #ifdef _SERIAL_
-char* DoubleMatExternalResult::SetMatlabField(mxArray* dataref){
+void DoubleMatExternalResult::SetMatlabField(mxArray* dataref){
 
         mxArray* pfield=NULL;
         mxArray* pfield2=NULL;
-        double* doublemat=NULL;
         int M,N;
         char* name=NULL;

issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp

@@ -202 +202 @@
 /*FUNCTION DoubleVecExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
 #ifdef _SERIAL_
-char* DoubleVecExternalResult::SetMatlabField(mxArray* dataref){
+void DoubleVecExternalResult::SetMatlabField(mxArray* dataref){
 
         mxArray* pfield=NULL;

issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp

@@ -184 +184 @@
 /*FUNCTION IntExternalResult::SetMatlabField(mxArray* dataref);{{{1*/
 #ifdef _SERIAL_
-char* IntExternalResult::SetMatlabField(mxArray* dataref){
+void IntExternalResult::SetMatlabField(mxArray* dataref){
 
         char* name=NULL;
         name=this->GetResultName();
-        mxSetField( dataref, 0, name,mxCreateIntScalar(value));
+        mxSetField( dataref, 0, name,mxCreateDoubleScalar(value));
 }
 #endif