Ignore:
Timestamp:
05/30/21 23:30:01 (3 years ago)
Author:
yushan
Message:

temporal commit for merging graph into XIOS_coupling

Location:
XIOS/dev/dev_trunk_graph/src/filter
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/dev_trunk_graph/src/filter/client_from_client_source_filter.cpp

    r2027 r2137  
    3838    for (auto& subEvent : event.subEvents) (*subEvent.buffer) >> packet->timestamp  ; // better management of time lien later... 
    3939    packet->timestamp = date; 
    40  
     40          
    4141    grid_->getClientFromClientConnector()->transfer(event,packet->data) ; 
    4242 
    … …  
    5555    if (wasDataAlreadyReceived_) isDataLate = lastDateReceived_ + offset_ + freqOp_ <= currentDate ; 
    5656    else isDataLate = CContext::getCurrent()->getCalendar()->getInitDate()+ offset_ <= currentDate ; 
     57    return isDataLate ; 
    5758  } 
    5859 

  • XIOS/dev/dev_trunk_graph/src/filter/client_to_model_store_filter.cpp

    r2019 r2137  
    1919    if (hasMissingValue_) missingValue_  = field->default_value ; 
    2020    detectMissingValues_ = (!field->detect_missing_value.isEmpty() && hasMissingValue_); 
    21      
    2221  } 
    2322 

  • XIOS/dev/dev_trunk_graph/src/filter/client_to_server_store_filter.cpp

    r2027 r2137  
    3030    field_->getSentGrid()->getClientToServerConnector(client_)->transfer(data[0]->data, client_, event, message) ; 
    3131    CTimer::get("Field : send data").suspend(); 
    32    } 
    33    
     32  } 
     33 
    3434  void CClientToServerStoreFilter::buildWorkflowGraph(std::vector<CDataPacketPtr> data) 
    3535  { 
    … …  
    4848    } 
    4949  } 
     50   
     51  CContextClient* CClientToServerStoreFilter::getTransferedDataSize(map<int,int>& size) 
     52  { 
     53    size = field_->getSentGrid()->getClientToServerConnector(client_)->getTransferedDataSize() ; 
     54    return client_ ; 
     55  } 
    5056 
    5157  bool CClientToServerStoreFilter::mustAutoTrigger() const 

  • XIOS/dev/dev_trunk_graph/src/filter/client_to_server_store_filter.hpp

    r2019 r2137  
    2424       */ 
    2525      CClientToServerStoreFilter(CGarbageCollector& gc, CField* field, CContextClient* client); 
     26      /*! 
     27       * Get the size of data transfered by call. Needed for context client buffer size evaluation 
     28       * 
     29       * \param size : map returning the size for each server rank   
     30       * \return the associated context client 
     31       */ 
     32      CContextClient* getTransferedDataSize(map<int,int>& size) ; 
    2633 
    2734      /*! 

  • XIOS/dev/dev_trunk_graph/src/filter/pass_through_filter.cpp

    r2028 r2137  
    6060 
    6161} // namespace xios 
    62  

  • XIOS/dev/dev_trunk_graph/src/filter/server_to_client_store_filter.cpp

    r2019 r2137  
    5050  } 
    5151 
     52  CContextClient* CServerToClientStoreFilter::getTransferedDataSize(map<int,int>& size) 
     53  { 
     54    size = grid_->getServerToClientConnector()->getTransferedDataSize() ; 
     55    return client_ ; 
     56  } 
    5257 
    5358  bool CServerToClientStoreFilter::mustAutoTrigger() const 

  • XIOS/dev/dev_trunk_graph/src/filter/server_to_client_store_filter.hpp

    r2019 r2137  
    2525       */ 
    2626      CServerToClientStoreFilter(CGarbageCollector& gc, CField* field, CContextClient* client); 
     27 
     28      /*! 
     29       * Get the size of data transfered by call. Needed for context client buffer size evaluation 
     30       * 
     31       * \param size : map returning the size for each server rank   
     32       * \return the associated context client 
     33       */ 
     34      CContextClient* getTransferedDataSize(map<int,int>& size) ; 
    2735 
    2836      /*! 

  • XIOS/dev/dev_trunk_graph/src/filter/temporal_filter.cpp

    r2028 r2137  
    2323                        this->samplingOffset.second, this->samplingOffset.timestep) 
    2424    , initDate(initDate) 
     25//    , nextSamplingDate(initDate + (this->samplingOffset + initDate.getRelCalendar().getTimeStep())) 
    2526    , nextSamplingDate(initDate + offsetMonth + ( offsetAllButMonth + initDate.getRelCalendar().getTimeStep())) 
    2627    , nbOperationDates(1) 
    2728    , nbSamplingDates(0) 
     29//    , nextOperationDate(initDate + opFreq + this->samplingOffset) 
    2830    , isFirstOperation(true) 
    2931    , graphCycleCompleted(true) 
    … …  
    7375      { 
    7476        usePacket = (data[0]->date >= nextSamplingDate); 
     77//        outputResult = (data[0]->date + samplingFreq > nextOperationDate); 
    7578        outputResult = (data[0]->date  > initDate + nbOperationDates*opFreq - samplingFreq + offsetMonth + offsetAllButMonth); 
    7679        copyLess = (isInstantOperation && usePacket && outputResult); 
    … …  
    110113 
    111114        isFirstOperation = false; 
    112          
     115//        nextOperationDate = initDate + samplingFreq + nbOperationDates*opFreq - samplingFreq + offsetMonth + offsetAllButMonth; 
    113116        graphCycleCompleted = true; 
    114       } 
     117     } 
    115118    } 
    116119 
    … …  
    125128  bool CTemporalFilter::isDataExpected(const CDate& date) const 
    126129  { 
     130//    return isOnceOperation ? isFirstOperation : (date >= nextSamplingDate || date + samplingFreq > nextOperationDate); 
    127131    return isOnceOperation ? isFirstOperation : (date >= nextSamplingDate || date > initDate + nbOperationDates*opFreq - samplingFreq + offsetMonth + offsetAllButMonth); 
    128132  } 

  • XIOS/dev/dev_trunk_graph/src/filter/transform_filter.cpp

    r2028 r2137  
    1919    packet->timestamp = data[0]->timestamp; 
    2020    packet->status = data[0]->status; 
    21      
     21 
    2222    if (packet->status == CDataPacket::NO_ERROR)  
    2323    { 
Note: See TracChangeset for help on using the changeset viewer.