Changeset 1646 for XIOS/dev/dev_trunk_omp/src/transformation/grid_transformation_selector.cpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

• XIOS/dev/dev_trunk_omp/src/transformation/grid_transformation_selector.cpp (modified) (19 diffs)

XIOS/dev/dev_trunk_omp/src/transformation/grid_transformation_selector.cpp

@@ -10 +10 @@
 #include "grid.hpp"
 #include "algo_types.hpp"
+#ifdef _usingEP
 using namespace ep_lib;
+#endif
 
 namespace xios {
@@ -48 +50 @@
  : gridSource_(source), gridDestination_(destination), isSameGrid_(false),
   listAlgos_(), algoTypes_(), nbNormalAlgos_(0), nbSpecialAlgos_(0), auxInputs_()
+TRY
 {
   if (0 == source)
@@ -63 +66 @@
   initializeTransformations(type);
 }
+CATCH
 
 /*!
@@ -71 +75 @@
 */
 void CGridTransformationSelector::initializeTransformations(TransformationType type)
+TRY
 {
   // Initialize algorithms
@@ -101 +106 @@
   }
 }
+CATCH
 
 CGridTransformationSelector::~CGridTransformationSelector()
+TRY
 {
   std::vector<CGenericAlgorithmTransformation*>::const_iterator itb = algoTransformation_.begin(), it,
@@ -108 +115 @@
   for (it = itb; it != ite; ++it) delete (*it);
 }
+CATCH
 
 /*!
@@ -113 +121 @@
 */
 void CGridTransformationSelector::updateElementPosition()
+TRY
 {
   int idxScalar = 0, idxAxis = 0, idxDomain = 0;
@@ -164 +173 @@
   }
 }
+CATCH
 
 /*!
@@ -169 +179 @@
 */
 void CGridTransformationSelector::initializeAlgorithms()
+TRY
 {
   updateElementPosition();
@@ -189 +200 @@
   }
 }
+CATCH
 
 /*!
@@ -198 +210 @@
 */
 void CGridTransformationSelector::initializeScalarAlgorithms(int scalarPositionInGrid)
+TRY
 {
   std::vector<CScalar*> scalarListDestP = gridDestination_->getScalars();
@@ -230 +243 @@
   }
 }
+CATCH
 
 /*!
@@ -239 +253 @@
 */
 void CGridTransformationSelector::initializeAxisAlgorithms(int axisPositionInGrid)
+TRY
 {
   std::vector<CAxis*> axisListDestP = gridDestination_->getAxis();
@@ -271 +286 @@
   }
 }
+CATCH
 
 /*!
@@ -279 +295 @@
 */
 void CGridTransformationSelector::initializeDomainAlgorithms(int domPositionInGrid)
+TRY
 {
   std::vector<CDomain*> domListDestP = gridDestination_->getDomains();
@@ -310 +327 @@
     }
   }
-
-}
+}
+CATCH
 
 /*!
@@ -322 +339 @@
 */
 void CGridTransformationSelector::selectAlgo(int elementPositionInGrid, ETranformationType transType, int transformationOrder, int algoType)
+TRY
 {
   updateElementPosition();
@@ -339 +357 @@
   }
 }
+CATCH
 
 bool CGridTransformationSelector::isSpecialTransformation(ETranformationType transType)
+TRY
 {
   bool res = false;
@@ -354 +374 @@
   return res;
 }
-
-}
+CATCH
+
+}