Changeset 1677 for XIOS/dev/dev_trunk_omp/src/workflow_graph.cpp

Timestamp:

06/25/19 16:14:54 (5 years ago)

Author:

yushan

Message:

MARK: Dynamic workflow graph developement. Branch up to date with trunk @1663.

File:

• XIOS/dev/dev_trunk_omp/src/workflow_graph.cpp (modified) (1 diff)

XIOS/dev/dev_trunk_omp/src/workflow_graph.cpp

@@ -29 +29 @@
   TRY
   {
-    // Create a list of filters (graph nodes)
-    if(mapFilters_ptr==0) mapFilters_ptr = new std::unordered_map <int, StdString>;
-    if(mapFieldToFilters_ptr==0) mapFieldToFilters_ptr = new std::unordered_map <StdString, vector <int > >;
-    size_t filterIdx = 0;
-    filters.resize(mapFilters_ptr->size());
-    for (auto it=mapFilters_ptr->begin(); it != mapFilters_ptr->end(); it++)
+    
+    if(mapFilters_ptr==0 || mapFieldToFilters_ptr==0) 
+      std::cout<<"No graph information provided"<<std::endl;
+
+    else // Create a list of filters (graph nodes)
     {
-      filters[it->first]=it->second;
-    }
+      size_t filterIdx = 0;
+      filters.resize(mapFilters_ptr->size());
+      fieldsToFilters.clear();
+      fields.clear();
+      for (auto it=mapFilters_ptr->begin(); it != mapFilters_ptr->end(); it++)
+      {
+        filters[it->first]=it->second;
+      }
 
-    // Create a list of fields and their filter connectivity (graph edges and edge-to-node connectivity)
-    for (auto it=mapFieldToFilters_ptr->begin(); it != mapFieldToFilters_ptr->end(); it++)
-    {
-      for (size_t i = 0; i < (it->second.size() - 1); i+=2)
+      // Create a list of fields and their filter connectivity (graph edges and edge-to-node connectivity)
+      for (auto it=mapFieldToFilters_ptr->begin(); it != mapFieldToFilters_ptr->end(); it++)
       {
-        fieldsToFilters.push_back(make_pair(it->second[i],it->second[i+1]));
-        fields.push_back(it->first);
+        for (size_t i = 0; i < (it->second.size() - 1); i+=2)
+        {
+          fieldsToFilters.push_back(make_pair(it->second[i],it->second[i+1]));
+          fields.push_back(it->first);
+        }
       }
     }