223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

new version handling was broken

This commit is contained in:
Martin Diehl 2016-01-28 08:56:12 +00:00
parent 7c9d344601
commit e298d2ebaa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Makefile
View File

@ -17,7 +17,7 @@ SHELL = /bin/sh
# STANDARD_CHECK = checking for Fortran 2008, compiler dependend # STANDARD_CHECK = checking for Fortran 2008, compiler dependend
######################################################################################## ########################################################################################
# including PETSc files. PETSC_ARCH is loaded from these files. # including PETSc files. PETSC_ARCH is loaded from these files.
DAMASKVERSION :="$(shell cat ../VERSION)" DAMASKVERSION :=$(shell cat ../VERSION)
include ${PETSC_DIR}/lib/petsc/conf/variables include ${PETSC_DIR}/lib/petsc/conf/variables
include ${PETSC_DIR}/lib/petsc/conf/rules include ${PETSC_DIR}/lib/petsc/conf/rules

3
installation/compile_CoreModule.py
View File

@ -3,6 +3,7 @@
import os,sys,glob,string,subprocess,shlex import os,sys,glob,string,subprocess,shlex
from damask import Environment from damask import Environment
from damask import version as DAMASKVERSION
# compiles fortran code for Python # compiles fortran code for Python
scriptID = '$Id$' scriptID = '$Id$'
@ -42,7 +43,7 @@ compiler = {
}[options['F90']] }[options['F90']]
#--- option not depending on compiler ------------------------------------------------------------- #--- option not depending on compiler -------------------------------------------------------------
compileOptions = ' -DSpectral -DFLOAT=8 -DINT=4 -I%s/lib'%damaskEnv.rootDir() compileOptions = ' -DSpectral -DFLOAT=8 -DINT=4 -I%s/lib -DDAMASKVERSION=\\\\\"\\\"%s\\\\\"\\\"'%(damaskEnv.rootDir(),DAMASKVERSION)
#--- this saves the path of libraries to core.so, hence it is known during runtime ---------------- #--- this saves the path of libraries to core.so, hence it is known during runtime ----------------
if options['F90'] == 'gfortran': if options['F90'] == 'gfortran':