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

Timestamp:

10/24/17 11:27:52 (7 years ago)

Author:

ymipsl

Message:

Add 2 new spatial transformations :

• reduce_scalar_to_scalar : global reduction between scalar
• duplicate_scalar_to_axis : a scalar value is duplicated on each level of the axis.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/node

Files:

• axis.cpp (modified) (1 diff)
• duplicate_scalar_to_axis.cpp (added)
• duplicate_scalar_to_axis.hpp (added)
• node_enum.hpp (modified) (1 diff)
• node_type.hpp (modified) (1 diff)
• reduce_axis_to_axis.cpp (modified) (1 diff)
• reduce_scalar_to_scalar.cpp (added)
• reduce_scalar_to_scalar.hpp (added)
• scalar.cpp (modified) (1 diff)
• transformation_enum.hpp (modified) (1 diff)

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

@@ -54 +54 @@
      m["extract_domain"] = TRANS_EXTRACT_DOMAIN_TO_AXIS;
      m["temporal_splitting"] = TRANS_TEMPORAL_SPLITTING;
+     m["duplicate_scalar"] = TRANS_DUPLICATE_SCALAR_TO_AXIS;
+
    }
 

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

@@ -35 +35 @@
          eExtractAxisToScalar,
          eReduceDomainToScalar,
-         eTemporalSplitting
-      } ENodeType;
+         eTemporalSplitting,
+         eDuplicateScalarToAxis,
+         eReduceScalarToScalar
+       } ENodeType;
 
 } // namespace xios

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

@@ -26 +26 @@
 #include "reduce_domain_to_scalar.hpp"
 #include "temporal_splitting.hpp"
+#include "duplicate_scalar_to_axis.hpp"
+#include "reduce_scalar_to_scalar.hpp"
 
 

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

@@ -47 +47 @@
              << "Axis destination " << axisDst->getId());
 
-    if (this->local.isEmpty()) local=false ;
 
     if (axisDst->n_glo != axisSrc->n_glo)

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

@@ -34 +34 @@
      m["extract_axis"]  = TRANS_EXTRACT_AXIS_TO_SCALAR;
      m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_SCALAR;
+     m["reduce_scalar"] = TRANS_REDUCE_SCALAR_TO_SCALAR;
    }
 

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

@@ -22 +22 @@
         TRANS_TEMPORAL_SPLITTING = 13,
         TRANS_REDUCE_AXIS_TO_AXIS = 14,
+        TRANS_DUPLICATE_SCALAR_TO_AXIS = 15,
+        TRANS_REDUCE_SCALAR_TO_SCALAR = 16,
       } ETranformationType;