Skip to content

Commit

Permalink
Add ifort in the makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
lauvergn committed Jan 11, 2023
1 parent bf6fef5 commit 21ed7e3
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 5 deletions.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions Ext_Lib/get_QDUtilLib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ EXTLIB_TYPE=$1
echo "In get_QDUtilLib.sh"
pwd

SAVE_version=Save_QDUtilLib-0.5
SAVE_version=Save_QDUtilLib-0.6
LOC_version=QDUtilLib

rm -rf QDUtilLib* #always remove the link


#latest release
version=https://github.com/lauvergn/QDUtilLib/archive/refs/tags/v0.5.zip
version=https://github.com/lauvergn/QDUtilLib/archive/refs/tags/v0.6.zip
#latest HEAD version
#version=https://github.com/lauvergn/QDUtilLib/archive/refs/heads/main.zip

Expand Down
4 changes: 2 additions & 2 deletions Ext_Lib/get_dnSVM.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ echo "In get_dnSVM.sh"
pwd


SAVE_version=Save_AD_dnSVM-3.0
SAVE_version=Save_AD_dnSVM-3.1
LOC_version=AD_dnSVM


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

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


test -z $EXTLIB_TYPE && curl -LJ $version --output $LOC_version.zip
Expand Down
45 changes: 44 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ifeq ($(FFC),gfortran)
FC_VER = $(shell $(FFC) --version | head -1 )

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

endif
#=================================================================================
Expand Down Expand Up @@ -311,3 +311,46 @@ $(OBJ_DIR)/Model_driver.o: $(OBJ_DIR)/Model_m.o $(OBJ_DIR)/Opt_m.o $(OBJ_DIR)/IR

$(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
$(OBJ_DIR)/TEST_driver.o: $(OBJ_DIR)/Model_driver.o
#
############################################################################



#=================================================================================
#=================================================================================
# ifort compillation v17 v18 with mkl
#=================================================================================
ifeq ($(FFC),ifort)

# opt management
ifeq ($(OOPT),1)
#F90FLAGS = -O -parallel -g -traceback
FFLAGS = -O -g -traceback
else
FFLAGS = -O0 -check all -g -traceback
endif

# where to store the modules
FFLAGS +=-module $(MOD_DIR)

# omp management
ifeq ($(OOMP),1)
FFLAGS += -qopenmp
endif

# lapack management with cpreprocessing
FFLAGS += -cpp -D__LAPACK="$(LLAPACK)"
FFLAGS += -I$(QDMOD_DIR) -I$(ADMOD_DIR)

ifeq ($(LLAPACK),1)
FLIB += -mkl -lpthread
else
FLIB += -lpthread
endif
FLIB += $(EXTLib)

FC_VER = $(shell $(F90) --version | head -1 )

endif
#=================================================================================
#=================================================================================

0 comments on commit 21ed7e3

Please sign in to comment.