Changeset 586 for XIOS/trunk/src/interface

Timestamp:

04/01/15 17:53:02 (9 years ago)

Author:

mhnguyen

Message:

Fixing some bugs on writting non-distributed data

+) Implement scalar grid: Allow to send scalar real data
+) Modify the way to compute the mapping of buffer size from one client to a server
+) Fix a bug of writting axis on one_file mode
+) Make some changes in test_new_features.f90 and test_complete.f90

Test
+) On Curie,
+) test_client and test_complete pass and results are correct

Location:

XIOS/trunk/src/interface

Files:

• c/icdata.cpp (modified) (3 diffs)
• fortran/idata.F90 (modified) (2 diffs)
• fortran/ixios.F90 (modified) (2 diffs, 1 prop)

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

@@ -365 +365 @@
    // ---------------------- Ecriture des données ------------------------------
 
-   void cxios_write_data_k81(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize)
+   void cxios_write_data_k80(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize)
    {
       std::string fieldid_str;
@@ -380 +380 @@
    }
 
-   void cxios_write_data_k82(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize)
-   {
-      std::string fieldid_str;
-      if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return;
-
-      CTimer::get("XIOS").resume() ;
-      CTimer::get("XIOS send field").resume() ;
-      CContext* context = CContext::getCurrent() ;
-      if (!context->hasServer) context->client->checkBuffers() ;
-
-      CArray<double,2>data(data_k8,shape(data_Xsize,data_Ysize),neverDeleteData) ;
-      CField::get(fieldid_str)->setData(data) ;
-      CTimer::get("XIOS send field").suspend() ;
-      CTimer::get("XIOS").suspend() ;
-   }
-
-   void cxios_write_data_k83(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize, int data_Zsize)
-   {
-      std::string fieldid_str;
-      if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return;
-
-      CTimer::get("XIOS").resume() ;
-      CTimer::get("XIOS send field").resume() ;
-      CContext* context = CContext::getCurrent() ;
-      if (!context->hasServer) context->client->checkBuffers() ;
-
-      CArray<double,3>data(data_k8,shape(data_Xsize,data_Ysize,data_Zsize),neverDeleteData) ;
-      CField::get(fieldid_str)->setData(data) ;
-      CTimer::get("XIOS send field").suspend() ;
-      CTimer::get("XIOS").suspend() ;
-   }
-
-   void cxios_write_data_k41(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize)
+   void cxios_write_data_k40(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize)
    {
       std::string fieldid_str;
@@ -430 +398 @@
    }
 
