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

simplified and updated abaqus

This commit is contained in:
Martin Diehl 2015-12-01 15:13:33 +00:00
parent 1737afa61a
commit 3365edc6cb
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
code/Makefile
View File

@ -35,13 +35,8 @@ ifeq ($(strip $(F90)),)
F90 :=$(findstring ifort,$(FC) $(COMPILEROUT)) F90 :=$(findstring ifort,$(FC) $(COMPILEROUT))
endif endif
ifeq "$(FASTBUILD)" "YES"
OPENMP := OFF
OPTIMIZATION := OFF
else
OPENMP ?= ON OPENMP ?= ON
OPTIMIZATION ?= DEFENSIVE OPTIMIZATION ?= DEFENSIVE
endif
ifeq "$(OPTIMIZATION)" "OFF" ifeq "$(OPTIMIZATION)" "OFF"
OPTI := OFF OPTI := OFF
@ -80,10 +75,10 @@ STANDARD_CHECK_ifort =$(STANDARD_CHECK)
STANDARD_CHECK_gfortran =$(STANDARD_CHECK) STANDARD_CHECK_gfortran =$(STANDARD_CHECK)
endif endif
ifneq "$(FASTBUILD)" "YES"
STANDARD_CHECK_ifort ?=-stand f08 -standard-semantics STANDARD_CHECK_ifort ?=-stand f08 -standard-semantics
STANDARD_CHECK_gfortran ?=-std=f2008ts -pedantic-errors STANDARD_CHECK_gfortran ?=-std=f2008ts -pedantic-errors
endif
#-pedantic: more strict on standard, enables some warnings #-pedantic: more strict on standard, enables some warnings
# -pedantic-errors: like pedantic, but errors instead of warnings # -pedantic-errors: like pedantic, but errors instead of warnings
OPTIMIZATION_OFF_ifort :=-O0 -no-ip OPTIMIZATION_OFF_ifort :=-O0 -no-ip
@ -99,7 +94,7 @@ COMPILE_OPTIONS_ifort :=-fpp\
-ftz\ -ftz\
-assume byterecl -assume byterecl
ifneq "$(FASTBUILD)" "YES"
COMPILE_OPTIONS_ifort +=-diag-enable sc3\ COMPILE_OPTIONS_ifort +=-diag-enable sc3\
-diag-disable 5268\ -diag-disable 5268\
-warn declarations\ -warn declarations\
@ -109,7 +104,7 @@ COMPILE_OPTIONS_ifort +=-diag-enable sc3\
-warn ignore_loc\ -warn ignore_loc\
-warn alignments\ -warn alignments\
-warn unused -warn unused
endif
################################################################################################### ###################################################################################################
#COMPILE SWITCHES #COMPILE SWITCHES
#-shared-intel: Link against shared Intel libraries instead of static ones #-shared-intel: Link against shared Intel libraries instead of static ones
@ -174,7 +169,7 @@ DEBUG_OPTIONS_ifort :=-g\
# stack: # stack:
LINK_OPTIONS_gfortran :=-Wl,-undefined,dynamic_lookup LINK_OPTIONS_gfortran :=-Wl,-undefined,dynamic_lookup
COMPILE_OPTIONS_gfortran :=-xf95-cpp-input COMPILE_OPTIONS_gfortran :=-xf95-cpp-input
ifneq "$(FASTBUILD)" "YES"
COMPILE_OPTIONS_gfortran +=-ffree-line-length-132\ COMPILE_OPTIONS_gfortran +=-ffree-line-length-132\
-fimplicit-none\ -fimplicit-none\
-fmodule-private\ -fmodule-private\
@ -187,7 +182,7 @@ COMPILE_OPTIONS_gfortran +=-ffree-line-length-132\
-Wconversion-extra\ -Wconversion-extra\
-Wimplicit-procedure\ -Wimplicit-procedure\
-Wno-unused-parameter -Wno-unused-parameter
endif
################################################################################################### ###################################################################################################
#COMPILE SWITCHES #COMPILE SWITCHES
#-shared #-shared