for new versioning

This commit is contained in:
Martin Diehl 2016-02-02 19:55:55 +01:00
parent a56f720e36
commit 23f1344031
2 changed files with 6 additions and 5 deletions

View File

@ -12,6 +12,7 @@
# Compile_cpp and link_exe for Abaqus make utility. # Compile_cpp and link_exe for Abaqus make utility.
# #
import os, re, glob, driverUtils import os, re, glob, driverUtils
from damask import version as DAMASKVERSION
# Use the version in $PATH # Use the version in $PATH
fortCmd = "ifort" fortCmd = "ifort"
@ -34,7 +35,8 @@ compile_fortran = (fortCmd + " -c -fPIC -auto -shared-intel " +
"-I%I -I../lib -free -O1 -fpp -openmp " + "-I%I -I../lib -free -O1 -fpp -openmp " +
"-ftz -diag-disable 5268 " + "-ftz -diag-disable 5268 " +
"-implicitnone -assume byterecl -stand f08 -standard-semantics " + "-implicitnone -assume byterecl -stand f08 -standard-semantics " +
"-real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4") "-real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4 " +
'-DDAMASKVERSION="%s"'%DAMASKVERSION)
# Abaqus/CAE will generate an input file without parts and assemblies. # Abaqus/CAE will generate an input file without parts and assemblies.
cae_no_parts_input_file=ON cae_no_parts_input_file=ON

View File

@ -12,6 +12,7 @@
# Compile_cpp and link_exe for Abaqus make utility. # Compile_cpp and link_exe for Abaqus make utility.
# #
import os, re, glob, driverUtils import os, re, glob, driverUtils
from damask import version as DAMASKVERSION
# Use the version in $PATH # Use the version in $PATH
fortCmd = "ifort" fortCmd = "ifort"
@ -29,15 +30,13 @@ fortCmd = "ifort"
# -assume byterecl count record length in bytes # -assume byterecl count record length in bytes
# -real-size 64 -DFLOAT=8 assume size of real to be 8 bytes, matches our definition of pReal # -real-size 64 -DFLOAT=8 assume size of real to be 8 bytes, matches our definition of pReal
# -integer-size 32 -DINT=4 assume size of integer to be 4 bytes, matches our definition of pInt # -integer-size 32 -DINT=4 assume size of integer to be 4 bytes, matches our definition of pInt
# -L/usr/lib64 -L/usr/lib search path for lapack libraries
# -Wl,-rpath=/usr/lib64,-rpath=/usr/lib run path for lapack libraries
# -llapack link against lapack
compile_fortran = (fortCmd + " -c -fPIC -auto -shared-intel " + compile_fortran = (fortCmd + " -c -fPIC -auto -shared-intel " +
"-I%I -I../lib -free -O1 -fpp " + "-I%I -I../lib -free -O1 -fpp " +
"-ftz -diag-disable 5268 " + "-ftz -diag-disable 5268 " +
"-implicitnone -assume byterecl -stand f08 -standard-semantics " + "-implicitnone -assume byterecl -stand f08 -standard-semantics " +
"-real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4") "-real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4 " +
'-DDAMASKVERSION="%s"'%DAMASKVERSION)
# Abaqus/CAE will generate an input file without parts and assemblies. # Abaqus/CAE will generate an input file without parts and assemblies.
cae_no_parts_input_file=ON cae_no_parts_input_file=ON