+   void cxios_write_data_k81(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize)
+   {
+      std::string fieldid_str;
+      if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return;
+
+      CTimer::get("XIOS").resume() ;
+      CTimer::get("XIOS send field").resume() ;
+      CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
+      CArray<double,(StdSize)1> data(data_k8,shape(data_Xsize),neverDeleteData) ;
+      CField::get(fieldid_str)->setData(data) ;
+      CTimer::get("XIOS send field").suspend() ;
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   void cxios_write_data_k82(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize)
+   {
+      std::string fieldid_str;
+      if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return;
+
+      CTimer::get("XIOS").resume() ;
+      CTimer::get("XIOS send field").resume() ;
+      CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
+
+      CArray<double,2>data(data_k8,shape(data_Xsize,data_Ysize),neverDeleteData) ;
+      CField::get(fieldid_str)->setData(data) ;
+      CTimer::get("XIOS send field").suspend() ;
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   void cxios_write_data_k83(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize, int data_Zsize)
+   {
+      std::string fieldid_str;
+      if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return;
+
+      CTimer::get("XIOS").resume() ;
+      CTimer::get("XIOS send field").resume() ;
+      CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
+
+      CArray<double,3>data(data_k8,shape(data_Xsize,data_Ysize,data_Zsize),neverDeleteData) ;
+      CField::get(fieldid_str)->setData(data) ;
+      CTimer::get("XIOS send field").suspend() ;
+      CTimer::get("XIOS").suspend() ;
+   }
+
+   void cxios_write_data_k41(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize)
+   {
+      std::string fieldid_str;
+     if (!cstr2string(fieldid, fieldid_size, fieldid_str)) return;
+
+      CTimer::get("XIOS").resume() ;
+      CTimer::get("XIOS send field").resume() ;
+      CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
+
+      CArray<float,1> data_tmp(data_k4,shape(data_Xsize),neverDeleteData) ;
+      CArray<double,1> data(data_Xsize) ;
+      data=data_tmp ;
+      CField::get(fieldid_str)->setData(data) ;
+      CTimer::get("XIOS send field").suspend() ;
+      CTimer::get("XIOS").suspend() ;
+   }
+
    void cxios_write_data_k42(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize, int data_Ysize)
    {

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

@@ -48 +48 @@
       SUBROUTINE  cxios_solve_inheritance() BIND(C)
       END SUBROUTINE cxios_solve_inheritance
+
+      SUBROUTINE cxios_write_data_k80(fieldid, fieldid_size, data_k8, data_Xsize) BIND(C)
+         USE ISO_C_BINDING
+         CHARACTER(kind = C_CHAR)  , DIMENSION(*) :: fieldid
+         REAL     (kind = C_DOUBLE)               :: data_k8
+         INTEGER  (kind = C_INT)   , VALUE        :: fieldid_size
+         INTEGER  (kind = C_INT)   , VALUE        :: data_Xsize
+      END SUBROUTINE cxios_write_data_k80
+
+      SUBROUTINE cxios_write_data_k40(fieldid, fieldid_size, data_k4, data_Xsize) BIND(C)
+         USE ISO_C_BINDING
+         CHARACTER(kind = C_CHAR)  , DIMENSION(*) :: fieldid
+         REAL     (kind = C_FLOAT)                :: data_k4
+         INTEGER  (kind = C_INT)   , VALUE        :: fieldid_size
+         INTEGER  (kind = C_INT)   , VALUE        :: data_Xsize
+      END SUBROUTINE cxios_write_data_k40
 
 
@@ -261 +277 @@
 
 
+   SUBROUTINE xios(send_field_r8)(fieldid, data_k8)
+   IMPLICIT NONE
+      CHARACTER(len = *) , INTENT(IN) :: fieldid
+      REAL     (kind = 8), INTENT(IN) :: data_k8
+      CALL cxios_write_data_k80(fieldid, len(fieldid), data_k8, 1)
+   END SUBROUTINE xios(send_field_r8)
+
+   SUBROUTINE xios(send_field_r4)(fieldid, data_k4)
+   IMPLICIT NONE
+      CHARACTER(len = *) , INTENT(IN) :: fieldid
+      REAL     (kind = 4), INTENT(IN) :: data_k4
+      CALL cxios_write_data_k40(fieldid, len(fieldid), data_k4, 1)
+   END SUBROUTINE xios(send_field_r4)
+
+
+
    SUBROUTINE xios(send_field_r8_1d)(fieldid, data1d_k8)
    IMPLICIT NONE

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

@@ -11 +11 @@
 
 USE icontext_attr, ONLY : xios(set_context_attr), xios(get_context_attr), xios(is_defined_context_attr)
+                  xios(setVar_logic), xios(setVar_char), xios(send_field_r8), xios(send_field_r4)
 
 USE idata, ONLY : xios(initialize), xios(init_server), xios(finalize), xios(context_initialize), xios(context_is_initialized), &
@@ -38 +39 @@
 
 USE ifield, ONLY : txios(field), txios(fieldgroup), xios(is_valid_field), xios(is_valid_fieldgroup)
+                    xios(send_field_r4_1d), xios(send_field_r4_2d), xios(send_field_r4_3d),              &
+                    xios(send_field_r8), xios(send_field_r4)
 
 USE ifield_attr, ONLY : xios(set_field_attr), xios(get_field_attr), xios(is_defined_field_attr)