Changeset 890 for XIOS/trunk/src
- Timestamp:
- 07/05/16 15:59:18 (8 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/distribution_client.cpp
r888 r890 188 188 nZoomEnd_.at((indexMap_[idx]+1)) = domList[domIndex]->global_zoom_jbegin + domList[domIndex]->global_zoom_nj-1; 189 189 190 dataBegin_.at(indexMap_[idx]+1) = domList[domIndex]->data_jbegin.getValue(); //(2 == domList[domIndex]->data_dim) ? domList[domIndex]->data_jbegin.getValue() : -1; 191 // dataIndex_.at(indexMap_[idx]+1) = &(domList[domIndex]->data_j_index); 192 // infoIndex_.at(indexMap_[idx]+1) = &(domList[domIndex]->j_index); 190 dataBegin_.at(indexMap_[idx]+1) = domList[domIndex]->data_jbegin.getValue(); 193 191 dataIndex_.at(indexMap_[idx]+1).reference(domList[domIndex]->data_j_index); 194 192 infoIndex_.at(indexMap_[idx]+1).reference(domList[domIndex]->j_index); … … 203 201 204 202 dataBegin_.at(indexMap_[idx]) = domList[domIndex]->data_ibegin.getValue(); 205 // dataIndex_.at(indexMap_[idx]) = &(domList[domIndex]->data_i_index);206 // infoIndex_.at(indexMap_[idx]) = &(domList[domIndex]->i_index);207 203 dataIndex_.at(indexMap_[idx]).reference(domList[domIndex]->data_i_index); 208 204 infoIndex_.at(indexMap_[idx]).reference(domList[domIndex]->i_index); … … 227 223 228 224 dataBegin_.at(indexMap_[idx]) = axisList[axisIndex]->data_begin.getValue(); 229 // dataIndex_.at(indexMap_[idx]) = &(axisList[axisIndex]->data_index);230 // infoIndex_.at(indexMap_[idx]) = &(axisList[axisIndex]->index);231 225 dataIndex_.at(indexMap_[idx]).reference(axisList[axisIndex]->data_index); 232 226 infoIndex_.at(indexMap_[idx]).reference(axisList[axisIndex]->index); -
XIOS/trunk/src/node/grid.cpp
r887 r890 34 34 , transformations_(0), isTransformed_(false) 35 35 , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false) 36 , gridSrc_(), hasTransform_(false), order_(), globalIndexOnServer_()36 , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_() 37 37 { 38 38 setVirtualDomainGroup(); … … 52 52 , transformations_(0), isTransformed_(false) 53 53 , axisPositionInGrid_(), positionDimensionDistributed_(1), hasDomainAxisBaseRef_(false) 54 , gridSrc_(), hasTransform_(false), order_(), globalIndexOnServer_()54 , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_() 55 55 { 56 56 setVirtualDomainGroup(); … … 707 707 } 708 708 709 // CGrid* CGrid::createGrid(StdString id, const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,710 // const CArray<int,1>& axisDomainOrder)711 // {712 // if (axisDomainOrder.numElements() > 0 && axisDomainOrder.numElements() != (domains.size() + axis.size()))713 // ERROR("CGrid* CGrid::createGrid(...)",714 // << "The size of axisDomainOrder (" << axisDomainOrder.numElements()715 // << ") is not coherent with the number of elements (" << domains.size() + axis.size() <<").");716 //717 // CGrid* grid = CGridGroup::get("grid_definition")->createChild(id);718 // grid->setDomainList(domains);719 // grid->setAxisList(axis);720 //721 // // By default, domains are always the first elements of a grid722 // if (0 == axisDomainOrder.numElements())723 // {724 // int size = domains.size() + axis.size();725 // grid->axis_domain_order.resize(size);726 // for (int i = 0; i < size; ++i)727 // {728 // if (i < domains.size()) grid->axis_domain_order(i) = 2;729 // else grid->axis_domain_order(i) = 1;730 // }731 // }732 // else733 // {734 // grid->axis_domain_order.resize(axisDomainOrder.numElements());735 // grid->axis_domain_order = axisDomainOrder;736 // }737 //738 // grid->solveDomainAxisRefInheritance(true);739 //740 // return grid;741 // }742 743 709 CGrid* CGrid::createGrid(StdString id, const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis, 744 710 const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder) … … 1040 1006 list<CMessage> listMsg; 1041 1007 list<CArray<size_t,1> > listOutIndex; 1042 // const CClientServerMapping::GlobalIndexMap& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();1043 // const CClientServerMapping::GlobalIndexMap& globalIndexOnServer = clientServerMap_->getGlobalIndexOnServer();1044 1008 const CDistributionClient::GlobalLocalDataMap& globalLocalIndexSendToServer = clientDistribution_->getGlobalLocalDataSendToServer(); 1045 1009 CDistributionClient::GlobalLocalDataMap::const_iterator itIndex = globalLocalIndexSendToServer.begin(), … … 1735 1699 } 1736 1700 1701 if (isGenerated()) return; 1702 setGenerated(); 1703 1737 1704 CGridGenerate gridGenerate(this, transformGridSrc); 1738 1705 gridGenerate.completeGrid(); 1706 } 1707 1708 bool CGrid::isGenerated() 1709 { 1710 return isGenerated_; 1711 } 1712 1713 void CGrid::setGenerated() 1714 { 1715 isGenerated_ = true; 1739 1716 } 1740 1717 -
XIOS/trunk/src/node/grid.hpp
r887 r890 120 120 static CGrid* createGrid(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis, 121 121 const CArray<int,1>& axisDomainOrder = CArray<int,1>()); 122 // static CGrid* createGrid(StdString id, const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,123 // const CArray<int,1>& axisDomainOrder = CArray<int,1>());124 122 static CGrid* createGrid(StdString id, const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis, 125 123 const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder = CArray<int,1>()); 126 124 static CGrid* createGrid(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis, 127 125 const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder); 128 // static StdString generateId(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis,129 // const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder = CArray<int,1>());130 126 static StdString generateId(const std::vector<CDomain*>& domains, const std::vector<CAxis*>& axis, 131 127 const std::vector<CScalar*>& scalars, const CArray<int,1>& axisDomainOrder = CArray<int,1>()); … … 206 202 bool isTransformed(); 207 203 void setTransformed(); 204 bool isGenerated(); 205 void setGenerated(); 208 206 void addTransGridSource(CGrid* gridSrc); 209 207 std::map<CGrid*, std::pair<bool,StdString> >& getTransGridSource(); … … 283 281 284 282 bool isTransformed_; 283 bool isGenerated_; 285 284 std::vector<int> axisPositionInGrid_; 286 285 CGridTransformation* transformations_; -
XIOS/trunk/src/transformation/scalar_algorithm_reduce_axis.cpp
r888 r890 8 8 */ 9 9 #include "scalar_algorithm_reduce_axis.hpp" 10 //#include "context.hpp"11 //#include "context_client.hpp"12 //#include "client_client_dht_template.hpp"13 10 #include "axis.hpp" 14 11 #include "scalar.hpp"
Note: See TracChangeset
for help on using the changeset viewer.