Changeset 1155 for XIOS/dev/branch_yushan_merged/src/transformation

Timestamp:

06/06/17 15:12:34 (7 years ago)

Author:

yushan

Message:

test_remap OK with openmp

Location:

XIOS/dev/branch_yushan_merged/src/transformation

Files:

• Functions/reduction.cpp (modified) (2 diffs)
• Functions/reduction.hpp (modified) (1 diff)
• axis_algorithm_extract_domain.cpp (modified) (2 diffs)
• axis_algorithm_extract_domain.hpp (modified) (2 diffs)
• axis_algorithm_reduce_domain.cpp (modified) (2 diffs)
• axis_algorithm_reduce_domain.hpp (modified) (2 diffs)
• domain_algorithm_interpolate.cpp (modified) (1 diff)
• scalar_algorithm_extract_axis.cpp (modified) (2 diffs)
• scalar_algorithm_extract_axis.hpp (modified) (2 diffs)
• scalar_algorithm_reduce_axis.cpp (modified) (2 diffs)
• scalar_algorithm_reduce_axis.hpp (modified) (2 diffs)
• scalar_algorithm_reduce_domain.cpp (modified) (2 diffs)
• scalar_algorithm_reduce_domain.hpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/src/transformation/Functions/reduction.cpp

@@ -11 +11 @@
 //std::map<StdString,EReductionType> CReductionAlgorithm::ReductionOperations = std::map<StdString,EReductionType>();
 std::map<StdString,EReductionType> *CReductionAlgorithm::ReductionOperations_ptr = 0; 
-
-bool CReductionAlgorithm::initReductionOperation(std::map<StdString,EReductionType>& m)
-{
-  // So so stupid way to intialize operation but it works ...
-  m["sum"] = TRANS_REDUCE_SUM;
-  CSumReductionAlgorithm::registerTrans();
-
-  m["min"] = TRANS_REDUCE_MIN;
-  CMinReductionAlgorithm::registerTrans();
-
-  m["max"] = TRANS_REDUCE_MAX;
-  CMaxReductionAlgorithm::registerTrans();
-
-  m["extract"] = TRANS_REDUCE_EXTRACT;
-  CExtractReductionAlgorithm::registerTrans();
-
-  m["average"] = TRANS_REDUCE_AVERAGE;
-  CAverageReductionAlgorithm::registerTrans();
-}
+//#pragma omp threadprivate(CReductionAlgorithm::ReductionOperations_ptr)
 
 
 bool CReductionAlgorithm::initReductionOperation()
 {
-  if(CReductionAlgorithm::ReductionOperations_ptr == NULL) CReductionAlgorithm::ReductionOperations_ptr = new std::map<StdString,EReductionType>();
+  CReductionAlgorithm::ReductionOperations_ptr = new std::map<StdString,EReductionType>();
   // So so stupid way to intialize operation but it works ...
   (*CReductionAlgorithm::ReductionOperations_ptr)["sum"] = TRANS_REDUCE_SUM;
@@ -50 +32 @@
   (*CReductionAlgorithm::ReductionOperations_ptr)["average"] = TRANS_REDUCE_AVERAGE;
   CAverageReductionAlgorithm::registerTrans();
-
-  printf("*CReductionAlgorithm::ReductionOperations_ptr = %p\t %p\n", *CReductionAlgorithm::ReductionOperations_ptr, &(*CReductionAlgorithm::ReductionOperations_ptr));
 }
 
 //bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation(CReductionAlgorithm::ReductionOperations);
-bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation();
+//bool CReductionAlgorithm::_dummyInit = CReductionAlgorithm::initReductionOperation();
 
 CReductionAlgorithm* CReductionAlgorithm::createOperation(EReductionType reduceType)
 {
   int reduceTypeInt = reduceType;
-  //if (0 == reductionCreationCallBacks_)
-  //  reductionCreationCallBacks_ = new CallBackMap();
 
   CallBackMap::const_iterator it = (*reductionCreationCallBacks_).find(reduceType);

XIOS/dev/branch_yushan_merged/src/transformation/Functions/reduction.hpp

@@ -28 +28 @@
 
 public:
-  CReductionAlgorithm() {}
+  CReductionAlgorithm() { }
 
   /*!

XIOS/dev/branch_yushan_merged/src/transformation/axis_algorithm_extract_domain.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
 
 namespace xios {
@@ -62 +61 @@
 
   pos_ = algo->position;
+
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+    CReductionAlgorithm::initReductionOperation();
+
   reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]);
 }

XIOS/dev/branch_yushan_merged/src/transformation/axis_algorithm_extract_domain.hpp

@@ -12 +12 @@
 #include "axis_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -25 +26 @@
   Extract a domain to an axis
 */
-class CAxisAlgorithmExtractDomain : public CAxisAlgorithmTransformation
+class CAxisAlgorithmExtractDomain : public CAxisAlgorithmTransformation, public CReductionAlgorithm
 {
 public:

XIOS/dev/branch_yushan_merged/src/transformation/axis_algorithm_reduce_domain.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
 
 namespace xios {
@@ -70 +69 @@
 
   dir_ = (CReduceDomainToAxis::direction_attr::iDir == algo->direction)  ? iDir : jDir;
+
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+    CReductionAlgorithm::initReductionOperation();
+
   reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]);
 }

XIOS/dev/branch_yushan_merged/src/transformation/axis_algorithm_reduce_domain.hpp

