Skip to content

Commit

Permalink
Merge pull request ESMCI#1274 from NCAR/ejh_test_3
Browse files Browse the repository at this point in the history 
removed varm functions
  • Loading branch information
@edhartnett
edhartnett authored Jan 9, 2018
2 parents bb5f72a + 73d2197 commit 4e42e46
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 1,913 deletions.
2 changes: 1 addition & 1 deletion src/clib/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project (PIOC C)

add_library (pioc topology.c pio_file.c pioc_support.c pio_lists.c
pioc.c pioc_sc.c pio_spmd.c pio_rearrange.c pio_nc4.c bget.c
pio_nc.c pio_put_nc.c pio_get_nc.c pio_getput_int.c pio_msg.c pio_varm.c
pio_nc.c pio_put_nc.c pio_get_nc.c pio_getput_int.c pio_msg.c
pio_darray.c pio_darray_int.c)

# set up include-directories
Expand Down
2 changes: 1 addition & 1 deletion src/clib/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ include_HEADERS = pio.h

# The library soure files.
libpio_la_SOURCES = bget.c pioc_sc.c pio_darray.c pio_file.c \
pio_getput_int.c pio_msg.c pio_nc.c pio_rearrange.c pio_varm.c pioc.c \
pio_getput_int.c pio_msg.c pio_nc.c pio_rearrange.c pioc.c \
pioc_support.c pio_darray_int.c pio_get_nc.c pio_lists.c pio_nc4.c \
pio_put_nc.c pio_spmd.c pio_internal.h bget.h
62 changes: 0 additions & 62 deletions src/clib/pio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,68 +1140,6 @@ extern "C" {
const PIO_Offset *count, const PIO_Offset *stride,
const unsigned long long *op);

/* Varm functions are deprecated and should be used with extreme
* caution or not at all. Varm functions are not supported in
* async mode. */
int PIOc_put_varm(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, const void *buf,
PIO_Offset bufcount, MPI_Datatype buftype);
int PIOc_get_varm_schar(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, signed char *buf);
int PIOc_put_varm_uchar(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap,
const unsigned char *op);
int PIOc_put_varm_short(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, const short *op);
int PIOc_get_varm_short(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, short *buf);
int PIOc_get_varm_ulonglong(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, unsigned long long *buf);
int PIOc_get_varm_ushort(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, unsigned short *buf);
int PIOc_get_varm_longlong(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, long long *buf);
int PIOc_put_varm_text(int ncid, int varid, const PIO_Offset *start,
const PIO_Offset *count, const PIO_Offset *stride,
const PIO_Offset *imap, const char *op);
int PIOc_put_varm_ushort(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, const unsigned short *op);
int PIOc_put_varm_ulonglong(int ncid, int varid, const PIO_Offset *start,
const PIO_Offset *count, const PIO_Offset *stride,
const PIO_Offset *imap, const unsigned long long *op);
int PIOc_put_varm_int(int ncid, int varid, const PIO_Offset *start,
const PIO_Offset *count, const PIO_Offset *stride,
const PIO_Offset *imap, const int *op);
int PIOc_put_varm_float(int ncid, int varid, const PIO_Offset *start,
const PIO_Offset *count, const PIO_Offset *stride,
const PIO_Offset *imap, const float *op);
int PIOc_put_varm_long(int ncid, int varid, const PIO_Offset *start,
const PIO_Offset *count, const PIO_Offset *stride,
const PIO_Offset *imap, const long *op);
int PIOc_put_varm_uint(int ncid, int varid, const PIO_Offset *start,
const PIO_Offset *count, const PIO_Offset *stride,
const PIO_Offset *imap, const unsigned int *op);
int PIOc_put_varm_double(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, const double *op);
int PIOc_put_varm_schar(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, const signed char *op);
int PIOc_put_varm_longlong(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, const long long *op);
int PIOc_get_varm_double(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, double *buf);
int PIOc_get_varm_text(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, char *buf);
int PIOc_get_varm_int(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, int *buf);
int PIOc_get_varm_uint(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, unsigned int *buf);
int PIOc_get_varm(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, void *buf,
PIO_Offset bufcount, MPI_Datatype buftype);
int PIOc_get_varm_float(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, float *buf);
int PIOc_get_varm_long(int ncid, int varid, const PIO_Offset *start, const PIO_Offset *count,
const PIO_Offset *stride, const PIO_Offset *imap, long *buf);
#if defined(__cplusplus)
}
#endif
Expand Down
Loading

0 comments on commit 4e42e46

Please sign in to comment.