Skip to content

Commit 21ed7e3

Browse files
committed
Add ifort in the makefile
1 parent bf6fef5 commit 21ed7e3

File tree

5 files changed

+48
-5
lines changed

5 files changed

+48
-5
lines changed
Binary file not shown.
Binary file not shown.

Ext_Lib/get_QDUtilLib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ EXTLIB_TYPE=$1
55
echo "In get_QDUtilLib.sh"
66
pwd
77

8-
SAVE_version=Save_QDUtilLib-0.5
8+
SAVE_version=Save_QDUtilLib-0.6
99
LOC_version=QDUtilLib
1010

1111
rm -rf QDUtilLib* #always remove the link
1212

1313

1414
#latest release
15-
version=https://github.com/lauvergn/QDUtilLib/archive/refs/tags/v0.5.zip
15+
version=https://github.com/lauvergn/QDUtilLib/archive/refs/tags/v0.6.zip
1616
#latest HEAD version
1717
#version=https://github.com/lauvergn/QDUtilLib/archive/refs/heads/main.zip
1818

Ext_Lib/get_dnSVM.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo "In get_dnSVM.sh"
66
pwd
77

88

9-
SAVE_version=Save_AD_dnSVM-3.0
9+
SAVE_version=Save_AD_dnSVM-3.1
1010
LOC_version=AD_dnSVM
1111

1212

@@ -15,7 +15,7 @@ rm -rf AD_dnSVM* #always remove the link
1515

1616
#latest release
1717
#latest HEAD version (dev version)
18-
version=https://github.com/lauvergn/AD_dnSVM/archive/refs/heads/AD_dnSVM_dev.zip
18+
version=https://github.com/lauvergn/AD_dnSVM/archive/refs/tags/v3.1.zip
1919

2020

2121
test -z $EXTLIB_TYPE && curl -LJ $version --output $LOC_version.zip

makefile

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ifeq ($(FFC),gfortran)
127127
FC_VER = $(shell $(FFC) --version | head -1 )
128128

129129
FFLAGS += -I$(QDMOD_DIR) -I$(ADMOD_DIR)
130-
FLIB += $(EXTLib)
130+
FLIB += $(EXTLib)
131131

132132
endif
133133
#=================================================================================
@@ -311,3 +311,46 @@ $(OBJ_DIR)/Model_driver.o: $(OBJ_DIR)/Model_m.o $(OBJ_DIR)/Opt_m.o $(OBJ_DIR)/IR
311311

312312
$(OBJ_DIR)/TEST_model.o: $(OBJ_DIR)/Model_m.o $(OBJ_DIR)/Opt_m.o $(OBJ_DIR)/IRC_m.o $(OBJ_DIR)/MakeHinact_m.o
313313
$(OBJ_DIR)/TEST_driver.o: $(OBJ_DIR)/Model_driver.o
314+
#
315+
############################################################################
316+
317+
318+
319+
#=================================================================================
320+
#=================================================================================
321+
# ifort compillation v17 v18 with mkl
322+
#=================================================================================
323+
ifeq ($(FFC),ifort)
324+
325+
# opt management
326+
ifeq ($(OOPT),1)
327+
#F90FLAGS = -O -parallel -g -traceback
328+
FFLAGS = -O -g -traceback
329+
else
330+
FFLAGS = -O0 -check all -g -traceback
331+
endif
332+
333+
# where to store the modules
334+
FFLAGS +=-module $(MOD_DIR)
335+
336+
# omp management
337+
ifeq ($(OOMP),1)
338+
FFLAGS += -qopenmp
339+
endif
340+
341+
# lapack management with cpreprocessing
342+
FFLAGS += -cpp -D__LAPACK="$(LLAPACK)"
343+
FFLAGS += -I$(QDMOD_DIR) -I$(ADMOD_DIR)
344+
345+
ifeq ($(LLAPACK),1)
346+
FLIB += -mkl -lpthread
347+
else
348+
FLIB += -lpthread
349+
endif
350+
FLIB += $(EXTLib)
351+
352+
FC_VER = $(shell $(F90) --version | head -1 )
353+
354+
endif
355+
#=================================================================================
356+
#=================================================================================

0 commit comments

Comments
 (0)