Changeset 22141

Timestamp:

10/05/17 14:58:31 (8 years ago)

Author:

seroussi

Message:

FIX: fixed checkfield for singletimeseries

File:

• issm/trunk-jpl/src/m/consistency/checkfield.m (modified) (4 diffs)

issm/trunk-jpl/src/m/consistency/checkfield.m

@@ -149 +149 @@
         lowerbound=getfieldvalue(options,'>=');
         field2=reshape(field,prod(size(field)),1);
-        if (getfieldvalue(options,'timeseries',0) | getfieldvalue(options,'singletimeseries',0)), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'timeseries',0), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'singletimeseries',0), field2=reshape(field(1,:),prod(size(field(1,:))),1); end
         if any(field2<lowerbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...
@@ -158 +159 @@
         lowerbound=getfieldvalue(options,'>');
         field2=reshape(field,prod(size(field)),1);
-        if (getfieldvalue(options,'timeseries',0) | getfieldvalue(options,'singletimeseries',0)), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'timeseries',0), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'singletimeseries',0), field2=reshape(field(1,:),prod(size(field(1,:))),1); end
         if any(field2<=lowerbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...
@@ -169 +171 @@
         upperbound=getfieldvalue(options,'<=');
         field2=reshape(field,prod(size(field)),1);
-        if (getfieldvalue(options,'timeseries',0) | getfieldvalue(options,'singletimeseries',0)), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'timeseries',0), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'singletimeseries',0), field2=reshape(field(1,:),prod(size(field(1,:))),1); end
         if any(field2>upperbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...
@@ -178 +181 @@
         upperbound=getfieldvalue(options,'<');
         field2=reshape(field,prod(size(field)),1);
-        if (getfieldvalue(options,'timeseries',0) | getfieldvalue(options,'singletimeseries',0)), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'timeseries',0), field2=reshape(field(1:end-1,:),prod(size(field(1:end-1,:))),1); end
+        if getfieldvalue(options,'singletimeseries',0), field2=reshape(field(1,:),prod(size(field(1,:))),1); end
         if any(field2>=upperbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...