testing all binaries

mpirunner.py

@@ -6,7 +6,7 @@ import os
 import sys
 from tools.Prealization import realization
 
-CONFIG_FILE_PATH = os.environ['CONFIG_FILE_PATH']
+CONFIG_FILE_PATH = 'config.ini' if 'CONFIG_FILE_PATH' not in os.environ else os.environ['CONFIG_FILE_PATH']
 
 print(CONFIG_FILE_PATH)
 

tests/integration/test.py

@@ -58,6 +58,8 @@ def equal_binaries(path_original, path):
     return False
 
 
+binaries = ['Cmap', 'D', 'P', 'V']
+
 def test():
     os.chdir('../..') #LO COMENTE PARA EVITAR VOLVER A CORRERLO
     #config_file = os.path.abspath("./tests/integration/conf_test.ini")
@@ -65,13 +67,14 @@ def test():
 
     #are_equal = are_dir_trees_equal("./tests/integration/tmp_output","./test_loop")
 
-    for i in range(90): # HABRIA QUE HACER ESTO PERO PARA TODOS 
+    for i in range(90):
-        path = './tests/integration/tmp_output/{}/D.npy'.format(i)
+        for binary in binaries:
-        path_original = './test_loop/{}/D.npy'.format(i)
+            path = './tests/integration/tmp_output/{}/{}.npy'.format(i, binary)
+            path_original = './test_loop/{}/{}.npy'.format(i, binary)
 
-        if not equal_binaries(path_original, path):
+            if not equal_binaries(path_original, path):
-            print("Failure :( on {}".format(i))
+                print("Failure :( on {}".format(i))
-            return
+                return
 
     print("Success!")
 

tools/Prealization.py

@@ -9,7 +9,7 @@ from shutil import copyfile
 from solver.comp_Kperm_scale import comp_kperm_sub
 from solver.Ndar import PetscP
 
-CONFIG_FILE_PATH = os.environ['CONFIG_FILE_PATH']
+CONFIG_FILE_PATH = 'config.ini' if 'CONFIG_FILE_PATH' not in os.environ else os.environ['CONFIG_FILE_PATH']
 
 def realization(job):
 

tools/generation/fftma_gen.py

@@ -154,6 +154,6 @@ def binarize(kc,kh,kl,p):
 		kc=np.where(kc<t1, kl,kh)
 	return kc
 
-CONFIG_FILE_PATH = os.environ["CONFIG_FILE_PATH"]
+CONFIG_FILE_PATH = 'config.ini' if 'CONFIG_FILE_PATH' not in os.environ else os.environ['CONFIG_FILE_PATH']
 
 fftmaGenerator(sys.argv[1],int(sys.argv[2]),CONFIG_FILE_PATH)