Changeset 2115

Timestamp:

03/23/21 13:38:20 (3 years ago)

Author:

jderouillat

Message:

Backport fix 2099 : Fix problem in fortran-c interface about logical/bool.

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/interface/fortran/idata.F90 (modified) (10 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/interface/fortran/idata.F90

@@ -394 +394 @@
          CHARACTER(kind = C_CHAR)  , DIMENSION(*) :: vardid
          INTEGER  (kind = C_INT)   , VALUE        :: varid_size
-         LOGICAL  (kind = 4)                      :: data_logic
+         LOGICAL  (kind = C_BOOL)                 :: data_logic
          LOGICAL  (kind = C_BOOL)                 :: is_var_existed
       END SUBROUTINE cxios_get_variable_data_logic
@@ -436 +436 @@
          CHARACTER(kind = C_CHAR)  , DIMENSION(*) :: vardid
          INTEGER  (kind = C_INT)   , VALUE        :: varid_size
-         LOGICAL  (kind = 4)       , VALUE        :: data_logic
+         LOGICAL  (kind = C_BOOL)  , VALUE        :: data_logic
          LOGICAL  (kind = C_BOOL)                 :: is_var_existed
       END SUBROUTINE cxios_set_variable_data_logic
@@ -797 +797 @@
    ! Get variable functions
    LOGICAL FUNCTION xios(getVar_k8)(varId, data_k8)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len = *)               , INTENT(IN) :: varId
       REAL     (kind = 8)              , INTENT(OUT):: data_k8
@@ -808 +809 @@
 
    LOGICAL FUNCTION xios(getVar_k4)(varId, data_k4)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len = *)               , INTENT(IN) :: varId
       REAL     (kind = 4)              , INTENT(OUT):: data_k4
@@ -819 +821 @@
 
    LOGICAL FUNCTION xios(getVar_int)(varId, data_int)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len = *)               , INTENT(IN) :: varId
       INTEGER                          , INTENT(OUT):: data_int
@@ -830 +833 @@
 
    LOGICAL FUNCTION xios(getVar_logic)(varId, data_logic)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len  = *)              , INTENT(IN) :: varId
-      LOGICAL  (kind = 4)              , INTENT(OUT):: data_logic
-
-      CALL cxios_get_variable_data_logic(varId, len(varId), data_logic, val)
-
+      LOGICAL  , INTENT(OUT)                        :: data_logic
+      LOGICAL (C_BOOL)                              :: data_tmp
+
+      CALL cxios_get_variable_data_logic(varId, len(varId), data_tmp, val)
       xios(getVar_logic) = val
+      IF (val) data_logic = data_tmp
    END FUNCTION xios(getVar_logic)
 
    LOGICAL FUNCTION xios(getVar_char)(varId, data_char)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len  = *)              , INTENT(IN) :: varId
       CHARACTER(len  = *)              , INTENT(OUT):: data_char
@@ -853 +859 @@
    ! Set variable functions
    LOGICAL FUNCTION xios(setVar_k8)(varId, data_k8)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len = *)               , INTENT(IN) :: varId
       REAL     (kind = 8)              , INTENT(IN) :: data_k8
@@ -864 +871 @@
 
    LOGICAL FUNCTION xios(setVar_k4)(varId, data_k4)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len = *)               , INTENT(IN) :: varId
       REAL     (kind = 4)              , INTENT(IN) :: data_k4
@@ -875 +883 @@
 
    LOGICAL FUNCTION xios(setVar_int)(varId, data_int)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len = *)               , INTENT(IN) :: varId
       INTEGER                          , INTENT(IN) :: data_int
@@ -886 +895 @@
 
    LOGICAL FUNCTION xios(setVar_logic)(varId, data_logic)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len  = *)              , INTENT(IN) :: varId
       LOGICAL  (kind = 4)              , INTENT(IN) :: data_logic
-
-      CALL cxios_set_variable_data_logic(varId, len(varId), data_logic, val)
+      LOGICAL  (kind = C_BOOL)                      :: data_tmp
+
+      data_tmp = data_logic
+      CALL cxios_set_variable_data_logic(varId, len(varId), data_tmp, val)
 
       xios(setVar_logic) = val
+
    END FUNCTION xios(setVar_logic)
 
    LOGICAL FUNCTION xios(setVar_char)(varId, data_char)
-   IMPLICIT NONE
-      LOGICAL  (kind = 1)                           :: val
+   USE ISO_C_BINDING
+   IMPLICIT NONE
+      LOGICAL  (kind = C_BOOL)                      :: val
       CHARACTER(len  = *)              , INTENT(IN) :: varId
       CHARACTER(len  = *)              , INTENT(IN) :: data_char