Changeset 1685

Timestamp:

07/31/19 13:34:37 (6 years ago)

Author:

yushan

Message:

dev for graph

Location:

XIOS/dev/dev_trunk_omp

Files:

• GENERIC_TESTCASE/context_atm.xml (modified) (1 diff)
• GENERIC_TESTCASE/iodef.xml (modified) (2 diffs)
• inputs/vis.html (modified) (7 diffs)
• inputs/vis2.html (added)
• src/filter/binary_arithmetic_filter.hpp (modified) (1 diff)
• src/filter/file_writer_filter.cpp (modified) (1 diff)
• src/filter/output_pin.cpp (modified) (1 diff)
• src/filter/output_pin.hpp (modified) (2 diffs)
• src/filter/pass_through_filter.cpp (modified) (3 diffs)
• src/filter/spatial_transform_filter.cpp (modified) (4 diffs)
• src/filter/spatial_transform_filter.hpp (modified) (1 diff)
• src/filter/store_filter.cpp (modified) (1 diff)
• src/filter/temporal_filter.cpp (modified) (1 diff)
• src/node/field.cpp (modified) (3 diffs)
• src/node/field_impl.hpp (modified) (1 diff)

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/context_atm.xml

@@ -289 +289 @@
   
   <field_definition level="1" prec="8" operation="instant" freq_op="1ts" enabled=".true." default_value="1.e+20" detect_missing_value="true">
-    <field id="field2D" grid_ref="grid2D" />
-    <field id="field3D" grid_ref="grid3D" build_workflow_graph=".TRUE." />
+    <field id="field2D" grid_ref="grid2D" build_workflow_graph="false" />
+    <field id="field3D" grid_ref="grid3D" build_workflow_graph="true"  />
     <field id="pressure" grid_ref="grid3D"  />
     <field id="field3D_recv" read_access="true" grid_ref="grid3D"  field_ref="field3D" />
     <field id="field3D_resend" grid_ref="grid3D" />
 
-    <field id="field_X" grid_ref="grid_X" />
-    <field id="field_Y" grid_ref="grid_Y" />
-    <field id="field_Z" grid_ref="grid1D" />
+    <field id="field_X" grid_ref="grid_X" build_workflow_graph="false" />
+    <field id="field_Y" grid_ref="grid_Y" build_workflow_graph="false" />
+    <field id="field_Z" grid_ref="grid1D" build_workflow_graph="false" />
     <field id="field_XY" grid_ref="grid_XY" />
     <field id="field_XYZ" grid_ref="grid_XYZ" />

XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/iodef.xml

@@ -6 +6 @@
 
       <variable id="timestep"> 1h </variable>
-      <variable id="domain"> gaussian </variable>
+      <variable id="domain"> lmdz </variable>
       <variable id="domain_mask"> true </variable>
       <variable id="axis_mask"> true </variable>
@@ -54 +54 @@
         <variable id="info_level" type="int">100</variable>
         <variable id="print_file" type="bool">true</variable>
-        <variable id="using_server2" type="bool">true</variable>
+        <variable id="using_server2" type="bool">false</variable>
         <variable id="ratio_server2" type="int">50</variable>
         <variable id="pure_one_sided" type="bool">false</variable>

XIOS/dev/dev_trunk_omp/inputs/vis.html

@@ -42 +42 @@
         /* /!\ Use border-top-color not border-color for firefox compatibility */
 
-        /*  Source Filter */
-        #class_1 {
-            background-color: LightSlateGray;
-            border: 2px solid SlateGray;
-            border-top-color: SlateGray;
-        }
-
-        /* Arithmetic Filter */
-        #class_2 {
-            background-color: Khaki;
-            border: 2px solid DarkKhaki;
-            border-top-color: DarkKhaki;
-        }
-
-        /* Axis Trans. Filter */
-        #class_3 {
-            background-color: Orchid;
-            border: 2px solid DarkOrchid;
-            border-top-color: DarkOrchid;
-        }
-
-        /* Temporal Filter */
-        #class_4 {
-            background-color: Orange;
-            border: 2px solid DarkOrange;
-            border-top-color: DarkOrange;
-        }
-
-        /* Pass Through Filter */
-        #class_5 {
-            background-color: YellowGreen;
-            border: 2px solid OliveDrab;
-            border-top-color: OliveDrab;
-        }
-
-        /* File Writer Filter */
-        #class_6 {
-            background-color: LightGray;
-            border: 2px solid Gray;
-            border-top-color: Gray;
-        }
+ 
+        
     </style>
 
