Merging changes for next release

CMakeLists.txt

@@ -24,8 +24,8 @@ project(${PROJECT_NAME})
 enable_language(C Fortran CXX)
 
 set(VERSION_MAJOR "24")
-set(VERSION_MINOR "4")
-set(VERSION_BugFix "5")
+set(VERSION_MINOR "10")
+set(VERSION_BugFix "3")
 
 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BugFix})
 
@@ -314,6 +314,8 @@ include(${PROJECT_SOURCE_DIR}/cmake/addPLPLOT.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/addFFTW.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/addGTKFortran.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/addLua.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/addGmsh.cmake)
+include(${PROJECT_SOURCE_DIR}/cmake/addHDF5.cmake)
 
 # Add source files
 include(src/modules/CMakeLists.txt)

cmake/Config.cmake.in

@@ -1,75 +1,70 @@
 @PACKAGE_INIT@
 
-LIST(
-  APPEND
-  ExternalLibs
-  Sparsekit
-  toml-f
-)
+list(APPEND ExternalLibs Sparsekit toml-f)
 
-IF( @USE_LAPACK95@ )
-  LIST(APPEND
-    ExternalLibs
-    LAPACK95
-  )
-ENDIF()
+if(@USE_LAPACK95@)
+  list(APPEND ExternalLibs LAPACK95)
+endif()
 
-IF( @USE_ARPACK@ )
-  LIST(APPEND
-    ExternalLibs
-    arpackng
-  )
-ENDIF()
+if(@USE_ARPACK@)
+  list(APPEND ExternalLibs arpackng)
+endif()
 
-IF( @USE_RAYLIB@ )
-  LIST(APPEND
-    ExternalLibs
-    raylib
-  )
-ENDIF()
+if(@USE_RAYLIB@)
+  list(APPEND ExternalLibs raylib)
+endif()
 
-FOREACH(LIB ${ExternalLibs})
-  FIND_PACKAGE(${LIB} REQUIRED)
-ENDFOREACH()
+foreach(LIB ${ExternalLibs})
+  find_package(${LIB} REQUIRED)
+endforeach()
 
-IF( @USE_OPENMP@ )
-	IF(APPLE)
-		IF(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES "AppleClang")
-			SET(OpenMP_C "${CMAKE_C_COMPILER}" CACHE STRING "" FORCE)
-			SET(OpenMP_C_FLAGS 
-					"-fopenmp=libomp -Wno-unused-command-line-argument" 
-					CACHE STRING 
-					"" 
-					FORCE
-			)
-			SET(OpenMP_C_LIB_NAMES "libomp" "libgomp" "libiomp5" CACHE STRING "" FORCE)
-			SET(OpenMP_libomp_LIBRARY ${OpenMP_C_LIB_NAMES} CACHE STRING "" FORCE)
-			SET(OpenMP_libgomp_LIBRARY ${OpenMP_C_LIB_NAMES} CACHE STRING "" FORCE)
-			SET(OpenMP_libiomp5_LIBRARY ${OpenMP_C_LIB_NAMES} CACHE STRING "" FORCE)
+if(@USE_GMSH_SDK@)
+  find_library(GMSH_LIBRARIES NAMES gmsh gmsh.4.13.0 gmsh.4.13 REQUIRED)
+endif()
 
-			SET(OpenMP_CXX "${CMAKE_CXX_COMPILER}" CACHE STRING "" FORCE)
-			SET(
-				OpenMP_CXX_FLAGS 
-				"-fopenmp=libomp -Wno-unused-command-line-argument" 
-				CACHE STRING 
-				"" 
-				FORCE
-			)
+find_package(HDF5 REQUIRED COMPONENTS Fortran HL)
 
-			SET(OpenMP_CXX_LIB_NAMES "libomp" "libgomp" "libiomp5" CACHE STRING "" FORCE)
-		ENDIF()
-	ENDIF()
+if(@USE_OPENMP@)
+  if(APPLE)
+    if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID MATCHES
+                                              "AppleClang")
+      set(OpenMP_C
+          "${CMAKE_C_COMPILER}"
+          CACHE STRING "" FORCE)
+      set(OpenMP_C_FLAGS
+          "-fopenmp=libomp -Wno-unused-command-line-argument"
+          CACHE STRING "" FORCE)
+      set(OpenMP_C_LIB_NAMES
+          "libomp" "libgomp" "libiomp5"
+          CACHE STRING "" FORCE)
+      set(OpenMP_libomp_LIBRARY
+          ${OpenMP_C_LIB_NAMES}
+          CACHE STRING "" FORCE)
+      set(OpenMP_libgomp_LIBRARY
+          ${OpenMP_C_LIB_NAMES}
+          CACHE STRING "" FORCE)
+      set(OpenMP_libiomp5_LIBRARY
+          ${OpenMP_C_LIB_NAMES}
+          CACHE STRING "" FORCE)
 
