Changeset 64

Timestamp:

04/27/09 11:15:02 (16 years ago)

Author:

seroussi

Message:

field time only if cluster

File:

• issm/trunk/src/m/classes/public/ismodelselfconsistent.m (modified) (5 diffs)

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

@@ -337 +337 @@
 
         %NAN VALUES
-        fields={'time','sparsity'};
+        fields={'sparsity'};
         for i=1:length(fields),
                 if ~isempty(eval(['md.' char(fields(i))])),
@@ -348 +348 @@
 
         %FIELD > 0
-        fields={'time','sparsity'};
+        fields={'sparsity'};
         for i=1:length(fields),
                 if ~isempty(eval(['md.' char(fields(i))])),
@@ -359 +359 @@
 
         %FIELD ~= 0
-        fields={'time','sparsity'};
+        fields={'sparsity'};
         for i=1:length(fields),
                 if ~isempty(eval(['md.' char(fields(i))])),
@@ -399 +399 @@
         end
 
-        %NP
-        if ~strcmpi(md.cluster,'none'),
-                if md.np==0,
-                        disp(['model ' md.name ' has a =0 value in field np !']);
-                elseif md.np<0,
-                        disp(['model ' md.name ' has a negative value in field np !']);
-                end
-        end
-
         %LOWMEM = 0 or 1
         if ((md.lowmem ~= 1) & (md.lowmem~=0)),
@@ -413 +404 @@
                 bool=0; return;
         end
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  PARALLEL CHECKS   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+        if ~strcmpi(md.cluster,'none'),
+
+                %NAN VALUES
+                fields={'time','np'};
+                for i=1:length(fields),
+                        if ~isempty(eval(['md.' char(fields(i))])),
+                                if find(isnan(eval(['md.' char(fields(i))]))),
+                                        disp(['model ' md.name ' has an NaN value in field ' char(fields(i)) '!']);
+                                        bool=0; return;
+                                end
+                        end
+                end
+
+                %FIELD > 0
+                fields={'time','np'};
+                for i=1:length(fields),
+                        if ~isempty(eval(['md.' char(fields(i))])),
+                                if find((eval(['md.' char(fields(i))]))<0),
+                                        disp(['model ' md.name ' has a <0 value in field ' char(fields(i)) '!']);
+                                        bool=0; return;
+                                end
+                        end
+                end
+
+                %FIELD ~= 0
+                fields={'time','np'};
+                for i=1:length(fields),
+                        if ~isempty(eval(['md.' char(fields(i))])),
+                                if find((eval(['md.' char(fields(i))]))==0),
+                                        disp(['model ' md.name ' has a =0 value in field ' char(fields(i)) '!']);
+                                        bool=0; return;
+                                end
+                        end
+                end
+
+        end
+
 end