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

Merged latest from trunk.

Browse Source
This commit is contained in:
Ward Fisher 2013-03-13 16:36:49 +00:00
commit e80c20a3f5
9 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -7,7 +7,7 @@ project(netCDF C)
SET(netCDF_VERSION_MAJOR 4)
SET(netCDF_VERSION_MINOR 3)
SET(netCDF_VERSION_PATCH 0)
SET(netCDF_VERSION_NOTE "-rc2")
SET(netCDF_VERSION_NOTE "-rc3")
SET(netCDF_VERSION ${netCDF_VERSION_MAJOR}.${netCDF_VERSION_MINOR}.${netCDF_VERSION_PATCH}${netCDF_VERSION_NOTE})
SET(VERSION ${netCDF_VERSION})

14
Make0
View File

@ -1,14 +1,18 @@
# Test c output
T=t
T=test_nc4
#VG=valgrind --leak-check=full
CFLAGS=-g -O0 -I. -I./include
LDFLAGS=/tmp/install/spock/lib/libnetcdf.a -L/share/ed/local/spock/lib -lhdf5_hl -lhdf5 -lz -lm -lcurl
LD_RUN_PATH=/tmp/install/spock/lib:/share/ed/local/spock/lib
CFLAGS=-g -O0 -I../include -I/share/ed/local/spock/include
LDFLAGS=./liblib/.libs/libnetcdf.a -L/share/ed/local/spock/lib -lhdf5_hl -lhdf5 -lz -lcurl -lm -llber -lldap -lrt -lssl -lcrypto -ldl
LFLAG=-L/usr/local/lib
RPATH=-Wl,-rpath,${LFLAG}
all::
export LD_RUN_PATH; export CFLAGS; export LDFLAGS; \
export CFLAGS; export LDFLAGS; \
${MAKE} all ; \
gcc -o t ${CFLAGS} ${T}.c ${LDFLAGS} -lm ; \
gcc ${CFLAGS} -o t ${T}.c ${LDFLAGS}
${VG} ./t

2
cf
View File

@ -8,7 +8,7 @@ fi
HDF5=1
DAP=1
#PNETCDF=1
PNETCDF=1
#RPC=1
#PGI=1
#M32=1

2
configure.ac
View File

@ -15,7 +15,7 @@ AC_REVISION([$Id: configure.ac,v 1.450 2010/05/28 19:42:47 dmh Exp $])
AC_PREREQ([2.59])
# Initialize with name, version, and support email address.
AC_INIT([netCDF], [4.3.0-rc2], [support-netcdf@unidata.ucar.edu])
AC_INIT([netCDF], [4.3.0-rc3], [support-netcdf@unidata.ucar.edu])
# Create the VERSION file, which contains the package version from
# AC_INIT.

6
libdap2/cache.c
View File

@ -85,7 +85,7 @@ else
NCerror
prefetchdata3(NCDAPCOMMON* nccomm)
{
int i,j;
int i;
NCerror ncstat = NC_NOERR;
NClist* allvars = nccomm->cdf.ddsroot->tree->varnodes;
DCEconstraint* urlconstraint = nccomm->oc.dapconstraint;
@ -109,7 +109,6 @@ prefetchdata3(NCDAPCOMMON* nccomm)
/* pull in those variables previously marked as prefetchable */
for(i=0;i<nclistlength(allvars);i++) {
CDFnode* var = (CDFnode*)nclistget(allvars,i);
size_t nelems = 1;
/* Most of the important testing was already done */
if(!var->basenode->prefetchable)
@ -397,7 +396,8 @@ markprefetch3(NCDAPCOMMON* nccomm)
var->prefetchable = 1;
if(SHOWFETCH)
{
nclog(NCLOGDBG,"prefetchable: %s=%lu",
extern char* ocfqn(OCddsnode);
nclog(NCLOGDBG,"prefetchable: %s=%lu",
ocfqn(var->ocnode),(unsigned long)nelems);
}
}

4
libdap2/cdf3.c
View File

@ -33,11 +33,9 @@ NCerror
computecdfnodesets3(NCDAPCOMMON* nccomm, CDFtree* tree)
{
unsigned int i;
CDFnode* root;
NClist* varnodes;
NClist* allnodes;
root = tree->root;
allnodes = tree->nodes;
varnodes = nclistnew();
@ -376,14 +374,12 @@ ocfqn(parentnode->ocnode),ocfqn(templateparent->ocnode));
for(index=0;index<nclistlength(parentnode->subnodes);index++) {
CDFnode* subnode = (CDFnode*)nclistget(parentnode->subnodes,index);
CDFnode* matchnode = NULL;
int matchindex = -1;
/* Look for a matching template node with same ocname */
for(i=0;i<nclistlength(templateparent->subnodes);i++) {
CDFnode* subtemp = (CDFnode*)nclistget(templateparent->subnodes,i);
if(strcmp(subnode->ocname,subtemp->ocname) == 0) {
matchnode = subtemp;
matchindex = i;
break;
}
}

4
libdap2/ncdap3.c
View File

@ -415,7 +415,6 @@ builddims(NCDAPCOMMON* dapcomm)
NClist* dimset = NULL;
NC* drno = dapcomm->controller;
NC* ncsub;
NC3_INFO* nc3sub;
char* definename;
/* collect all dimensions from variables */
@ -452,9 +451,8 @@ builddims(NCDAPCOMMON* dapcomm)
/* get the id for the substrate */
ncstat = NC_check_id(drno->substrate,&ncsub);
if(ncstat != NC_NOERR) {THROWCHK(ncstat); goto done;}
nc3sub = (NC3_INFO*)&ncsub->dispatchdata;
#if 0
nc3sub = (NC3_INFO*)&ncsub->dispatchdata;
/* Set the effective size of UNLIMITED;
note that this cannot easily be done thru the normal API.*/
NC_set_numrecs(nc3sub,unlimited->dim.declsize);

2
libsrc/nc3internal.c
View File

@ -612,7 +612,7 @@ move_recs_r(NC3_INFO *gnu, NC3_INFO *old)
static int
move_vars_r(NC3_INFO *gnu, NC3_INFO *old)
{
int i, err, status=NC_NOERR;
int err, status=NC_NOERR;
int varid;
NC_var **gnu_varpp = (NC_var **)gnu->vars.value;
NC_var **old_varpp = (NC_var **)old->vars.value;

6
oc2/oc.c
View File

@ -963,14 +963,8 @@ OCerror
oc_data_fieldbyname(OCobject link, OCobject datanode, const char* name, OCobject* fieldp)
{
OCerror err = OC_NOERR;
OCstate* state;
OCdata* data;
size_t count,i;
OCobject ddsnode;
OCVERIFY(OC_State,link);
OCDEREF(OCstate*,state,link);
OCVERIFY(OC_Data,datanode);
OCDEREF(OCdata*,data,datanode);
/* Get the dds node for this datanode */
err = oc_data_ddsnode(link,datanode,&ddsnode);