TREX/trexio
1
0
Fork 0
mirror of https://github.com/TREX-CoE/trexio.git synced 2024-10-02 14:31:05 +02:00
Code Issues Projects Releases Wiki Activity

trexio_f: fix complaints from gfortran 11, including data type issues

Browse Source 
This includes:
* Define kind of arguments of bind(C) procedures using the relevant C
  types provided by iso_c_binding.
* Replaced "call exit(1)" with "error stop 1".
* Fixed a couple of implicit type conversions between 4-/8-byte
  integers.

The first two fix compilation of the Fortran module with -std=f2008.
This commit is contained in:
Pablo Lopez Rios 2022-01-18 16:46:21 +00:00
parent 223f91a9b1
commit 0e9b9f1900
2 changed files with 140 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
src/templates_front/templator_front.org
View File

@ -83,8 +83,8 @@ module trexio
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
implicit none implicit none
integer, parameter :: trexio_exit_code = 4 integer, parameter :: trexio_exit_code = c_int
integer, parameter :: trexio_backend = 4 integer, parameter :: trexio_backend = c_int
character(kind=c_char), parameter :: TREXIO_DELIM = c_new_line character(kind=c_char), parameter :: TREXIO_DELIM = c_new_line
#+end_src #+end_src
@ -493,7 +493,7 @@ interface
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
import import
integer(trexio_exit_code), intent(in), value :: error integer(trexio_exit_code), intent(in), value :: error
character, intent(out) :: string(<<MAX_STRING_LENGTH()>>) character(kind=c_char), intent(out) :: string(<<MAX_STRING_LENGTH()>>)
end subroutine trexio_string_of_error end subroutine trexio_string_of_error
end interface end interface
#+end_src #+end_src
@ -596,9 +596,9 @@ bool trexio_has_backend(back_end_t back_end) {
#+begin_src f90 :tangle prefix_fortran.f90 #+begin_src f90 :tangle prefix_fortran.f90
interface interface
logical function trexio_has_backend (back_end) bind(C) logical(c_bool) function trexio_has_backend (back_end) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(4), intent(in), value :: back_end integer(c_int), intent(in), value :: back_end
end function trexio_has_backend end function trexio_has_backend
end interface end interface
#+end_src #+end_src
@ -958,11 +958,11 @@ trexio_open(const char* file_name, const char mode,
#+begin_src f90 :tangle prefix_fortran.f90 #+begin_src f90 :tangle prefix_fortran.f90
interface interface
integer(8) function trexio_open_c (filename, mode, backend, rc_open) bind(C, name="trexio_open") integer(c_long) function trexio_open_c (filename, mode, backend, rc_open) bind(C, name="trexio_open")
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
import import
character(kind=c_char), dimension(*) :: filename character(kind=c_char), dimension(*) :: filename
character, intent(in), value :: mode character(kind=c_char), intent(in), value :: mode
integer(trexio_backend), intent(in), value :: backend integer(trexio_backend), intent(in), value :: backend
integer(trexio_exit_code), intent(out) :: rc_open integer(trexio_exit_code), intent(out) :: rc_open
end function trexio_open_c end function trexio_open_c
@ -1036,9 +1036,9 @@ trexio_exit_code trexio_set_one_based(trexio_t* file)
#+begin_src f90 :tangle prefix_fortran.f90 #+begin_src f90 :tangle prefix_fortran.f90
interface interface
integer function trexio_set_one_based(trex_file) bind(C) integer(c_int) function trexio_set_one_based(trex_file) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
end function trexio_set_one_based end function trexio_set_one_based
end interface end interface
#+end_src #+end_src
@ -1139,9 +1139,9 @@ trexio_close (trexio_t* file)
#+begin_src f90 :tangle prefix_fortran.f90 #+begin_src f90 :tangle prefix_fortran.f90
interface interface
integer function trexio_close (trex_file) bind(C) integer(c_int) function trexio_close (trex_file) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
end function trexio_close end function trexio_close
end interface end interface
#+end_src #+end_src
@ -1193,7 +1193,7 @@ def close(trexio_file):
each variable can be found below: each variable can be found below:
| Template variable | Description | Example | | Template variable | Description | Example |
|--------------------------------+-----------------------------------------------------+-----------------------| |--------------------------------+-----------------------------------------------------+-----------------------------------|
| ~$group$~ | Name of the group | ~nucleus~ | | ~$group$~ | Name of the group | ~nucleus~ |
| ~$group_num$~ | Name of the numerical attribute (scalar) | ~nucleus_num~ | | ~$group_num$~ | Name of the numerical attribute (scalar) | ~nucleus_num~ |
| ~$group_str$~ | Name of the string attribute (scalar) | ~nucleus_point_group~ | | ~$group_str$~ | Name of the string attribute (scalar) | ~nucleus_point_group~ |
@ -1208,9 +1208,9 @@ def close(trexio_file):
| ~$group_dset_dtype_default$~ | Default datatype of the dataset [C] | ~double/int32_t~ | | ~$group_dset_dtype_default$~ | Default datatype of the dataset [C] | ~double/int32_t~ |
| ~$group_dset_dtype_single$~ | Single precision datatype of the dataset [C] | ~float/int32_t~ | | ~$group_dset_dtype_single$~ | Single precision datatype of the dataset [C] | ~float/int32_t~ |
| ~$group_dset_dtype_double$~ | Double precision datatype of the dataset [C] | ~double/int64_t~ | | ~$group_dset_dtype_double$~ | Double precision datatype of the dataset [C] | ~double/int64_t~ |
| ~$group_dset_f_dtype_default$~ | Default datatype of the dataset [Fortran] | ~real(8)/integer(4)~ | | ~$group_dset_f_dtype_default$~ | Default datatype of the dataset [Fortran] | ~real(c_double)/integer(c_int)~ |
| ~$group_dset_f_dtype_single$~ | Single precision datatype of the dataset [Fortran] | ~real(4)/integer(4)~ | | ~$group_dset_f_dtype_single$~ | Single precision datatype of the dataset [Fortran] | ~real(c_float)/integer(c_int)~ |
| ~$group_dset_f_dtype_double$~ | Double precision datatype of the dataset [Fortran] | ~real(8)/integer(8)~ | | ~$group_dset_f_dtype_double$~ | Double precision datatype of the dataset [Fortran] | ~real(c_double)/integer(c_long)~ |
| ~$group_dset_f_dims$~ | Dimensions in Fortran | ~(:,:)~ | | ~$group_dset_f_dims$~ | Dimensions in Fortran | ~(:,:)~ |
| ~$group_dset_py_dtype$~ | Standard datatype of the dataset [Python] | ~float/int~ | | ~$group_dset_py_dtype$~ | Standard datatype of the dataset [Python] | ~float/int~ |
| ~$default_prec$~ | Default precision for read/write without suffix [C] | ~64/32~ | | ~$default_prec$~ | Default precision for read/write without suffix [C] | ~64/32~ |
@ -1467,9 +1467,9 @@ trexio_has_$group_num$ (trexio_t* const file)
#+begin_src f90 :tangle write_attr_num_64_front_fortran.f90 #+begin_src f90 :tangle write_attr_num_64_front_fortran.f90
interface interface
integer function trexio_write_$group_num$_64 (trex_file, num) bind(C) integer(c_int) function trexio_write_$group_num$_64 (trex_file, num) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_num_f_dtype_double$, intent(in), value :: num $group_num_f_dtype_double$, intent(in), value :: num
end function trexio_write_$group_num$_64 end function trexio_write_$group_num$_64
end interface end interface
@ -1477,9 +1477,9 @@ end interface
#+begin_src f90 :tangle read_attr_num_64_front_fortran.f90 #+begin_src f90 :tangle read_attr_num_64_front_fortran.f90
interface interface
integer function trexio_read_$group_num$_64 (trex_file, num) bind(C) integer(c_int) function trexio_read_$group_num$_64 (trex_file, num) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_num_f_dtype_double$, intent(out) :: num $group_num_f_dtype_double$, intent(out) :: num
end function trexio_read_$group_num$_64 end function trexio_read_$group_num$_64
end interface end interface
@ -1487,9 +1487,9 @@ end interface
#+begin_src f90 :tangle write_attr_num_32_front_fortran.f90 #+begin_src f90 :tangle write_attr_num_32_front_fortran.f90
interface interface
integer function trexio_write_$group_num$_32 (trex_file, num) bind(C) integer(c_int) function trexio_write_$group_num$_32 (trex_file, num) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_num_f_dtype_single$, intent(in), value :: num $group_num_f_dtype_single$, intent(in), value :: num
end function trexio_write_$group_num$_32 end function trexio_write_$group_num$_32
end interface end interface
@ -1497,9 +1497,9 @@ end interface
#+begin_src f90 :tangle read_attr_num_32_front_fortran.f90 #+begin_src f90 :tangle read_attr_num_32_front_fortran.f90
interface interface
integer function trexio_read_$group_num$_32 (trex_file, num) bind(C) integer(c_int) function trexio_read_$group_num$_32 (trex_file, num) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_num_f_dtype_single$, intent(out) :: num $group_num_f_dtype_single$, intent(out) :: num
end function trexio_read_$group_num$_32 end function trexio_read_$group_num$_32
end interface end interface
@ -1507,9 +1507,9 @@ end interface
#+begin_src f90 :tangle write_attr_num_def_front_fortran.f90 #+begin_src f90 :tangle write_attr_num_def_front_fortran.f90
interface interface
integer function trexio_write_$group_num$ (trex_file, num) bind(C) integer(c_int) function trexio_write_$group_num$ (trex_file, num) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_num_f_dtype_default$, intent(in), value :: num $group_num_f_dtype_default$, intent(in), value :: num
end function trexio_write_$group_num$ end function trexio_write_$group_num$
end interface end interface
@ -1517,9 +1517,9 @@ end interface
#+begin_src f90 :tangle read_attr_num_def_front_fortran.f90 #+begin_src f90 :tangle read_attr_num_def_front_fortran.f90
interface interface
integer function trexio_read_$group_num$ (trex_file, num) bind(C) integer(c_int) function trexio_read_$group_num$ (trex_file, num) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_num_f_dtype_default$, intent(out) :: num $group_num_f_dtype_default$, intent(out) :: num
end function trexio_read_$group_num$ end function trexio_read_$group_num$
end interface end interface
@ -1527,9 +1527,9 @@ end interface
#+begin_src f90 :tangle has_attr_num_front_fortran.f90 #+begin_src f90 :tangle has_attr_num_front_fortran.f90
interface interface
integer function trexio_has_$group_num$ (trex_file) bind(C) integer(c_int) function trexio_has_$group_num$ (trex_file) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
end function trexio_has_$group_num$ end function trexio_has_$group_num$
end interface end interface
#+end_src #+end_src
@ -2130,9 +2130,9 @@ trexio_has_$group_dset$ (trexio_t* const file)
#+begin_src f90 :tangle write_dset_data_64_front_fortran.f90 #+begin_src f90 :tangle write_dset_data_64_front_fortran.f90
interface interface
integer function trexio_write_$group_dset$_64 (trex_file, dset) bind(C) integer(c_int) function trexio_write_$group_dset$_64 (trex_file, dset) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_dset_f_dtype_double$, intent(in) :: dset$group_dset_f_dims$ $group_dset_f_dtype_double$, intent(in) :: dset$group_dset_f_dims$
end function trexio_write_$group_dset$_64 end function trexio_write_$group_dset$_64
end interface end interface
@ -2140,9 +2140,9 @@ end interface
#+begin_src f90 :tangle read_dset_data_64_front_fortran.f90 #+begin_src f90 :tangle read_dset_data_64_front_fortran.f90
interface interface
integer function trexio_read_$group_dset$_64 (trex_file, dset) bind(C) integer(c_int) function trexio_read_$group_dset$_64 (trex_file, dset) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_dset_f_dtype_double$, intent(out) :: dset$group_dset_f_dims$ $group_dset_f_dtype_double$, intent(out) :: dset$group_dset_f_dims$
end function trexio_read_$group_dset$_64 end function trexio_read_$group_dset$_64
end interface end interface
@ -2150,9 +2150,9 @@ end interface
#+begin_src f90 :tangle write_dset_data_32_front_fortran.f90 #+begin_src f90 :tangle write_dset_data_32_front_fortran.f90
interface interface
integer function trexio_write_$group_dset$_32 (trex_file, dset) bind(C) integer(c_int) function trexio_write_$group_dset$_32 (trex_file, dset) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_dset_f_dtype_single$, intent(in) :: dset$group_dset_f_dims$ $group_dset_f_dtype_single$, intent(in) :: dset$group_dset_f_dims$
end function trexio_write_$group_dset$_32 end function trexio_write_$group_dset$_32
end interface end interface
@ -2160,9 +2160,9 @@ end interface
#+begin_src f90 :tangle read_dset_data_32_front_fortran.f90 #+begin_src f90 :tangle read_dset_data_32_front_fortran.f90
interface interface
integer function trexio_read_$group_dset$_32 (trex_file, dset) bind(C) integer(c_int) function trexio_read_$group_dset$_32 (trex_file, dset) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_dset_f_dtype_single$, intent(out) :: dset$group_dset_f_dims$ $group_dset_f_dtype_single$, intent(out) :: dset$group_dset_f_dims$
end function trexio_read_$group_dset$_32 end function trexio_read_$group_dset$_32
end interface end interface
@ -2170,9 +2170,9 @@ end interface
#+begin_src f90 :tangle write_dset_data_def_front_fortran.f90 #+begin_src f90 :tangle write_dset_data_def_front_fortran.f90
interface interface
integer function trexio_write_$group_dset$ (trex_file, dset) bind(C) integer(c_int) function trexio_write_$group_dset$ (trex_file, dset) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_dset_f_dtype_default$, intent(in) :: dset$group_dset_f_dims$ $group_dset_f_dtype_default$, intent(in) :: dset$group_dset_f_dims$
end function trexio_write_$group_dset$ end function trexio_write_$group_dset$
end interface end interface
@ -2180,9 +2180,9 @@ end interface
#+begin_src f90 :tangle read_dset_data_def_front_fortran.f90 #+begin_src f90 :tangle read_dset_data_def_front_fortran.f90
interface interface
integer function trexio_read_$group_dset$ (trex_file, dset) bind(C) integer(c_int) function trexio_read_$group_dset$ (trex_file, dset) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
$group_dset_f_dtype_default$, intent(out) :: dset$group_dset_f_dims$ $group_dset_f_dtype_default$, intent(out) :: dset$group_dset_f_dims$
end function trexio_read_$group_dset$ end function trexio_read_$group_dset$
end interface end interface
@ -2190,9 +2190,9 @@ end interface
#+begin_src f90 :tangle has_dset_data_front_fortran.f90 #+begin_src f90 :tangle has_dset_data_front_fortran.f90
interface interface
integer function trexio_has_$group_dset$ (trex_file) bind(C) integer(c_int) function trexio_has_$group_dset$ (trex_file) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
end function trexio_has_$group_dset$ end function trexio_has_$group_dset$
end interface end interface
#+end_src #+end_src
@ -2739,82 +2739,82 @@ trexio_has_$group_dset$ (trexio_t* const file)
#+begin_src f90 :tangle write_dset_sparse_front_fortran.f90 #+begin_src f90 :tangle write_dset_sparse_front_fortran.f90
interface interface
integer function trexio_write_$group_dset$ (trex_file, & integer(c_int) function trexio_write_$group_dset$ (trex_file, &
offset_file, buffer_size, & offset_file, buffer_size, &
index_sparse, value_sparse) bind(C) index_sparse, value_sparse) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
integer(8), intent(in), value :: offset_file integer(c_long), intent(in), value :: offset_file
integer(8), intent(in), value :: buffer_size integer(c_long), intent(in), value :: buffer_size
integer(4), intent(in) :: index_sparse(*) integer(c_int), intent(in) :: index_sparse(*)
double precision, intent(in) :: value_sparse(*) real(c_double), intent(in) :: value_sparse(*)
end function trexio_write_$group_dset$ end function trexio_write_$group_dset$
end interface end interface
interface interface
integer function trexio_write_safe_$group_dset$ (trex_file, & integer(c_int) function trexio_write_safe_$group_dset$ (trex_file, &
offset_file, buffer_size, & offset_file, buffer_size, &
index_sparse, index_size, & index_sparse, index_size, &
value_sparse, value_size) bind(C) value_sparse, value_size) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
integer(8), intent(in), value :: offset_file integer(c_long), intent(in), value :: offset_file
integer(8), intent(in), value :: buffer_size integer(c_long), intent(in), value :: buffer_size
integer(4), intent(in) :: index_sparse(*) integer(c_int), intent(in) :: index_sparse(*)
integer(8), intent(in), value :: index_size integer(c_long), intent(in), value :: index_size
double precision, intent(in) :: value_sparse(*) real(c_double), intent(in) :: value_sparse(*)
integer(8), intent(in), value :: value_size integer(c_long), intent(in), value :: value_size
end function trexio_write_safe_$group_dset$ end function trexio_write_safe_$group_dset$
end interface end interface
#+end_src #+end_src
#+begin_src f90 :tangle read_dset_sparse_front_fortran.f90 #+begin_src f90 :tangle read_dset_sparse_front_fortran.f90
interface interface
integer function trexio_read_$group_dset$ (trex_file, & integer(c_int) function trexio_read_$group_dset$ (trex_file, &
offset_file, buffer_size, & offset_file, buffer_size, &
index_sparse, value_sparse) bind(C) index_sparse, value_sparse) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
integer(8), intent(in), value :: offset_file integer(c_long), intent(in), value :: offset_file
integer(8), intent(inout) :: buffer_size integer(c_long), intent(inout) :: buffer_size
integer(4), intent(out) :: index_sparse(*) integer(c_int), intent(out) :: index_sparse(*)
double precision, intent(out) :: value_sparse(*) real(c_double), intent(out) :: value_sparse(*)
end function trexio_read_$group_dset$ end function trexio_read_$group_dset$
end interface end interface
interface interface
integer function trexio_read_safe_$group_dset$ (trex_file, & integer(c_int) function trexio_read_safe_$group_dset$ (trex_file, &
offset_file, buffer_size, & offset_file, buffer_size, &
index_sparse, index_size, & index_sparse, index_size, &
value_sparse, value_size) bind(C) value_sparse, value_size) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
integer(8), intent(in), value :: offset_file integer(c_long), intent(in), value :: offset_file
integer(8), intent(inout) :: buffer_size integer(c_long), intent(inout) :: buffer_size
integer(4), intent(out) :: index_sparse(*) integer(c_int), intent(out) :: index_sparse(*)
integer(8), intent(in), value :: index_size integer(c_long), intent(in), value :: index_size
double precision, intent(out) :: value_sparse(*) real(c_double), intent(out) :: value_sparse(*)
integer(8), intent(in), value :: value_size integer(c_long), intent(in), value :: value_size
end function trexio_read_safe_$group_dset$ end function trexio_read_safe_$group_dset$
end interface end interface
#+end_src #+end_src
#+begin_src f90 :tangle read_dset_sparse_size_front_fortran.f90 #+begin_src f90 :tangle read_dset_sparse_size_front_fortran.f90
interface interface
integer function trexio_read_$group_dset$_size (trex_file, & integer(c_int) function trexio_read_$group_dset$_size (trex_file, &
size_max) bind(C) size_max) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
integer(8), intent(out) :: size_max integer(c_long), intent(out) :: size_max
end function trexio_read_$group_dset$_size end function trexio_read_$group_dset$_size
end interface end interface
#+end_src #+end_src
#+begin_src f90 :tangle has_dset_sparse_front_fortran.f90 #+begin_src f90 :tangle has_dset_sparse_front_fortran.f90
interface interface
integer function trexio_has_$group_dset$ (trex_file) bind(C) integer(c_int) function trexio_has_$group_dset$ (trex_file) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
end function trexio_has_$group_dset$ end function trexio_has_$group_dset$
end interface end interface
#+end_src #+end_src
@ -3310,31 +3310,31 @@ trexio_has_$group_dset$ (trexio_t* const file)
#+begin_src f90 :tangle write_dset_str_front_fortran.f90 #+begin_src f90 :tangle write_dset_str_front_fortran.f90
interface interface
integer function trexio_write_$group_dset$_low (trex_file, dset, max_str_len) bind(C) integer(c_int) function trexio_write_$group_dset$_low (trex_file, dset, max_str_len) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
character, intent(in) :: dset(*) character(kind=c_char), intent(in) :: dset(*)
integer(4), intent(in), value :: max_str_len integer(c_int), intent(in), value :: max_str_len
end function trexio_write_$group_dset$_low end function trexio_write_$group_dset$_low
end interface end interface
#+end_src #+end_src
#+begin_src f90 :tangle read_dset_str_front_fortran.f90 #+begin_src f90 :tangle read_dset_str_front_fortran.f90
interface interface
integer function trexio_read_$group_dset$_low (trex_file, dset, max_str_len) bind(C) integer(c_int) function trexio_read_$group_dset$_low (trex_file, dset, max_str_len) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
character, intent(out) :: dset(*) character(kind=c_char), intent(out) :: dset(*)
integer(4), intent(in), value :: max_str_len integer(c_int), intent(in), value :: max_str_len
end function trexio_read_$group_dset$_low end function trexio_read_$group_dset$_low
end interface end interface
#+end_src #+end_src
#+begin_src f90 :tangle has_dset_str_front_fortran.f90 #+begin_src f90 :tangle has_dset_str_front_fortran.f90
interface interface
integer function trexio_has_$group_dset$ (trex_file) bind(C) integer(c_int) function trexio_has_$group_dset$ (trex_file) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
end function trexio_has_$group_dset$ end function trexio_has_$group_dset$
end interface end interface
#+end_src #+end_src
@ -3348,7 +3348,7 @@ end interface
character, allocatable :: str_compiled(:) character, allocatable :: str_compiled(:)
integer(8) :: $group_dset_dim$ integer(8) :: $group_dset_dim$
integer :: rc integer(4) :: rc
rc = trexio_read_$group_dset_dim$_64(trex_file, $group_dset_dim$) rc = trexio_read_$group_dset_dim$_64(trex_file, $group_dset_dim$)
if (rc /= TREXIO_SUCCESS) trexio_read_$group_dset$ = rc if (rc /= TREXIO_SUCCESS) trexio_read_$group_dset$ = rc
@ -3369,7 +3369,7 @@ end interface
#+end_src #+end_src
#+begin_src f90 :tangle helper_write_dset_str_front_fortran.fh_90 #+begin_src f90 :tangle helper_write_dset_str_front_fortran.fh_90
integer function trexio_write_$group_dset$ (trex_file, dset, max_str_len) integer(4) function trexio_write_$group_dset$ (trex_file, dset, max_str_len)
implicit none implicit none
integer(8), intent(in), value :: trex_file integer(8), intent(in), value :: trex_file
integer(4), intent(in), value :: max_str_len integer(4), intent(in), value :: max_str_len
@ -3626,33 +3626,33 @@ trexio_has_$group_str$ (trexio_t* const file)
#+begin_src f90 :tangle write_attr_str_front_fortran.f90 #+begin_src f90 :tangle write_attr_str_front_fortran.f90
interface interface
integer function trexio_write_$group_str$_c (trex_file, str, max_str_len) & integer(c_int) function trexio_write_$group_str$_c (trex_file, str, max_str_len) &
bind(C, name="trexio_write_$group_str$") bind(C, name="trexio_write_$group_str$")
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
character, intent(in) :: str(*) character(kind=c_char), intent(in) :: str(*)
integer(4), intent(in), value :: max_str_len integer(c_int), intent(in), value :: max_str_len
end function trexio_write_$group_str$_c end function trexio_write_$group_str$_c
end interface end interface
#+end_src #+end_src
#+begin_src f90 :tangle read_attr_str_front_fortran.f90 #+begin_src f90 :tangle read_attr_str_front_fortran.f90
interface interface
integer function trexio_read_$group_str$_c (trex_file, str, max_str_len) & integer(c_int) function trexio_read_$group_str$_c (trex_file, str, max_str_len) &
bind(C, name="trexio_read_$group_str$") bind(C, name="trexio_read_$group_str$")
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
character, intent(out) :: str(*) character(kind=c_char), intent(out) :: str(*)
integer(4), intent(in), value :: max_str_len integer(c_int), intent(in), value :: max_str_len
end function trexio_read_$group_str$_c end function trexio_read_$group_str$_c
end interface end interface
#+end_src #+end_src
#+begin_src f90 :tangle has_attr_str_front_fortran.f90 #+begin_src f90 :tangle has_attr_str_front_fortran.f90
interface interface
integer function trexio_has_$group_str$ (trex_file) bind(C) integer(c_int) function trexio_has_$group_str$ (trex_file) bind(C)
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
integer(8), intent(in), value :: trex_file integer(c_long), intent(in), value :: trex_file
end function trexio_has_$group_str$ end function trexio_has_$group_str$
end interface end interface
#+end_src #+end_src
@ -3814,7 +3814,7 @@ contains
integer, intent(in), value :: max_len_str ! maximum length of a string in an array integer, intent(in), value :: max_len_str ! maximum length of a string in an array
character(len=*), intent(in) :: str_array(*) character(len=*), intent(in) :: str_array(*)
character(len=:), allocatable, intent(out) :: str_res character(len=:), allocatable, intent(out) :: str_res
integer :: i integer(8) :: i
str_res = '' str_res = ''
do i = 1, max_num_str do i = 1, max_num_str
@ -3837,13 +3837,11 @@ contains
character(len=*), intent(inout) :: str_array(*) character(len=*), intent(inout) :: str_array(*)
character(len=max_len_str) :: tmp_str character(len=max_len_str) :: tmp_str
integer :: i, j, k, ind, offset integer(8) :: len_flat, i, j, k, ind
integer(8) :: len_flat
len_flat = (max_len_str+1)*max_num_str + 1 len_flat = (max_len_str+1)*max_num_str + 1
ind=1 ind=1
offset=1
do i=1,max_num_str do i=1,max_num_str
k = 1 k = 1
tmp_str='' tmp_str=''
@ -3856,7 +3854,6 @@ contains
k = k + 1 k = k + 1
enddo enddo
str_array(i)=tmp_str str_array(i)=tmp_str
offset=ind
enddo enddo
end subroutine trexio_str2strarray end subroutine trexio_str2strarray
@ -3882,7 +3879,7 @@ contains
else else
call trexio_string_of_error(trexio_rc, str) call trexio_string_of_error(trexio_rc, str)
print *, trim(str) print *, trim(str)
call exit(1) error stop 1
endif endif
end subroutine trexio_assert end subroutine trexio_assert

12
tools/generator_tools.py
View File

@ -494,9 +494,9 @@ def get_dtype_dict (dtype: str, target: str, rank = None, int_len_printf = None)
'default_prec' : '64', 'default_prec' : '64',
f'group_{target}_dtype' : 'double', f'group_{target}_dtype' : 'double',
f'group_{target}_h5_dtype' : 'native_double', f'group_{target}_h5_dtype' : 'native_double',
f'group_{target}_f_dtype_default' : 'real(8)', f'group_{target}_f_dtype_default' : 'real(c_double)',
f'group_{target}_f_dtype_double' : 'real(8)', f'group_{target}_f_dtype_double' : 'real(c_double)',
f'group_{target}_f_dtype_single' : 'real(4)', f'group_{target}_f_dtype_single' : 'real(c_float)',
f'group_{target}_dtype_default' : 'double', f'group_{target}_dtype_default' : 'double',
f'group_{target}_dtype_double' : 'double', f'group_{target}_dtype_double' : 'double',
f'group_{target}_dtype_single' : 'float', f'group_{target}_dtype_single' : 'float',
@ -509,9 +509,9 @@ def get_dtype_dict (dtype: str, target: str, rank = None, int_len_printf = None)
'default_prec' : '32', 'default_prec' : '32',
f'group_{target}_dtype' : 'int64_t', f'group_{target}_dtype' : 'int64_t',
f'group_{target}_h5_dtype' : 'native_int64', f'group_{target}_h5_dtype' : 'native_int64',
f'group_{target}_f_dtype_default' : 'integer(4)', f'group_{target}_f_dtype_default' : 'integer(c_int)',
f'group_{target}_f_dtype_double' : 'integer(8)', f'group_{target}_f_dtype_double' : 'integer(c_long)',
f'group_{target}_f_dtype_single' : 'integer(4)', f'group_{target}_f_dtype_single' : 'integer(c_int)',
f'group_{target}_dtype_default' : 'int32_t', f'group_{target}_dtype_default' : 'int32_t',
f'group_{target}_dtype_double' : 'int64_t', f'group_{target}_dtype_double' : 'int64_t',
f'group_{target}_dtype_single' : 'int32_t', f'group_{target}_dtype_single' : 'int32_t',