Changeset 802

Timestamp:

06/04/09 17:31:42 (16 years ago)

Author:

Mathieu Morlighem

Message:

no more eval, use md.(field) instead

Location:

issm/trunk/src/m/classes/public

Files:

• ismodelselfconsistent.m (modified) (13 diffs)
• parseresultsfromdisk.m (modified) (1 diff)

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -67 +67 @@
         'tolx','np','eps_rel','exclusive','n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
 for i=1:length(fields),
-        if ~isempty(eval(['md.' fields{i}])),
-                if any(isnan(eval(['md.' fields{i}]))),
+        if ~isempty(md.(fields{i})),
+                if any(isnan(md.(fields{i}))),
                         disp(['model ' md.name ' has an NaN value in field ' fields{i} '!']);
                         bool=0; return;
@@ -80 +80 @@
         'sparsity','lowmem','n','gridonbed','gridonsurface','elementonbed','elementonsurface','deltaH','DeltaH','timeacc','timedec'};
 for i=1:length(fields),
-        if ~isempty(eval(['md.' fields{i}])),
-                if any((eval(['md.' fields{i}]))<0),
+        if ~isempty(md.(fields{i})),
+                if any(md.(fields{i})<0),
                         disp(['model ' md.name ' has a <0 value in field ' fields{i} '!']);
                         bool=0; return;
@@ -97 +97 @@
         'sparsity','deltaH','DeltaH','timeacc','timedec'};
 for i=1:length(fields),
-        if ~isempty(eval(['md.' fields{i}])),
-                if any((eval(['md.' fields{i}]))==0),
+        if ~isempty(md.(fields{i})),
+                if any(md.(fields{i})==0),
                         disp(['model ' md.name ' has a =0 value in field ' fields{i} '!']);
                         bool=0; return;
@@ -108 +108 @@
 fields={'elements','p','q','elementoniceshelf','n','elementonbed'};
 for i=1:size(fields,2),
-        if (size(eval(['md.' fields{i}]),1)~=md.numberofelements),
+        if (size(md.(fields{i}),1)~=md.numberofelements),
                 disp(['model ' md.name ' field ' fields{i} ' should be of size ' num2str(md.numberofelements) '!']);
                 bool=0; return;
@@ -117 +117 @@
 fields={'x','y','z','B','drag','gridondirichlet_diag','melting','accumulation','surface','thickness','bed','gridonbed','gridonsurface'};
 for i=1:length(fields),
-        if length(eval(['md.' fields{i}]))~=md.numberofgrids,
+        if length(md.(fields{i}))~=md.numberofgrids,
                 disp(['model ' md.name ' field ' fields{i} ' should be of size ' num2str(md.numberofgrids) '!']);
                 bool=0; return;
@@ -249 +249 @@
         fields={'dt','ndt'};
         for i=1:length(fields),
-                if any((eval(['md.' fields{i}]))<0),
+                if any(md.(fields{i})<0),
                         disp(['model ' md.name ' has a <0 value in field ' fields{i} '!']);
                         bool=0; return;
@@ -320 +320 @@
         fields={'vx_obs','vy_obs'};
         for i=1:length(fields),
-                if any(length(eval(['md.' fields{i}]))~=md.numberofgrids),
+                if any(length(md.(fields{i}))~=md.numberofgrids),
                         disp(['model ' md.name ' field ' fields{i} ' should be of size ' num2str(md.numberofgrids) '!']);
                         bool=0; return;
@@ -362 +362 @@
         fields={'sparsity'};
         for i=1:length(fields),
-                if ~isempty(eval(['md.' fields{i}])),
-                        if any(isnan(eval(['md.' fields{i}]))),
+                if ~isempty(md.(fields{i})),
+                        if any(isnan(md.(fields{i}))),
                                 disp(['model ' md.name ' has an NaN value in field ' fields{i} '!']);
                                 bool=0; return;
@@ -373 +373 @@
         fields={'sparsity'};
         for i=1:length(fields),
-                if ~isempty(eval(['md.' fields{i}])),
-                        if any((eval(['md.' fields{i}]))<0),
+                if ~isempty(md.(fields{i})),
+                        if any(md.(fields{i})<0),
                                 disp(['model ' md.name ' has a <0 value in field ' fields{i} '!']);
                                 bool=0; return;
@@ -384 +384 @@
         fields={'sparsity'};
         for i=1:length(fields),
-                if ~isempty(eval(['md.' fields{i}])),
-                        if any((eval(['md.' fields{i}]))==0),
+                if ~isempty(md.(fields{i})),
+                        if any(md.(fields{i})==0),
                                 disp(['model ' md.name ' has a =0 value in field ' fields{i} '!']);
                                 bool=0; return;
@@ -435 +435 @@
                 fields={'time','np'};
                 for i=1:length(fields),
-                        if ~isempty(eval(['md.' fields{i}])),
-                                if any(isnan(eval(['md.' fields{i}]))),
+                        if ~isempty(md.(fields{i})),
+                                if any(isnan(md.(fields{i}))),
                                         disp(['model ' md.name ' has an NaN value in field ' fields{i} '!']);
                                         bool=0; return;
@@ -446 +446 @@
                 fields={'time','np'};
                 for i=1:length(fields),
-                        if ~isempty(eval(['md.' fields{i}])),
-                                if any((eval(['md.' fields{i}]))<0),
+                        if ~isempty(md.(fields{i})),
+                                if any(md.(fields{i})<0),
                                         disp(['model ' md.name ' has a <0 value in field ' fields{i} '!']);
                                         bool=0; return;
@@ -457 +457 @@
                 fields={'time','np'};
                 for i=1:length(fields),
-                        if ~isempty(eval(['md.' fields{i}])),
-                                if any((eval(['md.' fields{i}]))==0),
+                        if ~isempty(md.(fields{i})),
+                                if any(md.(fields{i})==0),
                                         disp(['model ' md.name ' has a =0 value in field ' fields{i} '!']);
                                         bool=0; return;

issm/trunk/src/m/classes/public/parseresultsfromdisk.m

@@ -17 +17 @@
 while ~isempty(result),
 
-        eval(['results(' num2str(result.step) ').step=result.step;']);
-        eval(['results(' num2str(result.step) ').time=result.time;']);
-        eval(['results(' num2str(result.step) ').' result.fieldname '=result.field;']);
+        results(result.step).step=result.step;
+        results(result.step).time=result.time;
+        results(result.step).(result.fieldname)=result.field;
         result=ReadData(fid);