Changeset 204
- Timestamp:
- 05/25/11 15:19:14 (14 years ago)
- Location:
- XMLIO_V2/dev/dev_rv
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
XMLIO_V2/dev/dev_rv/Makefile.wk
r203 r204 13 13 MCOLOR = no 14 14 SHOWCMD = yes 15 VTK = yes15 VTK = no 16 16 GUI = no 17 17 NPROC = 6 -
XMLIO_V2/dev/dev_rv/src/xmlio/attribute_template.hpp
r173 r204 36 36 CAttributeTemplate(const CAttribute * const attribut); // Not implemented. 37 37 38 public : 39 38 40 /// Accesseur /// 39 41 inline ValueType getValue(void) const; -
XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.cpp
r198 r204 1 1 #include "buffer_pair.hpp" 2 3 #include "impi_interface.hpp" 2 4 3 5 namespace xmlioserver … … 9 11 : com_client_server(com_client_server) 10 12 , first(BUFFER_CLIENT_SIZE), second(BUFFER_CLIENT_SIZE) 11 , first_request( -1), second_request(-1)13 , first_request(mpi_request_null), second_request(mpi_request_null) 12 14 , currentBuffer(0) 13 15 { /* Ne rien faire de plus */ } … … 21 23 { 22 24 if ((currentBuffer == 0) && (first.getUsedSize() != 0) && 23 ((second_request == -1) || CMPIManager::Test (second_request)))25 ((second_request == mpi_request_null) || CMPIManager::Test (second_request))) 24 26 return (true); 25 27 26 28 if ((currentBuffer == 1) && (second.getUsedSize() != 0) && 27 ((first_request == -1) || CMPIManager::Test (first_request)))29 ((first_request == mpi_request_null) || CMPIManager::Test (first_request))) 28 30 return (true); 29 31 … … 38 40 { 39 41 CMPIManager::Wait(this->second_request); 40 this->second_request = -1;42 this->second_request = mpi_request_null; 41 43 return (this->second_request); 42 44 } … … 44 46 { 45 47 CMPIManager::Wait(this->first_request); 46 this->first_request = -1;48 this->first_request = mpi_request_null; 47 49 return (this->first_request); 48 50 } … … 58 60 (this->com_client_server, 0, this->first, this->first_request); 59 61 this->currentBuffer = 1; 60 this->second_request = -1;62 this->second_request = mpi_request_null; 61 63 this->second.clear(); 62 64 } … … 66 68 (this->com_client_server, 0, this->second, this->second_request); 67 69 this->currentBuffer = 0; 68 this->first_request = -1;70 this->first_request = mpi_request_null; 69 71 this->first.clear(); 70 72 } -
XMLIO_V2/dev/dev_rv/src/xmlio/data_output.cpp
r202 r204 72 72 this->writeField_(field); 73 73 this->writeTimeAxis_(field, calendar); 74 75 74 } 76 75 -
XMLIO_V2/dev/dev_rv/src/xmlio/date.cpp
r188 r204 44 44 StdOStream & operator<<(StdOStream & out, const CDate & date) 45 45 { 46 out << date.day << '/' << date.month << '/' << date.year << '-' 47 << date.hour << ':' << date.minute << ':' << date.second; 46 std::streamsize s = out.width (2); 47 char c = out.fill ('0'); 48 out << date.day << '/'; 49 s = out.width (2); c = out.fill ('0'); 50 out << date.month << '/'; 51 s = out.width (4); c = out.fill ('0'); 52 out << date.year << '-'; 53 s = out.width (2); c = out.fill ('0'); 54 out << date.hour << ':'; 55 s = out.width (2); c = out.fill ('0'); 56 out << date.minute << ':'; 57 s = out.width (2); c = out.fill ('0'); 58 out << date.second; 59 48 60 return (out); 49 61 } -
XMLIO_V2/dev/dev_rv/src/xmlio/fortran/impi_interface.f90
r185 r204 4 4 include "mpif.h" 5 5 6 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_success" ) :: xios_mpi_success = MPI_SUCCESS 7 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_comm_world" ) :: xios_mpi_comm_world = MPI_COMM_WORLD 8 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_char" ) :: xios_mpi_char = MPI_CHARACTER 9 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_status_size" ) :: xios_mpi_status_size = MPI_STATUS_SIZE 10 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_any_tag" ) :: xios_mpi_any_tag = MPI_ANY_TAG 6 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_success" ) :: xios_mpi_success = MPI_SUCCESS 7 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_comm_world" ) :: xios_mpi_comm_world = MPI_COMM_WORLD 8 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_char" ) :: xios_mpi_char = MPI_CHARACTER 9 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_status_size" ) :: xios_mpi_status_size = MPI_STATUS_SIZE 10 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_any_tag" ) :: xios_mpi_any_tag = MPI_ANY_TAG 11 INTEGER (kind = C_INT ), BIND(C, NAME = "mpi_request_null" ) :: xios_mpi_request_null = MPI_REQUEST_NULL 11 12 12 13 CONTAINS -
XMLIO_V2/dev/dev_rv/src/xmlio/fortran/impi_interface.hpp
r152 r204 13 13 extern int mpi_status_size; 14 14 extern int mpi_any_tag; 15 extern int mpi_request_null; 15 16 16 17 -
XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp
r202 r204 411 411 { 412 412 SuperClassWriter::addVariable(axisid, NC_DOUBLE, dims); 413 this->writeTimeAxisAttributes (axisid,414 415 "lol",416 "lol");413 this->writeTimeAxisAttributes 414 (axisid, cal->getId(), 415 StdString("seconds since ").append(cal->getInitDate().toString()), 416 cal->getInitDate().toString()); 417 417 } 418 418
Note: See TracChangeset
for help on using the changeset viewer.