Changeset 1642 for XIOS/dev/branch_openmp/src/transformation/scalar_algorithm_extract_axis.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_extract_axis.cpp (modified) (5 diffs)

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

@@ -14 +14 @@
 #include "grid_transformation_factory_impl.hpp"
 
-
+#include "reduction.hpp"
 
 namespace xios {
@@ -26 +26 @@
                                                                      std::map<int, int>& elementPositionInGridDst2AxisPosition,
                                                                      std::map<int, int>& elementPositionInGridDst2DomainPosition)
+TRY
 {
   std::vector<CScalar*> scalarListDestP = gridDst->getScalars();
@@ -36 +37 @@
   return (new CScalarAlgorithmExtractAxis(scalarListDestP[scalarDstIndex], axisListSrcP[axisSrcIndex], extractAxis));
 }
+CATCH
 
 bool CScalarAlgorithmExtractAxis::registerTrans()
+TRY
 {
   CGridTransformationFactory<CScalar>::registerTransformation(TRANS_EXTRACT_AXIS_TO_SCALAR, create);
 }
+CATCH
 
 CScalarAlgorithmExtractAxis::CScalarAlgorithmExtractAxis(CScalar* scalarDestination, CAxis* axisSource, CExtractAxisToScalar* algo)
  : CScalarAlgorithmTransformation(scalarDestination, axisSource),
    reduction_(0)
+TRY
 {
   algo->checkValid(scalarDestination, axisSource);
   StdString op = "extract";
   pos_ = algo->position;
-  if(CReductionAlgorithm::ReductionOperations_ptr == 0) 
-  {
-    CReductionAlgorithm::initReductionOperation();
-  }
-  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations_ptr->at(op));
+  reduction_ = CReductionAlgorithm::createOperation(CReductionAlgorithm::ReductionOperations[op]);
 }
+CATCH
 
 void CScalarAlgorithmExtractAxis::apply(const std::vector<std::pair<int,double> >& localIndex,
@@ -61 +63 @@
                                          std::vector<bool>& flagInitial,                     
                                          bool ignoreMissingValue, bool firstPass)
+TRY
 {
   reduction_->apply(localIndex, dataInput, dataOut, flagInitial, ignoreMissingValue, firstPass);
 }
+CATCH
 
 CScalarAlgorithmExtractAxis::~CScalarAlgorithmExtractAxis()
+TRY
 {
   if (0 != reduction_) delete reduction_;
 }
+CATCH
 
 void CScalarAlgorithmExtractAxis::computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs)
+TRY
 {
   this->transformationMapping_.resize(1);
@@ -81 +88 @@
   transWeight[0].push_back(1.0);
 }
+CATCH
 
 }