Merge pull request #274 from easifem-fortran/shion

Updates in CSRMatrix_Method

release_install.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#!/Users/easifem/anaconda3/envs/easifem/bin/python3
+
+# This program is a part of EASIFEM library.
+# See. www.easifem.com
+# Copyright (c) 2020-2021, All right reserved, Vikas Sharma, Ph.D.
+#
+
+import os
+import platform
+
+print("Detecting OS type...")
+_os = platform.system()
+if _os == "Windows":
+    print("ERROR: INSTALLATION on windows is work in progress")
+    exit
+    # print("Please use Windows Subsystem Linux(WSL) ")
+    # print("Installation DONE!!")
+else:
+    cmake_def = ""
+    cmake_def += ' -G "Ninja"'  # Unix Makefiles, Ninja, Ninja Multi-Config
+    cmake_def += " -D USE_OpenMP:BOOL=ON"  # OFF
+    cmake_def += " -D CMAKE_BUILD_TYPE:STRING=Release" 
+    cmake_def += " -D BUILD_SHARED_LIBS:BOOL=ON"
+    cmake_def += " -D USE_PLPLOT:BOOL=ON"
+    cmake_def += " -D CMAKE_INSTALL_PREFIX:PATH=${EASIFEM_BASE}"
+    cmake_def += " -D USE_BLAS95:BOOL=ON"
+    cmake_def += " -D USE_LAPACK95:BOOL=ON"
+    cmake_def += " -D USE_FFTW:BOOL=ON"
+    cmake_def += " -D USE_GTK:BOOL=OFF"
+    cmake_def += " -D USE_ARPACK:BOOL=ON"
+    cmake_def += " -D USE_SUPERLU:BOOL=ON"
+    cmake_def += " -D USE_LIS:BOOL=ON"
+    cmake_def += " -D USE_PARPACK:BOOL=OFF"
+    cmake_def += " -D USE_METIS:BOOL=OFF"
+    cmake_def += " -D USE_LUA:BOOL=ON"
+    cmake_def += " -D USE_Int32:BOOL=ON"
+    cmake_def += " -D USE_Real64:BOOL=ON"
+    cmake_def += " -D COLOR_DISP:BOOL=OFF"
+    cmake_def += " -D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON"
+
+    print("CMAKE DEF : ", cmake_def)
+
+    _build0 = os.path.join(os.environ["HOME"], "temp")
+    build_dir = os.path.join(
+        os.environ.get("EASIFEM_BUILD_DIR", _build0), "easifem", "base", "build"
+    )
+    # build_dir = os.environ["HOME"] + "/temp/easifem-base/build"
+    os.makedirs(build_dir, exist_ok=True)
+    os.system(f"cmake -S ./ -B {build_dir} {cmake_def}")
+    os.system(f"cmake --build {build_dir} --target install")
+    print("Installation DONE!!")

src/modules/CSRMatrix/src/CSRMatrix_Method.F90

@@ -35,7 +35,7 @@ MODULE CSRMatrix_Method
 USE CSRMatrix_ILUMethods
 USE CSRMatrix_LUSolveMethods
 USE CSRMatrix_MatVecMethods
-USE CSRMatrix_MatmulMethods
+USE CSRMatrix_SymMatmulMethods
 USE CSRMatrix_ReorderingMethods
 USE CSRMatrix_DiagonalScalingMethods
 USE CSRMatrix_MatrixMarketIO