source: issm/oecreview/Archive/21337-21723/ISSM-21444-21445.diff@ 21726

Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp
===================================================================
--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp      (revision 21444)
+++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp      (revision 21445)
@@ -52,9 +52,8 @@
                                }
                                /*Free ressources:*/
                                for(j=0;j<numgates;j++){
-                                       char*       string = gatenames[j];             xDelete<char>(string);
-                                       char*       string2= gatedefinitionstrings[j]; xDelete<char>(string2);
-                                       IssmDouble* gate   = gatesegments[j];          xDelete<IssmDouble>(gate);
+                                       char*       string = gatenames[j];    xDelete<char>(string);
+                                       IssmDouble* gate   = gatesegments[j]; xDelete<IssmDouble>(gate);
                                }
                                xDelete<char*>(gatenames);
                                xDelete<IssmDouble*>(gatesegments);
@@ -141,20 +140,20 @@
                                /*nodal value variables: */
                                int          numnodalvalues;
                                char**       nodalvalue_name_s             = NULL;    
-                               int*         nodalvalue_definitionenums_s             = NULL;    
-                               int*         nodalvalue_model_enum_s        = NULL;
+                               char**       nodalvalue_definitionstrings             = NULL;    
+                               char**       nodalvalue_modelstrings        = NULL;
                                int*         nodalvalue_node_s = NULL;
 
                                /*Fetch name, model_enum, etc ... (see src/m/classes/nodalvalue.m): */
                                iomodel->FetchMultipleData(&nodalvalue_name_s,&numnodalvalues,            "md.nodalvalue.name");
-                               iomodel->FetchMultipleData(&nodalvalue_definitionenums_s,&numnodalvalues, "md.nodalvalue.definitionenum");
-                               iomodel->FetchMultipleData(&nodalvalue_model_enum_s,&numnodalvalues,      "md.nodalvalue.model_enum");
+                               iomodel->FetchMultipleData(&nodalvalue_definitionstrings,&numnodalvalues, "md.nodalvalue.definitionenum");
+                               iomodel->FetchMultipleData(&nodalvalue_modelstrings,&numnodalvalues,      "md.nodalvalue.model_enum");
                                iomodel->FetchMultipleData(&nodalvalue_node_s,&numnodalvalues,            "md.nodalvalue.node");
 
                                for(j=0;j<numnodalvalues;j++){
 
                                        /*First create a nodalvalue object for that specific enum (nodalvalue_model_enum_s[j]):*/
-                                       output_definitions->AddObject(new Nodalvalue(nodalvalue_name_s[j],nodalvalue_definitionenums_s[j],nodalvalue_model_enum_s[j],nodalvalue_node_s[j]-1)); //-1 because matlab to c indexing.
+                                       output_definitions->AddObject(new Nodalvalue(nodalvalue_name_s[j],StringToEnumx(nodalvalue_definitionstrings[j]),StringToEnumx(nodalvalue_modelstrings[j]),nodalvalue_node_s[j]-1)); //-1 because matlab to c indexing.
                                }
                                        
                                /*Free ressources:*/
@@ -164,8 +163,8 @@
                                        string = nodalvalue_name_s[j];    xDelete<char>(string);
                                }
                                xDelete<char*>(nodalvalue_name_s);
-                               xDelete<int>(nodalvalue_model_enum_s);
-                               xDelete<int>(nodalvalue_definitionenums_s);
+                               xDelete<char*>(nodalvalue_modelstrings);
+                               xDelete<char*>(nodalvalue_definitionstrings);
                                xDelete<int>(nodalvalue_node_s);
                                /*}}}*/
                        }
Index: ../trunk-jpl/src/m/classes/nodalvalue.m
===================================================================
--- ../trunk-jpl/src/m/classes/nodalvalue.m     (revision 21444)
+++ ../trunk-jpl/src/m/classes/nodalvalue.m     (revision 21445)
@@ -59,10 +59,10 @@
                end % }}}
                function md = marshall(self,prefix,md,fid) % {{{
 
-               WriteData(fid,prefix,'object',self,'fieldname','name','format','String');
-               WriteData(fid,prefix,'object',self,'fieldname','definitionstring','format','String');
-               WriteData(fid,prefix,'object',self,'fieldname','model_string','format','String');
-               WriteData(fid,prefix,'object',self,'fieldname','node','format','Integer');
+               WriteData(fid,prefix,'data',self.name,'name','md.nodalvalue.name','format','String');
+               WriteData(fid,prefix,'data',self.definitionstring,'name','md.nodalvalue.definitionenum','format','String');
+               WriteData(fid,prefix,'data',self.model_string,'name','md.nodalvalue.model_enum','format','String');
+               WriteData(fid,prefix,'data',self.node,'name','md.nodalvalue.node','format','Integer');
 
                end % }}}
        end