Changeset 23690

Timestamp:

02/04/19 16:28:18 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: externalresults were not being marhsalled correctly

Location:

issm/trunk-jpl/src/c

Files:

• classes/ExternalResults/GenericExternalResult.h (modified) (2 diffs)
• datastructures/DataSet.cpp (modified) (1 diff)

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

@@ -56 +56 @@
 
                         MARSHALLING_ENUM(this->ObjectEnum());
-
-                        bool isnull=true;
-                        if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE) if(value) isnull=false;
-
                         MARSHALLING(id);
-                        MARSHALLING(result_name);
-                        MARSHALLING(isnull)
-                        if (!isnull) MARSHALLING(value) else value=0;
                         MARSHALLING(step);
                         MARSHALLING(time);
 
+                        /*Marshal result name*/
+                        int size = 0;
+                        if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE) size=strlen(result_name)+1;
+                        MARSHALLING(size);
+                        MARSHALLING_DYNAMIC(result_name,char,size);
+
+                        /*Marshall value*/
+                        this->value=0;
+                        bool isnull=true;
+                        if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE){
+                                if(value) isnull=false;
+                        }
+                        MARSHALLING(isnull);
+                        if(!isnull) MARSHALLING(value)
                 }  /*}}}*/
 
@@ -77 +84 @@
                         step        = 0;
                         time        = 0;
-                        value       = NULL;
+                        value       = 0;
                 } /*}}}*/
                 GenericExternalResult(int in_id, int in_enum_type,ResultType in_values, int in_M,int in_N,int in_step,IssmDouble in_time){/*{{{*/

issm/trunk-jpl/src/c/datastructures/DataSet.cpp

@@ -293 +293 @@
                                 this->AddObject(penpair);
                         }
+                        else if(obj_enum==DoubleExternalResultEnum){
+                                GenericExternalResult<double>* result=new GenericExternalResult<double>();
+                                result->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+                                result->Echo();
+                                this->AddObject(result);
+                        }
                         else _error_("could not recognize enum type: " << obj_enum << ": " << EnumToStringx(obj_enum) ); 
                 }