Merge tag 'v0.2.1' into develop

Add SSP Linear Multistep Methods

Add Strong Stability Preserving Linear Multistep Methods (fixed stepsize).

Stable release, fully barckward compatible.

Author: szaghi

.travis.yml

@@ -1,7 +1,4 @@
-language: python
-
-python:
-  - 2.7
+language: generic
 
 sudo: false
 
@@ -17,38 +14,58 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - gfortran-4.9
+      - gfortran-6
       - binutils
       - python-pip
-      - graphviz      
+      - graphviz
 
 env:
   global:
-    - SCRIPT="FoBiS.py rule -ex makecoverage"
+    - MAKECOVERAGE="FoBiS.py rule -ex makecoverage"
+    - MAKEDOC="./scripts/makedoc.sh Fortran-FOSS-Programmers/FOODIE"
+    - CLEAN="FoBiS.py rule -ex clean"
+    - MAKETAR="FoBiS.py rule -ex maketar"
 
 before_install:
-  - git submodule update --init --recursive
+  - git submodule update --init
 
 install:
   - |
     if [[ ! -d "$HOME/.local/bin" ]]; then
       mkdir "$HOME/.local/bin"
     fi
   - export PATH="$HOME/.local/bin:$PATH"
-  - export FC=/usr/bin/gfortran-4.9
-  - ln -fs /usr/bin/gfortran-4.9 "$HOME/.local/bin/gfortran" && gfortran --version
-  - ls -l /usr/bin/gfortran-4.9
-  - ln -fs /usr/bin/gcov-4.9 "$HOME/.local/bin/gcov" && gcov --version
-  - pip install --upgrade pygooglechart
-  - pip install --upgrade graphviz
-  - pip install --upgrade FoBiS.py
-  - pip install --upgrade markdown-checklist 
-  - pip install --upgrade ford
+  - export FC=/usr/bin/gfortran-6
+  - ln -fs /usr/bin/gfortran-6 "$HOME/.local/bin/gfortran" && gfortran --version
+  - ls -l /usr/bin/gfortran-6
+  - ln -fs /usr/bin/gcov-6 "$HOME/.local/bin/gcov" && gcov --version
+  - pip install --user --upgrade pygooglechart
+  - pip install --user --upgrade graphviz
+  - pip install --user --upgrade FoBiS.py
+  - pip install --user --upgrade markdown-checklist 
+  - pip install --user --upgrade ford
 
 script:
-  - $SCRIPT
+  - $MAKECOVERAGE
 
 after_success:
