Remove extra prints and change generation

migrate_fortran
chortas 3 years ago
parent 17cb088c42
commit ab87cc8099

@ -1,44 +0,0 @@
[General]
simDir=tests/performance/tmp_gen_output
startJob=0
[Iterables]
p=[10,39,15]
seeds=[5462,2]
lc=[4]
connectivity=[1,2,3]
variances=[1]
[Generation]
Nx = 128
Ny = 128
Nz = 128
variogram_type=1
binary = no
kh = 100
kl = 0.01
compute_lc = no
lcBin=no
genera=no
[Connectivity]
keep_aspect=yes
block_size = 4
indicators_MinBlockSize =4
Max_sample_size = 12
compGconec= 1
conec=yes
[Solver]
num_of_cores = 1
ref = 2
solve = no
rtol = 1e-4
[K-Postprocess]
MinBlockSize =1
Max_sample_size = 4
kperm=no
postprocess=no
SaveVfield=no

@ -1,44 +0,0 @@
[General]
simDir=tests/performance/tmp_gen_output
startJob=0
[Iterables]
p=[10,39,15]
seeds=[5462,2]
lc=[4]
connectivity=[1,2,3]
variances=[1]
[Generation]
Nx = 256
Ny = 256
Nz = 256
variogram_type=1
binary = no
kh = 100
kl = 0.01
compute_lc = no
lcBin=no
genera=no
[Connectivity]
keep_aspect=yes
block_size = 4
indicators_MinBlockSize =4
Max_sample_size = 12
compGconec= 1
conec=yes
[Solver]
num_of_cores = 1
ref = 2
solve = no
rtol = 1e-4
[K-Postprocess]
MinBlockSize =1
Max_sample_size = 4
kperm=no
postprocess=no
SaveVfield=no

@ -1,44 +0,0 @@
[General]
simDir=tests/performance/tmp_gen_output
startJob=0
[Iterables]
p=[10,39,15]
seeds=[5462,2]
lc=[4]
connectivity=[1,2,3]
variances=[1]
[Generation]
Nx = 512
Ny = 512
Nz = 512
variogram_type=1
binary = no
kh = 100
kl = 0.01
compute_lc = no
lcBin=no
genera=no
[Connectivity]
keep_aspect= yes
block_size = 4
indicators_MinBlockSize =4
Max_sample_size = 12
compGconec= 1
conec=yes
[Solver]
num_of_cores = 1
ref = 2
solve = no
rtol = 1e-4
[K-Postprocess]
MinBlockSize =1
Max_sample_size = 4
kperm=no
postprocess=no
SaveVfield=no

@ -9,9 +9,7 @@ config_file_128 = os.path.abspath("./tests/performance/conf_gen_128.ini")
config_file_256 = os.path.abspath("./tests/performance/conf_gen_256.ini")
config_file_512 = os.path.abspath("./tests/performance/conf_gen_512.ini")
CONFIG_FILES = [config_file_64]
CONFIG_FILES = [config_file_64, config_file_128, config_file_256]
index_1 = 0
@ -30,7 +28,7 @@ with Benchmarker() as bench:
os.system("CONFIG_FILE_PATH="+ config_file + " mpirun -oversubscribe -np 1 python3 -m memory_profiler mpirunner.py")
## teardown
# os.system("rm -rf ./tests/performance/tmp_gen_output")
os.system("rm -rf ./tests/performance/tmp_gen_output")
index_1 +=1
@bench(f"generation 8 core {size} tamaño")
@ -41,5 +39,5 @@ with Benchmarker() as bench:
os.system("CONFIG_FILE_PATH="+ config_file + " mpirun -oversubscribe -np 8 python3 -m memory_profiler mpirunner.py")
## teardown
# os.system("rm -rf ./tests/performance/tmp_gen_output")
os.system("rm -rf ./tests/performance/tmp_gen_output")
index_8 +=1

@ -40,7 +40,6 @@ def realization(job):
nr= DotheLoop(job,parser, iterables)[3] -iterables['seeds'][0]
Cconec=parser.get('Connectivity',"conec")
if Cconec!='no':
print(f"Datadir is {datadir}")
comp_connec(parser,datadir,nr)
n_p=int(parser.get('Solver',"num_of_cores"))

@ -9,7 +9,6 @@ import json
def comp_connec(parser,rundir,nr):
print(f"Rundir is {rundir}")
kc=np.load(rundir+'k.npy')
keep_aspect = parser.get('Connectivity','keep_aspect')
kh,sx = float(parser.get('Generation','kh')),int(parser.get('Connectivity','block_size'))

Loading…
Cancel
Save