removed old DAMASK_marcXXXX.f90 source files.
If you just use one Marc version, simply select DAMASK_marc.f90, this matches for all releases. DAMAKS_marc.marc compile with Marc 2010 does not work with Marc 2012. In case you need more than one Marc version in parallel, run symLink_Code.py in /code/setup to generate symlinks for Marc version 2010,2011,2012
This commit is contained in:
parent
06b977ff61
commit
e6ca36c7d7
|
@ -1,3 +0,0 @@
|
|||
#define Marc4DAMASK 2010
|
||||
#include "DAMASK_marc.f90"
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#define Marc4DAMASK 2011
|
||||
#include "DAMASK_marc.f90"
|
|
@ -1,2 +0,0 @@
|
|||
#define Marc4DAMASK 2012
|
||||
#include "DAMASK_marc.f90"
|
|
@ -39,12 +39,12 @@ SHELL = /bin/sh
|
|||
########################################################################################
|
||||
|
||||
#any values will be overwritten by setup_code.py
|
||||
FFTWROOT ?= auto
|
||||
IMKLROOT ?= auto
|
||||
ACMLROOT ?= auto
|
||||
LAPACKROOT ?= auto
|
||||
FFTWROOT ?= /usr/lib/fftw
|
||||
IMKLROOT ?= /opt/intel/composerxe/mkl
|
||||
ACMLROOT ?= /opt/acml5.2.0
|
||||
LAPACKROOT ?=
|
||||
|
||||
F90?=ifort
|
||||
F90 ?= ifort
|
||||
|
||||
COMPILERNAME ?= $(F90)
|
||||
|
||||
|
|
|
@ -8,6 +8,8 @@ bin_link = { \
|
|||
],
|
||||
}
|
||||
|
||||
MarcReleases =[2010,2011,2012]
|
||||
|
||||
damaskEnv = damask.Environment('../../') # script location relative to root
|
||||
baseDir = damaskEnv.relPath('code/')
|
||||
|
||||
|
@ -21,3 +23,12 @@ for dir in bin_link:
|
|||
if os.path.lexists(sym_link): os.remove(sym_link)
|
||||
os.symlink(src,sym_link)
|
||||
print sym_link,'-->',src
|
||||
|
||||
|
||||
for version in MarcReleases:
|
||||
src = os.path.abspath(os.path.join(baseDir,'DAMASK_marc.f90'))
|
||||
if os.path.exists(src):
|
||||
sym_link = os.path.abspath(os.path.join(baseDir,'DAMASK_marc'+str(version)+'.f90'))
|
||||
if os.path.lexists(sym_link): os.remove(sym_link)
|
||||
os.symlink(src,sym_link)
|
||||
print sym_link,'-->',src
|
||||
|
|
Loading…
Reference in New Issue