Changeset 204

Timestamp:

05/25/11 15:19:14 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (1 diff)
• src/xmlio/attribute_template.hpp (modified) (1 diff)
• src/xmlio/buffer_pair.cpp (modified) (7 diffs)
• src/xmlio/data_output.cpp (modified) (1 diff)
• src/xmlio/date.cpp (modified) (1 diff)
• src/xmlio/fortran/impi_interface.f90 (modified) (1 diff)
• src/xmlio/fortran/impi_interface.hpp (modified) (1 diff)
• src/xmlio/output/nc4_data_output.cpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -13 +13 @@
 MCOLOR    = no
 SHOWCMD   = yes
-VTK       = yes
+VTK       = no
 GUI       = no
 NPROC     = 6

XMLIO_V2/dev/dev_rv/src/xmlio/attribute_template.hpp

@@ -36 +36 @@
             CAttributeTemplate(const CAttribute * const attribut); // Not implemented.
 
+          public :
+
             /// Accesseur ///
             inline ValueType getValue(void) const;

XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.cpp

@@ -1 +1 @@
 #include "buffer_pair.hpp"
+
+#include "impi_interface.hpp"
 
 namespace xmlioserver
@@ -9 +11 @@
          : com_client_server(com_client_server) 
          , first(BUFFER_CLIENT_SIZE), second(BUFFER_CLIENT_SIZE)
-         , first_request(-1), second_request(-1)
+         , first_request(mpi_request_null), second_request(mpi_request_null)
          , currentBuffer(0)
       { /* Ne rien faire de plus */ }
@@ -21 +23 @@
       {
          if ((currentBuffer  ==  0) && (first.getUsedSize()  != 0) &&
-            ((second_request == -1) || CMPIManager::Test (second_request)))
+            ((second_request == mpi_request_null) || CMPIManager::Test (second_request)))
              return (true);
              
          if ((currentBuffer  ==  1) && (second.getUsedSize() != 0) &&
-            ((first_request  == -1) || CMPIManager::Test (first_request)))
+            ((first_request  == mpi_request_null) || CMPIManager::Test (first_request)))
             return (true);
             
@@ -38 +40 @@
          {
             CMPIManager::Wait(this->second_request);
-            this->second_request = -1;
+            this->second_request = mpi_request_null;
             return (this->second_request);
          }
@@ -44 +46 @@
          {
             CMPIManager::Wait(this->first_request);
-            this->first_request = -1;
+            this->first_request = mpi_request_null;
             return (this->first_request);
          }
@@ -58 +60 @@
                (this->com_client_server, 0, this->first, this->first_request);
             this->currentBuffer  =  1;
-            this->second_request = -1;
+            this->second_request = mpi_request_null;
             this->second.clear();
          }
@@ -66 +68 @@
                (this->com_client_server, 0, this->second, this->second_request);
             this->currentBuffer =  0;
-            this->first_request = -1;
+            this->first_request = mpi_request_null;
             this->first.clear();
          }

XMLIO_V2/dev/dev_rv/src/xmlio/data_output.cpp

@@ -72 +72 @@
          this->writeField_(field);
          this->writeTimeAxis_(field, calendar);
-
       }
 

XMLIO_V2/dev/dev_rv/src/xmlio/date.cpp

@@ -44 +44 @@
       StdOStream & operator<<(StdOStream & out, const CDate & date)
       {
-         out << date.day  << '/' << date.month  << '/' << date.year   << '-'
-             << date.hour << ':' << date.minute << ':' << date.second;
+         std::streamsize s = out.width (2);
+         char c = out.fill ('0');
+         out << date.day << '/';
+         s = out.width (2); c = out.fill ('0');
+         out << date.month << '/';
+         s = out.width (4); c = out.fill ('0');
+         out << date.year << '-';
+         s = out.width (2); c = out.fill ('0');
+         out << date.hour << ':';
+         s = out.width (2); c = out.fill ('0');
+         out << date.minute << ':';
+         s = out.width (2); c = out.fill ('0');
+         out << date.second;
+         
          return (out);
       }

XMLIO_V2/dev/dev_rv/src/xmlio/fortran/impi_interface.f90

@@ -4 +4 @@
 include "mpif.h"
 
-   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_success" )     :: xios_mpi_success     = MPI_SUCCESS
-   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_comm_world" )  :: xios_mpi_comm_world  = MPI_COMM_WORLD
-   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_char" )        :: xios_mpi_char        = MPI_CHARACTER
-   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_status_size" ) :: xios_mpi_status_size = MPI_STATUS_SIZE
-   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_any_tag" )     :: xios_mpi_any_tag     = MPI_ANY_TAG
+   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_success" )      :: xios_mpi_success      = MPI_SUCCESS
+   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_comm_world" )   :: xios_mpi_comm_world   = MPI_COMM_WORLD
+   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_char" )         :: xios_mpi_char         = MPI_CHARACTER
+   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_status_size" )  :: xios_mpi_status_size  = MPI_STATUS_SIZE
+   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_any_tag" )      :: xios_mpi_any_tag      = MPI_ANY_TAG
+   INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_request_null" ) :: xios_mpi_request_null = MPI_REQUEST_NULL
 
    CONTAINS

XMLIO_V2/dev/dev_rv/src/xmlio/fortran/impi_interface.hpp

@@ -13 +13 @@
 extern int mpi_status_size;
 extern int mpi_any_tag;
+extern int mpi_request_null;
 
 

XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp

@@ -411 +411 @@
          {
             SuperClassWriter::addVariable(axisid, NC_DOUBLE, dims);
-            this->writeTimeAxisAttributes(axisid,
-                                         cal->getId(),
-                                         "lol",
-                                         "lol");
+            this->writeTimeAxisAttributes
+               (axisid, cal->getId(),
+                StdString("seconds since ").append(cal->getInitDate().toString()),
+                cal->getInitDate().toString());
          }