Changeset 310

Timestamp:

02/14/12 13:52:39 (12 years ago)

Author:

ymipsl

Message:

Add xios_field_is_active functionnality

YM

Location:

XIOS/trunk/src

Files:

• context_client.cpp.old (deleted)
• fortran/field_interface.f90 (modified) (1 diff)
• fortran/icfield.cpp (modified) (1 diff)
• fortran/ifield.F90 (modified) (3 diffs)
• fortran/ixios.F90 (modified) (3 diffs)
• node/field.cpp (modified) (1 diff)
• node/field.hpp (modified) (1 diff)
• test/test_cs.f90 (modified) (1 diff)

XIOS/trunk/src/fortran/field_interface.f90

@@ -112 +112 @@
       END SUBROUTINE cxios_field_valid_id
 
+      SUBROUTINE cxios_field_is_active(field_hdl, ret) BIND(C)
+         USE ISO_C_BINDING
+         INTEGER  (kind = C_INTPTR_T), VALUE        :: field_hdl
+         LOGICAL  (kind = C_BOOL)                   :: ret
+      END SUBROUTINE cxios_field_is_active
+
    END INTERFACE
    

XIOS/trunk/src/fortran/icfield.cpp

@@ -293 +293 @@
    }
    
+   void cxios_field_is_active (XFieldPtr field_hdl, bool* ret)
+   {
+      *ret = field_hdl->isActive();
+   }
+   
 } // extern "C"

XIOS/trunk/src/fortran/ifield.F90

@@ -31 +31 @@
    END INTERFACE  
    !----------------------------------------------------------------------------
+   
    
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
@@ -318 +319 @@
    END FUNCTION  xios(is_valid_fieldgroup)
    
-   
+  LOGICAL FUNCTION xios(field_is_active_id(field_id))
+      IMPLICIT NONE
+      CHARACTER(len  = *)    , INTENT(IN) :: field_id
+      LOGICAL  (kind = 1)                 :: val
+      TYPE(txios(field))                 :: field_hdl
+      
+      CALL xios(get_field_handle)(field_id,field_hdl)
+      xios(field_is_active_id)=xios(field_is_active_hdl(field_hdl))
+
+   END FUNCTION  xios(field_is_active_id)
+   
+   
+   LOGICAL FUNCTION xios(field_is_active_hdl(field_hdl))
+      IMPLICIT NONE
+      TYPE(txios(field)),INTENT(IN)       :: field_hdl
+      LOGICAL  (kind = 1)                 :: ret
+      
+      CALL cxios_field_is_active(field_hdl%daddr, ret);
+      xios(field_is_active_hdl) = ret
+      
+   END FUNCTION  xios(field_is_active_hdl) 
  
    
@@ -544 +565 @@
       field_valid_id = val
    END FUNCTION  field_valid_id
+ 
 
    LOGICAL FUNCTION fieldgroup_valid_id(idt)

XIOS/trunk/src/fortran/ixios.F90

@@ -24 +24 @@
                    xios(set_fieldgroup_attr_hdl),xios(set_field_attr),xios(set_field_attr_hdl),      &
                    xios(get_field_handle), xios(get_fieldgroup_handle), xios(is_valid_field),        &
-                   xios(is_valid_fieldgroup)  
+                   xios(is_valid_fieldgroup),xios(field_is_active_id),xios(field_is_active_hdl)  
                    
 USE ifile, ONLY : txios(file), txios(filegroup), xios(set_file_attr),xios(set_file_attr_hdl), &
@@ -72 +72 @@
 END INTERFACE xios(send_field)
 
+INTERFACE xios(field_is_active)
+  MODULE PROCEDURE xios(field_is_active_id),xios(field_is_active_hdl)
+END INTERFACE
   
  PUBLIC :: txios(domain), txios(domaingroup),txios(field), txios(fieldgroup),txios(file), txios(filegroup), &
@@ -91 +94 @@
  PUBLIC :: xios(set_timestep),xios(update_calendar)
  PUBLIC :: xios(initialize), xios(init_server), xios(finalize), xios(context_initialize),                       &
-           xios(close_context_definition), xios(context_finalize), xios(send_field)
+           xios(close_context_definition), xios(context_finalize), xios(send_field),xios(field_is_active)
 
 END MODULE XIOS

XIOS/trunk/src/node/field.cpp

@@ -285 +285 @@
    bool CField::hasDirectFieldReference(void) const
    { 
-      return (!this->field_ref.isEmpty()); 
-   }
-   
+     return (!this->field_ref.isEmpty()); 
+   }
+   
+   bool CField::isActive(void) const
+   { 
+      return (!this->refObject.empty()); 
+   }
    //----------------------------------------------------------------
    

XIOS/trunk/src/node/field.hpp

@@ -99 +99 @@
          /// Test ///
          bool hasDirectFieldReference(void) const;
+         bool isActive(void) const;
 
          /// Traitements ///

XIOS/trunk/src/test/test_cs.f90

@@ -98 +98 @@
 
     CALL xios_close_context_definition()
+    
+    PRINT*,"field field_A is active ? ",xios_field_is_active("field_A")
     DO ts=1,96
       CALL xios_update_calendar(ts)