Changeset 1134 for XIOS/dev/branch_yushan_merged/src/node/domain.cpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/node/domain.cpp (modified) (5 diffs)

XIOS/dev/branch_yushan_merged/src/node/domain.cpp

@@ -65 +65 @@
    }
 
-   std::map<StdString, ETranformationType> CDomain::transformationMapList_ = std::map<StdString, ETranformationType>();
-   bool CDomain::_dummyTransformationMapList = CDomain::initializeTransformationMap(CDomain::transformationMapList_);
+   //std::map<StdString, ETranformationType> CDomain::transformationMapList_ = std::map<StdString, ETranformationType>();
+   //bool CDomain::_dummyTransformationMapList = CDomain::initializeTransformationMap(CDomain::transformationMapList_);
+
+   std::map<StdString, ETranformationType> *CDomain::transformationMapList_ptr = 0;
 
    bool CDomain::initializeTransformationMap(std::map<StdString, ETranformationType>& m)
@@ -76 +78 @@
      m["expand_domain"] = TRANS_EXPAND_DOMAIN;
    }
+
+   bool CDomain::initializeTransformationMap()
+   {
+     CDomain::transformationMapList_ptr = new std::map<StdString, ETranformationType>();
+     (*CDomain::transformationMapList_ptr)["zoom_domain"] = TRANS_ZOOM_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["interpolate_domain"] = TRANS_INTERPOLATE_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["generate_rectilinear_domain"] = TRANS_GENERATE_RECTILINEAR_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["compute_connectivity_domain"] = TRANS_COMPUTE_CONNECTIVITY_DOMAIN;
+     (*CDomain::transformationMapList_ptr)["expand_domain"] = TRANS_EXPAND_DOMAIN;
+   }
+
 
    const std::set<StdString> & CDomain::getRelFiles(void) const
@@ -623 +636 @@
    {
           CContext* context = CContext::getCurrent();
-      CContextClient* client = context->client;
+          CContextClient* client = context->client;
           lon_g.resize(ni_glo) ;
           lat_g.resize(nj_glo) ;
@@ -1713 +1726 @@
                                                                                 client->intraComm);
     clientServerMap->computeServerIndexMapping(globalIndexDomain);
+    
     const CClientServerMapping::GlobalIndexMap& globalIndexDomainOnServer = clientServerMap->getGlobalIndexOnServer();
 
@@ -2350 +2364 @@
 
         nodeElementName = node.getElementName();
-        std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it;
-        it = transformationMapList_.find(nodeElementName);
+        if(transformationMapList_ptr == 0) initializeTransformationMap();
+        std::map<StdString, ETranformationType>::const_iterator ite = (*transformationMapList_ptr).end(), it;
+        it = (*transformationMapList_ptr).find(nodeElementName);
         if (ite != it)
         {