Additional API cleanups. All public json_value_* routines were renamed json_*.

some commenting updates.

Author: jacobwilliams

README.md

@@ -116,17 +116,17 @@ of pointers.  See the json_example.f90 file for more examples.
 
         ! add an "inputs" object to the structure:
         call json_create_object(inp,'inputs')
-        call json_value_add(p, inp) !add it to the root
+        call json_add(p, inp) !add it to the root
 
         ! add some data to inputs:
-        call json_value_add(inp, 't0', 0.1_wp)
-        call json_value_add(inp, 'tf', 1.1_wp)
-        call json_value_add(inp, 'x0', 9999.0000d0)
-        call json_value_add(inp, 'integer_scalar', 787)
-        call json_value_add(inp, 'integer_array', [2,4,99])
-        call json_value_add(inp, 'names', ['aaa','bbb','ccc'])
-        call json_value_add(inp, 'logical_scalar', .true.)
-        call json_value_add(inp, 'logical_vector', [.true., .false., .true.])
+        call json_add(inp, 't0', 0.1_wp)
+        call json_add(inp, 'tf', 1.1_wp)
+        call json_add(inp, 'x0', 9999.0000d0)
+        call json_add(inp, 'integer_scalar', 787)
+        call json_add(inp, 'integer_array', [2,4,99])
+        call json_add(inp, 'names', ['aaa','bbb','ccc'])
+        call json_add(inp, 'logical_scalar', .true.)
+        call json_add(inp, 'logical_vector', [.true., .false., .true.])
         nullify(inp)  !don't need this anymore
 
         ! write the file:

src/json_example.f90

@@ -261,9 +261,9 @@ subroutine test_4()
     do i=1,100
         write(istr,fmt='(I10)') i
         istr = adjustl(istr)
-        call json_value_add(inp, 'x'//trim(istr),i)
+        call json_add(inp, 'x'//trim(istr),i)
     end do
-    call json_value_add(p, inp)
+    call json_add(p, inp)
     nullify(inp)
 
     write(*,'(A)') ''
@@ -327,26 +327,26 @@ subroutine test_2()
 
     !config structure:
     call json_create_object(inp,'inputs')   !an object
-    call json_value_add(p, inp)
+    call json_add(p, inp)
 
     !trajectory structure:
     call json_create_array(traj,'trajectory')    !an array
-    call json_value_add(p, traj)
+    call json_add(p, traj)
 
     write(*,'(A)') ''
     write(*,'(A)') 'adding some data to structure...'
 
     !add some variables:
 
     !input variables:
-    call json_value_add(inp, 't0', 0.1_wp)
-    call json_value_add(inp, 'tf', 1.1_wp)
-    call json_value_add(inp, 'x0', 9999.000_wp)
-    call json_value_add(inp, 'integer_scalar', 1)
-    call json_value_add(inp, 'integer_array', [2,4,99])
-    call json_value_add(inp, 'names', ['aaa','bbb','ccc'])
-    call json_value_add(inp, 'logical_scalar', .true.)
-    call json_value_add(inp, 'logical_vector', [.true., .false., .true.])
+    call json_add(inp, 't0', 0.1_wp)
+    call json_add(inp, 'tf', 1.1_wp)
+    call json_add(inp, 'x0', 9999.000_wp)
+    call json_add(inp, 'integer_scalar', 1)
+    call json_add(inp, 'integer_array', [2,4,99])
+    call json_add(inp, 'names', ['aaa','bbb','ccc'])
+    call json_add(inp, 'logical_scalar', .true.)
+    call json_add(inp, 'logical_vector', [.true., .false., .true.])
     nullify(inp)
 
     !trajectory variables:
@@ -395,16 +395,16 @@ subroutine add_variables_to_input(me, variable, units, frame, center, rdata)
     call json_create_object(var,'')    !name does not matter
 
     !variable info:
-    call json_value_add(var, 'VARIABLE',trim(variable))
-    call json_value_add(var, 'UNITS', trim(units))
-    call json_value_add(var, 'FRAME', trim(frame))
-    call json_value_add(var, 'CENTER', trim(center))
+    call json_add(var, 'VARIABLE',trim(variable))
+    call json_add(var, 'UNITS', trim(units))
+    call json_add(var, 'FRAME', trim(frame))
+    call json_add(var, 'CENTER', trim(center))
 
     !trajectory [vector of reals]:
-    call json_value_add(var, 'DATA', rdata)
+    call json_add(var, 'DATA', rdata)
 
     !add this variable to trajectory structure:
-    call json_value_add(me, var)
+    call json_add(me, var)
 
     !cleanup:
     nullify(var)
@@ -710,4 +710,4 @@ end subroutine print_error_message
 
 !*******************************************************************************************************
     end program json_test
-!*******************************************************************************************************
+!*******************************************************************************************************