Changeset 23705

Timestamp:

02/08/19 02:31:06 (6 years ago)

Author:

bdef

Message:

BUG: vlaues have never been check against field values (checked against string) this might break a few tests for good reasons

File:

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

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

@@ -2 +2 @@
 import os
 from pairoptions import pairoptions
+from operator import attrgetter
 import MatlabFuncs as m
 
@@ -101 +102 @@
                                 "NaN values found in field '%s'" % fieldname))
 
-
         #check Inf
         if options.getfieldvalue('Inf',0):
@@ -107 +107 @@
                         md = md.checkmessage(options.getfieldvalue('message',\
                                 "Inf values found in field '%s'" % fieldname))
-
 
         #check cell
@@ -132 +131 @@
         if options.exist('>='):
                 lowerbound = options.getfieldvalue('>=')
+                if type(lowerbound) is str:
+                        lowerbound=attrgetter(lowerbound)(md)
                 if np.size(lowerbound)>1: #checking elementwise
                         if any(field<upperbound):
@@ -150 +151 @@
         if options.exist('>'):
                 lowerbound=options.getfieldvalue('>')
+                if type(lowerbound) is str:
+                        lowerbound=attrgetter(lowerbound)(md)
                 if np.size(lowerbound)>1: #checking elementwise
                         if any(field<=upperbound):
@@ -169 +172 @@
         if options.exist('<='):
                 upperbound=options.getfieldvalue('<=')
+                if type(upperbound) is str:
+                        upperbound=attrgetter(upperbound)(md)
                 if np.size(upperbound)>1: #checking elementwise
                         if any(field>upperbound):
@@ -186 +191 @@
         if options.exist('<'):
                 upperbound=options.getfieldvalue('<')
+                if type(upperbound) is str:
+                        upperbound=attrgetter(upperbound)(md)
                 if np.size(upperbound)>1: #checking elementwise
                         if any(field>=upperbound):
@@ -199 +206 @@
                                 else:
                                         maxval=np.nanmax(field[0])
-
                                 if maxval>=upperbound:
-                                        md = md.checkmessage(options.getfieldvalue('message',"field '%s' should have values below %d" % (fieldname,upperbound)))
+                                        md = md.checkmessage(options.getfieldvalue('message',"field '{}' should have values below {}".format(fieldname,upperbound)))
 
         #check file