Changeset 775 for XIOS/trunk/src/node/domain.hpp

Timestamp:

11/02/15 11:46:25 (8 years ago)

Author:

mhnguyen

Message:

Implementing the reading of attributes of an axis from a file

+) 3d grid can be read directly from a file
+) Clean some redundant codes
+) Add new attribute declaration that allows to output only desired attributes

Test
+) On Curie
+) test_remap passes and result is correct

File:

• XIOS/trunk/src/node/domain.hpp (modified) (4 diffs)

XIOS/trunk/src/node/domain.hpp

@@ -30 +30 @@
    BEGIN_DECLARE_ATTRIBUTE_MAP(CDomain)
 #  include "domain_attribute.conf"
+#  include "domain_attribute_private.conf"
    END_DECLARE_ATTRIBUTE_MAP(CDomain)
 
@@ -105 +106 @@
          int nj_srv,jbegin_srv,jend_srv ;
          int zoom_nj_srv,zoom_jbegin_srv,zoom_jend_srv ;
-
-         double bounds_lon_start, bounds_lon_end;
-         double bounds_lat_start, bounds_lat_end;
-         double lon_start, lon_end;
-         double lat_start, lat_end;
 
          CArray<double, 1> lonvalue_srv, latvalue_srv ;
@@ -133 +129 @@
          void fillInRectilinearBoundLonLat(CArray<double,2>& boundsLon, CArray<double,2>& boundsLat,
                                            bool isNorthPole = false, bool isSouthPole = false);
+         void fillInRectilinearLonLat();
 
          static bool dispatchEvent(CEventServer& event);
@@ -172 +169 @@
          void checkArea(void);
          void checkLonLat();
-         void checkGenerate();
 
          void checkTransformations();
          void setTransformations(const TransMapTypes&);
          void computeNGlobDomain();
-         void fillInRectilinearLonLat();
 
          void sendIndex();