@@ -112 +73 @@
 
 
-            //===========================================================
-            $('#clusteringcid2').on('click', function() 
-            {
-                network.setData(data);
-                var clusterOptionsByData = 
-                {
-                    joinCondition:function(childOptions) 
-                    {
-                        return childOptions.cid === 2;
-                    },
-                    clusterNodeProperties: {id:'cidCluster', borderWidth:3, shape:'database'}
-                };
-                network.clustering.cluster(clusterOptionsByData);
-                var allNode = nodes.get();
-                nodes.update(allNode);
-            });
-
-
 
             //===========================================================
@@ -165 +108 @@
 
                 }
+
+
+            }); 
+
+
+            //===========================================================
+            $('#showGraph').on('click', function() 
+            {
+                //===== hide all except selected
+                var allNode = nodes.get();
+
+                for(i=0; i<allNode.length; i++)
+                {
+                    var node = allNode[i];
+
+                    if(node.hidden != true)
+                    {
+                        node.hidden = true;
+                    }
+                }
+
+                nodes.update(allNode);
+
+                var node = nodes.get(nodeSelected);
+                node.hidden = false;
+                nodes.update(node);
+
+                //===== enable all parents
+                console.log("showAllParents: allParentsNode = ", allParentsNode);
+                allNode = nodes.get(allParentsNode);
+
+                for (i = 0; i < allNode.length; i++) {
+                    node = allNode[i];
+                    node.font = {
+                        color:'black'
+                    }
+                    node.hidden = false;
+                    if(node.filled == 1)
+                    {                
+                        node.color = {
+                            background: redNode.background,
+                            border: redNode.border,
+                            hover: redNode.background,
+                            highlight: {
+                               background: redNode.background,
+                               border: 'blue'
+                            }
+                        }
+                    } 
+                    else
+                    {
+                        node.color = {
+                            background: styleArr[node.class].background,
+                            border: styleArr[node.class].border,
+                            highlight: {
+                                background: styleArr[node.class].background,
+                                border: 'blue'
+                            }
+                        }
+                    }   
+                }
+
+                nodes.update(allNode);
+
+                node = nodes.get(nodeSelected);
+                var connectedEdgeArray = edges.get(network.getConnectedEdges(node.id));
+                for (j = 0; j < connectedEdgeArray.length; j++)
+                {                        
+                    var edge = connectedEdgeArray[j];
+                    if(edge.to == node.id)
+                    {
+                        edge.hidden = false;
+                    }
+                    
+                }
+                edges.update(connectedEdgeArray);
+
+                allNode = nodes.get();
+                nodes.update(allNode);
+
+                //===== enable all children
+                allNode = nodes.get(allChildNode);
+
+                for (i = 0; i < allNode.length; i++) {
+                    node = allNode[i];
+                    node.font = {
+                        color:'black'
+                    }
+                    node.hidden = false;
+                    if(node.filled == 1)
+                    {                
+                        node.color = {
+                            background: redNode.background,
+                            border: redNode.border,
+                            hover: redNode.background,
+                            highlight: {
+                                background: redNode.background,
+                                border: 'blue'
+                            }
+                        }
+                    } 
+                    else
+                    {
+                        node.color = {
+                            background: styleArr[node.class].background,
+                            border: styleArr[node.class].border,
+                            highlight: {
+                                background: styleArr[node.class].background,
+                                border: 'blue'
+                            }
+                        }
+                    }           
+                }
+
+                nodes.update(allNode);
+
+                allNode = nodes.get();
+                nodes.update(allNode);
 
 
@@ -698 +759 @@
                 },
                 7: {
-                    background: 'LightGray',
+                    background: 'LightBlue',
                     border: 'Gray',
                     shape: 'ellipse'
@@ -851 +912 @@
                                 },
                                 physics: {
-                                    enabled: false,
-                                    stabilization: false
+                                    enabled: false
                                 },
                                 nodes: {
@@ -867 +927 @@
                                         levelSeparation: 300,
                                         nodeSpacing: 80,
-                                        treeSpacing: 200,
+                                        treeSpacing: 100,
+                                        blockShifting: true,
+                                        edgeMinimization: true
                                     }
                                 },
