Changeset 625

Timestamp:

06/22/15 13:36:43 (9 years ago)

Author:

mhnguyen

Message:

Correcting some compilation errors during merge

Test
+) On Curie
+) test_client and test_complete pass with correct results (there are some difference due to zoom)

Location:

XIOS/trunk/src

Files:

• node/inverse_axis.hpp (modified) (2 diffs)
• node/transformation.hpp (modified) (2 diffs)
• node/zoom_axis.hpp (modified) (2 diffs)
• output/nc4_data_output.cpp (modified) (2 diffs)

XIOS/trunk/src/node/inverse_axis.hpp

@@ -1 @@
-#ifndef __XMLIO_CInverseAxis__
-#define __XMLIO_CInverseAxis__
+#ifndef __XIOS_CInverseAxis__
+#define __XIOS_CInverseAxis__
 
 /// xios headers ///
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "attribute_enum.hpp"
 #include "attribute_enum_impl.hpp"
@@ -61 +61 @@
 } // namespace xios
 
-#endif // __XMLIO_CInverseAxis__
+#endif // __XIOS_CInverseAxis__

XIOS/trunk/src/node/transformation.hpp

@@ -1 @@
-#ifndef __XMLIO_CTransformation__
-#define __XMLIO_CTransformation__
+#ifndef __XIOS_CTransformation__
+#define __XIOS_CTransformation__
 
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "transformation_enum.hpp"
 
@@ -30 +30 @@
 } // namespace xios
 
-#endif // __XMLIO_CTransformation__
+#endif // __XIOS_CTransformation__

XIOS/trunk/src/node/zoom_axis.hpp

@@ -1 @@
-#ifndef __XMLIO_CZoomAxis__
-#define __XMLIO_CZoomAxis__
+#ifndef __XIOS_CZoomAxis__
+#define __XIOS_CZoomAxis__
 
 /// xios headers ///
-#include "xmlioserver_spl.hpp"
+#include "xios_spl.hpp"
 #include "attribute_enum.hpp"
 #include "attribute_enum_impl.hpp"
@@ -63 +63 @@
 } // namespace xios
 
-#endif // __XMLIO_CZoomAxis__
+#endif // __XIOS_CZoomAxis__

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -372 +372 @@
                      count[0] = domain->zoom_nj_srv;
                    }
-                   
+
                    SuperClassWriter::writeData(domain->bounds_lon_srv, bounds_lonid, isCollective, 0, &start, &count);
                    SuperClassWriter::writeData(domain->bounds_lat_srv, bounds_latid, isCollective, 0, &start, &count);
@@ -599 +599 @@
         int zoom_size_srv  = axis->zoom_size_srv;
         int zoom_begin_srv = axis->zoom_begin_srv;
-        int zoom_size  = (MULTI_FILE == SuperClass::type) ? zoom_size_srv : axis->zoom_size;
+        StdSize zoom_size  = (MULTI_FILE == SuperClass::type) ? zoom_size_srv
                                                               : axis->global_zoom_size;
+        StdSize zoom_begin = (MULTI_FILE == SuperClass::type) ? zoom_begin_srv
                                                               : axis->global_zoom_begin;