Changeset 1158 for XIOS/dev/dev_olga/src/node/domain.hpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/node/domain.hpp (modified) (7 diffs)

XIOS/dev/dev_olga/src/node/domain.hpp

@@ -42 +42 @@
       , public CDomainAttributes
    {
-               /// typedef ///
-         typedef CObjectTemplate<CDomain>   SuperClass;
-         typedef CDomainAttributes SuperClassAttribute;
-         
-      public :
+     /// typedef ///
+     typedef CObjectTemplate<CDomain>   SuperClass;
+     typedef CDomainAttributes SuperClassAttribute;
+     public:
          enum EEventId
          {
@@ -91 +90 @@
          CTransformation<CDomain>* addTransformation(ETranformationType transType, const StdString& id="");
 
-      public:         
+      public:
+         const std::set<StdString> & getRelFiles(void) const;
          bool IsWritten(const StdString & filename) const;
          bool isWrittenCompressed(const StdString& filename) const;
@@ -116 +116 @@
          vector< vector<int> > i_indSrv ; // for each server, i global index to send
          vector< vector<int> > j_indSrv ; // for each server, j global index to send
-
+         std::vector<int> getNbGlob();
+         bool isEqual(CDomain* domain);
       public:
          /// Mutateur ///
@@ -130 +131 @@
          void fillInRectilinearBoundLonLat(CArray<double,1>& lon, CArray<double,1>& lat,
                                            CArray<double,2>& boundsLon, CArray<double,2>& boundsLat);
-         void fillInRectilinearLonLat();
+         
+         void fillInLonLat();
+         bool distributionAttributesHaveValue() const;
 
          static bool dispatchEvent(CEventServer& event);
@@ -157 +160 @@
          static StdString GetName(void);
          static StdString GetDefName(void);
-         static ENodeType GetType(void);   
-
+
+         static ENodeType GetType(void);
+         const std::map<int, vector<size_t> >& getIndexServer() const;
          CArray<bool, 1> localMask;
          bool isCurvilinear ;
@@ -182 +186 @@
 
          void setTransformations(const TransMapTypes&);         
-
+         void computeNGlobDomain();
          void sendAttributes();
          void sendIndex();
@@ -192 +196 @@
          void sendDataIndex();
          void convertLonLatValue();
-
+         void fillInRectilinearLonLat();
+         void fillInCurvilinearLonLat();
+         void fillInUnstructuredLonLat();
        private:         
          bool doZoomByIndex_;