Changeset 1642 for XIOS/dev/branch_openmp/src/type

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

Location:

XIOS/dev/branch_openmp/src/type

Files:

• type.hpp (modified) (2 diffs)
• type_impl.hpp (modified) (2 diffs)
• type_util.hpp (modified) (4 diffs)

XIOS/dev/branch_openmp/src/type/type.hpp

@@ -40 +40 @@
     virtual void fromString(const string& str)   { _fromString(str); }
     virtual string toString(void) const { return _toString(); }
+    virtual string dump(void) const { return _toString(); }
     virtual bool fromBuffer(CBufferIn& buffer) { return _fromBuffer(buffer) ; }
     virtual bool toBuffer(CBufferOut& buffer) const { return _toBuffer(buffer); }
@@ -95 +96 @@
     const CType_ref& operator = (CType<T>& val) const ;
     const CType_ref& operator = (const CType_ref& val) const;
-    operator T&() const;
+    operator T&() const;    
 
     inline virtual CBaseType* clone(void) const   { return _clone(); }

XIOS/dev/branch_openmp/src/type/type_impl.hpp

@@ -88 +88 @@
   {
     this->checkEmpty();
-    return *ptrValue ;
+   return *ptrValue ;
   }
 
@@ -129 +129 @@
    CType<T>::operator const T&() const
    {
-     this->checkEmpty();
-     return *ptrValue ;
+    this->checkEmpty();
+    return *ptrValue ;
    }
 

XIOS/dev/branch_openmp/src/type/type_util.hpp

@@ -26 +26 @@
     class CInterpolateAxis;
     class CInterpolateAxisGroup;
+    class CExtractAxis;
+    class CExtractAxisGroup;
     class CZoomDomain;
     class CZoomDomainGroup;
@@ -58 +60 @@
     class CReorderDomain;
     class CReorderDomainGroup;
+    class CExtractDomain;
+    class CExtractDomainGroup;
      
   template <typename T> inline string getStrType(void);
@@ -100 +104 @@
   macro(CInterpolateAxis)
   macro(CInterpolateAxisGroup)
+  macro(CExtractAxis)
+  macro(CExtractAxisGroup)
   macro(CZoomDomain)
   macro(CZoomDomainGroup)
@@ -132 +138 @@
   macro(CReorderDomain)
   macro(CReorderDomainGroup)
+  macro(CExtractDomain)
+  macro(CExtractDomainGroup)
   
 #undef macro