Ignore:
Timestamp:
12/01/14 19:00:32 (9 years ago)
Author:
mhnguyen
Message:

Fixing (temporarily) a bug on compiling with sequential netcdf.

+) Add an ifdef on including exception, which is necessary on compling with sequential netcdf
+) Correct some code alignment

Test
+) On Curie and local
+) Mode compilation: seq and par; Netcdf: seq and par
+) On Curie: 4 times, all passed
+) On local: Error happened randomly with netcdf in seq on compilating in parallel(6/8 passed)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/output/netcdf.hpp

    r501 r525  
    2424 
    2525#if !defined(USING_NETCDF_PAR) 
    26   #define NC_INDEPENDENT 0 
    27   #define NC_COLLECTIVE  1 
     26#define NC_INDEPENDENT 0 
     27#define NC_COLLECTIVE  1 
    2828#endif 
    2929 
     
    4040#endif 
    4141  } 
    42    
     42 
    4343  inline int nc_open_par(const char *path, int mode, MPI_Comm comm, MPI_Info info,int *ncidp) 
    44   {  
     44  { 
    4545#if defined(USING_NETCDF_PAR) 
    4646    return ::nc_open_par(path, mode, comm, info, ncidp) ; 
     
    5151#endif 
    5252  } 
    53    
     53 
    5454  inline int nc_var_par_access(int ncid, int varid, int par_access) 
    5555  { 
Note: See TracChangeset for help on using the changeset viewer.