Changeset 1301 for XIOS/dev/XIOS_DEV_CMIP6/src/node

Timestamp:

10/09/17 10:14:24 (7 years ago)

Author:

ymipsl

Message:

Add new transformation : reduce axis_to_axis
This a global reduction implying all process whih own the same source axis global point.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/node

Files:

• axis.cpp (modified) (2 diffs)
• node_enum.hpp (modified) (1 diff)
• node_type.hpp (modified) (1 diff)
• reduce_axis_to_axis.cpp (added)
• reduce_axis_to_axis.hpp (added)
• transformation_enum.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

@@ -51 +51 @@
      m["inverse_axis"] = TRANS_INVERSE_AXIS;
      m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_AXIS;
+     m["reduce_axis"] = TRANS_REDUCE_AXIS_TO_AXIS;
      m["extract_domain"] = TRANS_EXTRACT_DOMAIN_TO_AXIS;
      m["temporal_splitting"] = TRANS_TEMPORAL_SPLITTING;
@@ -1273 +1274 @@
 
     // Resize index to its real size
-    index.resizeAndPreserve(nbIndexGlob);
+    if (nbIndexGlob==0) index.resize(nbIndexGlob) ;
+    else index.resizeAndPreserve(nbIndexGlob);
 
     int nbData = nbIndexGlob;

XIOS/dev/XIOS_DEV_CMIP6/src/node/node_enum.hpp

@@ -29 +29 @@
          eReduceAxisToScalar,
          eReduceDomainToAxis,
+         eReduceAxisToAxis,
          eExtractDomainToAxis,
          eComputeConnectivityDomain,

XIOS/dev/XIOS_DEV_CMIP6/src/node/node_type.hpp

@@ -19 +19 @@
 #include "reduce_axis_to_scalar.hpp"
 #include "reduce_domain_to_axis.hpp"
+#include "reduce_axis_to_axis.hpp"
 #include "extract_domain_to_axis.hpp"
 #include "compute_connectivity_domain.hpp"

XIOS/dev/XIOS_DEV_CMIP6/src/node/transformation_enum.hpp

@@ -21 +21 @@
         TRANS_REDUCE_DOMAIN_TO_SCALAR = 12,
         TRANS_TEMPORAL_SPLITTING = 13,
+        TRANS_REDUCE_AXIS_TO_AXIS = 14,
       } ETranformationType;