added printing of cli arguments to seeds_fromRandom, fixed regression in compile_CoreModule and DAMASK_spectral_doxygen

This commit is contained in:
Martin Diehl 2014-05-15 09:58:31 +00:00
parent e62c5fdc05
commit 89c896678b
2 changed files with 8 additions and 8 deletions

View File

@ -36,7 +36,7 @@ if options['F90'] not in compilers:
compiler = {
'gfortran': '--fcompiler=gnu95 --f90flags="-fPIC -fno-range-check -xf95-cpp-input -std=f2008 -fall-intrinsics'+\
' -fdefault-real-8 -fdefault-double-8 -shared"',
' -fdefault-real-8 -fdefault-double-8"',
'ifort': '--fcompiler=intelem --f90flags="-fPIC -fpp -stand f08 -diag-disable 5268 -assume byterecl'+\
' -real-size 64 -integer-size 32 -shared-intel"',
}[options['F90']]
@ -46,7 +46,7 @@ compileOptions = ' -DSpectral -DFLOAT=8 -DINT=4 -I%s/lib'%damaskEnv.rootDir()
#--- this saves the path of libraries to core.so, hence it is known during runtime ----------------
if options['F90'] == 'gfortran':
LDFLAGS = '-Wl,-undefined,dynamic_lookup' # solved error: Undefined symbols for architecture x86_64: "_PyArg_ParseTupleAndKeywords" as found on https://lists.macosforge.org/pipermail/macports-dev/2013-May/022735.html
LDFLAGS = '-shared -Wl,-undefined,dynamic_lookup' # solved error: Undefined symbols for architecture x86_64: "_PyArg_ParseTupleAndKeywords" as found on https://lists.macosforge.org/pipermail/macports-dev/2013-May/022735.html
else:
LDFLAGS = ' -Wl'

View File

@ -82,11 +82,11 @@ seeds[1,:]=(numpy.mod(seedpoint// options.grid[0],options.grid[
seeds[2,:]=(numpy.mod(seedpoint//(options.grid[1]*options.grid[0]),options.grid[2])\
+numpy.random.random())/options.grid[2]
print "5\theader"
print scriptID
print "grid\ta %i\tb %i\tc %i"%(options.grid[0],options.grid[1],options.grid[2],)
print "microstructures\t%i"%options.N
print "randomSeed\t%i"%(options.randomSeed)
print "x\ty\tz\tphi1\tPhi\tphi2"
sys.stdout.write("5\theader\n")
sys.stdout.write(scriptID + " " + " ".join(sys.argv[1:])+"\n")
sys.stdout.write("grid\ta {}\tb {}\tc {}\n".format(options.grid[0],options.grid[1],options.grid[2]))
sys.stdout.write("microstructures\t{}\n".format(options.N))
sys.stdout.write("randomSeed\t{}\n".format(options.randomSeed))
sys.stdout.write("x\ty\tz\tphi1\tPhi\tphi2\n")
numpy.savetxt(sys.stdout,numpy.transpose(numpy.concatenate((seeds,grainEuler),axis = 0)),fmt='%10.6f',delimiter='\t')