Changeset 1646 for XIOS/dev/dev_trunk_omp/src/transformation/domain_algorithm_zoom.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/domain_algorithm_zoom.cpp (modified) (5 diffs)

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

@@ -16 +16 @@
                                                              std::map<int, int>& elementPositionInGridDst2AxisPosition,
                                                              std::map<int, int>& elementPositionInGridDst2DomainPosition)
+TRY
 {
   std::vector<CDomain*> domainListDestP = gridDst->getDomains();
@@ -26 +27 @@
   return (new CDomainAlgorithmZoom(domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], zoomDomain));
 }
+CATCH
 
 bool CDomainAlgorithmZoom::registerTrans()
+TRY
 {
   CGridTransformationFactory<CDomain>::registerTransformation(TRANS_ZOOM_DOMAIN, create);
 }
+CATCH
 
 CDomainAlgorithmZoom::CDomainAlgorithmZoom(CDomain* domainDestination, CDomain* domainSource, CZoomDomain* zoomDomain)
 : CDomainAlgorithmTransformation(domainDestination, domainSource)
+TRY
 {
   zoomDomain->checkValid(domainSource);
@@ -93 +98 @@
   domainDest_->ni.setValue(niDest);
   domainDest_->nj.setValue(njDest);
-  domainDest_->ibegin.setValue(ibeginDest);
-  domainDest_->jbegin.setValue(jbeginDest);
+  if ( (niDest==0) || (njDest==0))
+  {
+    domainDest_->ibegin.setValue(0);
+    domainDest_->jbegin.setValue(0);
+  }
+  else
+  {
+    domainDest_->ibegin.setValue(ibeginDest);
+    domainDest_->jbegin.setValue(jbeginDest);
+  }
   domainDest_->i_index.resize(niDest*njDest);
   domainDest_->j_index.resize(niDest*njDest);
@@ -100 +113 @@
   domainDest_->data_ni.setValue(niDest);
   domainDest_->data_nj.setValue(njDest);
-  domainDest_->data_ibegin.setValue(0);  // local position
-  domainDest_->data_jbegin.setValue(0);  // local position
-  domainDest_->data_i_index.resize(niDest*njDest); // local position
-  domainDest_->data_j_index.resize(niDest*njDest); // local position
+  domainDest_->data_ibegin.setValue(0);
+  domainDest_->data_jbegin.setValue(0);
+  domainDest_->data_i_index.resize(niDest*njDest);
+  domainDest_->data_j_index.resize(niDest*njDest);
 
   domainDest_->domainMask.resize(niDest*njDest);
@@ -259 +272 @@
     }
   }
-
-}
+  domainDest_->computeLocalMask();
+}
+CATCH
 
 /*!