Changeset 9381

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

Location:

issm/trunk/src

Files:

• c/EnumDefinitions/Synchronize.sh (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp (modified) (1 diff)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• c/objects/IoModel.cpp (modified) (1 diff)
• m/classes/model.m (modified) (2 diffs)
• m/model/marshall.m (modified) (12 diffs)
• m/model/parseresultsfromdisk.m (modified) (1 diff)
• m/model/presolve.m (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/Synchronize.sh

@@ -3 +3 @@
 
 #Get all lines of EnumDefinitions2.h which hold Enum | remove all comas | add line number in the first column > put everything in file temp
-cat EnumDefinitions.h | grep -e "[0-9]Enum" -e "[a-zA-Z]Enum" | grep -v include | sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
+cat EnumDefinitions.h | grep -e "[0-9]Enum," -e "[a-zA-Z]Enum," | grep -v include | sed -e "s/,//g" | awk '{ printf "%s %s\n", NR, $0 }' > temp
 
 #Removed existing files

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

@@ -494 +494 @@
                 case HydrologyWaterVyEnum : return "HydrologyWaterVy";
                 case SpcDynamicEnum : return "SpcDynamic";
-                case MaximumNumberOfEnums : return "MaximumNumberOfE";
                 default : return "unknown";
 

issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp

@@ -211 +211 @@
                 xfree((void**)&qmuerrname);
                 xfree((void**)&qmuoutname);
-                xfree((void**)&name);
                 /*}}}*/
         } //if(qmu_analysis)
+
+        /*Free data*/
+        xfree((void**)&name);
 
         /*Assign output pointer: */

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

@@ -492 +492 @@
         else if (strcmp(name,"HydrologyWaterVy")==0) return HydrologyWaterVyEnum;
         else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
-        else if (strcmp(name,"MaximumNumberOfE")==0) return MaximumNumberOfEnums;
         else _error_("Enum %s not found",name);
 

issm/trunk/src/c/objects/IoModel.cpp

@@ -625 +625 @@
                                                 /*Add string to parameters: */
                                                 parameters->AddObject(new StringParam(record_enum,string));
+
+                                                /*Free string*/
+                                                xfree((void**)&string);
 
                                                 break;

issm/trunk/src/m/classes/model.m

@@ -93 +93 @@
                  riftinfo             = {NaN,true,'DoubleMat',3};
                  riftproperties       = {NaN,false};
-                 numrifts             = {0,false};
+                 numrifts             = {0,true,'Integer'};
 
                  %Projections
@@ -245 +245 @@
                  strainrate                          = {NaN,false};
                  %Debugging
-                 verbose                             = {0,false};
-                 verbose_binary                      = {0,true,'Integer'};
+                 verbose                             = {0,true,'Integer'};
                  element_debug                       = {0,false};
                  element_debugid                     = {NaN,false};

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,

issm/trunk/src/m/model/parseresultsfromdisk.m

@@ -49 +49 @@
 fclose(fid);
 % }}}
-function results=parseresultsfromdisk(filename) % {{{
+function results=parseresultsfromdiskiosplit(filename) % {{{
 %PARSERESULTSFROMDISKIOSPLIT - ...
 %

issm/trunk/src/m/model/presolve.m

@@ -35 +35 @@
 end
 
-
-%resolve some fields at solution time
-md.verbose_binary=VerboseToBinary(md.verbose);
-
 %Control methods
 md.num_control_type=numel(md.control_type);