From 557f0ec5a01d6a6ff3119b59599aa0707900c29c Mon Sep 17 00:00:00 2001 From: toraneko11 <36912350+toraneko11@users.noreply.github.com> Date: Thu, 1 Mar 2018 10:45:08 +0900 Subject: [PATCH 1/2] Delete degug option from FCBASE flag The debug option (-g) should be deleted, since it always turn on even if compilation with optimization flag (-O2 or -O3). --- slv.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slv.mk b/slv.mk index 3a33c72..1e2ebe1 100644 --- a/slv.mk +++ b/slv.mk @@ -61,7 +61,7 @@ FINC = $(foreach i,$(INCDIR),-I$(i)/include) -I./ $(MKLINC) $(OTHERINCDIR) FLIB = $(foreach i,$(LIBDIR),-L$(i)/lib) $(PBSDIR) $(OTHERLIBDIR) FLIB += $(MKLLIB) $(METISLIB) $(CGNSLIB) $(HDF5LIB) $(SZIPLIB) $(PBSLIB) $(OTHERLIB) -FCBASE = $(REALLOCFLAG) $(TRACEFLAG) -g +FCBASE = $(REALLOCFLAG) $(TRACEFLAG) ADDFLAGS = $(MKLFLAG) $(MOD) $(FINC) $(FCADD) $(CMPFLAGS) From b0d2804f0f407bada37972dc28d96ed2ff2cf129 Mon Sep 17 00:00:00 2001 From: toraneko11 <36912350+toraneko11@users.noreply.github.com> Date: Thu, 1 Mar 2018 13:02:29 +0900 Subject: [PATCH 2/2] Fixed bag with argument of doti function Changing number of arguments for doti function of Intel MKL --- typesgen_mod.f90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/typesgen_mod.f90 b/typesgen_mod.f90 index d141546..61460ec 100644 --- a/typesgen_mod.f90 +++ b/typesgen_mod.f90 @@ -834,6 +834,7 @@ pure function dot_mat_sparse(this,idx,array) result(return_value) do n = 1,size(array,dim=2) #ifdef USE_INTEL_MKL return_value(n) = doti( this%row_val(n1:n2) , & + this%row_idx(n1:n2) , & array( this%row_idx(n1:n2) , n ) ) #else return_value(n) = dot( this%row_val(n1:n2) , & @@ -1255,10 +1256,11 @@ pure function dot_mat2_sparse(this,idx,array) result(return_value) do n = 1,size(array,dim=2) #ifdef USE_INTEL_MKL return_value(n,m) = doti( this%row_val(n1:n2) , & - array( this%row_idx(n1:n2) , n,m ) ) + this%row_idx(n1:n2) , & + array( this%row_idx(n1:n2) , n,m ) ) #else return_value(n,m) = dot( this%row_val(n1:n2) , & - array( this%row_idx(n1:n2) , n,m ) ) + array( this%row_idx(n1:n2) , n,m ) ) #endif end do end do