Changeset 1689 for XIOS/dev/dev_trunk_omp/src/node/field.cpp

Timestamp:

08/06/19 13:00:08 (5 years ago)

Author:

yushan

Message:

dev for graph. up to date with trunk at r1684

File:

• XIOS/dev/dev_trunk_omp/src/node/field.cpp (modified) (9 diffs)

XIOS/dev/dev_trunk_omp/src/node/field.cpp

@@ -77 +77 @@
 
   //----------------------------------------------------------------
-
-
-   
 
    void CField::setVirtualVariableGroup(CVariableGroup* newVVariableGroup)
@@ -688 +685 @@
 
    //----------------------------------------------------------------
-   
+
    StdString CField::GetName(void)    { return StdString("field"); }
    StdString CField::GetDefName(void) { return CField::GetName(); }
@@ -920 +917 @@
    TRY
    {
-
      CContext* context = CContext::getCurrent();
      bool hasClient = context->hasClient;
@@ -1223 +1219 @@
          {
            fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this));
-           instantDataFilter->connectOutput(fileWriterFilter, 0);        
+           instantDataFilter->connectOutput(fileWriterFilter, 0);
          }
        }
@@ -1241 +1237 @@
            if (!field_ref.isEmpty())
            {
-             CField* fieldRef = CField::get(field_ref);
-             CGrid* gridRef = fieldRef->grid;
+             CGrid* gridRef = CField::get(field_ref)->grid;
 
              if (grid && grid != gridRef && grid->hasTransform())
              {
-               std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid,
-                                                                                         detectMissingValues, defaultValue);
+               std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid, detectMissingValues, defaultValue);
 
                filter->connectOutput(filters.first, 0);
-
-
                filter = filters.second;
-               
              }
            }
@@ -1354 +1345 @@
    TRY
    {
-
-      
-
      if (instantDataFilter || field_ref.isEmpty())
        ERROR("COutputPin* CField::getFieldReference(CGarbageCollector& gc)",
@@ -1510 +1498 @@
 
          selfReferenceFilter = clientSourceFilter;
-       }    
+       }
      }
 
@@ -1536 +1524 @@
      CContext* context = CContext::getCurrent();
 
-     // Time filter_start;
-     // if(!build_workflow_graph_start.isEmpty() && buildWorkflowGraph) filter_start = context->calendar->getInitDate()+build_workflow_graph_start;
-     // else if(build_workflow_graph_start.isEmpty() && buildWorkflowGraph) filter_start = 0;
-     // else filter_start = -1;
-
-     // Time filter_end;
-     // if(!build_workflow_graph_end.isEmpty() && buildWorkflowGraph) filter_end = context->calendar->getInitDate()+build_workflow_graph_end;
-     // else if(build_workflow_graph_end.isEmpty() && buildWorkflowGraph) filter_end = 9223372036854775807;
-     // else filter_end = -1;
-
-     // filter_start = this->field_graph_start;
-     // filter_end = this->field_graph_end;
-
-     // if(CXios::isClient) std::cout<<"getTemporalDataFilter field_id = "<<this->getId()<<" this->field_graph_start = "<<this->field_graph_start<<" this->field_graph_end = "<<this->field_graph_end<<std::endl;
 
      if (it == temporalDataFilters.end())
@@ -1614 +1588 @@
        std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
                                                                            CContext::getCurrent()->getCalendar()->getInitDate(),
-                                                                           freq_op, freq_offset, outFreq,
-                                                                           detectMissingValues));
+                                                                           freq_op, freq_offset, outFreq, detectMissingValues));
 
        selfReferenceFilter->connectOutput(temporalFilter, 0);