Changeset 1978

Timestamp:

11/12/20 12:06:26 (3 years ago)

Author:

ymipsl

Message:

Add get_current_context functionnality with string id, in fortran interface.

YM

Location:

XIOS/trunk/src/interface

Files:

• c/iccontext.cpp (modified) (1 diff)
• fortran/context_interface.f90 (modified) (1 diff)
• fortran/icontext.F90 (modified) (2 diffs)

XIOS/trunk/src/interface/c/iccontext.cpp

@@ -68 +68 @@
    CATCH_DUMP_STACK
 
+   void cxios_context_get_id(XContextPtr context, char * _id, int _id_len)
+   TRY
+   {
+      string_copy(context->getId(),_id,_id_len);
+   }
+   CATCH_DUMP_STACK
+   
    void cxios_context_set_current(XContextPtr context, bool withswap)
    TRY

XIOS/trunk/src/interface/fortran/context_interface.f90

@@ -16 +16 @@
       END SUBROUTINE cxios_context_get_current
 
+      SUBROUTINE cxios_context_get_id(context, idt, idt_size) BIND(C)
+         import C_CHAR, C_INTPTR_T, C_INT
+         INTEGER (kind = C_INTPTR_T) :: context
+         CHARACTER(kind = C_CHAR)    , DIMENSION(*) :: idt
+         INTEGER  (kind = C_INT)     , VALUE        :: idt_size
+     END SUBROUTINE cxios_context_get_id
+
       SUBROUTINE cxios_context_set_current(context, withswap) BIND(C)
          import C_BOOL, C_INT, C_INTPTR_T

XIOS/trunk/src/interface/fortran/icontext.F90

@@ -17 +17 @@
    END INTERFACE xios(set_current_context)
 
+   INTERFACE xios(get_current_context)
+      MODULE PROCEDURE xios(get_current_context_hdl), xios(get_current_context_id)
+   END INTERFACE xios(get_current_context)
+
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
 
@@ -27 +31 @@
    END SUBROUTINE xios(get_context_handle)
 
-   SUBROUTINE xios(get_current_context)(context)
+   SUBROUTINE xios(get_current_context_hdl)(context)
       IMPLICIT NONE
 
-      TYPE(txios(context)), INTENT(IN) :: context
+      TYPE(txios(context)), INTENT(OUT) :: context
 
       CALL cxios_context_get_current(context%daddr)
 
-   END SUBROUTINE xios(get_current_context)
+   END SUBROUTINE xios(get_current_context_hdl)
 
+   SUBROUTINE xios(get_current_context_id)(idt)
+      IMPLICIT NONE
+      CHARACTER(len = *) , INTENT(OUT) :: idt
+      TYPE(txios(context)) :: context
+
+      CALL cxios_context_get_current(context%daddr)
+      CALL cxios_context_get_id(context%daddr, idt, len(idt))
+
+   END SUBROUTINE xios(get_current_context_id)
+   
    SUBROUTINE xios(set_current_context_hdl)(context, withswap)
       IMPLICIT NONE