diff --git a/mpirunner.py b/mpirunner.py index a609343..32bb65b 100755 --- a/mpirunner.py +++ b/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) diff --git a/tests/integration/test.py b/tests/integration/test.py index 68c16fa..77bc32c 100644 --- a/tests/integration/test.py +++ b/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 - path = './tests/integration/tmp_output/{}/D.npy'.format(i) - path_original = './test_loop/{}/D.npy'.format(i) + for i in range(90): + for binary in binaries: + path = './tests/integration/tmp_output/{}/{}.npy'.format(i, binary) + path_original = './test_loop/{}/{}.npy'.format(i, binary) - if not equal_binaries(path_original, path): - print("Failure :( on {}".format(i)) - return + if not equal_binaries(path_original, path): + print("Failure :( on {}".format(i)) + return print("Success!") diff --git a/tools/Prealization.py b/tools/Prealization.py index d2860cd..6235d43 100755 --- a/tools/Prealization.py +++ b/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): diff --git a/tools/Prealization.pyc b/tools/Prealization.pyc index 398c9c2..8522330 100644 Binary files a/tools/Prealization.pyc and b/tools/Prealization.pyc differ diff --git a/tools/generation/fftma_gen.py b/tools/generation/fftma_gen.py index 8f2293e..d89a0fc 100755 --- a/tools/generation/fftma_gen.py +++ b/tools/generation/fftma_gen.py @@ -154,6 +154,6 @@ def binarize(kc,kh,kl,p): kc=np.where(kc