Changeset 1642 for XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_scalar.cpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_scalar.cpp (modified) (6 diffs)

XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_reduce_scalar.cpp

@@ -9 +9 @@
 #include "grid.hpp"
 #include "grid_transformation_factory_impl.hpp"
-
+#include "reduction.hpp"
 
 
@@ -22 +22 @@
                                                                      std::map<int, int>& elementPositionInGridDst2AxisPosition,
                                                                      std::map<int, int>& elementPositionInGridDst2DomainPosition)
+TRY
 {
   std::vector<CScalar*> scalarListDestP = gridDst->getScalars();
@@ -32 +33 @@
   return (new CScalarAlgorithmReduceScalar(scalarListDestP[scalarDstIndex], scalarListSrcP[scalarSrcIndex], reduceScalar));
 }
+CATCH
 
 bool CScalarAlgorithmReduceScalar::registerTrans()
+TRY
 {
   CGridTransformationFactory<CScalar>::registerTransformation(TRANS_REDUCE_SCALAR_TO_SCALAR, create);
 }
+CATCH
 
 CScalarAlgorithmReduceScalar::CScalarAlgorithmReduceScalar(CScalar* scalarDestination, CScalar* scalarSource, CReduceScalarToScalar* algo)
  : CScalarAlgorithmTransformation(scalarDestination, scalarSource),
    reduction_(0)
+TRY
 {
   eliminateRedondantSrc_= false ;
@@ -70 +75 @@
 
   }
-
-  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
-  {
-    CReductionAlgorithm::initReductionOperation();
-  }
   
-  if (CReductionAlgorithm::ReductionOperations_ptr->end() == CReductionAlgorithm::ReductionOperations_ptr->find(op))
+  if (CReductionAlgorithm::ReductionOperations.end() == CReductionAlgorithm::ReductionOperations.find(op))
     ERROR("CScalarAlgorithmReduceScalar::CScalarAlgorithmReduceScalar(CScalar* scalarDestination, CScalar* scalarSource, CReduceScalarToScalar* algo)",
        << "Operation '" << op << "' not found. Please make sure to use a supported one"
@@ -82 +82 @@
        << "Scalar destination " << scalarDestination->getId());
 
-  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
+  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
 }
+CATCH
 
 void CScalarAlgorithmReduceScalar::apply(const std::vector<std::pair<int,double> >& localIndex, const double* dataInput, CArray<double,1>& dataOut,
                                          std::vector<bool>& flagInitial, bool ignoreMissingValue, bool firstPass)
+TRY
 {
   reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass);
 }
+CATCH
 
 void CScalarAlgorithmReduceScalar::updateData(CArray<double,1>& dataOut)
+TRY
 {
   reduction_->updateData(dataOut);
 }
+CATCH
 
 CScalarAlgorithmReduceScalar::~CScalarAlgorithmReduceScalar()
+TRY
 {
   if (0 != reduction_) delete reduction_;
 }
+CATCH
 
 void CScalarAlgorithmReduceScalar::computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs)
+TRY
 {
   this->transformationMapping_.resize(1);
@@ -113 +121 @@
 
 }
+CATCH
 
 }