Changeset 1666


Ignore:
Timestamp:
05/20/19 13:32:31 (2 years ago)
Author:
yushan
Message:

MARK: branch merged with trunk @1663. boost.tar.gz updated to 1652 for visualization.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_trunk_omp/src/io/onetcdf4_impl.hpp

    r1646 r1666  
    7676    memset (PtrArrayStr,' ',stringArrayLen*data.numElements()); 
    7777    size_t offset=0 ; 
    78     Array<StdString,1>::const_iterator it, itb=data.begin(), ite=data.end() ; 
     78/*    Array<StdString,1>::const_iterator it, itb=data.begin(), ite=data.end() ; 
    7979    for(it=itb;it!=ite;++it, offset+=stringArrayLen) 
    8080    { 
     
    8282      PtrArrayStr[offset+it->size()]='\0' ; 
    8383    } 
     84*/ 
     85    for(int i=0;i<data.numElements();i++,offset+=stringArrayLen) 
     86    { 
     87      data(i).copy(PtrArrayStr+offset,data(i).size()) ; 
     88      PtrArrayStr[offset+data(i).size()]='\0' ; 
     89    }  
    8490 
    85      CTimer::get("CONetCDF4::writeData writeData_").resume(); 
    86      this->writeData_(grpid, varid, sstart, scount, PtrArrayStr); 
    87      CTimer::get("CONetCDF4::writeData writeData_").suspend(); 
     91    CTimer::get("CONetCDF4::writeData writeData_").resume(); 
     92    this->writeData_(grpid, varid, sstart, scount, PtrArrayStr); 
     93    CTimer::get("CONetCDF4::writeData writeData_").suspend(); 
    8894 
    8995    delete []  PtrArrayStr; 
Note: See TracChangeset for help on using the changeset viewer.