Changeset 960
- Timestamp:
- 10/04/16 18:59:32 (7 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 5 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/config/node_type.conf
r935 r960 79 79 #endif //__XIOS_CExpandDomain__ 80 80 81 #ifdef __XIOS_CExtractAxisToScalar__ 82 DECLARE_NODE(ExtractAxisToScalar, extract_axis) 83 #endif //__XIOS_CExtractAxisToScalar__ 84 81 85 #ifdef __XIOS_CContext__ 82 86 DECLARE_NODE_PAR(Context, context) -
XIOS/trunk/src/group_factory_decl.cpp
r935 r960 37 37 macro(CComputeConnectivityDomainGroup) 38 38 macro(CExpandDomainGroup) 39 macro(CExtractAxisToScalarGroup) 39 40 } -
XIOS/trunk/src/group_template_decl.cpp
r935 r960 26 26 macro(ComputeConnectivityDomain) 27 27 macro(ExpandDomain) 28 macro(ExtractAxisToScalar) 28 29 29 30 } -
XIOS/trunk/src/node/node_enum.hpp
r935 r960 31 31 eExtractDomainToAxis, 32 32 eComputeConnectivityDomain, 33 eExpandDomain 33 eExpandDomain, 34 eExtractAxisToScalar 34 35 35 36 } ENodeType; -
XIOS/trunk/src/node/node_type.hpp
r935 r960 22 22 #include "compute_connectivity_domain.hpp" 23 23 #include "expand_domain.hpp" 24 #include "extract_axis_to_scalar.hpp" 24 25 25 26 -
XIOS/trunk/src/node/scalar.cpp
r895 r960 32 32 { 33 33 m["reduce_axis"] = TRANS_REDUCE_AXIS_TO_SCALAR; 34 m["extract_axis"] = TRANS_EXTRACT_AXIS_TO_SCALAR; 34 35 } 35 36 -
XIOS/trunk/src/node/transformation_enum.hpp
r935 r960 18 18 TRANS_COMPUTE_CONNECTIVITY_DOMAIN = 9, 19 19 TRANS_EXPAND_DOMAIN = 10, 20 TRANS_EXTRACT_AXIS_TO_SCALAR = 11, 20 21 } ETranformationType; 21 22 -
XIOS/trunk/src/object_factory_decl.cpp
r935 r960 38 38 macro(CComputeConnectivityDomain) 39 39 macro(CExpandDomain) 40 macro(CExtractAxisToScalar) 40 41 41 42 macro(CFieldGroup) … … 58 59 macro(CComputeConnectivityDomainGroup) 59 60 macro(CExpandDomainGroup) 61 macro(CExtractAxisToScalarGroup) 60 62 } -
XIOS/trunk/src/object_template_decl.cpp
r935 r960 25 25 template class CObjectTemplate<CComputeConnectivityDomain>; 26 26 template class CObjectTemplate<CExpandDomain>; 27 template class CObjectTemplate<CExtractAxisToScalar>; 27 28 28 29 template class CObjectTemplate<CContextGroup>; … … 45 46 template class CObjectTemplate<CComputeConnectivityDomainGroup>; 46 47 template class CObjectTemplate<CExpandDomainGroup>; 48 template class CObjectTemplate<CExtractAxisToScalarGroup>; 47 49 } -
XIOS/trunk/src/transformation/algo_types.hpp
r941 r960 27 27 #include "expand_domain.hpp" 28 28 #include "domain_algorithm_expand.hpp" 29 #include "extract_axis_to_scalar.hpp" 30 #include "scalar_algorithm_extract_axis.hpp" 29 31 30 32 #endif // __XIOS_ALGORITHM_TRANSFORMATION_TYPES_HPP__ -
XIOS/trunk/src/transformation/grid_transformation_selector.cpp
r941 r960 12 12 13 13 namespace xios { 14 15 /*! 16 Register transformation to the framework 17 */ 18 void CGridTransformationSelector::registerTransformations() 19 { 20 //! Scalar 21 CScalarAlgorithmReduceScalar::registerTrans(); 22 CScalarAlgorithmExtractScalar::registerTrans(); 23 24 //! Axis 25 CAxisAlgorithmZoom::registerTrans(); 26 CAxisAlgorithmExtractDomain::registerTrans(); 27 CAxisAlgorithmInterpolate::registerTrans(); 28 CAxisAlgorithmInverse::registerTrans(); 29 CAxisAlgorithmReduceDomain::registerTrans(); 30 31 //! Domain 32 CDomainAlgorithmComputeConnectivity::registerTrans(); 33 CDomainAlgorithmInterpolate::registerTrans(); 34 CDomainAlgorithmZoom::registerTrans(); 35 CDomainAlgorithmExpand::registerTrans(); 36 } 14 37 15 38 CGridTransformationSelector::CGridTransformationSelector(CGrid* destination, CGrid* source, TransformationType type) … … 308 331 } 309 332 310 311 void CGridTransformationSelector::registerTransformations() 312 { 313 //! Scalar 314 CScalarAlgorithmReduceScalar::registerTrans(); 315 316 //! Axis 317 CAxisAlgorithmZoom::registerTrans(); 318 CAxisAlgorithmExtractDomain::registerTrans(); 319 CAxisAlgorithmInterpolate::registerTrans(); 320 CAxisAlgorithmInverse::registerTrans(); 321 CAxisAlgorithmReduceDomain::registerTrans(); 322 323 //! Domain 324 CDomainAlgorithmComputeConnectivity::registerTrans(); 325 CDomainAlgorithmInterpolate::registerTrans(); 326 CDomainAlgorithmZoom::registerTrans(); 327 CDomainAlgorithmExpand::registerTrans(); 328 329 } 330 331 } 333 } -
XIOS/trunk/src/type/type_util.hpp
r935 r960 44 44 class CExpandDomain; 45 45 class CExpandDomainGroup; 46 class CExtractAxisToScalar; 47 class CExtractAxisToScalarGroup; 46 48 47 49 template <typename T> inline string getStrType(void); … … 104 106 macro(CExpandDomain) 105 107 macro(CExpandDomainGroup) 108 macro(CExtractAxisToScalar) 109 macro(CExtractAxisToScalarGroup) 110 106 111 #undef macro 107 112 } -
XIOS/trunk/src/xml_parser_decl.cpp
r935 r960 31 31 macro( ComputeConnectivityDomain ) 32 32 macro( ExpandDomain ) 33 macro( ExtractAxisToScalar ) 33 34 } 34 35 }
Note: See TracChangeset
for help on using the changeset viewer.