From c0a7847fde9091a4b09fc706e7411b078295a3a0 Mon Sep 17 00:00:00 2001
From: Olivia Fernandez <olivia.fernandez@jampp.com>
Date: Thu, 10 Feb 2022 21:06:42 -0300
Subject: [PATCH] fixes

---
 script_fortran.sh         | 8 ++++++++
 tests/integration/test.py | 9 ---------
 2 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100755 script_fortran.sh

diff --git a/script_fortran.sh b/script_fortran.sh
new file mode 100755
index 0000000..ec6fe8b
--- /dev/null
+++ b/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 ..
\ No newline at end of file
diff --git a/tests/integration/test.py b/tests/integration/test.py
index a422fcd..bf67630 100644
--- a/tests/integration/test.py
+++ b/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):