diff options
| author | Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> | 2022-09-28 23:57:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 15:57:51 -0600 |
| commit | 266453ce241452038e49e5d824dc1f4789185698 (patch) | |
| tree | 7da6c0ed6da5cd5432d8ea70ee8e4c4a537e81b9 /var | |
| parent | 81f9a5b7325de5036540f18538333a94ae966548 (diff) | |
| download | spack-266453ce241452038e49e5d824dc1f4789185698.tar.gz spack-266453ce241452038e49e5d824dc1f4789185698.tar.bz2 spack-266453ce241452038e49e5d824dc1f4789185698.tar.xz spack-266453ce241452038e49e5d824dc1f4789185698.zip | |
serialbox: enable building with NAG 7.1 (#32883)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/serialbox/nag/bool_getters.patch | 54 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/serialbox/package.py | 1 |
2 files changed, 55 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/serialbox/nag/bool_getters.patch b/var/spack/repos/builtin/packages/serialbox/nag/bool_getters.patch new file mode 100644 index 0000000000..4d23421040 --- /dev/null +++ b/var/spack/repos/builtin/packages/serialbox/nag/bool_getters.patch @@ -0,0 +1,54 @@ +# This patch is applicable starting version 2.3.1 +--- a/src/serialbox-fortran/m_serialize.f90 ++++ b/src/serialbox-fortran/m_serialize.f90 +@@ -634,11 +634,14 @@ SUBROUTINE fs_get_serializer_metainfo_b(serializer, key, val) + USE, INTRINSIC :: iso_c_binding + TYPE(C_PTR), INTENT(IN), VALUE :: serializer + CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: key +- LOGICAL, INTENT(OUT) :: val ++ INTEGER(KIND=C_INT), INTENT(OUT) :: val + END SUBROUTINE fs_get_serializer_metainfo_b_ + END INTERFACE + +- CALL fs_get_serializer_metainfo_b_(serializer%serializer_ptr, TRIM(key)//C_NULL_CHAR, val) ++ INTEGER(KIND=C_INT) :: c_val ++ CALL fs_get_serializer_metainfo_b_(serializer%serializer_ptr, TRIM(key)//C_NULL_CHAR, c_val) ++ ++ val = c_val /= 0 + END SUBROUTINE fs_get_serializer_metainfo_b + + SUBROUTINE fs_get_serializer_metainfo_i(serializer, key, val) +@@ -950,11 +953,14 @@ SUBROUTINE fs_get_field_metainfo_b(serializer, fieldname, key, val) + USE, INTRINSIC :: iso_c_binding + TYPE(C_PTR), INTENT(IN), VALUE :: serializer + CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: fieldname, key +- LOGICAL, INTENT(OUT) :: val ++ INTEGER(KIND=C_INT), INTENT(OUT) :: val + END SUBROUTINE fs_get_field_metainfo_b_ + END INTERFACE + +- CALL fs_get_field_metainfo_b_(serializer%serializer_ptr, TRIM(fieldname)//C_NULL_CHAR, TRIM(key)//C_NULL_CHAR, val) ++ INTEGER(KIND=C_INT) :: c_val ++ CALL fs_get_field_metainfo_b_(serializer%serializer_ptr, TRIM(fieldname)//C_NULL_CHAR, TRIM(key)//C_NULL_CHAR, c_val) ++ ++ val = c_val /= 0 + END SUBROUTINE fs_get_field_metainfo_b + + SUBROUTINE fs_get_field_metainfo_i(serializer, fieldname, key, val) +@@ -1466,11 +1472,14 @@ SUBROUTINE fs_get_savepoint_metainfo_b(savepoint, key, val) + USE, INTRINSIC :: iso_c_binding + TYPE(C_PTR), INTENT(IN), VALUE :: savepoint + CHARACTER(KIND=C_CHAR), DIMENSION(*), INTENT(IN) :: key +- LOGICAL, INTENT(OUT) :: val ++ INTEGER(KIND=C_INT), INTENT(OUT) :: val + END SUBROUTINE fs_get_savepoint_metainfo_b_ + END INTERFACE + +- CALL fs_get_savepoint_metainfo_b_(savepoint%savepoint_ptr, TRIM(key)//C_NULL_CHAR, val) ++ INTEGER(KIND=C_INT) :: c_val ++ CALL fs_get_savepoint_metainfo_b_(savepoint%savepoint_ptr, TRIM(key)//C_NULL_CHAR, c_val) ++ ++ val = c_val /= 0 + END SUBROUTINE fs_get_savepoint_metainfo_b + + SUBROUTINE fs_get_savepoint_metainfo_i(savepoint, key, val) diff --git a/var/spack/repos/builtin/packages/serialbox/package.py b/var/spack/repos/builtin/packages/serialbox/package.py index 5ec3fa8e88..8d7f24144d 100644 --- a/var/spack/repos/builtin/packages/serialbox/package.py +++ b/var/spack/repos/builtin/packages/serialbox/package.py @@ -62,6 +62,7 @@ class Serialbox(CMakePackage): patch("nag/interface.patch", when="@2.0.1:%nag+fortran") patch("nag/examples.patch", when="@2.3.1:%nag+fortran+examples") patch("nag/ftg.patch", when="@2.3.1:%nag+ftg") + patch("nag/bool_getters.patch", when="@2.3.1:%nag@7.1:+fortran") # Add missing include directives # (part of https://github.com/GridTools/serialbox/pull/259): |