Changeset 2613 for XIOS3/trunk/src/transformation/scalar_algorithm

Timestamp:

03/08/24 17:05:40 (4 months ago)

Author:

jderouillat

Message:

Fix the attached mode for scalar output, and some bugs revealed by the adastra porting in debug mode

File:

• XIOS3/trunk/src/transformation/scalar_algorithm/scalar_algorithm_redistribute.cpp (modified) (2 diffs)

XIOS3/trunk/src/transformation/scalar_algorithm/scalar_algorithm_redistribute.cpp

@@ -95 +95 @@
     CArray<double,1> valSrc, valDst ;
     valSrc.resize(scalarSource->getLocalView(CElementView::FULL)->getSize()) ;
-    valDst.resize(scalarDestination->getLocalView(CElementView::FULL)->getSize()) ;
-    
-    if (scalarSource->hasValue())
-    {
-      if (valSrc.numElements()>0)  valSrc(0)=scalarSource->value ;
-      transformConnector->transfer(valSrc, valDst) ;
-      if (valDst.numElements()>0)  scalarDestination->value = valDst(0) ;
-    }
 
     if (scalarSource->hasBounds()) 
@@ -124 +116 @@
     
     transformMask->transfer(workflow, mask, false) ;   
-    scalarDestination->mask = mask(0) ;
+    if (mask.numElements()>0)
+    {
+      scalarDestination->mask = mask(0) ;
+    }
 
     scalarDestination->checkAttributes() ;
+    this->computeAlgorithm(scalarSource->getLocalView(CElementView::WORKFLOW), scalarDestination->getLocalView(CElementView::WORKFLOW)) ;
+
+    valDst.resize(scalarDestination->getLocalView(CElementView::FULL)->getSize()) ;
+    if (scalarSource->hasValue())
+    {
+      if (valSrc.numElements()>0)  valSrc(0)=scalarSource->value ;
+      transformConnector->transfer(valSrc, valDst) ;
+      if (valDst.numElements()>0)  scalarDestination->value = valDst(0) ;
+    }
   }
   CATCH