Merge pull request #66 from jvdp1/rename_modhash

Rename modhash to modsparse_hash to avoid conflicts

Author: jvdp1

src/CMakeLists.txt

@@ -18,7 +18,7 @@ list(
   APPEND srcs
   "${dir}/dgtrsm.f"
   "${dir}/modcommon.f90"
-  "${dir}/modhash.f90"
+  "${dir}/modsparse_hash.f90"
   "${dir}/modrandom.f90"
   "${dir}/modspainv.f90"
   "${dir}/modsparse_coo.f90"

src/Makefile

@@ -18,7 +18,7 @@ all: libsparse.a
 OBJ = modcommon.o \
       modrandom.o \
       $(OBJPARDISO) $(OBJMETIS) $(OBJSPAINV) \
-      modsparse_mkl.o modhash.o modsparse.o modsparse_gen.o modsparse_coo.o \
+      modsparse_mkl.o modsparse_hash.o modsparse.o modsparse_gen.o modsparse_coo.o \
       modsparse_crs64.o \
       modsparse_crs.o modsparse_ll.o modsparse_metisgraph.o
 
@@ -33,7 +33,7 @@ libsparse.a: $(OBJ)
 
 
 #dependencies
-modsparse_coo.o: modsparse.o modhash.o
+modsparse_coo.o: modsparse.o modsparse_hash.o
 modsparse_crs.o: modsparse_mkl.o modsparse.o $(OBJSPAINV) $(OBJPARDISO) $(OBJMETIS)
 modsparse_crs64.o: modsparse.o $(OBJPARDISO)
 modspainv.o: modcommon.o modsparse_mkl.o

src/modsparse_coo.f90

@@ -1,5 +1,5 @@
 submodule (modsparse) modsparse_coo
- use modhash, only:hashf,roundinguppower2
+ use modsparse_hash, only:hashf,roundinguppower2
  !$ use omp_lib
  implicit none
 

src/modhash.f90 renamed to src/modsparse_hash.f90

@@ -1,6 +1,6 @@
 !> Module containing functions for hashing
 
-module modhash
+module modsparse_hash
  use iso_fortran_env,only:int32,int64,real64
  implicit none
  private