Merge pull request #78 from jacobwilliams/unit-test-hotfix

fixed unit tests when compiling with real precision other than real64

Author: jacobwilliams

fpm.toml

@@ -13,7 +13,7 @@ auto-examples = false
 auto-tests = true
 
 [dev-dependencies]
-pyplot-fortran = { git = "https://github.com/jacobwilliams/pyplot-fortran", tag = "3.2.0" }
+pyplot-fortran = { git = "https://github.com/jacobwilliams/pyplot-fortran", tag = "3.3.0" }
 
 [library]
 source-dir = "src"

test/bspline_extrap_test.f90

@@ -10,7 +10,6 @@ program bspline_extrap_test
     use bspline_module
     use bspline_kinds_module, only: wp, ip
     use pyplot_module
-    use, intrinsic :: iso_fortran_env
 
     implicit none
 
@@ -57,7 +56,7 @@ program bspline_extrap_test
     !initialize the plot:
     call plt%initialize(grid=.true.,xlabel='x (deg)',ylabel='f(x)',&
                         title='Extrapolation Test',legend=.true.)
-    call plt%add_plot(real(x*rad2deg,real64),real(fcn_1d,real64),&
+    call plt%add_plot(x*rad2deg,fcn_1d,&
                         label='Function $f(x) = \sin(x)$',&
                         linestyle='ko',markersize=5,linewidth=2,istat=istat)
 
@@ -82,7 +81,7 @@ program bspline_extrap_test
         write(*,*) ''
 
         if (extrap) then
-            call plt%add_plot(real(xval*rad2deg,real64),real(fval,real64),&
+            call plt%add_plot(xval*rad2deg,fval,&
                     label='Interpolated',&
                     linestyle='g.-',linewidth=1,istat=istat)
             call plt%savefig('bspline_extrap_test.png',istat=istat)

test/dbint4_test.f90

@@ -7,7 +7,6 @@ program dbint4_test
     use bspline_module
     use bspline_kinds_module, only: wp,ip
     use pyplot_module
-    use, intrinsic :: iso_fortran_env
 
     implicit none
 
@@ -56,7 +55,7 @@ program dbint4_test
     !initialize the plot:
     call plt%initialize(grid=.true.,xlabel='x (deg)',ylabel='f(x)',&
                         title='B-Spline End Conditions',legend=.true.)
-    call plt%add_plot(real(x*rad2deg,real64),real(fcn_1d,real64),&
+    call plt%add_plot(x*rad2deg,fcn_1d,&
                         label='Function $f(x) = \sin(x)$',&
                         linestyle='ko',markersize=5,linewidth=2,istat=istat)
 
@@ -183,7 +182,7 @@ program dbint4_test
         !write(*,*) ''
         !write(*,*) '==============================================='
 
-        call plt%add_plot(real(xval*rad2deg,real64),real(fval,real64),&
+        call plt%add_plot(xval*rad2deg,fval,&
                 label=trim(labels(icase)),&
                 linestyle=linestyles(icase),linewidth=2,istat=istat)
 

test/knot_tests.f90

@@ -14,7 +14,6 @@ program knot_tests
     use bspline_module
     use bspline_kinds_module, only: wp, ip
     use pyplot_module
-    use, intrinsic :: iso_fortran_env
 
     implicit none
 
@@ -41,7 +40,7 @@ program knot_tests
     !initialize the plot:
     call plt%initialize(grid=.true.,xlabel='x',ylabel='f(x)',&
                         title='Knot Test',legend=.true.)
-    call plt%add_plot(real(x,real64),real(fcn,real64),&
+    call plt%add_plot(x,fcn,&
                         label='Function $f(x) = \sin(x \cdot \pi/18)$ : $x=[0,20,40,60,80,100]$',&
                         linestyle='ko--',markersize=5,linewidth=2,istat=istat)
 
@@ -83,13 +82,13 @@ program knot_tests
 
     !call plt%add_plot(x_new,f_actual,label='Actual function',linestyle='k--',linewidth=2)
 
-    call plt%add_plot(real(x_new,real64),real(f_new_default,real64),&
+    call plt%add_plot(x_new,f_new_default,&
             label='Interpolated : $t_x=[0,0,0,0,40,60,102,102,102,102]$ (Default)',&
             linestyle='b-',linewidth=1,istat=istat)
-    call plt%add_plot(real(x_new,real64),real(f1,real64),&
+    call plt%add_plot(x_new,f1,&
             label='Interpolated : $t_x=[0,0,0,0,20,40,101,101,101,101]$',&
             linestyle='r-',linewidth=1,istat=istat)
-    call plt%add_plot(real(x_new,real64),real(f2,real64),&
+    call plt%add_plot(x_new,f2,&
             label='Interpolated : $t_x=[0,0,0,0,60,80,101,101,101,101]$',&
             linestyle='g-',linewidth=1,istat=istat)
 

test/speed_test.f90

@@ -10,7 +10,6 @@ program bspline_speed_test
     use bspline_module
     use bspline_kinds_module, only: wp, ip
     use pyplot_module
-    use, intrinsic :: iso_fortran_env
 
     implicit none
 
@@ -317,7 +316,7 @@ program bspline_speed_test
                         axes_labelsize = 20,&
                         xtick_labelsize = 20,&
                         ytick_labelsize = 20)
-    call plt%add_bar(x=real([1,2,3,4,5,6],real64),height=real(cases_per_sec,real64),&
+    call plt%add_bar(x=real([1,2,3,4,5,6],wp),height=cases_per_sec,&
                         label='Speed test runs',&
                         yscale='log',align='center',color='r',istat=istat)
     call plt%savefig('speed_test.png',istat=istat)

test/speed_test_oo.f90

@@ -10,7 +10,6 @@ program bspline_speed_test_oo
     use bspline_module
     use bspline_kinds_module, only: wp, ip
     use pyplot_module
-    use, intrinsic :: iso_fortran_env
 
     implicit none
 
@@ -248,7 +247,7 @@ program bspline_speed_test_oo
                         axes_labelsize = 20,&
                         xtick_labelsize = 20,&
                         ytick_labelsize = 20)
-    call plt%add_bar(x=real([1,2,3,4,5,6],real64),height=real(cases_per_sec,real64),&
+    call plt%add_bar(x=real([1,2,3,4,5,6],wp),height=cases_per_sec,&
                         label='Speed test runs',&
                         yscale='log',align='center',color='r',istat=istat)
     call plt%savefig('speed_test_oo.png',istat=istat)