@@ -1010 +1072 @@
             <button type="button" class="btn btn-default" id="disableAllChild">Disable all children</button>
             <button type="button" class="btn btn-default" id="lastTemporal">Enable last temporal input</button>
-
-
-            <button type="button" class="btn btn-default" id="clusteringcid2">Clustering cid=2</button>
+            <button type="button" class="btn btn-default" id="showGraph">Show subgraph (and hide other)</button>
+
+
         </div>
 

XIOS/dev/dev_trunk_omp/src/filter/binary_arithmetic_filter.hpp

@@ -40 +40 @@
       std::tuple<int, int, int> virtual buildGraph(std::vector<CDataPacketPtr> data);
       
-      // CDataPacketPtr virtual buildGraph_post(CDataPacketPtr packet, std::vector<CDataPacketPtr> data);
+
   }; // class CScalarFieldArithmeticFilter
 

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

@@ -38 +38 @@
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes += "</br>file attributes : </br>" +this->field->file->record4graphXiosAttributes();
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].clusterID =1;
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1;
 
       if(CXios::isClient && CWorkflowGraph::build_begin) 

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

@@ -129 +129 @@
   }
 
-  int COutputPin::getDistance()
-  {
-    int distance = 0;
-    // for(int i=0; i<parent_filters.size(); i++)
-    // {
-    //   distance = max(distance, parent_filters[i]->getDistance()+1);
-    // }
-    return distance;
-  }
+
 
 

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

@@ -18 +18 @@
   {
     public:
-      // StdString output_field_id;
       int tag;
       Time start_graph;
@@ -86 +85 @@
 
       void virtual setParentFiltersTag();
-      int virtual getDistance();
 
 

XIOS/dev/dev_trunk_omp/src/filter/pass_through_filter.cpp

@@ -18 +18 @@
     if(building_graph)
     {
+      std::cout<<"pass through packet->distance = "<<data[0]->distance<<std::endl;
       // std::cout<<"CPassThroughFilter::apply field_id = "<<this->field->getId()<<" start = "<<start_graph<<" end = "<<end_graph<<std::endl;
       this->filterID = InvalidableObject::filterIdGenerator++;
@@ -25 +26 @@
 
       CWorkflowGraph::addNode(this->filterID, "Pass Through Filter\\n("+data[0]->field->getId()+")", 2, 1, 1, data[0]);
-      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
+      (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = data[0]->distance+1;
 
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();
@@ -39 +40 @@
       
       data[0]->src_filterID=this->filterID;
+      data[0]->distance++;
 
     }
 
     data[0]->field = this->field;
+
   }
 

XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.cpp

@@ -75 +75 @@
 
     CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine);
-    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field, this->getDistance());
+    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field);
     if (outputPacket)
     {
@@ -112 +112 @@
 
     CSpatialTransformFilterEngine* spaceFilter = static_cast<CSpatialTransformFilterEngine*>(engine);
-    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field, this->getDistance());
+    CDataPacketPtr outputPacket = spaceFilter->applyFilter(data, outputDefaultValue, this->tag, this->start_graph, this->end_graph, this->field);
 
     if (outputPacket)
@@ -179 +179 @@
   }
 
-  bool CSpatialTransformFilterEngine::buildGraph(std::vector<CDataPacketPtr> data, int tag, Time start_graph, Time end_graph, CField *field, int distance)
+  bool CSpatialTransformFilterEngine::buildGraph(std::vector<CDataPacketPtr> data, int tag, Time start_graph, Time end_graph, CField *field)
   {
     bool building_graph = tag ? data[0]->timestamp >= start_graph && data[0]->timestamp <= end_graph : false;
@@ -207 +207 @@
   }
 
-  CDataPacketPtr CSpatialTransformFilterEngine::applyFilter(std::vector<CDataPacketPtr> data, double defaultValue, int tag, Time start_graph, Time end_graph, CField *field, int distance)
+  CDataPacketPtr CSpatialTransformFilterEngine::applyFilter(std::vector<CDataPacketPtr> data, double defaultValue, int tag, Time start_graph, Time end_graph, CField *field)
   {
     
-    bool BG = buildGraph(data, tag, start_graph, end_graph, field, distance);
+    bool BG = buildGraph(data, tag, start_graph, end_graph, field);
 
     CDataPacketPtr packet(new CDataPacket);

XIOS/dev/dev_trunk_omp/src/filter/spatial_transform_filter.hpp

@@ -121 +121 @@
        * \return the result of the grid transformation
        */
-      CDataPacketPtr applyFilter(std::vector<CDataPacketPtr> data, double defaultValue = 0, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0, int distance=1);
-      bool buildGraph(std::vector<CDataPacketPtr> data, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0, int distance=1);
+      CDataPacketPtr applyFilter(std::vector<CDataPacketPtr> data, double defaultValue = 0, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0);
+      bool buildGraph(std::vector<CDataPacketPtr> data, int tag=0, Time start_graph=0, Time end_graph=-1, CField *field=0);
 
        /*!

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

@@ -100 +100 @@
       CWorkflowGraph::allocNodeEdge();
  
-      CWorkflowGraph::addNode(this->filterID, "Store Filter", 7, 1, 1, data[0]);
+      CWorkflowGraph::addNode(this->filterID, "Store Filter", 7, 0, 1, data[0]);
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].distance = ++(data[0]->distance);
       (*CWorkflowGraph::mapFilters_ptr_with_info)[this->filterID].attributes = this->field->record4graphXiosAttributes();

XIOS/dev/dev_trunk_omp/src/filter/temporal_filter.cpp

@@ -139 +139 @@
           packet->src_filterID=this->filterID;
           packet->distance = data[0]->distance+1;
+          std::cout<<"temporal packet->distance = "<<packet->distance<<std::endl;
           this->filterIDoutputs.clear();
           CWorkflowGraph::build_begin=true;

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

@@ -1319 +1319 @@
            storeFilter->end_graph = filter_end;
            storeFilter->field = this;
-           storeFilter->distance = instantDataFilter->getDistance()+1;
+           storeFilter->distance = instantDataFilter->distance+1;
          }
 
@@ -1334 +1334 @@
            fileWriterFilter->start_graph = filter_start;
            fileWriterFilter->end_graph = filter_end;
-           fileWriterFilter->distance = getTemporalDataFilter(gc, file->output_freq)->getDistance()+1;
+           fileWriterFilter->distance = getTemporalDataFilter(gc, file->output_freq)->distance+1;
 
            // std::cout<<"CFileWriterFilter filter start = "<<filter_start<<" end = "<<filter_end<<" field = "<<this->getId()<<std::endl;
@@ -1560 +1560 @@
 
        const bool detectMissingValues = (!detect_missing_value.isEmpty()  && detect_missing_value == true);
-       std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation, CContext::getCurrent()->getCalendar()->getInitDate(),
-                                                                             freq_op, freq_offset, outFreq,
-                                                                             detectMissingValues));
+       std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,
+                                                                             CContext::getCurrent()->getCalendar()->getInitDate(),
+                                                                             freq_op, freq_offset, outFreq, detectMissingValues));
 
        instantDataFilter->connectOutput(temporalFilter, 0);

XIOS/dev/dev_trunk_omp/src/node/field_impl.hpp

@@ -23 +23 @@
       if (check_if_active.isEmpty() || (!check_if_active.isEmpty() && (!check_if_active) || isActive(true)))
         clientSourceFilter->streamData(CContext::getCurrent()->getCalendar()->getCurrentDate(), _data);
-        // clientSourceFilter->streamData(CContext::getCurrent()->getCalendar()->getCurrentDate(), _data, this->getId());
     }
     else if (instantDataFilter)