Changeset 1558
- Timestamp:
- 07/12/18 17:22:39 (6 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 5 added
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/config/node_type.conf
r1549 r1558 111 111 #endif //__XIOS_CExtractDomain__ 112 112 113 #ifdef __XIOS_CExtractAxis__ 114 DECLARE_NODE(ExtractAxis, extract_axis) 115 #endif //__XIOS_CExtractAxis__ 116 113 117 #ifdef __XIOS_CContext__ 114 118 DECLARE_NODE_PAR(Context, context) -
XIOS/trunk/src/generate_fortran_interface.cpp
r1549 r1558 41 41 CZoomAxis zoomAxis; 42 42 CInverseAxis inverseAxis; 43 CExtractAxis extractAxis; 44 43 45 CReduceDomainToAxis reduceDomainToAxis; 44 46 CReduceAxisToAxis reduceAxisToAxis; … … 360 362 file.close(); 361 363 364 file.open((path+"extract_axis_interface_attr.F90").c_str()); 365 extractAxis.generateFortran2003Interface(file); 366 file.close(); 367 362 368 file.open((path+"icinverse_axis_attr.cpp").c_str()); 363 369 inverseAxis.generateCInterface(file); -
XIOS/trunk/src/group_factory_decl.cpp
r1549 r1558 28 28 macro(CZoomAxisGroup) 29 29 macro(CInterpolateAxisGroup) 30 macro(CExtractAxisGroup) 30 31 macro(CZoomDomainGroup) 31 32 macro(CInterpolateDomainGroup) -
XIOS/trunk/src/group_template_decl.cpp
r1549 r1558 17 17 macro(ZoomAxis) 18 18 macro(InterpolateAxis) 19 macro(ExtractAxis) 19 20 macro(ZoomDomain) 20 21 macro(InterpolateDomain) -
XIOS/trunk/src/node/axis.cpp
r1542 r1558 51 51 m["zoom_axis"] = TRANS_ZOOM_AXIS; 52 52 m["interpolate_axis"] = TRANS_INTERPOLATE_AXIS; 53 m["extract_axis"] = TRANS_EXTRACT_AXIS; 53 54 m["inverse_axis"] = TRANS_INVERSE_AXIS; 54 55 m["reduce_domain"] = TRANS_REDUCE_DOMAIN_TO_AXIS; -
XIOS/trunk/src/node/axis.hpp
r1542 r1558 125 125 public: 126 126 bool hasValue; 127 bool hasBounds; 128 bool hasLabel; 129 127 130 CArray<size_t,1> localIndexToWriteOnServer; 128 131 … … 173 176 std::map<int, CArray<int, 1> > compressedIndexToWriteOnServer; 174 177 std::map<int, std::vector<int> > connectedServerRank_; 175 bool hasBounds;176 bool hasLabel;177 178 bool computedWrittenIndex_; 178 179 -
XIOS/trunk/src/node/node_enum.hpp
r1549 r1558 23 23 eZoomAxis, 24 24 eInterpolateAxis, 25 eExtractAxis, 25 26 eZoomDomain, 26 27 eInterpolateDomain, -
XIOS/trunk/src/node/node_type.hpp
r1549 r1558 13 13 #include "zoom_axis.hpp" 14 14 #include "interpolate_axis.hpp" 15 #include "extract_axis.hpp" 15 16 #include "zoom_domain.hpp" 16 17 #include "interpolate_domain.hpp" -
XIOS/trunk/src/node/transformation_enum.hpp
r1549 r1558 25 25 TRANS_REDUCE_SCALAR_TO_SCALAR = 16, 26 26 TRANS_REORDER_DOMAIN = 17, 27 TRANS_EXTRACT_DOMAIN = 18 27 TRANS_EXTRACT_DOMAIN = 18, 28 TRANS_EXTRACT_AXIS = 19 28 29 } ETranformationType; 29 30 -
XIOS/trunk/src/object_factory_decl.cpp
r1549 r1558 29 29 macro(CZoomAxis) 30 30 macro(CInterpolateAxis) 31 macro(CExtractAxis) 31 32 macro(CZoomDomain) 32 33 macro(CInterpolateDomain) … … 57 58 macro(CZoomAxisGroup) 58 59 macro(CInterpolateAxisGroup) 60 macro(CExtractAxisGroup) 59 61 macro(CZoomDomainGroup) 60 62 macro(CInterpolateDomainGroup) -
XIOS/trunk/src/object_template_decl.cpp
r1549 r1558 16 16 template class CObjectTemplate<CZoomAxis>; 17 17 template class CObjectTemplate<CInterpolateAxis>; 18 template class CObjectTemplate<CExtractAxis>; 18 19 template class CObjectTemplate<CZoomDomain>; 19 20 template class CObjectTemplate<CInterpolateDomain>; … … 44 45 template class CObjectTemplate<CZoomAxisGroup>; 45 46 template class CObjectTemplate<CInterpolateAxisGroup>; 47 template class CObjectTemplate<CExtractAxisGroup>; 46 48 template class CObjectTemplate<CZoomDomainGroup>; 47 49 template class CObjectTemplate<CInterpolateDomainGroup>; -
XIOS/trunk/src/transformation/algo_types.hpp
r1549 r1558 17 17 #include "axis_algorithm_zoom.hpp" 18 18 #include "axis_algorithm_interpolate.hpp" 19 #include "axis_algorithm_extract.hpp" 19 20 #include "axis_algorithm_reduce_domain.hpp" 20 21 #include "axis_algorithm_reduce_axis.hpp" -
XIOS/trunk/src/transformation/grid_transformation_selector.cpp
r1549 r1558 28 28 CAxisAlgorithmExtractDomain::registerTrans(); 29 29 CAxisAlgorithmInterpolate::registerTrans(); 30 CAxisAlgorithmExtract::registerTrans(); 30 31 CAxisAlgorithmInverse::registerTrans(); 31 32 CAxisAlgorithmReduceDomain::registerTrans(); -
XIOS/trunk/src/type/type_util.hpp
r1549 r1558 26 26 class CInterpolateAxis; 27 27 class CInterpolateAxisGroup; 28 class CExtractAxis; 29 class CExtractAxisGroup; 28 30 class CZoomDomain; 29 31 class CZoomDomainGroup; … … 102 104 macro(CInterpolateAxis) 103 105 macro(CInterpolateAxisGroup) 106 macro(CExtractAxis) 107 macro(CExtractAxisGroup) 104 108 macro(CZoomDomain) 105 109 macro(CZoomDomainGroup) -
XIOS/trunk/src/xml_parser_decl.cpp
r1549 r1558 22 22 macro( ZoomAxis ) 23 23 macro( InterpolateAxis ) 24 macro( ExtractAxis ) 24 25 macro( ZoomDomain ) 25 26 macro( InterpolateDomain )
Note: See TracChangeset
for help on using the changeset viewer.