Merge pull request #265 from jacobwilliams/get_alloc_string

Get alloc string

Author: jacobwilliams

.travis.yml

@@ -18,7 +18,7 @@ addons:
       - kalakris-cmake
       - ubuntu-toolchain-r-test
     packages:
-      - gfortran-4.9
+      - gfortran-6
       - binutils
       - cmake
       - python-pip
@@ -53,10 +53,10 @@ install:
       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
+  - 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
   - perl --version
   - |
     if ! which f90split; then

src/json_file_module.F90

@@ -101,6 +101,7 @@ module json_file_module
                                  MAYBEWRAP(json_file_get_double_vec),  &
                                  MAYBEWRAP(json_file_get_logical_vec), &
                                  MAYBEWRAP(json_file_get_string_vec),  &
+                                 MAYBEWRAP(json_file_get_alloc_string_vec),  &
                                  json_file_get_root
 
         generic,public :: update =>  MAYBEWRAP(json_file_update_integer),  &
@@ -140,6 +141,7 @@ module json_file_module
         procedure :: MAYBEWRAP(json_file_get_double_vec)
         procedure :: MAYBEWRAP(json_file_get_logical_vec)
         procedure :: MAYBEWRAP(json_file_get_string_vec)
+        procedure :: MAYBEWRAP(json_file_get_alloc_string_vec)
         procedure :: json_file_get_root
 
         !update:
@@ -1120,6 +1122,52 @@ subroutine wrap_json_file_get_string_vec(me, path, vec, found)
     end subroutine wrap_json_file_get_string_vec
 !*****************************************************************************************
 
+!*****************************************************************************************
+!> author: Jacob Williams
+!  date: 12/17/2016
+!
+!  Get an (allocatable length) string vector from a JSON file.
+!  This is just a wrapper for [[json_get_alloc_string_vec_with_path]].
+
+    subroutine json_file_get_alloc_string_vec(me, path, vec, ilen, found)
+
+    implicit none
+
+    class(json_file),intent(inout)      :: me
+    character(kind=CK,len=*),intent(in) :: path
+    character(kind=CK,len=:),dimension(:),allocatable,intent(out) :: vec
+    integer(IK),dimension(:),allocatable,intent(out) :: ilen !! the actual length
+                                                             !! of each character
+                                                             !! string in the array
+    logical(LK),intent(out),optional :: found
+
+    call me%core%get(me%p, path, vec, ilen, found)
+
+    end subroutine json_file_get_alloc_string_vec
+!*****************************************************************************************
+
+!*****************************************************************************************
+!>
+!  Alternate version of [[json_file_get_alloc_string_vec]], where "path" is kind=CDK.
+!  This is just a wrapper for [[wrap_json_get_alloc_string_vec_with_path]].
+
+    subroutine wrap_json_file_get_alloc_string_vec(me, path, vec, ilen, found)
+
+    implicit none
+
+    class(json_file),intent(inout)       :: me
+    character(kind=CDK,len=*),intent(in) :: path
+    character(kind=CK,len=:),dimension(:),allocatable,intent(out) :: vec
+    integer(IK),dimension(:),allocatable,intent(out) :: ilen !! the actual length
+                                                             !! of each character
+                                                             !! string in the array
+    logical(LK),intent(out),optional :: found
+
+    call me%get(to_unicode(path), vec, ilen, found)
+
+    end subroutine wrap_json_file_get_alloc_string_vec
+!*****************************************************************************************
+
 !*****************************************************************************************
 !> author: Jacob Williams
 !  date:1/10/2015