Changeset 2620 for XIOS3/trunk/src/interface/fortran/idata.F90

Timestamp:

03/20/24 14:48:11 (4 months ago)

Author:

jderouillat

Message:

Modify fortran-C interfaces to manage logical-bool conversion, the optimizations of OneAPI could produce bugs regarding the logical-bool encodings.

File:

• XIOS3/trunk/src/interface/fortran/idata.F90 (modified) (12 diffs)

XIOS3/trunk/src/interface/fortran/idata.F90

@@ -5 +5 @@
    USE ICONTEXT
    USE IFIELD
+   USE LOGICAL_BOOL_CONVERSION
 
    INTERFACE ! Ne pas appeler directement/Interface FORTRAN 2003 <-> C99
@@ -780 +781 @@
 
       CALL cxios_context_is_initialized(context_id, LEN(context_id), is_init)
+      CALL xios_bool_to_logical_0d(is_init)
       xios(context_is_initialized) = is_init
 
@@ -1347 +1349 @@
       CALL cxios_get_variable_data_k8(varId, len(varId), data_k8, val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(getVar_k8) = val
    END FUNCTION xios(getVar_k8)
@@ -1359 +1362 @@
       CALL cxios_get_variable_data_k4(varId, len(varId), data_k4, val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(getVar_k4) = val
    END FUNCTION xios(getVar_k4)
@@ -1371 +1375 @@
       CALL cxios_get_variable_data_int(varId, len(varId), data_int, val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(getVar_int) = val
    END FUNCTION xios(getVar_int)
@@ -1383 +1388 @@
 
       CALL cxios_get_variable_data_logic(varId, len(varId), data_tmp, val)
+      CALL xios_bool_to_logical_0d(val)
       xios(getVar_logic) = val
-      IF (val) data_logic = data_tmp
+      IF (val) THEN
+         CALL xios_bool_to_logical_0d(data_tmp)
+         data_logic = data_tmp
+      ENDIF
    END FUNCTION xios(getVar_logic)
 
@@ -1396 +1405 @@
       CALL cxios_get_variable_data_char(varId, len(varId), data_char, len(data_char), val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(getVar_char) = val
    END FUNCTION xios(getVar_char)
@@ -1409 +1419 @@
       CALL cxios_set_variable_data_k8(varId, len(varId), data_k8, val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(setVar_k8) = val
    END FUNCTION xios(setVar_k8)
@@ -1421 +1432 @@
       CALL cxios_set_variable_data_k4(varId, len(varId), data_k4, val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(setVar_k4) = val
    END FUNCTION xios(setVar_k4)
@@ -1433 +1445 @@
       CALL cxios_set_variable_data_int(varId, len(varId), data_int, val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(setVar_int) = val
    END FUNCTION xios(setVar_int)
@@ -1445 +1458 @@
 
       data_tmp = data_logic
+      CALL xios_logical_to_bool_0d(data_tmp)
       CALL cxios_set_variable_data_logic(varId, len(varId), data_tmp, val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(setVar_logic) = val
    END FUNCTION xios(setVar_logic)
@@ -1459 +1474 @@
       CALL cxios_set_variable_data_char(varId, len(varId), data_char, len(data_char), val)
 
+      CALL xios_bool_to_logical_0d(val)
       xios(setVar_char) = val
    END FUNCTION xios(setVar_char)