Changeset 1095
- Timestamp:
- 04/13/17 14:34:48 (7 years ago)
- Location:
- XIOS/dev/branch_yushan/src
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_yushan/src/attribute_map.hpp
r1088 r1095 69 69 /// Propriété statique /// 70 70 static CAttributeMap * Current; 71 #pragma omp threadprivate (Current)71 //#pragma omp threadprivate (Current) 72 72 73 73 }; // class CAttributeMap -
XIOS/dev/branch_yushan/src/buffer_client.hpp
r1088 r1095 16 16 public: 17 17 static size_t maxRequestSize; 18 #pragma omp threadprivate(maxRequestSize)18 //#pragma omp threadprivate(maxRequestSize) 19 19 20 20 CClientBuffer(MPI_Comm intercomm, int serverRank, StdSize bufferSize, StdSize maxBufferedEvents); -
XIOS/dev/branch_yushan/src/cxios.hpp
r1088 r1095 66 66 67 67 static CRegistry* globalRegistry ; //!< global registry which is wrote by the root process of the servers 68 68 69 69 70 70 -
XIOS/dev/branch_yushan/src/event_client.hpp
r1088 r1095 12 12 public: 13 13 static const size_t headerSize; 14 //#pragma omp threadprivate(headerSize) 14 15 15 16 CEventClient(int classId, int typeId); -
XIOS/dev/branch_yushan/src/filter/spatial_transform_filter.cpp
r1088 r1095 64 64 } 65 65 66 std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *CSpatialTransformFilterEngine::engines_ptr = 0;66 std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > CSpatialTransformFilterEngine::engines; 67 67 68 68 CSpatialTransformFilterEngine* CSpatialTransformFilterEngine::get(CGridTransformation* gridTransformation) … … 71 71 ERROR("CSpatialTransformFilterEngine& CSpatialTransformFilterEngine::get(CGridTransformation* gridTransformation)", 72 72 "Impossible to get the requested engine, the grid transformation is invalid."); 73 74 if(engines_ptr == NULL) engines_ptr = new std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >; 75 76 std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines_ptr->find(gridTransformation); 77 if (it == engines_ptr->end()) 73 74 std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> >::iterator it = engines.find(gridTransformation); 75 if (it == engines.end()) 78 76 { 79 77 boost::shared_ptr<CSpatialTransformFilterEngine> engine(new CSpatialTransformFilterEngine(gridTransformation)); 80 it = engines _ptr->insert(std::make_pair(gridTransformation, engine)).first;78 it = engines.insert(std::make_pair(gridTransformation, engine)).first; 81 79 } 82 80 -
XIOS/dev/branch_yushan/src/filter/spatial_transform_filter.hpp
r1088 r1095 103 103 //! The allocated engines 104 104 static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > engines; 105 static std::map<CGridTransformation*, boost::shared_ptr<CSpatialTransformFilterEngine> > *engines_ptr; 106 #pragma omp threadprivate(engines_ptr) 105 // #pragma omp threadprivate(engines) 107 106 108 107 }; // class CSpatialTransformFilterEngine -
XIOS/dev/branch_yushan/src/group_factory.cpp
r1094 r1095 4 4 { 5 5 /// ////////////////////// Définitions ////////////////////// /// 6 StdString *CGroupFactory::CurrContext_ptr = new StdString;7 6 StdString *CGroupFactory::CurrContext_ptr = new StdString; 8 7 -
XIOS/dev/branch_yushan/src/indent.hpp
r1088 r1095 10 10 public: 11 11 static int defaultIncSize; 12 #pragma omp threadprivate(defaultIncSize)12 //#pragma omp threadprivate(defaultIncSize) 13 13 14 14 static int index ; 15 #pragma omp threadprivate(index)15 //#pragma omp threadprivate(index) 16 16 17 17 int incSize ; -
XIOS/dev/branch_yushan/src/indent_xml.cpp
r1088 r1095 15 15 { 16 16 static unsigned int LineNB = 1; 17 #pragma omp threadprivate(LineNB)17 //#pragma omp threadprivate(LineNB) 18 18 19 19 if (CIndent::WithLine) out << LineNB++ << ". "; -
XIOS/dev/branch_yushan/src/indent_xml.hpp
r1088 r1095 22 22 /// Propriétés statiques /// 23 23 static unsigned int Indent; 24 #pragma omp threadprivate(Indent)24 //#pragma omp threadprivate(Indent) 25 25 26 26 static StdString Increm; 27 #pragma omp threadprivate(Increm)27 //#pragma omp threadprivate(Increm) 28 28 29 29 static bool WithLine; 30 #pragma omp threadprivate(WithLine)30 //#pragma omp threadprivate(WithLine) 31 31 32 32 }; // class CIndent -
XIOS/dev/branch_yushan/src/interface/c/icdata.cpp
r1088 r1095 131 131 132 132 CContext* context = CContext::getCurrent(); 133 //printf("Check : CContext::getCurrent() = %p\n", CContext::getCurrent());133 printf("Check : CContext::getCurrent() = %p\n", CContext::getCurrent()); 134 134 context->finalize(); 135 135 -
XIOS/dev/branch_yushan/src/io/netCdf_cf_constant.hpp
r1088 r1095 28 28 static const std::set<StdString> XIOS_CF_Longitude_units; 29 29 30 // #pragma omp threadprivate(XIOS_CF_Latitude_units, XIOS_CF_Longitude_units) 31 30 32 private: 31 33 CCFConvention(); -
XIOS/dev/branch_yushan/src/memtrack.cpp
r1088 r1095 68 68 private: // static member variables 69 69 static BlockHeader *ourFirstNode; 70 #pragma omp threadprivate(ourFirstNode)70 //#pragma omp threadprivate(ourFirstNode) 71 71 72 72 private: // member variables … … 245 245 static const unsigned int SIGNATURE1 = 0xCAFEBABE; 246 246 static const unsigned int SIGNATURE2 = 0xFACEFACE; 247 248 //#pragma omp threadprivate(SIGNATURE1, SIGNATURE2) 247 249 248 250 private: // member variables -
XIOS/dev/branch_yushan/src/node/axis.cpp
r1089 r1095 44 44 { /* Ne rien faire de plus */ } 45 45 46 //std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 47 std::map<StdString, ETranformationType> *CAxis::transformationMapList_ptr = 0; 48 bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(*CAxis::transformationMapList_ptr); 46 std::map<StdString, ETranformationType> CAxis::transformationMapList_ = std::map<StdString, ETranformationType>(); 47 bool CAxis::dummyTransformationMapList_ = CAxis::initializeTransformationMap(CAxis::transformationMapList_); 49 48 bool CAxis::initializeTransformationMap(std::map<StdString, ETranformationType>& m) 50 49 { … … 1005 1004 1006 1005 nodeElementName = node.getElementName(); 1007 if(transformationMapList_ptr == NULL) transformationMapList_ptr = new std::map<StdString, ETranformationType>; 1008 1009 std::map<StdString, ETranformationType>::const_iterator ite = (*transformationMapList_ptr).end(), it; 1010 it = transformationMapList_ptr->find(nodeElementName); 1006 std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it; 1007 it = transformationMapList_.find(nodeElementName); 1011 1008 if (ite != it) 1012 1009 { -
XIOS/dev/branch_yushan/src/node/axis.hpp
r1088 r1095 166 166 private: 167 167 static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m); 168 //static std::map<StdString, ETranformationType> transformationMapList_; 169 static std::map<StdString, ETranformationType> *transformationMapList_ptr; 170 #pragma omp threadprivate(transformationMapList_ptr) 168 static std::map<StdString, ETranformationType> transformationMapList_; 169 // #pragma omp threadprivate(transformationMapList_) 171 170 172 171 static bool dummyTransformationMapList_; 173 #pragma omp threadprivate(dummyTransformationMapList_)172 //#pragma omp threadprivate(dummyTransformationMapList_) 174 173 175 174 DECLARE_REF_FUNC(Axis,axis) -
XIOS/dev/branch_yushan/src/node/compute_connectivity_domain.hpp
r1088 r1095 60 60 static CTransformation<CDomain>* create(const StdString& id, xml::CXMLNode* node); 61 61 static bool _dummyRegistered; 62 #pragma omp threadprivate(_dummyRegistered)62 //#pragma omp threadprivate(_dummyRegistered) 63 63 64 64 }; // class CComputeConnectivityDomain -
XIOS/dev/branch_yushan/src/node/domain.cpp
r1088 r1095 65 65 } 66 66 67 std::map<StdString, ETranformationType> * CDomain::transformationMapList_ptr = new std::map<StdString, ETranformationType>;68 bool CDomain::_dummyTransformationMapList = CDomain::initializeTransformationMap( *CDomain::transformationMapList_ptr);67 std::map<StdString, ETranformationType> CDomain::transformationMapList_ = std::map<StdString, ETranformationType>(); 68 bool CDomain::_dummyTransformationMapList = CDomain::initializeTransformationMap(CDomain::transformationMapList_); 69 69 70 70 bool CDomain::initializeTransformationMap(std::map<StdString, ETranformationType>& m) … … 2189 2189 2190 2190 nodeElementName = node.getElementName(); 2191 std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_ ptr->end(), it;2192 it = transformationMapList_ ptr->find(nodeElementName);2191 std::map<StdString, ETranformationType>::const_iterator ite = transformationMapList_.end(), it; 2192 it = transformationMapList_.find(nodeElementName); 2193 2193 if (ite != it) 2194 2194 { -
XIOS/dev/branch_yushan/src/node/domain.hpp
r1088 r1095 211 211 private: 212 212 static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m); 213 static std::map<StdString, ETranformationType> *transformationMapList_ptr;213 static std::map<StdString, ETranformationType> transformationMapList_; 214 214 static bool _dummyTransformationMapList; 215 #pragma omp threadprivate(transformationMapList_ptr,_dummyTransformationMapList)215 //#pragma omp threadprivate(_dummyTransformationMapList) 216 216 217 217 DECLARE_REF_FUNC(Domain,domain) -
XIOS/dev/branch_yushan/src/node/expand_domain.hpp
r1088 r1095 60 60 static CTransformation<CDomain>* create(const StdString& id, xml::CXMLNode* node); 61 61 static bool _dummyRegistered; 62 #pragma omp threadprivate(_dummyRegistered)62 //#pragma omp threadprivate(_dummyRegistered) 63 63 64 64 }; // class CExpandDomain -
XIOS/dev/branch_yushan/src/node/extract_axis_to_scalar.hpp
r1088 r1095 60 60 static CTransformation<CScalar>* create(const StdString& id, xml::CXMLNode* node); 61 61 static bool _dummyRegistered; 62 #pragma omp threadprivate(_dummyRegistered)62 //#pragma omp threadprivate(_dummyRegistered) 63 63 }; // class CExtractAxisToScalar 64 64
Note: See TracChangeset
for help on using the changeset viewer.