Changeset 689 for XIOS/trunk/src/node

Timestamp:

09/15/15 17:31:13 (9 years ago)

Author:

mhnguyen

Message:

Modifying the interface of interpolation domain

+) Change node name from interpolate_from_file_domain to interpolate_domain and add some new atrributes
+) Add more tests into test_remap

Test
+) On Curie
+) test_remap works for direct weight calculation and reading weight calculation from file

Location:

XIOS/trunk/src/node

Files:

• domain.cpp (modified) (3 diffs)
• interpolate_domain.cpp (added)
• interpolate_domain.hpp (moved) (moved from XIOS/trunk/src/node/interpolate_from_file_domain.hpp) (4 diffs)
• interpolate_from_file_domain.cpp (deleted)
• node_enum.hpp (modified) (1 diff)
• node_type.hpp (modified) (1 diff)
• transformation_enum.hpp (modified) (1 diff)

XIOS/trunk/src/node/domain.cpp

@@ -19 +19 @@
 #include "client_server_mapping_distributed.hpp"
 #include "zoom_domain.hpp"
-#include "interpolate_from_file_domain.hpp"
+#include "interpolate_domain.hpp"
 #include "generate_rectilinear_domain.hpp"
 
@@ -1782 +1782 @@
       StdString zoomDomainDefRoot("zoom_domain_definition");
       StdString zoom("zoom_domain");
-      StdString interpFromFileDomainDefRoot("interpolate_from_file_domain_definition");
-      StdString interpFromFile("interpolate_from_file_domain");
+      StdString interpDomainDefRoot("interpolate_domain_definition");
+      StdString interpFromFile("interpolate_domain");
       StdString generateRectilinearDefRoot("generate_rectilinear_domain_definition");
       StdString generateRectilinear("generate_rectilinear_domain");
@@ -1795 +1795 @@
         else if (node.getElementName() == interpFromFile)
         {
-          CInterpolateFromFileDomain* tmp = (CInterpolateFromFileDomainGroup::get(interpFromFileDomainDefRoot))->createChild();
+          CInterpolateDomain* tmp = (CInterpolateDomainGroup::get(interpDomainDefRoot))->createChild();
           tmp->parse(node);
-          transformationMap_.push_back(std::make_pair(TRANS_INTERPOLATE_DOMAIN_FROM_FILE,tmp));
+          transformationMap_.push_back(std::make_pair(TRANS_INTERPOLATE_DOMAIN,tmp));
         }
         else if (node.getElementName() == generateRectilinear)

XIOS/trunk/src/node/interpolate_domain.hpp

@@ -1 @@
-#ifndef __XIOS_CInterpolateFromFileDomain__
-#define __XIOS_CInterpolateFromFileDomain__
+#ifndef __XIOS_CInterpolateDomain__
+#define __XIOS_CInterpolateDomain__
 
 /// xios headers ///
@@ -16 +16 @@
 namespace xios {
   /// ////////////////////// Déclarations ////////////////////// ///
-  class CInterpolateFromFileDomainGroup;
-  class CInterpolateFromFileDomainAttributes;
-  class CInterpolateFromFileDomain;
+  class CInterpolateDomainGroup;
+  class CInterpolateDomainAttributes;
+  class CInterpolateDomain;
   class CDomain;
 
@@ -24 +24 @@
 
   // Declare/Define CFileAttribute
-  BEGIN_DECLARE_ATTRIBUTE_MAP(CInterpolateFromFileDomain)
-#include "interpolate_from_file_domain_attribute.conf"
-  END_DECLARE_ATTRIBUTE_MAP(CInterpolateFromFileDomain)
+  BEGIN_DECLARE_ATTRIBUTE_MAP(CInterpolateDomain)
+#include "interpolate_domain_attribute.conf"
+  END_DECLARE_ATTRIBUTE_MAP(CInterpolateDomain)
 
   ///--------------------------------------------------------------
   /*!
-    \class CInterpolateFromFileDomain
+    \class CInterpolateDomain
     This class describes interpolate_from_file_domain in xml file.
   */
-  class CInterpolateFromFileDomain
-    : public CObjectTemplate<CInterpolateFromFileDomain>
-    , public CInterpolateFromFileDomainAttributes
+  class CInterpolateDomain
+    : public CObjectTemplate<CInterpolateDomain>
+    , public CInterpolateDomainAttributes
     , public CTransformation<CDomain>
   {
     public :
-      typedef CObjectTemplate<CInterpolateFromFileDomain> SuperClass;
-      typedef CInterpolateFromFileDomainAttributes SuperClassAttribute;
+      typedef CObjectTemplate<CInterpolateDomain> SuperClass;
+      typedef CInterpolateDomainAttributes SuperClassAttribute;
 
     public :
       /// Constructeurs ///
-      CInterpolateFromFileDomain(void);
-      explicit CInterpolateFromFileDomain(const StdString& id);
+      CInterpolateDomain(void);
+      explicit CInterpolateDomain(const StdString& id);
 
       /// Destructeur ///
-      virtual ~CInterpolateFromFileDomain(void);
+      virtual ~CInterpolateDomain(void);
 
       virtual void checkValid(CDomain* axisDest);
@@ -58 +58 @@
     private:
 
-  }; // class CInterpolateFromFileDomain
+  }; // class CInterpolateDomain
 
-  DECLARE_GROUP(CInterpolateFromFileDomain);
+  DECLARE_GROUP(CInterpolateDomain);
 } // namespace xios
 
-#endif // __XIOS_CInterpolateFromFileDomain__
+#endif // __XIOS_CInterpolateDomain__

XIOS/trunk/src/node/node_enum.hpp

@@ -24 +24 @@
          eInterpolateAxis,
          eZoomDomain,
-         eInterpolateFromFileDomain,
+         eInterpolateDomain,
          eGenerateRectilinearDomain
 

XIOS/trunk/src/node/node_type.hpp

@@ -14 +14 @@
 #include "interpolate_axis.hpp"
 #include "zoom_domain.hpp"
-#include "interpolate_from_file_domain.hpp"
+#include "interpolate_domain.hpp"
 #include "generate_rectilinear_domain.hpp"
 

XIOS/trunk/src/node/transformation_enum.hpp

@@ -11 +11 @@
         TRANS_INTERPOLATE_AXIS,
         TRANS_ZOOM_DOMAIN,
-        TRANS_INTERPOLATE_DOMAIN_FROM_FILE,
+        TRANS_INTERPOLATE_DOMAIN,
         TRANS_GENERATE_RECTILINEAR_DOMAIN
       } ETranformationType;