Changeset 625


Ignore:
Timestamp:
06/22/15 13:36:43 (6 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:
4 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/node/inverse_axis.hpp

    r621 r625  
    1 #ifndef __XMLIO_CInverseAxis__ 
    2 #define __XMLIO_CInverseAxis__ 
     1#ifndef __XIOS_CInverseAxis__ 
     2#define __XIOS_CInverseAxis__ 
    33 
    44/// xios headers /// 
    5 #include "xmlioserver_spl.hpp" 
     5#include "xios_spl.hpp" 
    66#include "attribute_enum.hpp" 
    77#include "attribute_enum_impl.hpp" 
     
    6161} // namespace xios 
    6262 
    63 #endif // __XMLIO_CInverseAxis__ 
     63#endif // __XIOS_CInverseAxis__ 
  • XIOS/trunk/src/node/transformation.hpp

    r622 r625  
    1 #ifndef __XMLIO_CTransformation__ 
    2 #define __XMLIO_CTransformation__ 
     1#ifndef __XIOS_CTransformation__ 
     2#define __XIOS_CTransformation__ 
    33 
    4 #include "xmlioserver_spl.hpp" 
     4#include "xios_spl.hpp" 
    55#include "transformation_enum.hpp" 
    66 
     
    3030} // namespace xios 
    3131 
    32 #endif // __XMLIO_CTransformation__ 
     32#endif // __XIOS_CTransformation__ 
  • XIOS/trunk/src/node/zoom_axis.hpp

    r621 r625  
    1 #ifndef __XMLIO_CZoomAxis__ 
    2 #define __XMLIO_CZoomAxis__ 
     1#ifndef __XIOS_CZoomAxis__ 
     2#define __XIOS_CZoomAxis__ 
    33 
    44/// xios headers /// 
    5 #include "xmlioserver_spl.hpp" 
     5#include "xios_spl.hpp" 
    66#include "attribute_enum.hpp" 
    77#include "attribute_enum_impl.hpp" 
     
    6363} // namespace xios 
    6464 
    65 #endif // __XMLIO_CZoomAxis__ 
     65#endif // __XIOS_CZoomAxis__ 
  • XIOS/trunk/src/output/nc4_data_output.cpp

    r624 r625  
    372372                     count[0] = domain->zoom_nj_srv; 
    373373                   } 
    374                     
     374 
    375375                   SuperClassWriter::writeData(domain->bounds_lon_srv, bounds_lonid, isCollective, 0, &start, &count); 
    376376                   SuperClassWriter::writeData(domain->bounds_lat_srv, bounds_latid, isCollective, 0, &start, &count); 
     
    599599        int zoom_size_srv  = axis->zoom_size_srv; 
    600600        int zoom_begin_srv = axis->zoom_begin_srv; 
    601         int zoom_size  = (MULTI_FILE == SuperClass::type) ? zoom_size_srv : axis->zoom_size; 
     601        StdSize zoom_size  = (MULTI_FILE == SuperClass::type) ? zoom_size_srv 
    602602                                                              : axis->global_zoom_size; 
     603        StdSize zoom_begin = (MULTI_FILE == SuperClass::type) ? zoom_begin_srv 
    603604                                                              : axis->global_zoom_begin; 
    604605 
Note: See TracChangeset for help on using the changeset viewer.