solved conflict after merge

nansencenter · Apr 17, 2015 · 73585cb · 73585cb
2 parents 02bea41 + 5949f14
commit 73585cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mapper_tests/mapper_test_archive.py b/mapper_tests/mapper_test_archive.py
@@ -3,10 +3,10 @@
 # Purpose:      To test nansat
 #
 # Author:       Anton Korosov, Morten Wergeland Hansen, Asuka Yamakawa
-# Modified:     Anton Korosov
+# Modified:	Morten Wergeland Hansen
 #
 # Created:  18.06.2014
-# Last modified:17.04.2015 12:47
+# Last modified:17.04.2015 13:32
 # Copyright:    (c) NERSC
 # Licence:      This file is part of NANSAT. You can redistribute it or modify
 #               under the terms of GNU General Public License, v.3

diff --git a/mapper_tests/test_radarsat2.py b/mapper_tests/test_radarsat2.py
@@ -3,10 +3,10 @@
 # Purpose:      End to end testing of Nansat for Radarsat-2
 #
 # Author:       Morten Wergeland Hansen
-# Modified: Morten Wergeland Hansen
+# Modified:	Morten Wergeland Hansen
 #
 # Created:  17.04.2015
-# Last modified:17.04.2015 10:24
+# Last modified:17.04.2015 13:21
 # Copyright:    (c) NERSC
 # License:
 #-------------------------------------------------------------------------------
@@ -54,7 +54,7 @@ def export(self, rsfile):
         np.testing.assert_allclose(lat0, lat1)
         # If the next tests fail, it could indicate that the data is flipped
         # check by pyplot.imshow orig vs copy...
-        np.testing.assert_allclose(inc0, inc1, rtol=1e-3)
+        np.testing.assert_allclose(inc0, inc1)
         np.testing.assert_allclose(sigma0_0, sigma0_1)
         os.unlink(ncfile)