Changeset 1654

Timestamp:

03/08/19 16:59:14 (5 years ago)

Author:

oabramkina

Message:

Corrections for workflow visualization.

Location:

XIOS/dev/dev_olga

Files:

• arch/arch-X64_IRENE.env (modified) (1 diff)
• bld.cfg (modified) (1 diff)
• src/filter/file_server_writer_filter.cpp (modified) (1 diff)
• src/filter/file_writer_filter.cpp (modified) (3 diffs)
• src/filter/file_writer_filter.hpp (modified) (1 diff)
• src/filter/input_pin.hpp (modified) (1 diff)
• src/filter/output_pin.cpp (modified) (2 diffs)
• src/filter/output_pin.hpp (modified) (1 diff)
• src/filter/source_filter.cpp (modified) (1 diff)
• src/filter/source_filter.hpp (modified) (1 diff)
• src/filter/store_filter.cpp (modified) (1 diff)
• src/node/field.cpp (modified) (2 diffs)
• src/workflow_graph.cpp (modified) (1 diff)

XIOS/dev/dev_olga/arch/arch-X64_IRENE.env

@@ -1 +1 @@
 module unload netcdf-c netcdf-fortran hdf5 flavor perl hdf5 boost blitz mpi gnu
-module load gnu
-module load mpi/openmpi/2.0.2
 module load flavor/hdf5/parallel
 module load netcdf-fortran/4.4.4
 module load hdf5/1.8.20
+module load gnu
 module load boost
 module load blitz

XIOS/dev/dev_olga/bld.cfg

@@ -43 +43 @@
 bld::lib xios
 bld::target libxios.a 
-bld::target generate_fortran_interface.exe 
+#bld::target generate_fortran_interface.exe 
 #bld::target test_remap.exe
-#bld::target xios_server.exe 
+bld::target xios_server.exe 
 #bld::target test_regular.exe
 #bld::target test_xios2_cmip6.exe

XIOS/dev/dev_olga/src/filter/file_server_writer_filter.cpp

@@ -12 +12 @@
       ERROR("CFileServerWriterFilter::CFileServerWriterFilter(CField* field)",
             "The field cannot be null.");
-    filterId = InvalidableObject::count;
-    InvalidableObject::count++;
   }
 
   void CFileServerWriterFilter::onInputReady(std::vector<CDataPacketPtr> data)
   {
-    field->writeUpdateData(data[0]->data);
+    field->writeUpdateData(data[0]->data);    
   }
 

XIOS/dev/dev_olga/src/filter/file_writer_filter.cpp

@@ -7 +7 @@
 namespace xios
 {
-  CFileWriterFilter::CFileWriterFilter(CGarbageCollector& gc, CField* field)
+  CFileWriterFilter::CFileWriterFilter(CGarbageCollector& gc, CField* field, bool buildWorkflowGraph /* =false */)
     : CInputPin(gc, 1)
     , field(field)
@@ -14 +14 @@
       ERROR("CFileWriterFilter::CFileWriterFilter(CField* field)",
             "The field cannot be null.");
-    filterId = InvalidableObject::count;
-    InvalidableObject::count++;
+    if (buildWorkflowGraph)
+    {
+      filterId = InvalidableObject::count;
+      InvalidableObject::count++;
+    }
   }
 
@@ -38 +41 @@
 
     field->sendUpdateData(dataArray);
+
   }
 

XIOS/dev/dev_olga/src/filter/file_writer_filter.hpp

@@ -20 +20 @@
        * \param gc the associated garbage collector
        * \param field the associated field
+       * \param[in] buildWorkflowGraph indicates whether the workflow will be visualized
        */
-      CFileWriterFilter(CGarbageCollector& gc, CField* field);
+      CFileWriterFilter(CGarbageCollector& gc, CField* field, bool buildWorkflowGraph = false);
 
       inline StdString GetName(void) {return StdString("File writer filter");};

XIOS/dev/dev_olga/src/filter/input_pin.hpp

@@ -130 +130 @@
       //! Whether some triggers have been set
       bool hasTriggers;
+
   }; // class CInputPin
 } // namespace xios

XIOS/dev/dev_olga/src/filter/output_pin.cpp

@@ -10 +10 @@
     , buildWorkflowGraph(buildWorkflowGraph)
   {
-    filterId = InvalidableObject::count;
-    InvalidableObject::count++;
+    if (buildWorkflowGraph)
+    {
+      filterId = InvalidableObject::count;
+      InvalidableObject::count++;
+    }
   }
 
@@ -49 +52 @@
     }
     else
+    {
       deliverOuput(packet);
+    }
   }
 

XIOS/dev/dev_olga/src/filter/output_pin.hpp

@@ -97 +97 @@
       CGarbageCollector& gc; //!< The garbage collector associated to the output pin
 
-      //!< Whether the ouput should be triggered manually
+      //! Whether the ouput should be triggered manually
       bool manualTrigger;
 
-      //!< The list of connected filters and the corresponding slot numbers
+      //! The list of connected filters and the corresponding slot numbers
       std::vector<std::pair<std::shared_ptr<CInputPin>, size_t> > outputs;
 

XIOS/dev/dev_olga/src/filter/source_filter.cpp

@@ -25 +25 @@
             "Impossible to construct a source filter without providing a grid.");
   }
-
+  
   template <int N>
   void CSourceFilter::streamData(CDate date, const CArray<double, N>& data)

XIOS/dev/dev_olga/src/filter/source_filter.hpp

@@ -74 +74 @@
       const bool compression ; //!< indicates if data need to be compressed : on client side : true, on server side : false
       const bool mask ;        //!< indicates whether grid mask should be applied (true for clients, false for servers)
+      
   }; // class CSourceFilter
 } // namespace xios

XIOS/dev/dev_olga/src/filter/store_filter.cpp

@@ -21 +21 @@
       ERROR("CStoreFilter::CStoreFilter(CContext* context, CGrid* grid)",
             "Impossible to construct a store filter without providing a grid.");
-    filterId = InvalidableObject::count;
-    InvalidableObject::count++;
+//    filterId = InvalidableObject::count;
+//    InvalidableObject::count++;
   }
 

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

@@ -1212 +1212 @@
             instantDataFilter = clientSourceFilter = std::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, false, true, NoneDu, false,
                                                                                                       detectMissingValues, defaultValue, buildWorkflowGraph));
+            if (buildWorkflowGraph) CWorkflowGraph::mapFilters[instantDataFilter->getFilterId()] = instantDataFilter->GetName();
          }
        }
@@ -1227 +1228 @@
          if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write))
          {
-           fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this));
+           fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this, buildWorkflowGraph));
            getTemporalDataFilter(gc, file->output_freq)->connectOutput(fileWriterFilter, 0);
            if (buildWorkflowGraph)

XIOS/dev/dev_olga/src/workflow_graph.cpp

@@ -24 +24 @@
     // Create a list of filters (graph nodes)
     size_t filterIdx = 0;
+    filters.resize(mapFilters.size());
     for (auto it=mapFilters.begin(); it != mapFilters.end(); it++)
     {
-      filters.push_back(it->second);
+      filters[it->first]=it->second;
     }