Merge branch 'release/0.1.1'

Fortran-FOSS-Programmers · Jan 13, 2017 · 6b737a7 · 6b737a7
2 parents 652491d + d48c7d9
commit 6b737a7
Show file tree

Hide file tree

Showing 5 changed files with 354 additions and 60 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,3 +6,7 @@
   path = src/third_party/PENF
   url = https://github.com/szaghi/PENF
   branch = master
+[submodule "src/third_party/FLAP"]
+  path = src/third_party/FLAP
+  url = https://github.com/szaghi/FLAP
+  branch = master
diff --git a/fobos b/fobos
@@ -14,7 +14,7 @@ $DEBUG_GNU   = -Og -g3 -Warray-bounds -Wcharacter-truncation -Wline-truncation -
 ; $DEBUG_GNU   = -Og -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=f2008 -fall-intrinsics
 $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 -std08
 $OPTIMIZE    = -O2
-$EXDIRS      = PENF/src/tests/ pyplot-fortran/src/tests/
+$EXDIRS      = FLAP/src/tests/ PENF/src/tests/ pyplot-fortran/src/tests/
 
 # main modes
 # GNU

diff --git a/src/lib/wenoof_interpolator_js.f90 b/src/lib/wenoof_interpolator_js.f90
@@ -138,7 +138,7 @@ pure subroutine interpolate(self, S, stencil, location, interpolation)
   enddo
 
   ! computing the convolution
-  interpolation = 0.
+  interpolation = 0._R_P
   do k = 0, S - 1 ! stencils loop
     do f = f1, f2 ! 1 => left interface (i-1/2), 2 => right interface (i+1/2)
       interpolation(f + ff) = interpolation(f + ff) + weights(f, k) * self%polynom%poly(f, k)