Merge pull request #45 from jacobwilliams/develop

Develop

Author: jacobwilliams

.github/workflows/CI.yml

@@ -24,7 +24,7 @@ jobs:
       uses: actions/setup-python@v1 # Use pip to install latest CMake, & FORD/Jin2For, etc.
       with:
         python-version: ${{ matrix.python-version }}
-        
+
     - name: Setup Graphviz
       uses: ts-graphviz/setup-graphviz@v1
 
@@ -49,23 +49,41 @@ jobs:
       run: |
         FoBiS.py build -f bspline-fortran.fobis -mode tests-gnu
 
-    - name: Run tests
-      run: |
-        ./bin/bspline_test
-        ./bin/bspline_test_2
-        ./bin/bspline_extrap_test
-        ./bin/test_regrid
-        ./bin/knot_tests
-        ./bin/speed_test_oo
-        ./bin/speed_test
-        ./bin/test_integrate
-        ./bin/test_oo
+    - name: bspline_test
+      run: ./bin/bspline_test
+
+    - name: bspline_test_2
+      run: ./bin/bspline_test_2
+
+    - name: bspline_extrap_test
+      run: ./bin/bspline_extrap_test
+
+    - name: test_regrid
+      run: ./bin/test_regrid
+
+    - name: knot_tests
+      run: ./bin/knot_tests
+
+    - name: speed_test_oo
+      run: ./bin/speed_test_oo
+
+    - name: speed_test
+      run: ./bin/speed_test
+
+    - name: test_integrate
+      run: ./bin/test_integrate
+
+    - name: test_oo
+      run: ./bin/test_oo
+
+    - name: dbint4_test
+      run: ./bin/dbint4_test
 
     - name: Build documentation
       run: ford ./bspline-fortran.md
 
     - name: Deploy Documentation
-      if: github.ref == 'refs/heads/master' 
+      if: github.ref == 'refs/heads/master'
       uses: JamesIves/github-pages-deploy-action@4.1.0
       with:
         branch: gh-pages # The branch the action should deploy to.

.gitignore

@@ -33,9 +33,10 @@ build
 doc
 lib
 bin
+install
 
 # mac
 *.DS_Store
 
 # vscode
-/.vscode
+/.vscode

CMakeLists.txt

@@ -2,13 +2,152 @@
 # Basic CMake configuration file for bspline-fortran
 #
 
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required(VERSION 3.11)
 
-set(PROJECT_DESCRIPTION "Multidimensional B-Spline Interpolation of Data on a Regular Grid")
-set(PROJECT_URL "https://github.com/jacobwilliams/bspline-fortran")
+set( CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/install"
+  CACHE STRING "Select where to install the library and test programs." )
 
-project (bspline-fortran NONE)
-enable_language (Fortran)
+project(bspline-fortran NONE)
 
