Changeset 977

Timestamp:

10/18/16 11:09:00 (8 years ago)

Author:

mhnguyen

Message:

Minor improvements: Removing some redundant codes

Location:

XIOS/trunk/src/transformation

Files:

• axis_algorithm_extract_domain.cpp (modified) (1 diff)
• axis_algorithm_reduce_domain.cpp (modified) (1 diff)
• generic_algorithm_transformation.cpp (modified) (3 diffs)
• scalar_algorithm_extract_axis.cpp (modified) (1 diff)
• scalar_algorithm_reduce_axis.cpp (modified) (1 diff)

XIOS/trunk/src/transformation/axis_algorithm_extract_domain.cpp

@@ -14 +14 @@
 #include "grid_transformation_factory_impl.hpp"
 
-#include "sum.hpp"
+#include "reduction.hpp"
 
 namespace xios {

XIOS/trunk/src/transformation/axis_algorithm_reduce_domain.cpp

@@ -14 +14 @@
 #include "grid_transformation_factory_impl.hpp"
 
-#include "sum.hpp"
+#include "reduction.hpp"
 
 namespace xios {

XIOS/trunk/src/transformation/generic_algorithm_transformation.cpp

@@ -180 +180 @@
   // Find out global index source of transformed element on corresponding process.
   std::vector<boost::unordered_map<int,std::vector<size_t> > > globalElementIndexOnProc(axisDomainDstOrder.numElements());
-  CClientClientDHTInt::Index2VectorInfoTypeMap globalIndexOfTransformedElementOnProc;
-  int axisIndex = 0, domainIndex = 0;
+  CClientClientDHTInt::Index2VectorInfoTypeMap globalIndexOfTransformedElementOnProc;  
   for (int idx = 0; idx < axisDomainDstOrder.numElements(); ++idx)
   {
@@ -192 +191 @@
                                    domainListSrcP[elementPositionInGridSrc2DomainPosition_[idx]],
                                    transPos,
-                                   globalElementIndexOnProc[idx]);
-      ++domainIndex;
+                                   globalElementIndexOnProc[idx]);      
 
     }
@@ -203 +201 @@
                                  transPos,
                                  globalElementIndexOnProc[idx]);
-      ++axisIndex;
-
     }
     else //it's a scalar

XIOS/trunk/src/transformation/scalar_algorithm_extract_axis.cpp

@@ -11 +11 @@
 #include "scalar.hpp"
 #include "extract_axis_to_scalar.hpp"
-#include "sum.hpp"
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
+
+#include "reduction.hpp"
 
 namespace xios {

XIOS/trunk/src/transformation/scalar_algorithm_reduce_axis.cpp

@@ -11 +11 @@
 #include "scalar.hpp"
 #include "reduce_axis_to_scalar.hpp"
-#include "sum.hpp"
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
+
+#include "reduction.hpp"
 
 namespace xios {