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

Timestamp:

06/04/19 10:00:52 (5 years ago)

Author:

yushan

Message:

MARK: branch merged with trunk @1663. One output graph file with output file names in file writer filter.

File:

• XIOS/dev/dev_trunk_omp/src/workflow_graph.cpp (modified) (7 diffs)

XIOS/dev/dev_trunk_omp/src/workflow_graph.cpp

@@ -4 +4 @@
 {
 
-  std::unordered_map < StdString, std::unordered_map <StdString, vector <int> >    > *CWorkflowGraph::mapFieldToFilters_ptr = 0;
+  std::unordered_map <StdString, vector <int > > *CWorkflowGraph::mapFieldToFilters_ptr = 0;
   #pragma omp threadprivate(CWorkflowGraph::mapFieldToFilters_ptr)
 
-  std::unordered_map < StdString, std::unordered_map <int, StdString>  > *CWorkflowGraph::mapFilters_ptr = 0;
+  std::unordered_map <int, StdString> *CWorkflowGraph::mapFilters_ptr = 0;
   #pragma omp threadprivate(CWorkflowGraph::mapFilters_ptr)
 
-  std::unordered_map < StdString, std::unordered_map <int, vector<Time> >  > *CWorkflowGraph::mapFilterTimestamps_ptr = 0;
+  std::unordered_map <int,vector<Time> > *CWorkflowGraph::mapFilterTimestamps_ptr = 0;
   #pragma omp threadprivate(CWorkflowGraph::mapFilterTimestamps_ptr)
 
-  std::unordered_map< StdString, set<Time> >  *CWorkflowGraph::timestamps_ptr = 0;
+  set<Time>  *CWorkflowGraph::timestamps_ptr = 0;
   #pragma omp threadprivate(CWorkflowGraph::timestamps_ptr)
 
@@ -19 +19 @@
   vector <StdString> CWorkflowGraph::fields;
   vector <pair<int, int> > CWorkflowGraph::fieldsToFilters;
-
-  StdString CWorkflowGraph::my_filename = "my_filename";
-  #pragma omp threadprivate(CWorkflowGraph::my_filename)
-
-  std::map< StdString, int> *InvalidableObject::count_ptr=0;
-  #pragma omp threadprivate(InvalidableObject::count_ptr)
 
   CWorkflowGraph::CWorkflowGraph()
@@ -32 +26 @@
    * Reorganize information collected by XIOS for visualization.
    */
-  /*
-
   void CWorkflowGraph::buildStaticWorkflow()
   TRY
@@ -58 +50 @@
   }
   CATCH
-*/
-
-  void CWorkflowGraph::buildStaticWorkflow_forfile(StdString filename)
-  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)[filename].size());
-    fieldsToFilters.clear();
-    fields.clear();
-
-
-    for (std::unordered_map <int, StdString>::iterator it=(*mapFilters_ptr)[filename].begin(); it != (*mapFilters_ptr)[filename].end(); it++)
-    {
-      filters[it->first]=it->second;
-    }
-
-    // Create a list of fields and their filter connectivity (graph edges and edge-to-node connectivity)
-    for (std::unordered_map <StdString, vector <int > >::iterator it=(*mapFieldToFilters_ptr)[filename].begin(); it != (*mapFieldToFilters_ptr)[filename].end(); it++)
-    {
-      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);
-      }
-    }
-  }
-  CATCH
 
 
@@ -96 +58 @@
     for (auto it=mapFilters_ptr->begin(); it != mapFilters_ptr->end(); it++)
     {
-      for (auto it2=mapFilters_ptr->at(it->first).begin(); it2 != mapFilters_ptr->at(it->first).end(); it2++)
-        std::cout<<"mapFilters_ptr["<<it->first<<"]="<<it2->first<<"   "<<it2->second<<std::endl;
+      std::cout<<"mapFilters_ptr["<<it->first<<"]="<<it->second<<std::endl;
     }
     else std::cout<<"mapFilters_ptr empty"<<std::endl;
@@ -104 +65 @@
     for (auto it=mapFieldToFilters_ptr->begin(); it != mapFieldToFilters_ptr->end(); it++)
     {
-      for (auto it2=mapFieldToFilters_ptr->at(it->first).begin(); it2 != mapFieldToFilters_ptr->at(it->first).end(); it2++)
+      for (size_t i = 0; i < it->second.size(); i++)
       {
-        for (size_t i = 0; i < it2->second.size(); i++)
-          std::cout<<"mapFieldToFilters_ptr["<<it->first<<"]["<<it2->first<<"]["<<i<<"] = "<<it2->second[i]<<std::endl;
+        std::cout<<"mapFieldToFilters_ptr["<<it->first<<"]["<<i<<"] = "<<it->second[i]<<std::endl;
       }
     }
     else std::cout<<"mapFieldToFilters_ptr empty"<<mapFieldToFilters_ptr<<std::endl;
-/*
-    if(mapFilterTimestamps_ptr!=0 && !mapFilterTimestamps_ptr->empty())
+
+    /*if(mapFilterTimestamps_ptr!=0 && !mapFilterTimestamps_ptr->empty())
     for (auto it=mapFilterTimestamps_ptr->begin(); it != mapFilterTimestamps_ptr->end(); it++)
     {
@@ -133 +93 @@
 
 }
-