-file(GLOB SOURCES src/*.f90)
-add_library(${PROJECT_NAME} ${SOURCES})
+# Real and Integer kinds
+SET(BSPLINE_REAL_KIND "REAL64" CACHE STRING "Real kind parameter")
+SET_PROPERTY(CACHE BSPLINE_REAL_KIND PROPERTY STRINGS REAL32 REAL64 REAL128)
+if(${BSPLINE_REAL_KIND} MATCHES "REAL32")
+  add_definitions(-DREAL32)
+elseif(${BSPLINE_REAL_KIND} MATCHES "REAL64")
+  add_definitions(-DREAL64)
+elseif(${BSPLINE_REAL_KIND} MATCHES "REAL128")
+  add_definitions(-DREAL128)
+endif()
+SET(BSPLINE_INT_KIND "INT32" CACHE STRING "Integer kind parameter")
+SET_PROPERTY(CACHE BSPLINE_INT_KIND PROPERTY STRINGS INT8 INT16 INT32 INT64)
+if(${BSPLINE_INT_KIND} MATCHES "INT8")
+  add_definitions(-DINT8)
+elseif(${BSPLINE_INT_KIND} MATCHES "INT16")
+  add_definitions(-DINT16)
+elseif(${BSPLINE_INT_KIND} MATCHES "INT32")
+  add_definitions(-DINT32)
+elseif(${BSPLINE_INT_KIND} MATCHES "INT64")
+  add_definitions(-DINT64)
+endif()
+
+# Use MSVS folders to organize projects on windows
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set( LIB_NAME ${CMAKE_PROJECT_NAME} )
+set( PROJECT_DESCRIPTION
+  "Multidimensional B-Spline Interpolation of Data on a Regular Grid" )
+set( PROJECT_URL "https://github.com/jacobwilliams/bspline-fortran" )
+set( CMAKE_CONFIGURATION_TYPES "Debug" "Release" "MinSizeRel" "RelWithDebInfo" )
+set( CMAKE_BUILD_TYPE "Release"
+  CACHE STRING "Select which configuration to build." )
+
+enable_language(Fortran)
+
+set( SOURCES
+  src/bspline_kinds_module.F90
+  src/bspline_module.f90
+  src/bspline_oo_module.f90
+  src/bspline_sub_module.f90 )
+
+set( PYPLOT_SOURCES
+  src/tests/pyplot-fortran/src/pyplot_module.f90 )
+
+set( TEST_SOURCES src/tests/bspline_extrap_test.f90
+  src/tests/bspline_test.f90
+  src/tests/bspline_test_2.f90
+  src/tests/dbint4_test.f90
+  src/tests/knot_tests.f90
+  src/tests/speed_test.f90
+  src/tests/speed_test_oo.f90
+  src/tests/test_integrate.f90
+  src/tests/test_oo.f90
+  src/tests/test_regrid.f90 )
+
+set(INSTALL_MOD_DIR "lib")
+set(INSTALL_LIB_DIR "${INSTALL_MOD_DIR}")
+set(ABS_LIB_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}")
+set(MODULE_DIR "${CMAKE_BINARY_DIR}/lib")
+
+if( "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin" )
+  set( ENABLE_DYLIBS_USE_RPATH TRUE CACHE BOOL
+    "Enable @rpath install name for dylibs" )
+  mark_as_advanced( ENABLE_DYLIBS_USE_RPATH )
+endif()
+
+if( ENABLE_DYLIBS_USE_RPATH )
+  set( CMAKE_MACOSX_RPATH TRUE )
+else()
+  set( CMAKE_INSTALL_NAME_DIR
+    "${ABS_LIB_INSTALL_DIR}" )
+endif()
+
+add_library( ${LIB_NAME}        SHARED ${SOURCES} )
+add_library( ${LIB_NAME}-static STATIC ${SOURCES} )
+
+set_target_properties(${LIB_NAME}-static
+  PROPERTIES
+  OUTPUT_NAME "${LIB_NAME}"
+  if(NOT MSVC_IDE)
+    PREFIX lib
+  endif()
+  ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+  Fortran_MODULE_DIRECTORY ${MODULE_DIR})
+
+set_target_properties(${LIB_NAME}
+  PROPERTIES
+  OUTPUT_NAME "${LIB_NAME}"
+  if(NOT MSVC_IDE)
+    PREFIX lib
+  endif()
+  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+  Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR})
+
+set( BSPLINE_TESTS TRUE CACHE BOOL "Enable the unit tests." )
+
+if( BSPLINE_TESTS )
+
+  # we also need to build the pyplot-fortran library,
+  # since that is needed by some of the tests:
+  set( PYPLOT_LIB_NAME "pyplot-fortran" )
+  add_library( ${PYPLOT_LIB_NAME} STATIC ${PYPLOT_SOURCES} )
+  set_target_properties(${PYPLOT_LIB_NAME}
+    PROPERTIES
+    OUTPUT_NAME ${PYPLOT_LIB_NAME}
+    if(NOT MSVC_IDE)
+      PREFIX lib
+    endif()
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+    Fortran_MODULE_DIRECTORY ${MODULE_DIR})
+
+  # build each test program:
+  foreach( UNIT_TEST ${TEST_SOURCES} )
+    get_filename_component( TEST ${UNIT_TEST} NAME_WE )
+    if(MSVC_IDE)
+      link_directories(${CMAKE_BINARY_DIR}/lib)
+    endif()
+    add_executable( ${TEST} ${UNIT_TEST} )
+    target_link_libraries( ${TEST} ${LIB_NAME}-static ${PYPLOT_LIB_NAME} )
+    set_target_properties(${TEST}
+        PROPERTIES
+        ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
+        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+        Fortran_MODULE_DIRECTORY ${MODULE_DIR})
+    install(TARGETS ${TEST} ${TEST}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  endforeach()
+
+endif()
+
+# install library:
+install( TARGETS ${LIB_NAME} ${LIB_NAME}-static
+          LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+          ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" )
+install( DIRECTORY "${MODULE_DIR}/" DESTINATION "${INSTALL_MOD_DIR}" )
+
+# Windows settings:
+if(MSVC_IDE)
+   INCLUDE_DIRECTORIES("src")
+   SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpp")
+endif()

LICENSE

@@ -33,6 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 !  from the National Institute of Standards and Technology (NIST)
 !
 !  The CMLIB license is given below:
+!
+!-----------------------------------------------------------------------------------------
 
 The research software provided on this web site ("software") is provided by NIST as a
 public service. You may use, copy and distribute copies of the software in any medium,

README.md

@@ -117,11 +117,11 @@ A [FoBiS](https://github.com/szaghi/FoBiS) configuration file (`bspline-fortran.
 
   The full set of modes are: `static-gnu`, `static-gnu-debug`, `static-intel`, `static-intel-debug`, `shared-gnu`, `shared-gnu-debug`, `shared-intel`, `shared-intel-debug`, `tests-gnu`, `tests-gnu-debug`, `tests-intel`, `tests-intel-debug`
 
-  To generate the documentation using [ford](https://github.com/cmacmackin/ford), run: ```FoBis.py rule --execute makedoc -f bspline-fortran.fobis```
+  To generate the documentation using [ford](https://github.com/Fortran-FOSS-Programmers/ford), run: ```FoBis.py rule --execute makedoc -f bspline-fortran.fobis```
 
 # Documentation
 
-The latest API documentation can be found [here](http://jacobwilliams.github.io/bspline-fortran/). This was generated from the source code using [FORD](https://github.com/cmacmackin/ford) (note that the build script will also generate these files).
+The latest API documentation can be found [here](http://jacobwilliams.github.io/bspline-fortran/). This was generated from the source code using [FORD](https://github.com/Fortran-FOSS-Programmers/ford) (note that the build script will also generate these files).
 
 # License
 

bspline-fortran.code-workspace

@@ -0,0 +1,13 @@
+{
+    "folders": [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "files.trimTrailingWhitespace": true,
+        "editor.insertSpaces": true,
+        "editor.tabSize": 4,
+        "editor.trimAutoWhitespace": true
+    }
+}

bspline-fortran.fobis

@@ -14,8 +14,8 @@ $SHARED_LIB  = libbspline.so
 $OPTIMIZE    = -O2
 $CSTATIC_GNU = -c -fbacktrace -Wall -Wextra -Wno-maybe-uninitialized -Wno-unused-function -pedantic -std=f2008ts
 $DEBUG_GNU   = -O0 -g3 -Warray-bounds -Wcharacter-truncation -Wline-truncation -Wimplicit-interface -Wimplicit-procedure -Wunderflow -fcheck=all -fmodule-private -ffree-line-length-132 -fimplicit-none -fbacktrace -fdump-core -finit-real=nan -std=f2008ts -fall-intrinsics
-$CSTATIC_INT = -c -std15
-$DEBUG_INT   = -O0 -debug all -check all -warn all -extend-source 132 -traceback -gen-interfaces -fpe-all=0 -fp-stack-check -fstack-protector-all -ftrapuv -no-ftz -std15
+$CSTATIC_INT = -c -std18 -fpp
+$DEBUG_INT   = -O0 -debug all -check all -warn all -extend-source 132 -traceback -gen-interfaces -fpe-all=0 -fp-stack-check -fstack-protector-all -ftrapuv -no-ftz -std18
 $EXCLUDE_DIRS = ./src/pyplot-fortran/src/tests/
 
 # modes templates

bspline-fortran.md

@@ -12,6 +12,7 @@ predocmark: <
 docmark_alt:
 docmark: !
 display: public
+         private
 source: true
 graph: true
 exclude: pyplot_module.f90

src/bspline_kinds_module.F90

@@ -0,0 +1,40 @@
+!*****************************************************************************************
+!> author: Jacob Williams
+!  license: BSD
+!
+!### Description
+!  Numeric kind definitions for BSpline-Fortran.
+
+    module bspline_kinds_module
+
+    use,intrinsic :: iso_fortran_env
+
+    implicit none
+
+    private
+
+#ifdef REAL32
+    integer,parameter,public :: wp = real32   !! Real working precision [4 bytes]
+#elif REAL64
+    integer,parameter,public :: wp = real64   !! Real working precision [8 bytes]
+#elif REAL128
+    integer,parameter,public :: wp = real128  !! Real working precision [16 bytes]
+#else
+    integer,parameter,public :: wp = real64   !! Real working precision if not specified [8 bytes]
+#endif
+
+#ifdef INT8
+    integer,parameter,public :: ip = int8     !! Integer working precision [1 byte]
+#elif INT16
+    integer,parameter,public :: ip = int16    !! Integer working precision [2 bytes]
+#elif INT32
+    integer,parameter,public :: ip = int32    !! Integer working precision [4 bytes]
+#elif INT64
+    integer,parameter,public :: ip = int64    !! Integer working precision [8 bytes]
+#else
+    integer,parameter,public :: ip = int32    !! Integer working precision if not specified [4 bytes]
+#endif
+
+!*****************************************************************************************
+    end module bspline_kinds_module
+!*****************************************************************************************