Changeset 9381 for issm/trunk/src/m/model/marshall.m

Timestamp:

08/23/11 10:26:17 (14 years ago)

Author:

Mathieu Morlighem

Message:

removed some leaks in C and fixed marshall and parseresult for new IoModel interface

File:

• issm/trunk/src/m/model/marshall.m (modified) (12 diffs)

issm/trunk/src/m/model/marshall.m

@@ -23 +23 @@
         marshall=template.(field){2};
         if marshall,
-                WriteData(md,fid,template,field);
-        end
-end
+                if strcmpi(field,'verbose'),
+                        WriteData(fid,field,VerboseToBinary(md.verbose),{'Integer'});
+                else
+                        WriteData(fid,field,md.(field),template.(field)(3:end));
+                end
+        end
+end
+
+%Quick fix: add some fields needed by parameters
+WriteData(fid,'numberofvertices',md.numberofnodes,{'Integer'});
 
 %close file
@@ -33 +40 @@
 end
 
-function WriteData(md,fid,template,field) % {{{
+function WriteData(fid,fieldname,fieldvalue,fieldtype) % {{{
 %WRITEDATA - write model field in binary file
 %
 %   Usage:
-%      WriteData(md,fid,template,field)
+%      WriteData(fid,fieldname,fieldvalue,fieldtype)
 %
 %   Example:
-%     WriteData(md,fid,template,'thickness')
+%     WriteData(fid,'thickness',md.thickness,{'DoubleMat',1})
 
 %first recover data, enum of the data and type of data
-data=md.(field);
-enum=BuildEnum(field);
-data_type=template.(field){3};
+data=fieldvalue;
+enum=BuildEnum(fieldname);
+data_type=fieldtype{1};
 
 if issparse(data),
@@ -105 +112 @@
 
         %matrix type:
-        mattype=template.(field){4};
+        mattype=fieldtype{2};
 
         %Get size
@@ -113 +120 @@
                 s(1)=0; s(2)=0;
         end
-        
+
         %first write length of record
         fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int');  %2 integers (32 bits) + the double matrix + code + matrix type
@@ -131 +138 @@
 
         %matrix type:
-        mattype=template.(field){4};
+        mattype=fieldtype{2};
 
         %Get size
@@ -139 +146 @@
                 s(1)=0; s(2)=0;
         end
-        
+
         %first write length of record
         fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int');  %2 integers (32 bits) + the double matrix + code + matrix type
@@ -157 +164 @@
 
         %matrix type:
-        mattype=template.(field){4};
+        mattype=fieldtype{2};
 
         %Get size
@@ -165 +172 @@
                 s(1)=0; s(2)=0;
         end
-        
+
         %first write length of record
         fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int');  %2 integers (32 bits) + the double matrix + code + matrix type
@@ -183 +190 @@
 
         numrecords=numel(data);
-        
+
         %first get length of record
         recordlength=4+4; %number of records + code
@@ -190 +197 @@
                 s=size(matrix);
                 recordlength=recordlength+4*2+... %row and col of matrix
-                                         s(1)*s(2)*8; %matrix of doubles
+                        s(1)*s(2)*8; %matrix of doubles
         end
 
@@ -201 +208 @@
         %write data, first number of records
         fwrite(fid,numrecords,'int'); 
-        
+
         %write each matrix: 
         for i=1:numrecords,
@@ -230 +237 @@
         %now write length of string array
         fwrite(fid,num,'int'); 
-        
+
         %now write the strings
         for i=1:num,