mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Trying to sort out why netcdf parallel documentation isn't being generated.

Browse Source
This commit is contained in:
Ward Fisher 2016-01-14 11:02:23 -07:00
parent 10aed48aac
commit 75b0bcf07e
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Doxyfile.in
View File

@ -765,8 +765,8 @@ INPUT = \
@abs_top_srcdir@/docs/COPYRIGHT.dox \
@abs_top_srcdir@/docs/credits.md \
@abs_top_srcdir@/include/netcdf.h \
@abs_top_srcdir@/include/netcdf_meta.h \
@abs_top_srcdir@/include/netcdf_mem.h \
@abs_top_srcdir@/include/netcdf_par.h \
@abs_top_srcdir@/libdispatch/dfile.c \
@abs_top_srcdir@/libdispatch/ddim.c \
@abs_top_srcdir@/libdispatch/dvar.c \

11
include/netcdf_par.h
View File

@ -1,9 +1,12 @@
/*
/*! \file
*
* Main header file for the Parallel C API.
*
* Copyright 2010 University Corporation for Atmospheric
* Research/Unidata. See COPYRIGHT file for more info.
*
* This header file is for the parallel I/O functions of netCDF.
*
*
*/
/* "$Id: netcdf_par.h,v 1.1 2010/06/01 15:46:49 ed Exp $" */
@ -36,10 +39,10 @@ extern int
nc_var_par_access(int ncid, int varid, int par_access);
extern int
nc_create_par_fortran(const char *path, int cmode, int comm,
nc_create_par_fortran(const char *path, int cmode, int comm,
int info, int *ncidp);
extern int
nc_open_par_fortran(const char *path, int mode, int comm,
nc_open_par_fortran(const char *path, int mode, int comm,
int info, int *ncidp);
#if defined(__cplusplus)

26
libdispatch/dparallel.c
View File

@ -1,4 +1,4 @@
/** \file
/** \file dparallel.c
This file has the parallel I/O functions.
Copyright 2010 University Corporation for Atmospheric
@ -8,16 +8,19 @@ Research/Unidata. See COPYRIGHT file for more info.
#include "config.h"
#include "ncdispatch.h"
/* This function creates a file for use with parallel I/O. */
int
nc_create_par(const char *path, int cmode, MPI_Comm comm,
/** \ingroup datasets
This function creates a file for use with parallel I/O.
*/
int nc_create_par(const char *path, int cmode, MPI_Comm comm,
MPI_Info info, int *ncidp)
{
#ifndef USE_PARALLEL
return NC_ENOPAR;
#else
#else
NC_MPI_INFO data;
/* One of these two parallel IO modes must be chosen by the user,
* or else pnetcdf must be in use. */
if (!(cmode & NC_MPIIO || cmode & NC_MPIPOSIX) &&
@ -32,7 +35,7 @@ nc_create_par(const char *path, int cmode, MPI_Comm comm,
/* This function opens a file for parallel I/O. */
int
nc_open_par(const char *path, int mode, MPI_Comm comm,
nc_open_par(const char *path, int mode, MPI_Comm comm,
MPI_Info info, int *ncidp)
{
#ifndef USE_PARALLEL
@ -58,7 +61,7 @@ nc_open_par(const char *path, int mode, MPI_Comm comm,
/* Fortran needs to pass MPI comm/info as integers. */
int
nc_open_par_fortran(const char *path, int mode, int comm,
nc_open_par_fortran(const char *path, int mode, int comm,
int info, int *ncidp)
{
#ifndef USE_PARALLEL
@ -87,7 +90,7 @@ int
nc_var_par_access(int ncid, int varid, int par_access)
{
NC* ncp;
int stat = NC_NOERR;
if ((stat = NC_check_id(ncid, &ncp)))
@ -102,7 +105,7 @@ nc_var_par_access(int ncid, int varid, int par_access)
/* when calling from fortran: convert MPI_Comm and MPI_Info to C */
int
nc_create_par_fortran(const char *path, int cmode, int comm,
nc_create_par_fortran(const char *path, int cmode, int comm,
int info, int *ncidp)
{
#ifndef USE_PARALLEL
@ -124,6 +127,3 @@ nc_create_par_fortran(const char *path, int cmode, int comm,
return nc_create_par(path, cmode, comm_c, info_c, ncidp);
#endif
}