Changeset 1960

Timestamp:

10/12/20 11:23:54 (4 years ago)

Author:

ymipsl

Message:

Bug fix when using grid masking. Grid local connector apply systematicalling grid masking need for data coming from model.
Add a flag to chose using masking or not.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• distribution/grid_elements.cpp (modified) (2 diffs)
• distribution/grid_elements.hpp (modified) (1 diff)
• distribution/grid_local_connector.cpp (modified) (2 diffs)
• distribution/grid_local_connector.hpp (modified) (1 diff)
• node/grid.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_elements.cpp

@@ -12 +12 @@
   }
   
-  CGridLocalConnector* CGridLocalElements::getConnector(CElementView::type srcType, CElementView::type dstType)
+  CGridLocalConnector* CGridLocalElements::getConnector(CElementView::type srcType, CElementView::type dstType, bool withMask)
   {
     auto newPair = pair<CElementView::type,CElementView::type>(srcType,dstType);
@@ -18 +18 @@
     if (it==connectors_.end()) 
     {
-      auto insertPair=pair<pair<CElementView::type,CElementView::type>, CGridLocalConnector*>(newPair,new CGridLocalConnector(this, srcType, dstType)) ;
+      auto insertPair=pair<pair<CElementView::type,CElementView::type>, CGridLocalConnector*>(newPair,new CGridLocalConnector(this, srcType, dstType, withMask)) ;
       it=connectors_.insert(insertPair).first ;
     }

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_elements.hpp

@@ -28 +28 @@
       std::vector<CLocalElement*>& getElements(void) { return elements_ ; }
       CGridLocalView* getView(CElementView::type type) ;
-      CGridLocalConnector* getConnector(CElementView::type srcType, CElementView::type dstType) ;
+      CGridLocalConnector* getConnector(CElementView::type srcType, CElementView::type dstType, bool withMask=false) ;
   } ;
 }

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_local_connector.cpp

@@ -16 +16 @@
   } 
 
-  CGridLocalConnector::CGridLocalConnector(CGridLocalElements* parent, CElementView::type srcType, CElementView::type dstType)
+  CGridLocalConnector::CGridLocalConnector(CGridLocalElements* parent, CElementView::type srcType, CElementView::type dstType, bool withMask)
   {
     CGridLocalView* srcView=parent->getView(srcType) ;
@@ -31 +31 @@
     for(auto connector : elementsConnector_) dstSize_*=connector->getDstSize() ;
 
-    if (parent->hasLocalMask())
+    if (parent->hasLocalMask() && withMask)
     {
       vector<CLocalConnector*> elementsConnector ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/grid_local_connector.hpp

@@ -25 +25 @@
       
       CGridLocalConnector(const std::vector<CLocalConnector*>& elementsConnector)  ;
-      CGridLocalConnector(CGridLocalElements* parent, CElementView::type srcType, CElementView::type dstType) ;
+      CGridLocalConnector(CGridLocalElements* parent, CElementView::type srcType, CElementView::type dstType, bool withMask=false) ;
       int getSrcSize(void) { return srcSize_ ;}
       int getDstSize(void) { return dstSize_ ;}

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

@@ -3388 +3388 @@
   void CGrid::computeModelToWorkflowConnector(void)
   {
-    modelToWorkflowConnector_ = getGridLocalElements()->getConnector(CElementView::MODEL,CElementView::WORKFLOW) ;
+    modelToWorkflowConnector_ = getGridLocalElements()->getConnector(CElementView::MODEL,CElementView::WORKFLOW,true) ;
   }
 
@@ -3398 +3398 @@
   void CGrid::computeWorkflowToModelConnector(void)
   {
-    workflowToModelConnector_ = getGridLocalElements()->getConnector(CElementView::WORKFLOW,CElementView::MODEL) ;
+    workflowToModelConnector_ = getGridLocalElements()->getConnector(CElementView::WORKFLOW,CElementView::MODEL,true) ;
   }