Changeset 22104

Timestamp:

09/18/17 14:35:19 (8 years ago)

Author:

kruegern

Message:

NEW: Added misfit.py, translated from misfit.m. Added test123.py, translated from test123.m. Added test124.py, translated from test124.m. Fixed future-warning from runme.py regarding comparison to None

Location:

issm/trunk-jpl

Files:

• src/m/classes/misfit.py (added)
• test/NightlyRun/runme.py (modified) (1 diff)
• test/NightlyRun/test123.py (added)
• test/NightlyRun/test124.py (added)

issm/trunk-jpl/test/NightlyRun/runme.py

@@ -180 +180 @@
                                                 # Matlab uses base 1, so use base 1 in labels
                                                 archive=np.array(archread(archive_file,archive_name+'_field'+str(k+1)))
-                                                if archive == None:
+                                                #Because np.array is weird (str(np.array(None)) becomes 'None' but np.array(None) is never equal to None, it basically becomes a type of string in an array):
+                                                if str(archive) == 'None':
                                                         raise NameError("Field name '"+archive_name+'_field'+str(k+1)+"' does not exist in archive file.")
                                                 error_diff=np.amax(np.abs(archive-field),axis=0)/(np.amax(np.abs(archive),axis=0)+float_info.epsilon)