Unit tests now compile when changing the default real kind. Fixes #383

jacobwilliams · jacobwilliams · commit 36b16d21c6f8 · 2019-01-21T10:12:52.000-06:00
diff --git a/src/json_value_module.F90 b/src/json_value_module.F90
@@ -354,8 +354,8 @@ module json_value_module
         !### Example
         !
         !````fortran
-        !    use, intrinsic :: iso_fortran_env, only: output_unit, wp=>real64
-        !    use json_module
+        !    use, intrinsic :: iso_fortran_env, only: output_unit
+        !    use json_module, wp=>json_RK
         !    type(json_core) :: json
         !    type(json_value) :: p
         !    call json%create_object(p,'root') ! create the root
diff --git a/src/tests/jf_test_01.F90 b/src/tests/jf_test_01.F90
@@ -7,8 +7,8 @@
 
 module jf_test_1_mod
 
-    use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_02.F90 b/src/tests/jf_test_02.F90
@@ -7,8 +7,8 @@
 
 module jf_test_2_mod
 
-    use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
@@ -193,7 +193,7 @@ subroutine test_2(error_cnt)
     !trajectory variables:
     call add_variables_to_input(json, traj, 'Rx', 'km', 'J2000', 'EARTH', [1.0_wp, 2.0_wp, 3.0_wp], error_cnt )
     call add_variables_to_input(json, traj, 'Ry', 'km', 'J2000', 'EARTH', [10.0_wp, 20.0_wp, 30.0_wp], error_cnt )
-    call add_variables_to_input(json, traj, 'Rz', 'km', 'J2000', 'EARTH', [100.0_wp, 200.0d0, 300.0_wp], error_cnt )
+    call add_variables_to_input(json, traj, 'Rz', 'km', 'J2000', 'EARTH', [100.0_wp, 200.0_wp, 300.0_wp], error_cnt )
     call add_variables_to_input(json, traj, 'Vx', 'km/s', 'J2000', 'EARTH', [1.0e-3_wp, 2.0e-3_wp, 3.0e-3_wp], error_cnt )
     call add_variables_to_input(json, traj, 'Vy', 'km/s', 'J2000', 'EARTH', [2.0e-3_wp, 20.0e-3_wp, 3.0e-3_wp], error_cnt )
     call add_variables_to_input(json, traj, 'Vz', 'km/s', 'J2000', 'EARTH', [3.0e-3_wp, 30.0e-3_wp, 40.0e-3_wp], error_cnt )
diff --git a/src/tests/jf_test_03.F90 b/src/tests/jf_test_03.F90
@@ -7,8 +7,8 @@
 
 module jf_test_3_mod
 
-    use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_04.F90 b/src/tests/jf_test_04.F90
@@ -7,8 +7,8 @@
 
 module jf_test_4_mod
 
-    use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_05.F90 b/src/tests/jf_test_05.F90
@@ -7,8 +7,8 @@
 
 module jf_test_5_mod
 
-    use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_06.F90 b/src/tests/jf_test_06.F90
@@ -9,7 +9,7 @@ module jf_test_6_mod
 
     use json_module, CK => json_CK, LK => json_LK
     use json_parameters, only: newline
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_07.F90 b/src/tests/jf_test_07.F90
@@ -8,7 +8,7 @@
 module jf_test_7_mod
 
     use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_08.F90 b/src/tests/jf_test_08.F90
@@ -3,12 +3,12 @@
 !  Module for the eighth unit test.
 !
 !# HISTORY
-!  * Izaak Beekman : 2/18/2015 : Created (refactoried original json_example.f90 file)
+!  * Izaak Beekman : 2/18/2015 : Created (refactored original json_example.f90 file)
 
 module jf_test_8_mod
 
     use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_09.F90 b/src/tests/jf_test_09.F90
@@ -7,7 +7,7 @@
 module jf_test_9_mod
 
     use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_10.F90 b/src/tests/jf_test_10.F90
@@ -6,8 +6,8 @@
 
 module jf_test_10_mod
 
-    use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
@@ -176,7 +176,7 @@ subroutine test_10(error_cnt)
     end if
 
     write(error_unit,'(A)') 'json_file_update_real [variable present]...'
-    call f2%update('data[2].real',100.0d0,found)
+    call f2%update('data[2].real',100.0_wp,found)
     if (f2%failed()) then
         call f2%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -189,7 +189,7 @@ subroutine test_10(error_cnt)
         end if
     end if
     write(error_unit,'(A)') 'json_file_update_real [variable not present]...'
-    call f2%update('new_real',1776.0d0,found)
+    call f2%update('new_real',1776.0_wp,found)
     if (f2%failed()) then
         call f2%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -269,7 +269,7 @@ subroutine test_10(error_cnt)
     end if
 
     write(error_unit,'(A)') 'json_update_double...'
-    call json%update(p,'data(2).real',-1.0d0,found)
+    call json%update(p,'data(2).real',-1.0_wp,found)
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -315,7 +315,7 @@ subroutine test_10(error_cnt)
     write(error_unit,'(A)') 'json_create...'
     write(error_unit,'(A)') 'json_create_logical...'; call json%destroy(p); call json%create_logical(p,.true.,'foo')
     write(error_unit,'(A)') 'json_create_integer...'; call json%destroy(p); call json%create_integer(p,1000,'foo')
-    write(error_unit,'(A)') 'json_create_double ...'; call json%destroy(p); call json%create_double (p,9.0d0,'foo')
+    write(error_unit,'(A)') 'json_create_double ...'; call json%destroy(p); call json%create_double (p,9.0_wp,'foo')
     write(error_unit,'(A)') 'json_create_string ...'; call json%destroy(p); call json%create_string (p,'foo','bar')
     write(error_unit,'(A)') 'json_create_null   ...'; call json%destroy(p); call json%create_null   (p,'foo')
     write(error_unit,'(A)') 'json_create_object ...'; call json%destroy(p); call json%create_object (p,'foo')
diff --git a/src/tests/jf_test_11.F90 b/src/tests/jf_test_11.F90
@@ -6,8 +6,8 @@
 
 module jf_test_11_mod
 
-    use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_12.F90 b/src/tests/jf_test_12.F90
@@ -6,8 +6,8 @@
 
 module jf_test_12_mod
 
-    use json_module, CK => json_CK
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, CK => json_CK, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_15.F90 b/src/tests/jf_test_15.F90
@@ -7,8 +7,8 @@
 
 module jf_test_15_mod
 
-    use json_module, CK => json_CK
-    use, intrinsic :: iso_fortran_env , only: error_unit,output_unit,wp=>real64
+    use json_module, CK => json_CK, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit,output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_22.F90 b/src/tests/jf_test_22.F90
@@ -5,7 +5,7 @@
 module jf_test_22_mod
 
     use json_module, CK => json_CK
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_23.F90 b/src/tests/jf_test_23.F90
@@ -4,8 +4,8 @@
 
 module jf_test_23_mod
 
-    use json_module
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use json_module, wp => json_RK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
diff --git a/src/tests/jf_test_24.F90 b/src/tests/jf_test_24.F90
@@ -5,7 +5,7 @@
 module jf_test_24_mod
 
     use json_module, rk => json_rk, lk => json_lk, ik => json_ik, ck => json_ck, cdk => json_cdk
-    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
     implicit none
 
