Skip to content

Delete degug option from FCBASE flag #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toraneko11 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Delete degug option from FCBASE flag #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
557f0ec
Delete degug option from FCBASE flag
toraneko11 Mar 1, 2018
b0d2804
Fixed bag with argument of doti function
toraneko11 Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion slv.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 4 additions & 2 deletions typesgen_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) , &
Expand Down Expand Up @@ -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
Expand Down