Merge branch 'improvement-file_array' of github.com:medios-porosos-fiuba/simulacion-permeabilidad into improvement-file_array

fftma_module/gen/example.py

@@ -2,30 +2,33 @@ from FFTMA import gen
 import numpy as np
 import sys
 
-N=int(sys.argv[1])
+def generate(n):
+    nx, ny, nz = n,n,n
+    dx, dy, dz = 1.0, 1.0, 1.0
+    seed= 1548762 #rdi(10000,99999)
+    var=1
+    vario=2
+    alpha=1
+    lcx=2
+    lcy=4
+    lcz=16
+    ap1x=1
+    ap1y=0
+    ap1z=0
+    ap2x=0
+    ap2y=1
+    ap2z=0
 
-nx, ny, nz = N,N,N
-dx, dy, dz = 1.0, 1.0, 1.0
-seed= 1548762 #rdi(10000,99999)
-var=1
-vario=2
-alpha=1
-lcx=2
-lcy=4
-lcz=16
-ap1x=1
-ap1y=0
-ap1z=0
-ap2x=0
-ap2y=1
-ap2z=0
+    v1 = (var, vario, alpha, lcx, lcy, lcz, ap1x, ap1y, ap1z, ap2x, ap2y, ap2z)
+    variograms = [v1]
 
-v1 = (var, vario, alpha, lcx, lcy, lcz, ap1x, ap1y, ap1z, ap2x, ap2y, ap2z)
-variograms = [v1]
+    mean=15.3245987
+    variance=3.5682389
+    typ=3
 
-mean=15.3245987
-variance=3.5682389
-typ=3
+    k=gen(nx, ny, nz, dx, dy, dz, seed, variograms, mean, variance, typ)
+    np.save(f"out_{n}.npy",k)
 
-k=gen(nx, ny, nz, dx, dy, dz, seed, variograms, mean, variance, typ)
-np.save(f"out_{N}.npy",k)
+if __name__ == '__main__':
+    N=int(sys.argv[1])
+    generate(N)

fftma_module/gen/mem_profile.py

@@ -0,0 +1,16 @@
+from sympy import N
+from example import generate
+
+from memory_profiler import memory_usage
+
+from memory_profiler import memory_usage
+import sys
+
+if __name__ == '__main__':
+    N=int(sys.argv[1])
+     
+    def run_gen():
+        generate(N)
+
+    mem_usage = memory_usage(run_gen)
+    print('Maximum memory usage: %s' % max(mem_usage))

tests/stages/generation/test.py

@@ -1,6 +1,7 @@
-from FFTMA import gen
+
 import numpy as np
 import unittest
+from FFTMA import gen
 import time
 
 def generate(N):
@@ -30,17 +31,17 @@ def generate(N):
 
     k = gen(nx, ny, nz, dx, dy, dz, seed, variograms, mean, variance, typ)
 
-    print(f"Generation with N = {N} time = {time.time() - start_time}s")
-    return k
-
+    duration = time.time() - start_time
+    return k, duration
 
 def test(N):
-    k = generate(N)
+    k, duration = generate(N)
     k_correct = np.load(f"out_{N}.npy")
+    print(f"Generation with N = {N} time = {duration}s")
     return np.allclose(k, k_correct, rtol=1e-10, atol=1e-10)
 
 class TestGeneration(unittest.TestCase):
-    def test_8(self):
+    def test_08(self):
         self.assertTrue(test(8))
 
     def test_16(self):

tests/utils/gen_sample.py

@@ -0,0 +1,32 @@
+from FFTMA import gen
+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)
+    var=1
+    vario=2
+    alpha=1
+    lcx=2
+    lcy=4
+    lcz=16
+    ap1x=1
+    ap1y=0
+    ap1z=0
+    ap2x=0
+    ap2y=1
+    ap2z=0
+
+    v1 = (var, vario, alpha, lcx, lcy, lcz, ap1x, ap1y, ap1z, ap2x, ap2y, ap2z)
+    variograms = [v1]
+
+    mean=15.3245987
+    variance=3.5682389
+    typ=3
+
+    k = gen(nx, ny, nz, dx, dy, dz, seed, variograms, mean, variance, typ)
+
+    duration = time.time() - start_time
+    return k, duration