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

build object first, then exe

This commit is contained in:
Chen Zhang 2016-03-03 12:45:09 -05:00
parent 6397ea561f
commit d768884aa9
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/CMakeLists.txt
View File

@ -120,8 +120,6 @@ target_link_libraries(DAMASK_ENGINE DAMASK_HYDROGENFLUX )
target_link_libraries(DAMASK_ENGINE DAMASK_HOMOGENIZATION) target_link_libraries(DAMASK_ENGINE DAMASK_HOMOGENIZATION)
if (FEM) if (FEM)
add_library(DAMASK_CPFE "CPFEM.f90") add_library(DAMASK_CPFE "CPFEM.f90")
target_link_libraries(DAMASK_CPFE DAMASK_ENGINE) target_link_libraries(DAMASK_CPFE DAMASK_ENGINE)
@ -144,8 +142,11 @@ if (SPECTRAL)
"spectral_mech_Basic.f90") "spectral_mech_Basic.f90")
target_link_libraries(DAMASK_SPECTRAL_MECH DAMASK_SPECTRAL_UTILITY) target_link_libraries(DAMASK_SPECTRAL_MECH DAMASK_SPECTRAL_UTILITY)
add_library(DAMASK_SPECTRAL_SOLVER "DAMASK_spectral.f90")
target_link_libraries(DAMASK_SPECTRAL_SOLVER DAMASK_CPFE )
target_link_libraries(DAMASK_SPECTRAL_SOLVER DAMASK_SPECTRAL_BASE)
target_link_libraries(DAMASK_SPECTRAL_SOLVER DAMASK_SPECTRAL_MECH)
add_executable(DAMASKSpectral.exe DAMASK_spectral.f90) add_executable(DAMASKSpectral.exe DAMASK_spectral.f90)
target_link_libraries(DAMASKSpectral.exe DAMASK_CPFE target_link_libraries(DAMASKSpectral.exe DAMASK_SPECTRAL_SOLVER)
DAMASK_SPECTRAL_BASE
DAMASK_SPECTRAL_MECH)
endif(SPECTRAL) endif(SPECTRAL)

12
code/Makefile
View File

@ -33,7 +33,7 @@ LINKERNAME ?= $(FLINKER)
HDF5 = /mnt/research/CMM/opt/hdf5 HDF5 = /mnt/research/CMM/opt/hdf5
# 2. Location of External Libraries (missing in the 1.8.12 version) # 2. Location of External Libraries (missing in the 1.8.12 version)
LIBZ = /mnt/research/CMM/opt/hdf5/lib/libz.a LIBZ = /mnt/research/CMM/opt/hdf5/lib/libz.a
LIBSZ = /mnt/research/CMM/opt/hdf5/lib/libsz.a LIBSZ = /mnt/research/CMM/opt/hdf5/lib/libszip.a
# 3. Set libraries for HDF5 (LIBS: shared lib, LIBZ: external lib) # 3. Set libraries for HDF5 (LIBS: shared lib, LIBZ: external lib)
HDFLIBS = -I$(HDF5)/include -L$(HDF5)/lib HDFLIBS = -I$(HDF5)/include -L$(HDF5)/lib
HDFLIBZ = -L$(LIBZ) -L$(LIBSZ) HDFLIBZ = -L$(LIBZ) -L$(LIBSZ)
@ -631,6 +631,12 @@ numerics.o: numerics.f90 \
libs.o: libs.f90 \ libs.o: libs.f90 \
IO.o IO.o
damask_hdf5.o: damask_hdf5.f90 \
prec.o \
IO.o
$(PREFIX) $(COMPILERNAME) $(HDFLIBS) $(HDFLIBZ) -c damask_hdf5.f90 $(SUFFIX) -lm
IO.o: IO.f90 \ IO.o: IO.f90 \
DAMASK_interface.o DAMASK_interface.o
@ -660,10 +666,6 @@ DAMASK_interface.o: spectral_interface.f90 \
prec.o: prec.f90 prec.o: prec.f90
$(PREFIX) $(COMPILERNAME) $(COMPILE) -c prec.f90 $(SUFFIX) $(PREFIX) $(COMPILERNAME) $(COMPILE) -c prec.f90 $(SUFFIX)
damask_hdf5.o: damask_hdf5.f90 \
prec.o \
IO.o
$(PREFIX) $(COMPILERNAME) $(HDFLIBS) $(HDFLIBZ) -c damask_hdf5.f90 $(SUFFIX) -lm
endif endif
%.o : %.f90 %.o : %.f90

2
code/quit__genmod.f90
View File

@ -1,4 +1,4 @@
!COMPILER-GENERATED INTERFACE MODULE: Tue Feb 23 16:12:31 2016 !COMPILER-GENERATED INTERFACE MODULE: Thu Mar 3 12:28:23 2016
MODULE QUIT__genmod MODULE QUIT__genmod
INTERFACE INTERFACE
SUBROUTINE QUIT(STOP_ID) SUBROUTINE QUIT(STOP_ID)