- Timestamp:
- 04/28/11 10:53:26 (13 years ago)
- Location:
- XMLIO_V2/dev/dev_rv
- Files:
-
- 1 added
- 2 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
XMLIO_V2/dev/dev_rv/Makefile.wk
r182 r185 16 16 GUI = no 17 17 NPROC = 3 18 CSUITE = intel18 CSUITE = gnu 19 19 PFORME = fedora-wk 20 20 FORTEXT = .f90 … … 317 317 buffer_list buffer_pair \ 318 318 data_treatment data_output \ 319 rebuild functor maskconfigure319 rebuild functor configure 320 320 321 321 # Sources des gestionnaires (contenues dans le dossier manager) -
XMLIO_V2/dev/dev_rv/src/xmlio/fortran/impi_interface.f90
r182 r185 85 85 86 86 ! ATTTENTION GROS BUG ICI SOUS GNU MAIS PAS INTEL ???????? voir datatype 87 ! PRINT *, datatype, MPI_CHARACTER 87 ! PRINT *, datatype, MPI_CHARACTER, xios_mpi_char 88 88 CALL MPI_GET_COUNT(status, MPI_CHARACTER, count, err) 89 89 END SUBROUTINE xios_mpi_get_count -
XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp
r179 r185 15 15 16 16 CXIOSManager::Initialise(CXIOSManager::CLIENT_SERVER, &argc, &argv); 17 17 18 CXIOSManager::AddClient("nemo" , 2, 2, &nemo_fake_entry); 18 19 //CXIOSManager::AddClient("orchidee", 1, 1, &orchidee_fake_entry); -
XMLIO_V2/dev/dev_rv/src/xmlio/manager/mpi_manager.cpp
r182 r185 190 190 if (error != mpi_success) 191 191 ERROR("CMPIManager::getReceivedDataSize (comm, rank)", << " MPI Error !"); 192 if (flag == false) return (0); 192 if (flag == false) return (0); 193 193 mpi_get_count(status, &type, &size, &error); 194 194 if (error != mpi_success) -
XMLIO_V2/dev/dev_rv/src/xmlio/node/domain.cpp
r184 r185 398 398 void CDomain::completeLonLat(void) 399 399 { 400 //ARRAY_CREATE(value, valuetype, numdims, extent)// todo 401 //ARRAY_CREATE(value, valuetype, numdims, extent) 402 400 403 ARRAY(double, 1) lonvalue_ = this->lonvalue.getValue(), 401 404 latvalue_ = this->latvalue.getValue(); … … 403 406 if (this->data_dim.getValue() == 2) 404 407 { 405 StdSize dn = this->ni.getValue() *this->nj.getValue();408 StdSize dn = this->ni.getValue() * this->nj.getValue(); 406 409 lonvalue_->resize(boost::extents[dn]); 407 410 latvalue_->resize(boost::extents[dn]); … … 424 427 } 425 428 } 426 427 429 } 428 430 else … … 560 562 void CDomain::completeMask(void) 561 563 { 562 this->local_mask->resize(boost::extents[ ni.getValue()][nj.getValue()]);564 this->local_mask->resize(boost::extents[zoom_ni_loc.getValue()][zoom_nj_loc.getValue()]); 563 565 } 564 566 -
XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.cpp
r184 r185 383 383 } 384 384 385 StdOFStream ofs(this->getId().c_str());386 for (StdSize h = 0; h < storeIndex_srv->size(); h++)387 {388 ofs << "(" << (*storeIndex_srv)[h] << ";"389 << (*out_i_index_srv)[h] << ","390 << (*out_j_index_srv)[h] << ","391 << (*out_l_index_srv)[h] << ")" << std::endl;392 }393 ofs.close();385 //~ StdOFStream ofs(this->getId().c_str()); 386 //~ for (StdSize h = 0; h < storeIndex_srv->size(); h++) 387 //~ { 388 //~ ofs << "(" << (*storeIndex_srv)[h] << ";" 389 //~ << (*out_i_index_srv)[h] << "," 390 //~ << (*out_j_index_srv)[h] << "," 391 //~ << (*out_l_index_srv)[h] << ")" << std::endl; 392 //~ } 393 //~ ofs.close(); 394 394 395 395 } … … 401 401 ARRAY(double, 1) storedServer) const 402 402 { 403 if ((this->storeIndex.size() 403 if ((this->storeIndex.size()-1 ) != storedClient.size()) 404 404 ERROR("CGrid::inputFieldServer(...)", 405 405 << "[ Nombre de tableau attendu = " << (this->storeIndex.size()-1) << ", " -
XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp
r183 r185 76 76 ARRAY(int, 2) mask = domain->getLocalMask(); 77 77 78 unsigned int ssize = domain-> ni.getValue() * domain->nj.getValue();78 unsigned int ssize = domain->zoom_ni_loc.getValue() * domain->zoom_nj_loc.getValue(); 79 79 bool isCurvilinear = (domain->lonvalue.getValue()->size() == ssize); 80 80 … … 97 97 case (MULTI_FILE) : 98 98 { 99 SuperClassWriter::addDimension(lonid_loc, domain-> ni.getValue());100 SuperClassWriter::addDimension(latid_loc, domain-> nj.getValue());99 SuperClassWriter::addDimension(lonid_loc, domain->zoom_ni_loc.getValue()); 100 SuperClassWriter::addDimension(latid_loc, domain->zoom_nj_loc.getValue()); 101 101 this->writeLocalAttributes(domain->ibegin.getValue(), domain->iend.getValue(), 102 102 domain->jbegin.getValue(), domain->jend.getValue(), -
XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.hpp
r183 r185 6 6 #include "exception.hpp" 7 7 #include "array.hpp" 8 #include "mask.hpp"9 8 #include "data_output.hpp" 10 9 #include "mpi_manager.hpp"
Note: See TracChangeset
for help on using the changeset viewer.