diff --git a/.gitignore b/.gitignore index 1dfa116..153746c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,4 @@ fftma_module/gen/log_* fftma_module/gen/out*.npy .ipynb_checkpoints/analysis-checkpoint.ipynb fftma_module/gen/.ipynb_checkpoints/ -tests/stages/generation/__pycache__/ +__pycache__/ diff --git a/fftma_module/gen/moduleFFTMA.c b/fftma_module/gen/moduleFFTMA.c index 1b1996f..fd5b07b 100644 --- a/fftma_module/gen/moduleFFTMA.c +++ b/fftma_module/gen/moduleFFTMA.c @@ -56,8 +56,7 @@ static PyObject* genFunc(PyObject* self, PyObject* args) { free(variogram.ap); free(variogram.vario); - /*file_array_free(Z.vector_2); - remove("realization1.txt");*/ + remove("realization.txt"); return out_array; } diff --git a/fftma_module/gen/save_logs.sh b/fftma_module/gen/save_logs.sh deleted file mode 100755 index 63dd6f9..0000000 --- a/fftma_module/gen/save_logs.sh +++ /dev/null @@ -1,2 +0,0 @@ -python3 setup.py install --user -ENV=analysis python3 test.py $1 2>&1 | split -l 5000000 - log_$1_generate_improve- \ No newline at end of file diff --git a/tests/stages/generation/__pycache__/test.cpython-36.pyc b/tests/stages/generation/__pycache__/test.cpython-36.pyc deleted file mode 100644 index 08dcb13..0000000 Binary files a/tests/stages/generation/__pycache__/test.cpython-36.pyc and /dev/null differ diff --git a/tests/stages/generation/out_64.npy b/tests/stages/generation/out_64.npy new file mode 100644 index 0000000..05c2c8a Binary files /dev/null and b/tests/stages/generation/out_64.npy differ diff --git a/tests/stages/generation/test.py b/tests/stages/generation/test.py index cf28f33..77683f3 100644 --- a/tests/stages/generation/test.py +++ b/tests/stages/generation/test.py @@ -1,8 +1,10 @@ from FFTMA import gen import numpy as np import unittest +import time def generate(N): + start_time = time.time() nx, ny, nz = N,N,N dx, dy, dz = 1.0, 1.0, 1.0 seed= 1548762 #rdi(10000,99999) @@ -26,7 +28,10 @@ def generate(N): variance=3.5682389 typ=3 - return gen(nx, ny, nz, dx, dy, dz, seed, variograms, mean, variance, typ, 8) + k = gen(nx, ny, nz, dx, dy, dz, seed, variograms, mean, variance, typ, 8) + + print(f"Generation with N = {N} time = {time.time() - start_time}s") + return k def test(N): @@ -35,8 +40,6 @@ def test(N): comparison = k == k_correct return comparison.all() - - class TestGeneration(unittest.TestCase): def test_8(self): self.assertTrue(test(8)) @@ -45,4 +48,7 @@ class TestGeneration(unittest.TestCase): self.assertTrue(test(16)) def test_32(self): - self.assertTrue(test(32)) \ No newline at end of file + self.assertTrue(test(32)) + + def test_64(self): + self.assertTrue(test(64)) \ No newline at end of file