head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.2 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.3.0.10 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.8 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.6 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.4 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.2 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.2.0.60 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.58 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.56 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.54 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.52 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.50 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.48 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.46 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.44 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.42 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.40 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.38 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.36 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.34 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.32 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.30 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.28 pkgsrc-2008Q1:1.2.0.26 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.24 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2013.04.09.15.57.28; author adam; state dead; branches; next 1.3; 1.3 date 2012.03.07.16.11.30; author adam; state Exp; branches; next 1.2; 1.2 date 2005.02.25.09.52.47; author adam; state Exp; branches; next 1.1; 1.1 date 2004.01.11.15.58.45; author cjep; state Exp; branches; next ; desc @@ 1.4 log @Changes 4.2.1.1: Patched libdap2/ncdap3.c to fix DAP performance bug remotely accessing large files (> 2GiB). Patched ncdump/dumplib.c to properly escape special characters in CDL output from ncdump for netCDF-4 string data. @ text @$NetBSD: patch-an,v 1.3 2012/03/07 16:11:30 adam Exp $ --- cxx/nctst.cpp.orig 2011-06-30 23:22:19.000000000 +0000 +++ cxx/nctst.cpp @@@@ -369,12 +369,12 @@@@ void DumpableNcFile::dumpdims( void ) for (int n=0; n < num_dims(); n++) { NcDim* dim = get_dim(n); - cout << "\t" << dim->name() << " = " ; + std::cout << "\t" << dim->name() << " = " ; if (dim->is_unlimited()) - cout << "UNLIMITED" << " ;\t " << "// " << dim->size() << + std::cout << "UNLIMITED" << " ;\t " << "// " << dim->size() << " currently\n"; else - cout << dim->size() << " ;\n"; + std::cout << dim->size() << " ;\n"; } } @@@@ -383,9 +383,9 @@@@ void dumpatts(NcVar& var) NcToken vname = var.name(); NcAtt* ap; for(int n = 0; (ap = var.get_att(n)); n++) { - cout << "\t\t" << vname << ":" << ap->name() << " = " ; + std::cout << "\t\t" << vname << ":" << ap->name() << " = " ; NcValues* vals = ap->values(); - cout << *vals << " ;" << endl ; + std::cout << *vals << " ;" << endl ; delete ap; delete vals; } @@@@ -399,19 +399,19 @@@@ void DumpableNcFile::dumpvars( void ) NcVar* vp; for(n = 0; (vp = get_var(n)); n++) { - cout << "\t" << types[vp->type()] << " " << vp->name() ; + std::cout << "\t" << types[vp->type()] << " " << vp->name() ; if (vp->num_dims() > 0) { - cout << "("; + std::cout << "("; for (int d = 0; d < vp->num_dims(); d++) { NcDim* dim = vp->get_dim(d); - cout << dim->name(); + std::cout << dim->name(); if (d < vp->num_dims()-1) - cout << ", "; + std::cout << ", "; } - cout << ")"; + std::cout << ")"; } - cout << " ;\n"; + std::cout << " ;\n"; // now dump each of this variable's attributes dumpatts(*vp); } @@@@ -421,9 +421,9 @@@@ void DumpableNcFile::dumpgatts( void ) { NcAtt* ap; for(int n = 0; (ap = get_att(n)); n++) { - cout << "\t\t" << ":" << ap->name() << " = " ; + std::cout << "\t\t" << ":" << ap->name() << " = " ; NcValues* vals = ap->values(); - cout << *vals << " ;" << endl ; + std::cout << *vals << " ;" << endl ; delete vals; delete ap; } @@@@ -433,9 +433,9 @@@@ void DumpableNcFile::dumpdata( ) { NcVar* vp; for (int n = 0; (vp = get_var(n)); n++) { - cout << " " << vp->name() << " = "; + std::cout << " " << vp->name() << " = "; NcValues* vals = vp->values(); - cout << *vals << " ;" << endl ; + std::cout << *vals << " ;" << endl ; delete vals; } } @@@@ -444,25 +444,25 @@@@ void dump(const char* path) { DumpableNcFile nc(path); // default is open in read-only mode - cout << "netcdf " << cdl_name(path) << " {" << endl << - "dimensions:" << endl ; + std::cout << "netcdf " << cdl_name(path) << " {" << std::endl << + "dimensions:" << std::endl ; nc.dumpdims(); - cout << "variables:" << endl; + std::cout << "variables:" << std::endl; nc.dumpvars(); if (nc.num_atts() > 0) - cout << "// global attributes" << endl ; + std::cout << "// global attributes" << std::endl ; nc.dumpgatts(); - cout << "data:" << endl; + std::cout << "data:" << std::endl; nc.dumpdata(); - cout << "}" << endl; + std::cout << "}" << std::endl; } /* Test everything for classic and 64-bit offsetfiles. If netcdf-4 is @@@@ -477,7 +477,7 @@@@ int main( void ) // test new netCDF interface { - cout << "*** Testing C++ API with " << NUM_FORMATS + std::cout << "*** Testing C++ API with " << NUM_FORMATS << " different netCDF formats.\n"; // Set up the format constants. @@@@ -501,18 +501,18 @@@@ main( void ) // test new netCDF interfac if (gen(file_name[i], format[i]) || read(file_name[i], format[i])) { - cout << "*** FAILURE with file " << file_name[i] << "\n"; + std::cout << "*** FAILURE with file " << file_name[i] << "\n"; errs++; } else - cout << "*** SUCCESS with file " << file_name[i] << "\n"; + std::cout << "*** SUCCESS with file " << file_name[i] << "\n"; } - cout << "\n*** Total number of failures: " << errs << "\n"; + std::cout << "\n*** Total number of failures: " << errs << "\n"; if (errs) - cout << "*** nctst FAILURE!\n"; + std::cout << "*** nctst FAILURE!\n"; else - cout << "*** nctst SUCCESS!\n"; + std::cout << "*** nctst SUCCESS!\n"; return errs; } @ 1.3 log @Changes 4.1.3: * Stop looking for xdr if --disable-dap is used. * Don't try to run (some) fortran configure tests on machines with no fortran. * Allow nccopy to rechunk with chunksizes larger than current dimension lengths. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Changes 3.6.0-p1: Patched version of 3.6.0 to fix potentially serious bug described at http://www.unidata.ucar.edu/packages/netcdf/docs/known_problems.html#cdf2-bug Changes 3.6.0: Added texinfo source for the documentation. Added large file tests to Windows directory in distribution. Modified win32 visual studio project files so that m4 is no longer required to build netcdf under visual studio. Modified rules.make to use install instead of cp, fixing install problem for cygwin users. Modified configure/install stuff to support HP-UX. Modified configure/install stuff to support G95. In the f90 interface, applied Arnaud Desitter's fixes to correct mismatches between scalar and array arguments, eliminating (legitimate) complaints by the NAGWare f95 compiler. Also fixed bugs introduced in 3.6.0-beta5 in the mapped array interfaces. @ text @d3 1 a3 1 --- cxx/nctst.cpp.orig 2004-08-15 18:04:30.000000000 +0000 d5 1 a5 18 @@@@ -1,6 +1,6 @@@@ #include using namespace std; - +#include #include #include "netcdfcpp.h" @@@@ -22,7 +22,7 @@@@ void gen(const char* path, int version) // Check if the file was opened successfully if (! nc.is_valid()) { - cerr << "can't create netCDF file " << path << "\n"; + std::cerr << "can't create netCDF file " << path << "\n"; return; } @@@@ -138,12 +138,12 @@@@ void DumpableNcFile::dumpdims( void ) d21 1 a21 2 @@@@ -151,10 +151,10 @@@@ void dumpatts(NcVar& var) { d24 1 a24 1 - for(int n = 0; ap = var.get_att(n); n++) { a25 1 + for(int n = 0; (ap = var.get_att(n)); n++) { d29 1 a29 1 + std::cout << *vals << " ;" << std::endl ; d33 1 a33 2 @@@@ -167,20 +167,20 @@@@ void DumpableNcFile::dumpvars( void ) {"","byte","char","short","long","float","double"}; d36 1 a36 1 - for(n = 0; vp = get_var(n); n++) { a37 1 + for(n = 0; (vp = get_var(n)); n++) { d49 1 a49 1 + std::cout << ", "; d59 1 a59 2 @@@@ -189,10 +189,10 @@@@ void DumpableNcFile::dumpvars( void ) void DumpableNcFile::dumpgatts( void ) d62 1 a62 1 - for(int n = 0; ap = get_att(n); n++) { a63 1 + for(int n = 0; (ap = get_att(n)); n++) { d67 1 a67 1 + std::cout << *vals << " ;" << std::endl ; d71 1 a71 2 @@@@ -201,10 +201,10 @@@@ void DumpableNcFile::dumpgatts( void ) void DumpableNcFile::dumpdata( ) d74 1 a74 1 - for (int n = 0; vp = get_var(n); n++) { a75 1 + for (int n = 0; (vp = get_var(n)); n++) { d79 1 a79 1 + std::cout << *vals << " ;" << std::endl ; d83 1 a83 1 @@@@ -213,25 +213,25 @@@@ void dump(const char* path) d114 4 d119 29 @ 1.1 log @Make this package compile with gcc3. Fixes PR#23330 from Wolfgang S. Rupprecht. Patches from http://www.unidata.ucar.edu/packages/netcdf/known_problems.html (Mike Romberg). @ text @d3 1 a3 1 --- cxx/nctst.cpp.orig 1999-09-17 18:21:23.000000000 +0100 d5 4 a8 2 @@@@ -1,4 +1,4 @@@@ -#include d13 1 a13 1 @@@@ -8,7 +8,7 @@@@ void gen(const char* path) // Generate d22 1 a22 1 @@@@ -124,12 +124,12 @@@@ void DumpableNcFile::dumpdims( void ) d38 1 a38 1 @@@@ -137,10 +137,10 @@@@ void dumpatts(NcVar& var) d52 1 a52 1 @@@@ -153,20 +153,20 @@@@ void DumpableNcFile::dumpvars( void ) d80 1 a80 1 @@@@ -175,10 +175,10 @@@@ void DumpableNcFile::dumpvars( void ) d94 1 a94 1 @@@@ -187,10 +187,10 @@@@ void DumpableNcFile::dumpgatts( void ) d108 1 a108 1 @@@@ -199,25 +199,25 @@@@ void dump(const char* path) @