Changeset 9359

Timestamp:

08/19/11 18:06:16 (14 years ago)

Author:

Eric.Larour

Message:

For WriteData: better handling of bool upload (encapsulate into an int). a
ismodelselfconsistent: more homogeneous naming conventions for grounding line migration.

Location:

issm/trunk/src/m/model

Files:

• WriteData.m (modified) (3 diffs)
• ismodelselfconsistent.m (modified) (1 diff)

issm/trunk/src/m/model/WriteData.m

@@ -25 +25 @@
 
         %first write length of record
-        fwrite(fid,1+4,'int');  %1 bool+code
+        fwrite(fid,4+4,'int');  %1 bool (disguised as an int)+code
 
         %write data code: 
@@ -31 +31 @@
 
         %now write integer
-        fwrite(fid,data,'uint'); 
+        fwrite(fid,data,'int');  %send an int, not easy to send a bool
         % }}}
 elseif strcmpi(data_type,'Integer'), % {{{
@@ -205 +205 @@
         % }}}
 else 
-        error('WriteData error message: data type not supported yet!');
+        error(['WriteData error message: data type: ' num2str(data_type) ' not supported yet! (' EnumToString(enum) ')']);
 end
 

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -126 +126 @@
 end
 %GROUNDING LINE MIGRATION {{{1
-checkvalues(md,{'gl_migration'},[NoneEnum() AgressiveMigrationEnum() SoftMigrationEnum()]);
-if (md.gl_migration~=NoneEnum),
+checkvalues(md,{'groundingline_migration'},[NoneEnum() AgressiveMigrationEnum() SoftMigrationEnum()]);
+if (md.groundingline_migration~=NoneEnum),
         if (md.dim==3 | strcmpi(md.cluster.name,'none')),
                 message(['model ' md.name ' requesting grounding line migration, but grounding line module only implemented for 2d models and parallel runs!']);