Changeset 2460

Timestamp:

01/26/23 16:14:49 (17 months ago)

Author:

ymipsl

Message:

Squeletton to had new transformations : redistribute_domain, redistribute_axis, redistribute_scalar

YM

Location:

XIOS3/dev/XIOS_ATTACHED/src

Files:

• config/node_type.conf (modified) (1 diff)
• config/redistribute_axis_attribute.conf (added)
• config/redistribute_domain_attribute.conf (added)
• config/redistribute_scalar_attribute.conf (added)
• generate_fortran_interface.cpp (modified) (5 diffs)
• group_factory_decl.cpp (modified) (1 diff)
• group_template_decl.cpp (modified) (1 diff)
• node/node_enum.hpp (modified) (1 diff)
• node/node_type.hpp (modified) (1 diff)
• node/redistribute_axis.cpp (added)
• node/redistribute_axis.hpp (added)
• node/redistribute_domain.cpp (added)
• node/redistribute_domain.hpp (added)
• node/redistribute_scalar.cpp (added)
• node/redistribute_scalar.hpp (added)
• object_factory_decl2.cpp (modified) (1 diff)
• object_factory_decl4.cpp (modified) (1 diff)
• object_template_decl.cpp (modified) (2 diffs)
• transformation/algo_types.cpp (modified) (3 diffs)
• transformation/algo_types.hpp (modified) (3 diffs)
• transformation/axis_algorithm/axis_algorithm_redistribute.cpp (added)
• transformation/axis_algorithm/axis_algorithm_redistribute.hpp (added)
• transformation/domain_algorithm/domain_algorithm_redistribute.cpp (added)
• transformation/domain_algorithm/domain_algorithm_redistribute.hpp (added)
• transformation/scalar_algorithm/scalar_algorithm_redistribute.cpp (added)
• transformation/scalar_algorithm/scalar_algorithm_redistribute.hpp (added)
• transformation/transformation_enum.hpp (modified) (1 diff)
• type/type_util.hpp (modified) (2 diffs)
• xml_parser_decl.cpp (modified) (1 diff)

XIOS3/dev/XIOS_ATTACHED/src/config/node_type.conf

@@ -132 +132 @@
 #endif //__XIOS_CServiceNode__
 
+#ifdef __XIOS_CRedistributeDomain__
+   DECLARE_NODE(RedistributeDomain, redistribute_domain)
+#endif //__XIOS_CRedistributeDomain__
+
+#ifdef __XIOS_CRedistributeAxis__
+   DECLARE_NODE(RedistributeAxis, redistribute_axis)
+#endif //__XIOS_CRedistributeAxis__
+
+#ifdef __XIOS_CRedistributeScalar__
+   DECLARE_NODE(RedistributeScalar, redistribute_scalar)
+#endif //__XIOS_CRedistributeScalar__
+
 #ifdef __XIOS_CContext__
    DECLARE_NODE_PAR(Context, context)

XIOS3/dev/XIOS_ATTACHED/src/generate_fortran_interface.cpp

@@ -53 +53 @@
   CDuplicateScalarToAxis duplicateScalarToAxis;
   CReduceScalarToScalar reduceScalarToScalar;
+
+  CRedistributeDomain redistributeDomain ;
+  CRedistributeAxis   redistributeAxis ;
+  CRedistributeScalar redistributeScalar ;
   
   ostringstream oss;
@@ -329 +333 @@
   file.open((path+"ireorder_domain_attr.F90").c_str());
   reorderDomain.generateFortranInterface(file);
+  file.close();
+
+  file.open((path+"iredistribute_domain_attr.F90").c_str());
+  redistributeDomain.generateFortranInterface(file);
   file.close();
   
@@ -410 +418 @@
   file.close();
 
-
   file.open((path+"temporal_splitting_interface_attr.F90").c_str());
   temporalSplitting.generateFortran2003Interface(file);
@@ -435 +442 @@
   duplicateScalarToAxis.generateFortranInterface(file);
   file.close();
+
+  file.open((path+"iredistribute_axis_attr.F90").c_str());
+  redistributeAxis.generateFortranInterface(file);
+  file.close();
+
   /*!
     Scalar transformations
@@ -488 +500 @@
   file.close();
 
+  file.open((path+"iredistribute_scalar_attr.F90").c_str());
+  redistributeScalar.generateFortranInterface(file);
+  file.close();
 
 

XIOS3/dev/XIOS_ATTACHED/src/group_factory_decl.cpp

@@ -50 +50 @@
   macro(CPoolNodeGroup)
   macro(CServiceNodeGroup)
+  macro(CRedistributeDomainGroup)
+  macro(CRedistributeAxisGroup)
+  macro(CRedistributeScalarGroup)
 
 }

XIOS3/dev/XIOS_ATTACHED/src/group_template_decl.cpp

@@ -39 +39 @@
   macro(PoolNode)
   macro(ServiceNode)
+  macro(RedistributeDomain)
+  macro(RedistributeAxis)
+  macro(RedistributeScalar)
 
 }

XIOS3/dev/XIOS_ATTACHED/src/node/node_enum.hpp

@@ -45 +45 @@
          ePoolNode,gPoolNode,
          eServiceNode,gServiceNode,
-//         eService, gService
+         eRedistributeDomain, gRedistributeDomain,
+         eRedistributeAxis, gRedistributeAxis,
+         eRedistributeScalar, gRedistributeScalar,
        } ENodeType;
 

XIOS3/dev/XIOS_ATTACHED/src/node/node_type.hpp

@@ -35 +35 @@
 #include "pool_node.hpp"
 #include "service_node.hpp"
+#include "redistribute_domain.hpp"
+#include "redistribute_axis.hpp"
+#include "redistribute_scalar.hpp"
 
 

XIOS3/dev/XIOS_ATTACHED/src/object_factory_decl2.cpp

@@ -23 +23 @@
   macro(CPoolNode)
   macro(CServiceNode)
+  macro(CRedistributeDomain)
+  macro(CRedistributeAxis)
+  macro(CRedistributeScalar)
 }
 

XIOS3/dev/XIOS_ATTACHED/src/object_factory_decl4.cpp

@@ -19 +19 @@
   macro(CReorderDomainGroup)
   macro(CExtractDomainGroup)
+  macro(CRedistributeDomainGroup)
+  macro(CRedistributeAxisGroup)
+  macro(CRedistributeScalarGroup)
 }
 

XIOS3/dev/XIOS_ATTACHED/src/object_template_decl.cpp

@@ -38 +38 @@
   template class CObjectTemplate<CPoolNode>;
   template class CObjectTemplate<CServiceNode>;
+  template class CObjectTemplate<CRedistributeDomain>;
+  template class CObjectTemplate<CRedistributeAxis>;
+  template class CObjectTemplate<CRedistributeScalar>;
+
   
   template class CObjectTemplate<CContextGroup>;
@@ -71 +75 @@
   template class CObjectTemplate<CPoolNodeGroup>;
   template class CObjectTemplate<CServiceNodeGroup>;
+  template class CObjectTemplate<CRedistributeDomainGroup>;
+  template class CObjectTemplate<CRedistributeAxisGroup>;
+  template class CObjectTemplate<CRedistributeScalarGroup>;
 
 }

XIOS3/dev/XIOS_ATTACHED/src/transformation/algo_types.cpp

@@ -10 +10 @@
       if (!first) return ;
       bool ret ;
-      std::cout<<"register Transformation"<<std::endl ;
       ret=CScalarAlgorithmReduceAxis::registerTrans();
       ret=CScalarAlgorithmExtractAxis::registerTrans();
       ret=CScalarAlgorithmReduceDomain::registerTrans();
       ret=CScalarAlgorithmReduceScalar::registerTrans();
-
+      ret=CScalarAlgorithmRedistribute::registerTrans() ;
       //! Axis
       ret=CAxisAlgorithmZoom::registerTrans();
@@ -27 +26 @@
       ret=CAxisAlgorithmTemporalSplitting::registerTrans();
       ret=CAxisAlgorithmDuplicateScalar::registerTrans();
+      ret=CAxisAlgorithmRedistribute::registerTrans() ;
 
       //! Domain
@@ -36 +36 @@
       ret=CDomainAlgorithmExtract::registerTrans();
       ret=CDomainAlgorithmGenerateRectilinear::registerTrans() ;
+      ret=CDomainAlgorithmRedistribute::registerTrans() ;
       first=false ;
     }

XIOS3/dev/XIOS_ATTACHED/src/transformation/algo_types.hpp

@@ -14 +14 @@
 #include "scalar_algorithm_reduce_domain.hpp"
 #include "scalar_algorithm_reduce_scalar.hpp"
+#include "scalar_algorithm_redistribute.hpp"
 
 #include "axis_algorithm_inverse.hpp"
@@ -25 +26 @@
 #include "axis_algorithm_temporal_splitting.hpp"
 #include "axis_algorithm_duplicate_scalar.hpp"
-
+#include "axis_algorithm_redistribute.hpp"
 
 #include "domain_algorithm_zoom.hpp"
@@ -34 +35 @@
 #include "domain_algorithm_reorder.hpp"
 #include "domain_algorithm_extract.hpp"
+#include "domain_algorithm_redistribute.hpp"
 
 namespace xios

XIOS3/dev/XIOS_ATTACHED/src/transformation/transformation_enum.hpp

@@ -26 +26 @@
         TRANS_REORDER_DOMAIN = 17,
         TRANS_EXTRACT_DOMAIN = 18,
-        TRANS_EXTRACT_AXIS = 19
+        TRANS_EXTRACT_AXIS = 19,
+        TRANS_REDISTRIBUTE_DOMAIN = 20,
+        TRANS_REDISTRIBUTE_AXIS = 21,
+        TRANS_REDISTRIBUTE_SCALAR = 22
       } ETranformationType;
 

XIOS3/dev/XIOS_ATTACHED/src/type/type_util.hpp

@@ -70 +70 @@
     class CServiceNode ;
     class CServiceNodeGroup ;
-      
+    class CRedistributeDomain;
+    class CRedistributeDomainGroup;
+    class CRedistributeAxis;
+    class CRedistributeAxisGroup;
+    class CRedistributeScalar;
+    class CRedistributeScalarGroup;
+       
   template <typename T> inline string getStrType(void);
 
@@ -158 +164 @@
   macro(CServiceNode)
   macro(CServiceNodeGroup)
-  
+  macro(CRedistributeDomain)
+  macro(CRedistributeDomainGroup)  
+  macro(CRedistributeAxis)
+  macro(CRedistributeAxisGroup)  
+  macro(CRedistributeScalar)
+  macro(CRedistributeScalarGroup)  
+
 #undef macro
 }

XIOS3/dev/XIOS_ATTACHED/src/xml_parser_decl.cpp

@@ -44 +44 @@
     macro( PoolNode )
     macro( ServiceNode )
+    macro( RedistributeDomain )
+    macro( RedistributeAxis )
+    macro( RedistributeScalar )
+
   }
 }