@@ -12 +12 @@
 #include "axis_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -24 +25 @@
   Reduce a domain to an axis
 */
-class CAxisAlgorithmReduceDomain : public CAxisAlgorithmTransformation
+class CAxisAlgorithmReduceDomain : public CAxisAlgorithmTransformation, public CReductionAlgorithm
 {
 public:

XIOS/dev/branch_yushan_merged/src/transformation/domain_algorithm_interpolate.cpp

@@ -111 +111 @@
   const int constNVertex = 4; // Value by default number of vertex for rectangular domain
   int nVertexSrc, nVertexDest;
-  nVertexSrc = nVertexDest = constNVertex;
+  nVertexSrc = constNVertex;
+  nVertexDest = constNVertex;
 
   // First of all, try to retrieve the boundary values of domain source and domain destination

XIOS/dev/branch_yushan_merged/src/transformation/scalar_algorithm_extract_axis.cpp

@@ -14 +14 @@
 #include "grid_transformation_factory_impl.hpp"
 
-#include "reduction.hpp"
+
 
 namespace xios {
@@ -49 +49 @@
   StdString op = "extract";
   pos_ = algo->position;
+  
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+    CReductionAlgorithm::initReductionOperation();
+  
   reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]);
 }

XIOS/dev/branch_yushan_merged/src/transformation/scalar_algorithm_extract_axis.hpp

@@ -12 +12 @@
 #include "scalar_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -24 +25 @@
   Extract a scalar from an axis
 */
-class CScalarAlgorithmExtractAxis : public CScalarAlgorithmTransformation
+class CScalarAlgorithmExtractAxis : public CScalarAlgorithmTransformation, public CReductionAlgorithm
 {
 public:

XIOS/dev/branch_yushan_merged/src/transformation/scalar_algorithm_reduce_axis.cpp

@@ -13 +13 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-#include "reduction.hpp"
-
-#include "reduction.hpp"
 
 namespace xios {
+
+//extern std::map<StdString,EReductionType> *CReductionAlgorithm::ReductionOperations_ptr; 
+//#pragma omp threadprivate(CReductionAlgorithm::ReductionOperations_ptr)
+
 CGenericAlgorithmTransformation* CScalarAlgorithmReduceAxis::create(CGrid* gridDst, CGrid* gridSrc,
                                                                      CTransformation<CScalar>* transformation,
@@ -75 +76 @@
   }
   
-  //if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op))
-  //  if ((CReductionAlgorithm::ReductionOperations_ptr)->end() == (CReductionAlgorithm::ReductionOperations_ptr)->find(op))
-  //  ERROR("CScalarAlgorithmReduceAxis::CScalarAlgorithmReduceAxis(CAxis* axisDestination, CAxis* axisSource, CReduceAxisToScalar* algo)",
-  //     << "Operation '" << op << "' not found. Please make sure to use a supported one"
-  //     << "Axis source " <<axisSource->getId() << std::endl
-  //     << "Scalar destination " << scalarDestination->getId());
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+    CReductionAlgorithm::initReductionOperation();
+  
+  if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op))
+    ERROR("CScalarAlgorithmReduceAxis::CScalarAlgorithmReduceAxis(CAxis* axisDestination, CAxis* axisSource, CReduceAxisToScalar* algo)",
+       << "Operation '" << op << "' not found. Please make sure to use a supported one"
+       << "Axis source " <<axisSource->getId() << std::endl
+       << "Scalar destination " << scalarDestination->getId());
 
   reduction_ = CReductionAlgorithm::createOperation((*CReductionAlgorithm::ReductionOperations_ptr)[op]);

XIOS/dev/branch_yushan_merged/src/transformation/scalar_algorithm_reduce_axis.hpp

@@ -12 +12 @@
 #include "scalar_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -24 +25 @@
   Reducing an axis to a scalar
 */
-class CScalarAlgorithmReduceAxis : public CScalarAlgorithmTransformation
+class CScalarAlgorithmReduceAxis : public CScalarAlgorithmTransformation, public CReductionAlgorithm
 {
 public:

XIOS/dev/branch_yushan_merged/src/transformation/scalar_algorithm_reduce_domain.cpp

@@ -14 +14 @@
 #include "grid_transformation_factory_impl.hpp"
 
-#include "reduction.hpp"
+
 
 namespace xios {
@@ -68 +68 @@
 
   }
-  
+
+  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
+    CReductionAlgorithm::initReductionOperation();
+
   if ((*CReductionAlgorithm::ReductionOperations_ptr).end() == (*CReductionAlgorithm::ReductionOperations_ptr).find(op))
     ERROR("CScalarAlgorithmReduceDomain::CScalarAlgorithmReduceDomain(CDomain* domainDestination, CDomain* domainSource, CReduceDomainToScalar* algo)",

XIOS/dev/branch_yushan_merged/src/transformation/scalar_algorithm_reduce_domain.hpp

@@ -12 +12 @@
 #include "scalar_algorithm_transformation.hpp"
 #include "transformation.hpp"
+#include "reduction.hpp"
 
 namespace xios {
@@ -24 +25 @@
   Reducing an DOMAIN to a scalar
 */
-class CScalarAlgorithmReduceDomain : public CScalarAlgorithmTransformation
+class CScalarAlgorithmReduceDomain : public CScalarAlgorithmTransformation, public CReductionAlgorithm
 {
 public: