From 708b4d2eca85a58bf37281945a20cc7b676bf9f7 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 14 Oct 2011 22:39:58 +0000 Subject: [PATCH] seed-file header format corrected, setup script now contains minimalSurface and vicinityOffset. removed .exe from compile output --- processing/pre/voronoi_randomSeeding.f90 | 2 +- processing/setup/setup_processing.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/processing/pre/voronoi_randomSeeding.f90 b/processing/pre/voronoi_randomSeeding.f90 index 2766ceea5..a5d467a72 100644 --- a/processing/pre/voronoi_randomSeeding.f90 +++ b/processing/pre/voronoi_randomSeeding.f90 @@ -80,7 +80,7 @@ program voronoi ! write description file with orientation and position of each seed open(21, file = trim(filename)//('.seeds')) write(21, '(i1,a1,a6)') 4,achar(9),'header' - write(21, '(A, I2, A, I2, A, I2)') 'resolution a ', a, ' b ', b, ' c ', c + write(21, '(A, I8, A, I8, A, I8)') 'resolution a ', a, ' b ', b, ' c ', c write(21,*) 'grains', N_Seeds write(21,*) 'random seed ',rndInit(1) write(21,'(6(a,a1))') 'x',achar(9),'y',achar(9),'z',achar(9),'phi1',achar(9),'Phi',achar(9),'phi2',achar(9) diff --git a/processing/setup/setup_processing.py b/processing/setup/setup_processing.py index 632cc989a..a89b18efd 100755 --- a/processing/setup/setup_processing.py +++ b/processing/setup/setup_processing.py @@ -16,8 +16,10 @@ bin_link = { \ 'mentat_spectralBox', 'patchFromReconstructedBoundaries', 'spectral_geomCheck', - 'voronoi_randomSeeding.exe', - 'voronoi_tessellation.exe', + 'spectral_minimalSurface', + 'spectral_vicinityOffset', + 'voronoi_randomSeeding', + 'voronoi_tessellation', ], 'post' : [ '3Dvisualize', @@ -74,7 +76,7 @@ for dir in compile: if os.path.isfile(src): print file os.system('rm %s.exe'%(os.path.splitext(src)[0])) - os.system('ifort -O3 -parallel -o%s.exe %s'%(os.path.splitext(src)[0],src)) + os.system('ifort -O3 -parallel -o%s %s'%(os.path.splitext(src)[0],src)) modules = glob.glob('*.mod') for module in modules: