Changeset 2137 for XIOS/dev/dev_trunk_graph/src/node/grid.cpp

Timestamp:

05/30/21 23:30:01 (3 years ago)

Author:

yushan

Message:

temporal commit for merging graph into XIOS_coupling

File:

• XIOS/dev/dev_trunk_graph/src/node/grid.cpp (modified) (9 diffs)

XIOS/dev/dev_trunk_graph/src/node/grid.cpp

@@ -1210 +1210 @@
   }
 
+
   void CGrid::sendGridToCouplerOut(CContextClient* client, const string& fieldId)
   {
@@ -1217 +1218 @@
     distributeGridToServer(client,fieldId) ;
   }
+
 
   void CGrid::distributeGridToServer(CContextClient* client, const string& fieldId)
@@ -1312 +1314 @@
     CMessage message ;
     if (isCoupling) message<<getCouplingAlias(fieldId) ;
-    else message<<getId() ;
+    else message<<getId() ; 
     gridScattererConnector.transfer(maskOut, client, event, message) ;
     for(auto& it : scattererConnectors) delete it ;
@@ -1342 +1344 @@
     clientFromServerConnector_[client] = new CGridGathererConnector(clientFromServerConnectors) ;
 
-
-  }
+  }
+
 
   void CGrid::recvMask(CEventServer& event)
@@ -1394 +1396 @@
   }
 
-
   string CGrid::getCouplingAlias(const string& fieldId)
   {
     return "_grid_of_"+fieldId;
   }
-
 
   void CGrid::makeAliasForCoupling(const string& fieldId)
@@ -1650 +1650 @@
     std::shared_ptr<CFilter> inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc));
     std::shared_ptr<CFilter> outputFilter = inputFilter ;
-    cout<<"***************CGrid::buildTransformationGraph Pass through filter ***************"<<transformationGoing<<field->getId()<<endl;
-    /*inputFilter->graphEnabled = true;
-    inputFilter->graphPackage = new CGraphPackage;
-    inputFilter->graphPackage->inFields.push_back(field);
-*/
+
+
     string newId ;
     if (gridSrc!=nullptr) newId = gridSrc->getId() + " --> " + this->getId()  ;
@@ -1667 +1664 @@
     else  
     {
-      StdString role = CXios::isClient? "Client ": "Server ";
-      cout<<role<<"Create new grid : "<<newId<<endl ;
+      cout<<"Create new grid : "<<newId<<endl ;
       newGrid = CGrid::create(newId) ;
       isNewGrid = true ;
@@ -1715 +1711 @@
         else if (srcElement.type==TYPE_AXIS)   tmpGridSrc->addAxis(srcElement.axis->getId()) ;
         else if (srcElement.type==TYPE_SCALAR) tmpGridSrc->addScalar(srcElement.scalar->getId()) ;
-        tmpGridSrc->checkElementsAttributes() ;
+        // WARNING -> suppress checkElement attribute ? What append ?
+        // tmpGridSrc->checkElementsAttributes() ;
         CGrid* tmpGridDst=CGrid::create(); // destination Grid
         map<int,int> posInGrid={{0,0}} ;
@@ -1956 +1953 @@
           auxField->getInstantDataFilter()->connectOutput(transformFilter,i) ;
           i++ ;
-          
         }
         outputFilter = transformFilter ;