seed-file header format corrected, setup script now contains minimalSurface and vicinityOffset. removed .exe from compile output

This commit is contained in:
Philip Eisenlohr 2011-10-14 22:39:58 +00:00
parent 62db3326d6
commit 708b4d2eca
2 changed files with 6 additions and 4 deletions

View File

@ -80,7 +80,7 @@ program voronoi
! write description file with orientation and position of each seed ! write description file with orientation and position of each seed
open(21, file = trim(filename)//('.seeds')) open(21, file = trim(filename)//('.seeds'))
write(21, '(i1,a1,a6)') 4,achar(9),'header' 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,*) 'grains', N_Seeds
write(21,*) 'random seed ',rndInit(1) 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) write(21,'(6(a,a1))') 'x',achar(9),'y',achar(9),'z',achar(9),'phi1',achar(9),'Phi',achar(9),'phi2',achar(9)

View File

@ -16,8 +16,10 @@ bin_link = { \
'mentat_spectralBox', 'mentat_spectralBox',
'patchFromReconstructedBoundaries', 'patchFromReconstructedBoundaries',
'spectral_geomCheck', 'spectral_geomCheck',
'voronoi_randomSeeding.exe', 'spectral_minimalSurface',
'voronoi_tessellation.exe', 'spectral_vicinityOffset',
'voronoi_randomSeeding',
'voronoi_tessellation',
], ],
'post' : [ 'post' : [
'3Dvisualize', '3Dvisualize',
@ -74,7 +76,7 @@ for dir in compile:
if os.path.isfile(src): if os.path.isfile(src):
print file print file
os.system('rm %s.exe'%(os.path.splitext(src)[0])) 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') modules = glob.glob('*.mod')
for module in modules: for module in modules: