Changeset 1782 for XIOS

Timestamp:

12/04/19 18:18:24 (4 years ago)

Author:

ymipsl

Message:

coupling branch : implement new objet coupler_in and coupler_out to be properly parsed from XML file.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• config/coupler_in_attribute.conf (added)
• config/coupler_out_attribute.conf (added)
• config/node_type.conf (modified) (1 diff)
• group_factory_decl.cpp (modified) (1 diff)
• group_template_decl.cpp (modified) (1 diff)
• node/coupler_in.cpp (added)
• node/coupler_in.hpp (added)
• node/coupler_out.cpp (added)
• node/coupler_out.hpp (added)
• node/node_enum.hpp (modified) (1 diff)
• node/node_type.hpp (modified) (1 diff)
• object_factory_decl1.cpp (modified) (1 diff)
• object_factory_decl3.cpp (modified) (1 diff)
• object_template_decl.cpp (modified) (2 diffs)
• type/type_util.hpp (modified) (2 diffs)
• xml_parser_decl.cpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/config/node_type.conf

@@ -14 +14 @@
    DECLARE_NODE(File  , file  )
 #endif //__XIOS_CFile__
+
+#ifdef __XIOS_CCouplerIn__
+   DECLARE_NODE(CouplerIn  , coupler_in  )
+#endif //__XIOS_CCouplerIn__
+
+#ifdef __XIOS_CCouplerOut__
+   DECLARE_NODE(CouplerOut  , coupler_out  )
+#endif //__XIOS_CCouplerOut__
+
 
 #ifdef __XIOS_CGrid__

XIOS/dev/dev_ym/XIOS_COUPLING/src/group_factory_decl.cpp

@@ -20 +20 @@
   macro(CFieldGroup)
   macro(CFileGroup)
+  macro(CCouplerInGroup)
+  macro(CCouplerOutGroup)
   macro(CGridGroup)
   macro(CAxisGroup)

XIOS/dev/dev_ym/XIOS_COUPLING/src/group_template_decl.cpp

@@ -10 +10 @@
   macro(Field)
   macro(File)
+  macro(CouplerIn)
+  macro(CouplerOut)
   macro(Domain)
   macro(Grid)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/node_enum.hpp

@@ -15 +15 @@
          eField,gField,
          eFile,gFile,
+         eCouplerIn,gCouplerIn,
+         eCouplerOut,gCouplerOut,
          eGrid,gGrid,
          eVariable,gVariable,

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/node_type.hpp

@@ -6 +6 @@
 #include "field.hpp"
 #include "file.hpp"
+#include "coupler_in.hpp"
+#include "coupler_out.hpp"
 #include "grid.hpp"
 #include "variable.hpp"

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_factory_decl1.cpp

@@ -5 +5 @@
   macro(CField)
   macro(CFile)
+  macro(CCouplerIn)
+  macro(CCouplerOut)
   macro(CGrid)
   macro(CAxis)

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_factory_decl3.cpp

@@ -6 +6 @@
   macro(CFieldGroup)
   macro(CFileGroup)
+  macro(CCouplerInGroup)
+  macro(CCouplerOutGroup)
   macro(CGridGroup)
   macro(CAxisGroup)

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template_decl.cpp

@@ -9 +9 @@
   template class CObjectTemplate<CField>;
   template class CObjectTemplate<CFile>;
+  template class CObjectTemplate<CCouplerIn>;
+  template class CObjectTemplate<CCouplerOut>;
   template class CObjectTemplate<CDomain>;
   template class CObjectTemplate<CGrid>;
@@ -38 +40 @@
   template class CObjectTemplate<CFieldGroup>;
   template class CObjectTemplate<CFileGroup>;
+  template class CObjectTemplate<CCouplerInGroup>;
+  template class CObjectTemplate<CCouplerOutGroup>;
   template class CObjectTemplate<CDomainGroup>;
   template class CObjectTemplate<CGridGroup>;

XIOS/dev/dev_ym/XIOS_COUPLING/src/type/type_util.hpp

@@ -15 +15 @@
     class CFile;
     class CFileGroup;
+    class CCouplerIn;
+    class CCouplerInGroup;
+    class CCouplerOut;
+    class CCouplerOutGroup;
     class CContext;
     class CContextGroup;
@@ -93 +97 @@
   macro(CFile)
   macro(CFileGroup)
+  macro(CCouplerIn)
+  macro(CCouplerInGroup)
+  macro(CCouplerOut)
+  macro(CCouplerOutGroup)
   macro(CContext)
   macro(CContextGroup)

XIOS/dev/dev_ym/XIOS_COUPLING/src/xml_parser_decl.cpp

@@ -18 +18 @@
     macro( Field )
     macro( File )
+    macro( CouplerIn )
+    macro( CouplerOut )
     macro( Variable )
     macro( InverseAxis )