Changeset 2270 for XIOS/dev/dev_ym/XIOS_COUPLING/src
- Timestamp:
- 12/07/21 12:07:33 (3 years ago)
- Location:
- XIOS/dev/dev_ym/XIOS_COUPLING/src
- Files:
-
- 102 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/temporal_transform_filter.cpp
r2195 r2270 5 5 { 6 6 7 CTemporalTransformFilter::CTemporalTransformFilter(CGarbageCollector& gc, int slots, CGridAlgorithm*algo, int nrecords, bool detectMissingValues, double defaultValue)7 CTemporalTransformFilter::CTemporalTransformFilter(CGarbageCollector& gc, int slots, shared_ptr<CGridAlgorithm> algo, int nrecords, bool detectMissingValues, double defaultValue) 8 8 : CTransformFilter(gc, slots, algo, detectMissingValues, defaultValue), nrecords_(nrecords), graphCycleCompleted(true) 9 9 { -
XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/temporal_transform_filter.hpp
r2195 r2270 14 14 public: 15 15 16 CTemporalTransformFilter(CGarbageCollector& gc, int slots, CGridAlgorithm*algo, int nrecords, bool detectMissingValues, double defaultValue) ;16 CTemporalTransformFilter(CGarbageCollector& gc, int slots, shared_ptr<CGridAlgorithm> algo, int nrecords, bool detectMissingValues, double defaultValue) ; 17 17 18 18 protected: -
XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/transform_filter.cpp
r2143 r2270 5 5 { 6 6 7 CTransformFilter::CTransformFilter( CGarbageCollector& gc, int slots, CGridAlgorithm*algo, bool detectMissingValues, double defaultValue)7 CTransformFilter::CTransformFilter( CGarbageCollector& gc, int slots, shared_ptr<CGridAlgorithm> algo, bool detectMissingValues, double defaultValue) 8 8 : CFilter(gc, slots, this), algorithm_(algo), 9 9 detectMissingValues_(detectMissingValues), defaultValue_(defaultValue) … … 35 35 } 36 36 37 void CTransformFilter::buildWorkflowGraph(std::vector<CDataPacketPtr> data, CDataPacketPtr packet, CGridAlgorithm*algorithm)37 void CTransformFilter::buildWorkflowGraph(std::vector<CDataPacketPtr> data, CDataPacketPtr packet, shared_ptr<CGridAlgorithm> algorithm) 38 38 { 39 39 if(this->graphEnabled) -
XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/transform_filter.hpp
r2143 r2270 15 15 public: 16 16 17 CTransformFilter(CGarbageCollector& gc, int slots, CGridAlgorithm*algo, bool detectMissingValues, double defaultValue) ;17 CTransformFilter(CGarbageCollector& gc, int slots, shared_ptr<CGridAlgorithm> algo, bool detectMissingValues, double defaultValue) ; 18 18 19 19 protected: … … 22 22 */ 23 23 CDataPacketPtr virtual apply(std::vector<CDataPacketPtr> data) ; 24 void buildWorkflowGraph(std::vector<CDataPacketPtr> data, CDataPacketPtr packet, CGridAlgorithm*algorithm);24 void buildWorkflowGraph(std::vector<CDataPacketPtr> data, CDataPacketPtr packet, shared_ptr<CGridAlgorithm> algorithm); 25 25 26 26 // void apply(const CArray<double, 1>& dataSrc, CArray<double,1>& dataDest); 27 27 28 CGridAlgorithm*algorithm_ ;28 shared_ptr<CGridAlgorithm> algorithm_ ; 29 29 bool detectMissingValues_ ; 30 30 bool defaultValue_ ; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.hpp
r2267 r2270 152 152 bool activateFieldWorkflow_done_=false ; 153 153 private: 154 CGenericAlgorithmTransformation*transformationAlgorithm_ = nullptr ;155 public: 156 void setTransformationAlgorithm( CGenericAlgorithmTransformation*transformationAlgorithm) { transformationAlgorithm_=transformationAlgorithm ;}157 CGenericAlgorithmTransformation*getTransformationAlgorithm(void) { return transformationAlgorithm_ ;}154 shared_ptr<CGenericAlgorithmTransformation> transformationAlgorithm_ = nullptr ; 155 public: 156 void setTransformationAlgorithm(shared_ptr<CGenericAlgorithmTransformation> transformationAlgorithm) { transformationAlgorithm_=transformationAlgorithm ;} 157 shared_ptr<CGenericAlgorithmTransformation> getTransformationAlgorithm(void) { return transformationAlgorithm_ ;} 158 158 private: 159 159 CTransformationPaths transformationPaths_ ; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/compute_connectivity_domain.cpp
r2196 r2270 52 52 } 53 53 54 CGenericAlgorithmTransformation*CComputeConnectivityDomain::createAlgorithm(bool isSource,54 shared_ptr<CGenericAlgorithmTransformation> CComputeConnectivityDomain::createAlgorithm(bool isSource, 55 55 CGrid* gridDst, CGrid* gridSrc, 56 56 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/compute_connectivity_domain.hpp
r2011 r2270 64 64 static CTransformation<CDomain>* getTransformation(const StdString& id) { return SuperClass::get(id);} 65 65 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 66 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,66 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 67 67 CGrid* gridDst, CGrid* gridSrc, 68 68 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.hpp
r2267 r2270 117 117 118 118 private: 119 CGenericAlgorithmTransformation*transformationAlgorithm_ = nullptr ;120 public: 121 void setTransformationAlgorithm( CGenericAlgorithmTransformation*transformationAlgorithm) { transformationAlgorithm_=transformationAlgorithm ;}122 CGenericAlgorithmTransformation*getTransformationAlgorithm(void) { return transformationAlgorithm_ ;}119 shared_ptr<CGenericAlgorithmTransformation> transformationAlgorithm_ = nullptr ; 120 public: 121 void setTransformationAlgorithm(shared_ptr<CGenericAlgorithmTransformation> transformationAlgorithm) { transformationAlgorithm_=transformationAlgorithm ;} 122 shared_ptr<CGenericAlgorithmTransformation> getTransformationAlgorithm(void) { return transformationAlgorithm_ ;} 123 123 private: 124 124 CTransformationPaths transformationPaths_ ; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/duplicate_scalar_to_axis.cpp
r2011 r2270 45 45 } 46 46 47 CGenericAlgorithmTransformation*CDuplicateScalarToAxis::createAlgorithm(bool isSource,47 shared_ptr<CGenericAlgorithmTransformation> CDuplicateScalarToAxis::createAlgorithm(bool isSource, 48 48 CGrid* gridDst, CGrid* gridSrc, 49 49 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/duplicate_scalar_to_axis.hpp
r2011 r2270 64 64 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 65 65 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 66 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,66 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 67 67 CGrid* gridDst, CGrid* gridSrc, 68 68 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/expand_domain.cpp
r2196 r2270 49 49 } 50 50 51 CGenericAlgorithmTransformation*CExpandDomain::createAlgorithm(bool isSource,51 shared_ptr<CGenericAlgorithmTransformation> CExpandDomain::createAlgorithm(bool isSource, 52 52 CGrid* gridDst, CGrid* gridSrc, 53 53 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/expand_domain.hpp
r2011 r2270 64 64 static CTransformation<CDomain>* getTransformation(const StdString& id) { return SuperClass::get(id);} 65 65 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 66 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,66 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 67 67 CGrid* gridDst, CGrid* gridSrc, 68 68 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_axis.cpp
r2011 r2270 78 78 } 79 79 80 CGenericAlgorithmTransformation*CExtractAxis::createAlgorithm(bool isSource,80 shared_ptr<CGenericAlgorithmTransformation> CExtractAxis::createAlgorithm(bool isSource, 81 81 CGrid* gridDst, CGrid* gridSrc, 82 82 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_axis.hpp
r2011 r2270 63 63 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_axis_to_scalar.cpp
r2011 r2270 59 59 } 60 60 61 CGenericAlgorithmTransformation*CExtractAxisToScalar::createAlgorithm(bool isSource,61 shared_ptr<CGenericAlgorithmTransformation> CExtractAxisToScalar::createAlgorithm(bool isSource, 62 62 CGrid* gridDst, CGrid* gridSrc, 63 63 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_axis_to_scalar.hpp
r2011 r2270 63 63 static CTransformation<CScalar>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_domain.cpp
r2196 r2270 73 73 } 74 74 75 CGenericAlgorithmTransformation*CExtractDomain::createAlgorithm(bool isSource,75 shared_ptr<CGenericAlgorithmTransformation> CExtractDomain::createAlgorithm(bool isSource, 76 76 CGrid* gridDst, CGrid* gridSrc, 77 77 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_domain.hpp
r2011 r2270 63 63 static CTransformation<CDomain>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_domain_to_axis.cpp
r2255 r2270 88 88 } 89 89 90 CGenericAlgorithmTransformation*CExtractDomainToAxis::createAlgorithm(bool isSource,90 shared_ptr<CGenericAlgorithmTransformation> CExtractDomainToAxis::createAlgorithm(bool isSource, 91 91 CGrid* gridDst, CGrid* gridSrc, 92 92 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/extract_domain_to_axis.hpp
r2011 r2270 63 63 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/generate_rectilinear_domain.cpp
r2196 r2270 139 139 } 140 140 141 CGenericAlgorithmTransformation*CGenerateRectilinearDomain::createAlgorithm(bool isSource,141 shared_ptr<CGenericAlgorithmTransformation> CGenerateRectilinearDomain::createAlgorithm(bool isSource, 142 142 CGrid* gridDst, CGrid* gridSrc, 143 143 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/generate_rectilinear_domain.hpp
r2011 r2270 63 63 static CTransformation<CDomain>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp
r2267 r2270 1901 1901 bool hasTransform=false ; 1902 1902 bool hasRemainTransform=false ; 1903 CGenericAlgorithmTransformation*algo ;1903 shared_ptr<CGenericAlgorithmTransformation> algo ; 1904 1904 int pos ; 1905 1905 … … 2192 2192 if (!isSource) 2193 2193 { 2194 CGridAlgorithm*gridAlgorithm ;2194 shared_ptr<CGridAlgorithm> gridAlgorithm ; 2195 2195 if (isNewGrid) 2196 2196 { -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.hpp
r2267 r2270 222 222 double defaultValue, CGrid*& newGrid, bool graphEnabled=false, CField* field=0) ; 223 223 private: 224 CGridAlgorithm*gridAlgorithm_ = nullptr ;225 public: 226 void setGridAlgorithm( CGridAlgorithm*gridAlgorithm) {gridAlgorithm_ = gridAlgorithm;}227 CGridAlgorithm*getGridAlgorithm(void) { return gridAlgorithm_ ;}224 shared_ptr<CGridAlgorithm> gridAlgorithm_ = nullptr ; 225 public: 226 void setGridAlgorithm(shared_ptr<CGridAlgorithm> gridAlgorithm) {gridAlgorithm_ = gridAlgorithm;} 227 shared_ptr<CGridAlgorithm> getGridAlgorithm(void) { return gridAlgorithm_ ;} 228 228 229 229 /////////////////////////////////////////// -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/interpolate_axis.cpp
r2122 r2270 136 136 } 137 137 138 CGenericAlgorithmTransformation*CInterpolateAxis::createAlgorithm(bool isSource,138 shared_ptr<CGenericAlgorithmTransformation> CInterpolateAxis::createAlgorithm(bool isSource, 139 139 CGrid* gridDst, CGrid* gridSrc, 140 140 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/interpolate_axis.hpp
r2011 r2270 65 65 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 66 66 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 67 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,67 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 68 68 CGrid* gridDst, CGrid* gridSrc, 69 69 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/interpolate_domain.cpp
r2196 r2270 69 69 } 70 70 71 CGenericAlgorithmTransformation*CInterpolateDomain::createAlgorithm(bool isSource,71 shared_ptr<CGenericAlgorithmTransformation> CInterpolateDomain::createAlgorithm(bool isSource, 72 72 CGrid* gridDst, CGrid* gridSrc, 73 73 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/interpolate_domain.hpp
r2011 r2270 63 63 static CTransformation<CDomain>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/inverse_axis.cpp
r2011 r2270 40 40 {} 41 41 42 CGenericAlgorithmTransformation*CInverseAxis::createAlgorithm(bool isSource,42 shared_ptr<CGenericAlgorithmTransformation> CInverseAxis::createAlgorithm(bool isSource, 43 43 CGrid* gridDst, CGrid* gridSrc, 44 44 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/inverse_axis.hpp
r2011 r2270 62 62 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 63 63 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 64 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,64 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 65 65 CGrid* gridDst, CGrid* gridSrc, 66 66 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_axis_to_axis.cpp
r2011 r2270 57 57 } 58 58 59 CGenericAlgorithmTransformation*CReduceAxisToAxis::createAlgorithm(bool isSource,59 shared_ptr<CGenericAlgorithmTransformation> CReduceAxisToAxis::createAlgorithm(bool isSource, 60 60 CGrid* gridDst, CGrid* gridSrc, 61 61 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_axis_to_axis.hpp
r2011 r2270 62 62 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 63 63 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 64 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,64 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 65 65 CGrid* gridDst, CGrid* gridSrc, 66 66 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_axis_to_scalar.cpp
r2011 r2270 42 42 } 43 43 44 CGenericAlgorithmTransformation*CReduceAxisToScalar::createAlgorithm(bool isSource,44 shared_ptr<CGenericAlgorithmTransformation> CReduceAxisToScalar::createAlgorithm(bool isSource, 45 45 CGrid* gridDst, CGrid* gridSrc, 46 46 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_axis_to_scalar.hpp
r2011 r2270 62 62 static CTransformation<CScalar>* getTransformation(const StdString& id) { return SuperClass::get(id);} 63 63 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 64 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,64 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 65 65 CGrid* gridDst, CGrid* gridSrc, 66 66 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_domain_to_axis.cpp
r2011 r2270 88 88 } 89 89 90 CGenericAlgorithmTransformation*CReduceDomainToAxis::createAlgorithm(bool isSource,90 shared_ptr<CGenericAlgorithmTransformation> CReduceDomainToAxis::createAlgorithm(bool isSource, 91 91 CGrid* gridDst, CGrid* gridSrc, 92 92 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_domain_to_axis.hpp
r2011 r2270 63 63 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_domain_to_scalar.cpp
r2011 r2270 43 43 } 44 44 45 CGenericAlgorithmTransformation*CReduceDomainToScalar::createAlgorithm(bool isSource,45 shared_ptr<CGenericAlgorithmTransformation> CReduceDomainToScalar::createAlgorithm(bool isSource, 46 46 CGrid* gridDst, CGrid* gridSrc, 47 47 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_domain_to_scalar.hpp
r2011 r2270 63 63 static CTransformation<CScalar>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_scalar_to_scalar.cpp
r2011 r2270 42 42 } 43 43 44 CGenericAlgorithmTransformation*CReduceScalarToScalar::createAlgorithm(bool isSource,44 shared_ptr<CGenericAlgorithmTransformation> CReduceScalarToScalar::createAlgorithm(bool isSource, 45 45 CGrid* gridDst, CGrid* gridSrc, 46 46 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reduce_scalar_to_scalar.hpp
r2011 r2270 62 62 static CTransformation<CScalar>* getTransformation(const StdString& id) { return SuperClass::get(id);} 63 63 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 64 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,64 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 65 65 CGrid* gridDst, CGrid* gridSrc, 66 66 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reorder_domain.cpp
r2196 r2270 42 42 } 43 43 44 CGenericAlgorithmTransformation*CReorderDomain::createAlgorithm(bool isSource,44 shared_ptr<CGenericAlgorithmTransformation> CReorderDomain::createAlgorithm(bool isSource, 45 45 CGrid* gridDst, CGrid* gridSrc, 46 46 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/reorder_domain.hpp
r2011 r2270 63 63 static CTransformation<CDomain>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/scalar.hpp
r2267 r2270 126 126 bool activateFieldWorkflow_done_=false ; 127 127 private: 128 CGenericAlgorithmTransformation*transformationAlgorithm_ = nullptr ;128 shared_ptr<CGenericAlgorithmTransformation> transformationAlgorithm_ = nullptr ; 129 129 public: 130 void setTransformationAlgorithm( CGenericAlgorithmTransformation*transformationAlgorithm) { transformationAlgorithm_=transformationAlgorithm ;}131 CGenericAlgorithmTransformation*getTransformationAlgorithm(void) { return transformationAlgorithm_ ;}130 void setTransformationAlgorithm(shared_ptr<CGenericAlgorithmTransformation> transformationAlgorithm) { transformationAlgorithm_=transformationAlgorithm ;} 131 shared_ptr<CGenericAlgorithmTransformation> getTransformationAlgorithm(void) { return transformationAlgorithm_ ;} 132 132 private: 133 133 CTransformationPaths transformationPaths_ ; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/temporal_splitting.cpp
r2011 r2270 46 46 } 47 47 48 CGenericAlgorithmTransformation*CTemporalSplitting::createAlgorithm(bool isSource,48 shared_ptr<CGenericAlgorithmTransformation> CTemporalSplitting::createAlgorithm(bool isSource, 49 49 CGrid* gridDst, CGrid* gridSrc, 50 50 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/temporal_splitting.hpp
r2011 r2270 63 63 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/zoom_axis.cpp
r2011 r2270 78 78 } 79 79 80 CGenericAlgorithmTransformation*CZoomAxis::createAlgorithm(bool isSource,80 shared_ptr<CGenericAlgorithmTransformation> CZoomAxis::createAlgorithm(bool isSource, 81 81 CGrid* gridDst, CGrid* gridSrc, 82 82 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/zoom_axis.hpp
r2011 r2270 63 63 static CTransformation<CAxis>* getTransformation(const StdString& id) { return SuperClass::get(id);} 64 64 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/zoom_domain.cpp
r2196 r2270 73 73 } 74 74 75 CGenericAlgorithmTransformation*CZoomDomain::createAlgorithm(bool isSource,75 shared_ptr<CGenericAlgorithmTransformation> CZoomDomain::createAlgorithm(bool isSource, 76 76 CGrid* gridDst, CGrid* gridSrc, 77 77 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/node/zoom_domain.hpp
r2011 r2270 63 63 virtual void inheritFrom(SuperTransform* srcTransform) { solveDescInheritance(true, this->SuperClass::get((MyClass*)srcTransform)) ;} 64 64 static CTransformation<CDomain>* getTransformation(const StdString& id) { return SuperClass::get(id);} 65 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,65 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 66 66 CGrid* gridDst, CGrid* gridSrc, 67 67 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/algorithm_transformation_no_data_modification.cpp
r2007 r2270 10 10 } 11 11 12 CGridAlgorithm*CAlgorithmTransformationNoDataModification::createGridAlgorithm(CGrid* gridSrc, CGrid* gridDst, int pos)12 shared_ptr<CGridAlgorithm> CAlgorithmTransformationNoDataModification::createGridAlgorithm(CGrid* gridSrc, CGrid* gridDst, int pos) 13 13 { 14 return new CGridAlgorithmNoDataModification(this) ;14 return make_shared<CGridAlgorithmNoDataModification>(static_pointer_cast<CAlgorithmTransformationNoDataModification>(shared_from_this())) ; 15 15 } 16 16 } -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/algorithm_transformation_no_data_modification.hpp
r2007 r2270 15 15 virtual ~CAlgorithmTransformationNoDataModification() {}; 16 16 virtual void apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, CArray<double,1>& dataOut); 17 virtual CGridAlgorithm*createGridAlgorithm(CGrid* gridSrc, CGrid* newGrid, int pos) ;17 virtual shared_ptr<CGridAlgorithm> createGridAlgorithm(CGrid* gridSrc, CGrid* newGrid, int pos) ; 18 18 }; 19 19 -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_duplicate_scalar.cpp
r2147 r2270 12 12 13 13 namespace xios { 14 CGenericAlgorithmTransformation*CAxisAlgorithmDuplicateScalar::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,14 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmDuplicateScalar::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 15 15 CTransformation<CAxis>* transformation, 16 16 int elementPositionInGrid, … … 30 30 int scalarSrcIndex = elementPositionInGridSrc2ScalarPosition[elementPositionInGrid]; 31 31 32 return (new CAxisAlgorithmDuplicateScalar(isSource, axisListDestP[axisDstIndex], scalarListSrcP[scalarSrcIndex], duplicateScalar));32 return make_shared<CAxisAlgorithmDuplicateScalar>(isSource, axisListDestP[axisDstIndex], scalarListSrcP[scalarSrcIndex], duplicateScalar); 33 33 } 34 34 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_duplicate_scalar.hpp
r2145 r2270 34 34 virtual StdString getAlgoName() {return "\\nduplicate_scalar";} 35 35 36 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,36 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 37 37 CTransformation<CAxis>* transformation, 38 38 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_extract.cpp
r2255 r2270 10 10 11 11 namespace xios { 12 CGenericAlgorithmTransformation*CAxisAlgorithmExtract::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,12 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmExtract::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 13 13 CTransformation<CAxis>* transformation, 14 14 int elementPositionInGrid, … … 28 28 int axisSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 29 29 30 return (new CAxisAlgorithmExtract(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], extractAxis));30 return make_shared<CAxisAlgorithmExtract>(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], extractAxis); 31 31 } 32 32 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_extract.hpp
r2145 r2270 48 48 49 49 public: 50 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,50 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 51 51 CTransformation<CAxis>* transformation, 52 52 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_extract_domain.cpp
r2255 r2270 15 15 #include "reduction.hpp" 16 16 17 namespace xios { 18 CGenericAlgorithmTransformation* CAxisAlgorithmExtractDomain::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 17 namespace xios 18 { 19 20 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmExtractDomain::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 19 21 CTransformation<CAxis>* transformation, 20 22 int elementPositionInGrid, … … 34 36 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 35 37 36 return (new CAxisAlgorithmExtractDomain(isSource, axisListDestP[axisDstIndex], domainListSrcP[domainSrcIndex], extractDomain));38 return make_shared<CAxisAlgorithmExtractDomain>(isSource, axisListDestP[axisDstIndex], domainListSrcP[domainSrcIndex], extractDomain); 37 39 } 38 40 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_extract_domain.hpp
r2145 r2270 49 49 50 50 public: 51 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,51 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 52 52 CTransformation<CAxis>* transformation, 53 53 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_interpolate.cpp
r2196 r2270 20 20 21 21 namespace xios { 22 CGenericAlgorithmTransformation*CAxisAlgorithmInterpolate::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,22 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmInterpolate::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 23 23 CTransformation<CAxis>* transformation, 24 24 int elementPositionInGrid, … … 38 38 int axisSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 39 39 40 return (new CAxisAlgorithmInterpolate(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], interpolateAxis));40 return make_shared<CAxisAlgorithmInterpolate>(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], interpolateAxis); 41 41 } 42 42 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_interpolate.hpp
r2145 r2270 52 52 53 53 public: 54 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,54 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 55 55 CTransformation<CAxis>* transformation, 56 56 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_interpolate_coordinate.cpp
r2268 r2270 23 23 namespace xios 24 24 { 25 CGenericAlgorithmTransformation*CAxisAlgorithmInterpolateCoordinate::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,25 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmInterpolateCoordinate::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 26 26 CTransformation<CAxis>* transformation, 27 27 int elementPositionInGrid, … … 41 41 int axisSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 42 42 43 return (new CAxisAlgorithmInterpolateCoordinate(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], interpolateAxis));43 return make_shared<CAxisAlgorithmInterpolateCoordinate>(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], interpolateAxis); 44 44 } 45 45 CATCH … … 138 138 CATCH 139 139 140 CTransformFilter* CAxisAlgorithmInterpolateCoordinate::createTransformFilter(CGarbageCollector& gc, CGridAlgorithm*algo, bool detectMissingValues, double defaultValue)140 CTransformFilter* CAxisAlgorithmInterpolateCoordinate::createTransformFilter(CGarbageCollector& gc, shared_ptr<CGridAlgorithm> algo, bool detectMissingValues, double defaultValue) 141 141 { 142 142 if (hasCoordinateSrc_ && hasCoordinateDest_) return new CTransformFilter(gc, 3, algo, detectMissingValues, defaultValue) ; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_interpolate_coordinate.hpp
r2145 r2270 37 37 static bool registerTrans(); 38 38 virtual StdString getAlgoName() {return "\\ninterpolate_axis";} 39 virtual CTransformFilter* createTransformFilter(CGarbageCollector& gc, CGridAlgorithm*algo, bool detectMissingValues, double defaultValue) ;39 virtual CTransformFilter* createTransformFilter(CGarbageCollector& gc, shared_ptr<CGridAlgorithm> algo, bool detectMissingValues, double defaultValue) ; 40 40 41 41 private: … … 59 59 60 60 public: 61 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,61 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 62 62 CTransformation<CAxis>* transformation, 63 63 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_inverse.cpp
r2257 r2270 18 18 namespace xios { 19 19 20 CGenericAlgorithmTransformation*CAxisAlgorithmInverse::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,20 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmInverse::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 21 21 CTransformation<CAxis>* transformation, 22 22 int elementPositionInGrid, … … 36 36 int axisSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 37 37 38 return (new CAxisAlgorithmInverse(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], inverseAxis));38 return make_shared<CAxisAlgorithmInverse>(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], inverseAxis); 39 39 } 40 40 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_inverse.hpp
r2256 r2270 38 38 39 39 public: 40 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,40 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 41 41 CTransformation<CAxis>* transformation, 42 42 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_reduce_axis.cpp
r2136 r2270 15 15 16 16 namespace xios { 17 CGenericAlgorithmTransformation*CAxisAlgorithmReduceAxis::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,17 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmReduceAxis::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 18 18 CTransformation<CAxis>* transformation, 19 19 int elementPositionInGrid, … … 33 33 int axisSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 34 34 35 return (new CAxisAlgorithmReduceAxis(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], reduceAxis));35 return make_shared<CAxisAlgorithmReduceAxis>(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], reduceAxis); 36 36 } 37 37 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_reduce_axis.hpp
r2145 r2270 35 35 36 36 public: 37 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,37 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 38 38 CTransformation<CAxis>* transformation, 39 39 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_reduce_domain.cpp
r2251 r2270 16 16 17 17 namespace xios { 18 CGenericAlgorithmTransformation*CAxisAlgorithmReduceDomain::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,18 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmReduceDomain::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 19 19 CTransformation<CAxis>* transformation, 20 20 int elementPositionInGrid, … … 34 34 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 35 35 36 return (new CAxisAlgorithmReduceDomain(isSource, axisListDestP[axisDstIndex], domainListSrcP[domainSrcIndex], reduceDomain));36 return make_shared<CAxisAlgorithmReduceDomain>(isSource, axisListDestP[axisDstIndex], domainListSrcP[domainSrcIndex], reduceDomain); 37 37 } 38 38 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_reduce_domain.hpp
r2145 r2270 48 48 49 49 public: 50 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,50 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 51 51 CTransformation<CAxis>* transformation, 52 52 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_temporal_splitting.cpp
r2011 r2270 13 13 14 14 namespace xios { 15 CGenericAlgorithmTransformation*CAxisAlgorithmTemporalSplitting::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,15 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmTemporalSplitting::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 16 16 CTransformation<CAxis>* transformation, 17 17 int elementPositionInGrid, … … 31 31 int scalarSrcIndex = elementPositionInGridSrc2ScalarPosition[elementPositionInGrid]; 32 32 33 return (new CAxisAlgorithmTemporalSplitting(isSource, axisListDestP[axisDstIndex], scalarListSrcP[scalarSrcIndex], temporalSplitting));33 return make_shared<CAxisAlgorithmTemporalSplitting>(isSource, axisListDestP[axisDstIndex], scalarListSrcP[scalarSrcIndex], temporalSplitting); 34 34 } 35 35 CATCH … … 49 49 } 50 50 51 CTransformFilter* CAxisAlgorithmTemporalSplitting::createTransformFilter(CGarbageCollector& gc, CGridAlgorithm*algo, bool detectMissingValues, double defaultValue)51 CTransformFilter* CAxisAlgorithmTemporalSplitting::createTransformFilter(CGarbageCollector& gc, shared_ptr<CGridAlgorithm> algo, bool detectMissingValues, double defaultValue) 52 52 { 53 53 return new CTemporalTransformFilter(gc, 1, algo, nrecords_, detectMissingValues, defaultValue) ; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_temporal_splitting.hpp
r2145 r2270 31 31 virtual StdString getAlgoName() {return "\\ntemporal_splitting";} 32 32 33 virtual CTransformFilter* createTransformFilter(CGarbageCollector& gc, CGridAlgorithm*algo, bool detectMissingValues, double defaultValue) ;33 virtual CTransformFilter* createTransformFilter(CGarbageCollector& gc, shared_ptr<CGridAlgorithm> algo, bool detectMissingValues, double defaultValue) ; 34 34 35 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,35 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 36 36 CTransformation<CAxis>* transformation, 37 37 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_zoom.cpp
r1998 r2270 10 10 11 11 namespace xios { 12 CGenericAlgorithmTransformation*CAxisAlgorithmZoom::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,12 shared_ptr<CGenericAlgorithmTransformation> CAxisAlgorithmZoom::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 13 13 CTransformation<CAxis>* transformation, 14 14 int elementPositionInGrid, … … 28 28 int axisSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 29 29 30 return (new CAxisAlgorithmZoom(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], zoomAxis));30 return make_shared<CAxisAlgorithmZoom>(isSource, axisListDestP[axisDstIndex], axisListSrcP[axisSrcIndex], zoomAxis); 31 31 } 32 32 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm/axis_algorithm_zoom.hpp
r2011 r2270 48 48 49 49 public: 50 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,50 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 51 51 CTransformation<CAxis>* transformation, 52 52 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_compute_connectivity.cpp
r2011 r2270 15 15 16 16 namespace xios { 17 CGenericAlgorithmTransformation*CDomainAlgorithmComputeConnectivity::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,17 shared_ptr<CGenericAlgorithmTransformation> CDomainAlgorithmComputeConnectivity::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 18 18 CTransformation<CDomain>* transformation, 19 19 int elementPositionInGrid, … … 33 33 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 34 34 35 return (new CDomainAlgorithmComputeConnectivity(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], compute_connectivityDomain));35 return make_shared<CDomainAlgorithmComputeConnectivity>(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], compute_connectivityDomain); 36 36 } 37 37 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_compute_connectivity.hpp
r2011 r2270 37 37 38 38 public: 39 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,39 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 40 40 CTransformation<CDomain>* transformation, 41 41 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_expand.cpp
r1998 r2270 17 17 18 18 namespace xios { 19 CGenericAlgorithmTransformation*CDomainAlgorithmExpand::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,19 shared_ptr<CGenericAlgorithmTransformation> CDomainAlgorithmExpand::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 20 20 CTransformation<CDomain>* transformation, 21 21 int elementPositionInGrid, … … 35 35 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 36 36 37 return (new CDomainAlgorithmExpand(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], expandDomain));37 return make_shared<CDomainAlgorithmExpand>(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], expandDomain); 38 38 } 39 39 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_expand.hpp
r2145 r2270 46 46 47 47 public: 48 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,48 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 49 49 CTransformation<CDomain>* transformation, 50 50 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_extract.cpp
r2232 r2270 7 7 8 8 namespace xios { 9 CGenericAlgorithmTransformation*CDomainAlgorithmExtract::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,9 shared_ptr<CGenericAlgorithmTransformation> CDomainAlgorithmExtract::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 10 10 CTransformation<CDomain>* transformation, 11 11 int elementPositionInGrid, … … 25 25 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 26 26 27 return (new CDomainAlgorithmExtract(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], extractDomain));27 return make_shared<CDomainAlgorithmExtract>(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], extractDomain); 28 28 } 29 29 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_extract.hpp
r2145 r2270 43 43 44 44 public: 45 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,45 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 46 46 CTransformation<CDomain>* transformation, 47 47 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_generate_rectilinear.cpp
r2016 r2270 18 18 19 19 20 CGenericAlgorithmTransformation*CDomainAlgorithmGenerateRectilinear::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,20 shared_ptr<CGenericAlgorithmTransformation> CDomainAlgorithmGenerateRectilinear::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 21 21 CTransformation<CDomain>* transformation, 22 22 int elementPositionInGrid, … … 36 36 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 37 37 38 return (new CDomainAlgorithmGenerateRectilinear(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], gridDst, gridSrc, transform));38 return make_shared<CDomainAlgorithmGenerateRectilinear>(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], gridDst, gridSrc, transform); 39 39 } 40 40 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_generate_rectilinear.hpp
r2145 r2270 45 45 46 46 public: 47 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,47 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 48 48 CTransformation<CDomain>* transformation, 49 49 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_interpolate.cpp
r2006 r2270 22 22 23 23 namespace xios { 24 CGenericAlgorithmTransformation*CDomainAlgorithmInterpolate::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,24 shared_ptr<CGenericAlgorithmTransformation> CDomainAlgorithmInterpolate::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 25 25 CTransformation<CDomain>* transformation, 26 26 int elementPositionInGrid, … … 40 40 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 41 41 42 return (new CDomainAlgorithmInterpolate(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], interpolateDomain));42 return make_shared<CDomainAlgorithmInterpolate>(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], interpolateDomain); 43 43 } 44 44 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_interpolate.hpp
r2145 r2270 87 87 public: 88 88 89 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,89 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 90 90 CTransformation<CDomain>* transformation, 91 91 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_reorder.cpp
r2226 r2270 10 10 11 11 namespace xios { 12 CGenericAlgorithmTransformation*CDomainAlgorithmReorder::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,12 shared_ptr<CGenericAlgorithmTransformation> CDomainAlgorithmReorder::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 13 13 CTransformation<CDomain>* transformation, 14 14 int elementPositionInGrid, … … 28 28 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 29 29 30 return (new CDomainAlgorithmReorder(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], reorderDomain));30 return make_shared<CDomainAlgorithmReorder>(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], reorderDomain); 31 31 } 32 32 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_reorder.hpp
r2145 r2270 30 30 31 31 public: 32 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,32 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 33 33 CTransformation<CDomain>* transformation, 34 34 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_zoom.cpp
r1998 r2270 7 7 8 8 namespace xios { 9 CGenericAlgorithmTransformation*CDomainAlgorithmZoom::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,9 shared_ptr<CGenericAlgorithmTransformation> CDomainAlgorithmZoom::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 10 10 CTransformation<CDomain>* transformation, 11 11 int elementPositionInGrid, … … 25 25 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 26 26 27 return (new CDomainAlgorithmZoom(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], zoomDomain));27 return make_shared<CDomainAlgorithmZoom>(isSource, domainListDestP[domainDstIndex], domainListSrcP[domainSrcIndex], zoomDomain); 28 28 } 29 29 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm/domain_algorithm_zoom.hpp
r2011 r2270 46 46 47 47 public: 48 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,48 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 49 49 CTransformation<CDomain>* transformation, 50 50 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/generic_algorithm_transformation.cpp
r2011 r2270 33 33 /////////////////////////////////////////////////////////////// 34 34 35 CGridAlgorithm*CGenericAlgorithmTransformation::createGridAlgorithm(CGrid* gridSrc, CGrid* gridDst, int pos)35 shared_ptr<CGridAlgorithm> CGenericAlgorithmTransformation::createGridAlgorithm(CGrid* gridSrc, CGrid* gridDst, int pos) 36 36 { 37 return new CGridAlgorithmGeneric(gridSrc, gridDst, pos, this) ;37 return make_shared<CGridAlgorithmGeneric>(gridSrc, gridDst, pos, shared_from_this()) ; 38 38 } 39 39 40 40 41 41 42 CTransformFilter* CGenericAlgorithmTransformation::createTransformFilter(CGarbageCollector& gc, CGridAlgorithm*algo, bool detectMissingValues, double defaultValue)42 CTransformFilter* CGenericAlgorithmTransformation::createTransformFilter(CGarbageCollector& gc, shared_ptr<CGridAlgorithm> algo, bool detectMissingValues, double defaultValue) 43 43 { 44 44 return new CTransformFilter(gc, 1, algo, detectMissingValues, defaultValue) ; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/generic_algorithm_transformation.hpp
r2267 r2270 32 32 This class defines the interface for all other inherited algorithms class 33 33 */ 34 class CGenericAlgorithmTransformation 34 class CGenericAlgorithmTransformation : public std::enable_shared_from_this<CGenericAlgorithmTransformation> 35 35 { 36 36 public : 37 37 CGenericAlgorithmTransformation(bool isSource) ; 38 virtual CGridAlgorithm*createGridAlgorithm(CGrid* gridSrc, CGrid* newGrid, int pos) ;39 virtual CTransformFilter* createTransformFilter(CGarbageCollector& gc, CGridAlgorithm*algo, bool detectMissingValues, double defaultValue) ;38 virtual shared_ptr<CGridAlgorithm> createGridAlgorithm(CGrid* gridSrc, CGrid* newGrid, int pos) ; 39 virtual CTransformFilter* createTransformFilter(CGarbageCollector& gc, shared_ptr<CGridAlgorithm> algo, bool detectMissingValues, double defaultValue) ; 40 40 virtual void apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, CArray<double,1>& dataOut) { abort() ;} //=0 41 41 virtual void apply(int dimBefore, int dimAfter, const CArray<double,1>& dataIn, const vector<CArray<double,1>>& auxData, CArray<double,1>& dataOut) { abort() ;} //=0 -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/grid_algorithm.cpp
r2145 r2270 7 7 CTransformFilter* CGridAlgorithm::createTransformFilter(CGarbageCollector& gc, bool detectMissingValues, double defaultValue) 8 8 { 9 return algorithm_->createTransformFilter(gc, this, detectMissingValues, defaultValue) ;9 return algorithm_->createTransformFilter(gc, shared_from_this(), detectMissingValues, defaultValue) ; 10 10 } 11 11 -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/grid_algorithm.hpp
r2145 r2270 19 19 class CGarbageCollector ; 20 20 21 class CGridAlgorithm 21 class CGridAlgorithm : public std::enable_shared_from_this<CGridAlgorithm> 22 22 { 23 23 public: 24 CGridAlgorithm( CGenericAlgorithmTransformation*algorithm) : algorithm_(algorithm) {} ;24 CGridAlgorithm(shared_ptr<CGenericAlgorithmTransformation> algorithm) : algorithm_(algorithm) {} ; 25 25 virtual ~CGridAlgorithm() {} ; 26 26 virtual void apply(const CArray<double,1>& dataIn, CArray<double,1>& dataOut) { abort(); } //=0 … … 31 31 32 32 protected: 33 CGenericAlgorithmTransformation*algorithm_=nullptr ;33 shared_ptr<CGenericAlgorithmTransformation> algorithm_=nullptr ; 34 34 }; 35 35 -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/grid_algorithm_generic.cpp
r2267 r2270 10 10 { 11 11 12 CGridAlgorithmGeneric::CGridAlgorithmGeneric(CGrid* gridSrc, CGrid* gridDst, int pos, CGenericAlgorithmTransformation*algo)12 CGridAlgorithmGeneric::CGridAlgorithmGeneric(CGrid* gridSrc, CGrid* gridDst, int pos, shared_ptr<CGenericAlgorithmTransformation> algo) 13 13 : CGridAlgorithm(algo), gridSrc_(gridSrc), gridDst_(gridDst), pos_(pos) 14 14 { -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/grid_algorithm_generic.hpp
r2267 r2270 23 23 { 24 24 public: 25 CGridAlgorithmGeneric(CGrid* gridSrc, CGrid* gridDst, int pos, CGenericAlgorithmTransformation*algo) ;25 CGridAlgorithmGeneric(CGrid* gridSrc, CGrid* gridDst, int pos, shared_ptr<CGenericAlgorithmTransformation> algo) ; 26 26 virtual ~CGridAlgorithmGeneric() {} ; 27 27 -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/grid_algorithm_no_data_modification.hpp
r2007 r2270 19 19 { 20 20 public: 21 CGridAlgorithmNoDataModification( CGenericAlgorithmTransformation*algo) : CGridAlgorithm(algo) {}21 CGridAlgorithmNoDataModification(shared_ptr<CGenericAlgorithmTransformation> algo) : CGridAlgorithm(algo) {} 22 22 ~CGridAlgorithmNoDataModification(void) {}; 23 23 void computeAlgorithm(void) {} ; -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/grid_transformation_factory_impl.hpp
r1985 r2270 33 33 virtual ~CGridTransformationFactory() {} 34 34 35 static CGenericAlgorithmTransformation*createTransformation(ETranformationType transType, bool isSource,35 static shared_ptr<CGenericAlgorithmTransformation> createTransformation(ETranformationType transType, bool isSource, 36 36 CGrid* gridDst, CGrid* gridSrc, 37 37 CTransformation<T>* transformation, … … 45 45 46 46 public: 47 typedef CGenericAlgorithmTransformation*(*CreateTransformationCallBack)(bool isSource, CGrid* gridDst, CGrid* gridSrc,47 typedef shared_ptr<CGenericAlgorithmTransformation> (*CreateTransformationCallBack)(bool isSource, CGrid* gridDst, CGrid* gridSrc, 48 48 CTransformation<T>* transformation, 49 49 int elementPositionInGrid, … … 68 68 69 69 template<typename T> 70 CGenericAlgorithmTransformation*CGridTransformationFactory<T>::createTransformation(ETranformationType transType, bool isSource,70 shared_ptr<CGenericAlgorithmTransformation> CGridTransformationFactory<T>::createTransformation(ETranformationType transType, bool isSource, 71 71 CGrid* gridDst, CGrid* gridSrc, 72 72 CTransformation<T>* transformation, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_extract_axis.cpp
r1999 r2270 17 17 18 18 namespace xios { 19 CGenericAlgorithmTransformation*CScalarAlgorithmExtractAxis::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,19 shared_ptr<CGenericAlgorithmTransformation> CScalarAlgorithmExtractAxis::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 20 20 CTransformation<CScalar>* transformation, 21 21 int elementPositionInGrid, … … 35 35 int axisSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 36 36 37 return (new CScalarAlgorithmExtractAxis(isSource, scalarListDestP[scalarDstIndex], axisListSrcP[axisSrcIndex], extractAxis));37 return make_shared<CScalarAlgorithmExtractAxis>(isSource, scalarListDestP[scalarDstIndex], axisListSrcP[axisSrcIndex], extractAxis); 38 38 } 39 39 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_extract_axis.hpp
r2145 r2270 39 39 40 40 public: 41 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,41 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 42 42 CTransformation<CScalar>* transformation, 43 43 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_axis.cpp
r1999 r2270 18 18 19 19 namespace xios { 20 CGenericAlgorithmTransformation*CScalarAlgorithmReduceAxis::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,20 shared_ptr<CGenericAlgorithmTransformation> CScalarAlgorithmReduceAxis::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 21 21 CTransformation<CScalar>* transformation, 22 22 int elementPositionInGrid, … … 36 36 int axisSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 37 37 38 return (new CScalarAlgorithmReduceAxis(isSource, scalarListDestP[scalarDstIndex], axisListSrcP[axisSrcIndex], reduceAxis));38 return make_shared<CScalarAlgorithmReduceAxis>(isSource, scalarListDestP[scalarDstIndex], axisListSrcP[axisSrcIndex], reduceAxis); 39 39 } 40 40 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_axis.hpp
r2145 r2270 37 37 38 38 public: 39 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,39 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 40 40 CTransformation<CScalar>* transformation, 41 41 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_domain.cpp
r1999 r2270 15 15 16 16 namespace xios { 17 CGenericAlgorithmTransformation*CScalarAlgorithmReduceDomain::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,17 shared_ptr<CGenericAlgorithmTransformation> CScalarAlgorithmReduceDomain::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 18 18 CTransformation<CScalar>* transformation, 19 19 int elementPositionInGrid, … … 33 33 int domainSrcIndex = elementPositionInGridSrc2DomainPosition[elementPositionInGrid]; 34 34 35 return (new CScalarAlgorithmReduceDomain(isSource, scalarListDestP[scalarDstIndex], domainListSrcP[domainSrcIndex], reduceDomain));35 return make_shared<CScalarAlgorithmReduceDomain>(isSource, scalarListDestP[scalarDstIndex], domainListSrcP[domainSrcIndex], reduceDomain); 36 36 } 37 37 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_domain.hpp
r2145 r2270 40 40 41 41 public: 42 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,42 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 43 43 CTransformation<CScalar>* transformation, 44 44 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_scalar.cpp
r2011 r2270 13 13 14 14 namespace xios { 15 CGenericAlgorithmTransformation*CScalarAlgorithmReduceScalar::create(bool isSource, CGrid* gridDst, CGrid* gridSrc,15 shared_ptr<CGenericAlgorithmTransformation> CScalarAlgorithmReduceScalar::create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 16 16 CTransformation<CScalar>* transformation, 17 17 int elementPositionInGrid, … … 31 31 int scalarSrcIndex = elementPositionInGridSrc2AxisPosition[elementPositionInGrid]; 32 32 33 return (new CScalarAlgorithmReduceScalar(isSource, scalarListDestP[scalarDstIndex], scalarListSrcP[scalarSrcIndex], reduceScalar));33 return make_shared<CScalarAlgorithmReduceScalar>(isSource, scalarListDestP[scalarDstIndex], scalarListSrcP[scalarSrcIndex], reduceScalar); 34 34 } 35 35 CATCH -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm/scalar_algorithm_reduce_scalar.hpp
r2145 r2270 33 33 34 34 public: 35 static CGenericAlgorithmTransformation*create(bool isSource, CGrid* gridDst, CGrid* gridSrc,35 static shared_ptr<CGenericAlgorithmTransformation> create(bool isSource, CGrid* gridDst, CGrid* gridSrc, 36 36 CTransformation<CScalar>* transformation, 37 37 int elementPositionInGrid, -
XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/transformation.hpp
r2118 r2270 40 40 virtual const string& getName(void) { ERROR("string Transformation<T>::getId())",<< "unimplemented virtual function for child"); } ; 41 41 virtual const string& getDefName(void) { ERROR("string Transformation<T>::getId())",<< "unimplemented virtual function for child"); } ; 42 virtual CGenericAlgorithmTransformation*createAlgorithm(bool isSource,42 virtual shared_ptr<CGenericAlgorithmTransformation> createAlgorithm(bool isSource, 43 43 CGrid* gridDst, CGrid* gridSrc, 44 44 int elementPositionInGrid,
Note: See TracChangeset
for help on using the changeset viewer.