fixes

script_fortran.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm ./tools/connec/conec2d
+rm ./tools/connec/conec3d
+
+cd ./tools/connec/connec-src && make clean && make all
+mv ./conec2d ..
+mv ./conec3d ..

tests/integration/test.py

@@ -9,7 +9,6 @@ def find_relative_errors(path_original, path):
     binary_original = np.load(path_original)
     binary = np.load(path)
 
-<<<<<<< Updated upstream
     diffs = binary_original - binary
 
     binary_original = binary_original.tolist()
@@ -40,14 +39,6 @@ def find_relative_errors(path_original, path):
 
 BINARIES = ["Cmap", "D", "P", "V", "k"]
 
-=======
-    diffs = np.divide(binary_original - binary, binary_original)
-    comparisons = np.array([(abs(x) < 0.01).all() for x in diffs])
-    return comparisons.all()
-
-BINARIES = ['Cmap', 'D', 'P', 'V', 'k']
->>>>>>> Stashed changes
-
 class TestIntegration(unittest.TestCase):
     @classmethod
     def setUpClass(cls):