-	FIND_PACKAGE(OpenMP REQUIRED)
-ENDIF()
+      set(OpenMP_CXX
+          "${CMAKE_CXX_COMPILER}"
+          CACHE STRING "" FORCE)
+      set(OpenMP_CXX_FLAGS
+          "-fopenmp=libomp -Wno-unused-command-line-argument"
+          CACHE STRING "" FORCE)
 
+      set(OpenMP_CXX_LIB_NAMES
+          "libomp" "libgomp" "libiomp5"
+          CACHE STRING "" FORCE)
+    endif()
+  endif()
 
-set_and_check(
-  "@PROJECT_NAME@_INCLUDE_DIR" "@PACKAGE_INSTALL_INCLUDEDIR@")
+  find_package(OpenMP REQUIRED)
+endif()
 
-include(
-  "${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
+set_and_check("@PROJECT_NAME@_INCLUDE_DIR" "@PACKAGE_INSTALL_INCLUDEDIR@")
 
-check_required_components(
-    "@PROJECT_NAME@"
-  )
+include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
+
+check_required_components("@PROJECT_NAME@")

cmake/addGmsh.cmake

@@ -0,0 +1,32 @@
+# This program is a part of EASIFEM library Copyright (C) 2020-2021  Vikas
+# Sharma, Ph.D
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <https: //www.gnu.org/licenses/>
+
+option(USE_GMSH_SDK OFF)
+if(USE_GMSH_SDK)
+
+  message(STATUS "USING GMSH SDK")
+  list(APPEND TARGET_COMPILE_DEF "-DUSE_GMSH_SDK")
+
+  find_library(GMSH_LIBRARIES NAMES gmsh gmsh.4.13.0 gmsh.4.13 REQUIRED)
+
+  target_link_libraries(${PROJECT_NAME} PUBLIC ${GMSH_LIBRARIES})
+  message(STATUS "GMSH_LIBRARIES : ${GMSH_LIBRARIES}")
+
+else()
+
+  message(STATUS "NOT USING GMSH SDK")
+
+endif()

cmake/addHDF5.cmake

@@ -0,0 +1,33 @@
+# This program is a part of EASIFEM library Copyright (C) 2020-2021  Vikas
+# Sharma, Ph.D
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <https: //www.gnu.org/licenses/>
+#
+
+# SET(HDF5_NO_FIND_PACKAGE_CONFIG_FILE true CACHE BOOL "Set true to skip trying
+# to find hdf5-config.cmake" FORCE)
+find_package(HDF5 REQUIRED COMPONENTS Fortran HL)
+if(HDF5_VERSION VERSION_LESS 1.8.7)
+  message(WARNING "HDF5 VERSION SHOULD BE >= 1.8.7")
+endif()
+if(HDF5_FOUND)
+  message(STATUS "HDF5 FOUND: ")
+  list(APPEND TARGET_COMPILE_DEF "-DUSE_HDF5")
+  list(APPEND TARGET_COMPILE_DEF "${HDF5_Fortran_DEFINITIONS}")
+  message(STATUS "HDF5 fortran lib :: ${HDF5_Fortran_LIBRARIES}")
+else()
+  message(ERROR "HDF5 NOT FOUND")
+endif()
+target_link_libraries(${PROJECT_NAME} PUBLIC ${HDF5_Fortran_LIBRARIES})
+target_include_directories(${PROJECT_NAME} PUBLIC ${HDF5_Fortran_INCLUDE_DIRS})

cmake/addLIS.cmake

@@ -14,7 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <https: //www.gnu.org/licenses/>
-#
 
 option(USE_LIS OFF)
 if(USE_LIS)

cmake/addToml.cmake

@@ -18,7 +18,7 @@
 
 find_package(toml-f REQUIRED)
 
-if(Sparsekit_FOUND)
+if(toml-f_FOUND)
   message(STATUS "[INFO] :: FOUND toml-f")
   target_link_libraries(${PROJECT_NAME} PUBLIC toml-f::toml-f)
 

src/modules/BLAS95/src/F95_BLAS.F90

@@ -40,6 +40,7 @@ MODULE F95_BLAS
 PUBLIC :: AXPY
 PUBLIC :: ASUM
 PUBLIC :: GEMV
+PUBLIC :: GEMM
 
 #ifndef USE_NativeBLAS
 PUBLIC :: IAMIN
@@ -204,6 +205,24 @@ MODULE F95_BLAS
 END INTERFACE GEMV
 #endif
 
+!----------------------------------------------------------------------------
+!
+!----------------------------------------------------------------------------
+
+INTERFACE GEMM
+  MODULE PROCEDURE SGEMM_F95, DGEMM_F95, CGEMM_F95, ZGEMM_F95
+END INTERFACE GEMM
+
+! #ifdef USE_INTEL_MKL
+! INTERFACE GEMV
+!   MODULE PROCEDURE SCGEMV_F95, DZGEMV_F95
+! END INTERFACE GEMV
+! #endif
+
+!----------------------------------------------------------------------------
+!
+!----------------------------------------------------------------------------
+
 CONTAINS
 
 #ifndef USE_APPLE_NativeBLAS