-  - cd $TRAVIS_BUILD_DIR
-  - cd build/lib/obj/ ; bash <(curl -s https://codecov.io/bash) ; cd -
-  - ./makedoc.sh Fortran-FOSS-Programmers/FOODiE
+  - find . -name '*.gcno' -print
+  - bash <(curl -s https://codecov.io/bash)
+  - $MAKEDOC
+
+before_deploy:
+  - $CLEAN
+  - $MAKETAR
+  - mv FOODIE.tar.gz FOODIE-$TRAVIS_TAG.tar.gz
+
+deploy:
+  provider: releases
+  api_key:
+    secure: QTsZ8jIN5/f15EW/L93u7Yn0fUlX1UaF6qCLfiWfo0jDiK0FGkIo4B+MeBYbZs+HphMxbhDv7v+A1dpcA8w9RlkMX47NsGT4Nu7bu5AzABsjnFPUKbUux4ktoYkPAxXujcvT1fTYrv2bgH0ualtPnvU9CDT3PRfUpZND+bM0UIMyo40ojOec2v3opYfGYvbksosAVKTg15cxzxGgGVrZb+DWfnILgrETieULL1Tvp8eZG9wY9Kja65JCzbUVBrcGIThz5iZqO8rAi6Opl7cgpP7W2qRotNRXQjQc1KsV+HH0w5eTCUwqUZOJKuucZrUjYiu762LYMYfLGxs4F2Wy2aXPqcTImVIG5W9tFN4xKsL46Ed7PZdCHWZJFCFx89znEosZnCFmSp445L88Q1/dbluk/oP+TxYi6z61QEstSB2T5r0Pv/rC2PGqoBlYyCGIZZdBzzXNSW2gaUEkhNgOU1Q/K6yFpjy+GUxvcGugroWsHBXvoSMswzC+IhYUvjSXkiFM5AkXbJrb8/mIc25QehUrvO5Fe/A67o2HuM6aHZDBbGyP8876k63o1H82JkW0fSfCrcWu302eqCu5YwrZJ3I20bepZEbj5Wh50Bz6n8c0ZsFQL1GUxAA+3KBtWp7wDHK9WYsKrdc2FFGtfZgQ7X5iiY01/i6ZCqiUO4vASWg=
+  file: 
+    - FOODIE-$TRAVIS_TAG.tar.gz
+    - ./scripts/install.sh
+  skip_cleanup: true
+  overwrite: true
+  on:
+    tags: true

README.md

@@ -98,7 +98,7 @@ FOODIE is aimed to be a KISS-pure-Fortran library for integrating Ordinary Diffe
                 + [x] 3 stages, 3rd order accurate;
                 + [ ] 4 stages;
                 + [x] 5 stages, 4th order accurate;
-            + [ ] [embedded (adaptive)](http://fortran-foss-programmers.github.io/FOODIE/module/foodie_integrator_runge_kutta_emd.html) schemes:
+            + [ ] [embedded (adaptive)](http://fortran-foss-programmers.github.io/FOODIE/module/foodie_integrator_runge_kutta_embeddedd.html) schemes:
                 + [x] Heun-Euler, 2 stages, 2nd order accurate;
                 + [ ] Runge-Kutta-Fehlberg, 5 stages, 4th order accurate;
                 + [x] Runge-Kutta-Cash-Karp, 6 stages, 5th order accurate, see [13];

codecov.yml

@@ -0,0 +1,4 @@
+coverage:
+  ignore:
+    - src/third_party/
+    - doc

makedoc.sh scripts/makedoc.shmakedoc.sh renamed to scripts/makedoc.sh

@@ -352,11 +352,12 @@ elemental subroutine destroy(self)
   if (allocated(self%gamm)) deallocate(self%gamm)
   endsubroutine destroy
 
-  subroutine init(self, stages, tolerance)
+  subroutine init(self, stages, tolerance, stop_on_fail)
   !< Create the actual RK integrator: initialize the Butcher' table coefficients.
-  class(integrator_runge_kutta_emd), intent(inout) :: self      !< Integrator.
-  integer(I_P),                      intent(in)    :: stages    !< Number of stages used.
-  real(R_P), optional,               intent(in)    :: tolerance !< Tolerance on the local truncation error (default 0.01).
+  class(integrator_runge_kutta_emd), intent(inout)        :: self         !< Integrator.
+  integer(I_P),                      intent(in)           :: stages       !< Number of stages used.
+  real(R_P),                         intent(in), optional :: tolerance    !< Tolerance on the local truncation error (default 0.01).
+  logical,                           intent(in), optional :: stop_on_fail !< Stop execution if initialization fail.
 
   if (self%is_supported(stages)) then
     call self%destroy
@@ -602,7 +603,7 @@ subroutine init(self, stages, tolerance)
   else
     call self%trigger_error(error=ERROR_BAD_STAGES_NUMBER,                                  &
                             error_message='bad (unsupported) number of Runge-Kutta stages', &
-                            is_severe=.true.)
+                            is_severe=stop_on_fail)
   endif
   endsubroutine init
 

src/lib/foodie_integrator_runge_kutta_embedded.f90

@@ -228,10 +228,11 @@ elemental subroutine destroy(self)
   if (allocated(self%C)) deallocate(self%C)
   endsubroutine destroy
 
-  subroutine init(self, stages)
+  subroutine init(self, stages, stop_on_fail)
   !< Create the actual RK integrator: initialize the Butcher' low storage table coefficients.
-  class(integrator_runge_kutta_ls), intent(inout) :: self   !< Integrator.
-  integer(I_P),                     intent(in)    :: stages !< Number of stages used.
+  class(integrator_runge_kutta_ls), intent(inout)        :: self         !< Integrator.
+  integer(I_P),                     intent(in)           :: stages       !< Number of stages used.
+  logical,                          intent(in), optional :: stop_on_fail !< Stop execution if initialization fail.
 
   if (self%is_supported(stages)) then
     call self%destroy
@@ -321,7 +322,7 @@ subroutine init(self, stages)
   else
     call self%trigger_error(error=ERROR_BAD_STAGES_NUMBER,                                  &
                             error_message='bad (unsupported) number of Runge-Kutta stages', &
-                            is_severe=.true.)
+                            is_severe=stop_on_fail)
   endif
   endsubroutine init
 

src/lib/foodie_integrator_runge_kutta_low_storage.f90

@@ -179,10 +179,11 @@ elemental subroutine destroy(self)
   if (allocated(self%gamm)) deallocate(self%gamm)
   endsubroutine destroy
 
-  subroutine init(self, stages)
+  subroutine init(self, stages, stop_on_fail)
   !< Create the actual RK integrator: initialize the Butcher' table coefficients.
-  class(integrator_runge_kutta_tvd), intent(inout) :: self   !< Integrator.
-  integer(I_P),                      intent(in)    :: stages !< Number of stages used.
+  class(integrator_runge_kutta_tvd), intent(inout)        :: self         !< Integrator.
+  integer(I_P),                      intent(in)           :: stages       !< Number of stages used.
+  logical,                           intent(in), optional :: stop_on_fail !< Stop execution if initialization fail.
 
   if (self%is_supported(stages)) then
     call self%destroy
@@ -235,7 +236,7 @@ subroutine init(self, stages)
   else
     call self%trigger_error(error=ERROR_BAD_STAGES_NUMBER,                                  &
                             error_message='bad (unsupported) number of Runge-Kutta stages', &
-                            is_severe=.true.)
+                            is_severe=stop_on_fail)
   endif
   endsubroutine init