Commit Graph

3644 Commits

Author SHA1 Message Date
Ward Fisher
d0d1a69826 Updated release notes in support of https://github.com/Unidata/netcdf-c/pull/316 2017-03-21 15:01:00 -06:00
Ward Fisher
da72d671f7 Merge branch 'NC_CHAR_to_ASCII' of https://github.com/shoyer/netcdf-c into ghpull-316 2017-03-21 12:50:19 -06:00
Ward Fisher
48113a5508 Merge pull request #378 from Unidata/gattenum.dmh
Fix bug in ncgen handling of global, enum valued, attribute.
2017-03-20 18:20:21 -06:00
Dennis Heimbigner
24414335f3 debug cmake failures 2017-03-20 14:40:00 -06:00
Dennis Heimbigner
8e290f2aec CMake fixes 2017-03-20 14:28:38 -06:00
Dennis Heimbigner
44e52e0515 More distcheck cleanup 2017-03-20 13:50:44 -06:00
Dennis Heimbigner
a763bb51d4 Add the intermediate file to be cleaned up 2017-03-18 18:47:19 -06:00
Dennis Heimbigner
cb473bf6ff Apparently we have no .cdl test cases that have
a global attribute whose type is an enum.

Turns out this case fails because of an
oversight in ncgen.

This pr fixes that problem (in semantics.c).
Also added test case .cdl file: tst_gattenum.cdl
2017-03-18 17:57:48 -06:00
Stephan Hoyer
4dd8e380c1 Switch NC_CHAR on netCDF4 to use ASCII
Fixes GH298
2017-03-13 20:12:08 -07:00
Ward Fisher
2ad4b06f15 Merge pull request #376 from Unidata/issue373.dmh
Suppress selected orphan opendap attributes
2017-03-13 17:51:02 -06:00
Ward Fisher
290f556ae5 Updated release notes in support of https://github.com/Unidata/netcdf-c/pull/376 2017-03-13 15:48:51 -06:00
Dennis Heimbigner
3024070a58 Update affected test cases 2017-03-11 18:17:38 -07:00
Dennis Heimbigner
3213705205 Re: github issue https://github.com/Unidata/netcdf-c/issues/373
Github issue https://github.com/Unidata/netcdf-c/issues/152
requested that "orphaned" DAS attributes be included in the netcdf
metadata as global variables. The term orphaned here meant that
they were not connected to any variable in the DDS.
This was done in pull request https://github.com/Unidata/netcdf-c/pull/164

However, some servers (e.g. Thredds) include attributes for variables not
specified in a constraint expression, but which exist in the full DDS.
So I was adding these to the set of global attributes, but in retrospect
this should not have been done: they should have been elided.

Solution: modify oc2 code to be more distriminatory about
which orphaned attributes to include.
2017-03-11 16:17:20 -07:00
Dennis Heimbigner
1aab7556cf ckp 2017-03-11 15:20:20 -07:00
Ward Fisher
98f5de4bf7 Merge branch 'master' into gh276 2017-03-06 16:21:46 -07:00
Ward Fisher
9ea61d114b Corrected an issue detecting parallel hdf5 properly. 2017-03-06 15:34:14 -07:00
Ward Fisher
2558fd6f9f Merge branch 'att_callbk' of https://github.com/brtnfld/netcdf-c into gh276 2017-03-06 12:56:33 -07:00
Ward Fisher
ecc52efe92 Merge branch 'unused-cleanup' 2017-03-06 12:35:35 -07:00
Greg Sjaardema
cbb9448ab0 Remove unused fields from struct
The nvars, ndims, and natts fields on the NC_HDF5_FILE_INFO struct are
never set.  The nvars field is read, but since it is never written,
the value is always zero.
2017-03-06 11:14:00 -07:00
Greg Sjaardema
473529d199 Remove unused ndims from grp struct 2017-03-06 11:14:00 -07:00
Ward Fisher
caacf4d325 Merge pull request #331 from wkliao/NC_USHORT_rec_align
bug fix: record size alignment for NC_USHORT is missing
2017-03-06 11:08:56 -07:00
Ward Fisher
ec526880dd Merge branch 'master' into NC_USHORT_rec_align 2017-03-02 15:22:36 -07:00
Ward Fisher
6c3f665bc0 Merge pull request #346 from Barhul/master
Avoiding conditional directives that break statements
2017-03-02 14:57:20 -07:00
Ward Fisher
1a8e7891f0 Merge branch 'master' into master 2017-03-02 13:34:51 -07:00
Ward Fisher
42c3be4823 Updated IP address of target cdash instance. 2017-03-01 12:34:49 -07:00
Ward Fisher
6ebfea6730 Refactored additional constants. 2017-02-28 11:15:51 -07:00
Ward Fisher
aca2589061 Updated utf8proc_data.c 2017-02-28 11:14:08 -07:00
Ward Fisher
773fe80727 Refactored some data types due to collision. 2017-02-28 11:12:00 -07:00
Ward Fisher
5883b6587f Additional utf8 refactoring to avoid name collisions. 2017-02-28 11:05:45 -07:00
Ward Fisher
2def20ccfd More refactoring 2017-02-28 10:46:15 -07:00
Ward Fisher
f20228def5 Refactoring utf8 2017-02-28 10:36:46 -07:00
Ward Fisher
74a07272af Updated software.html page with reference to ArcGIS Pro Space Time Pattern Toolbox 2017-02-27 13:20:48 -07:00
Ward Fisher
1603cd0d31 Merge pull request #364 from Unidata/utffix.dmh
Resolve license issue with the utf8proc code.
2017-02-27 12:47:13 -07:00
Ward Fisher
78c0f34c82 Merging master into branch. 2017-02-27 11:00:24 -07:00
Ward Fisher
622bbbb0e7 Merge pull request #367 from Unidata/dap2clean.dmh
Clean up dap2 code to remove now obsolete functionality
2017-02-27 10:40:22 -07:00
Ward Fisher
696c200e29 Merge branch 'master' into dap2clean.dmh 2017-02-24 14:26:39 -07:00
Dennis Heimbigner
ba429bcc56 Add comment to explain change of OPAQUE to OPAQUE_ 2017-02-23 22:51:32 -07:00
Dennis Heimbigner
0415300fbc It appears that the token OPAQUE in ncgen.y
is somehow in interference with something
in the HDF4 code. So, I changed
the OPAQUE -> OPAQUE_ and that appears
to fix the problem with bison when HDF4
is enabled.

ps. when Visual Studio complained about token
'constant' it turn out that it mean token type,
not the actual token named 'constant'. Instead
the actual token that was causing the problem
was 'OPAQUE'.
2017-02-23 22:34:11 -07:00
Ward Fisher
7cb03504ed Merge branch 'master' into issue365.dmh 2017-02-23 13:55:10 -07:00
Ward Fisher
1cdde8bbd2 Invoked makeparser from OSX. 2017-02-23 12:22:44 -07:00
Ward Fisher
cda06db42f Updated release notes 2017-02-23 12:05:05 -07:00
Dennis Heimbigner
d0fb4a472a 1. Added a restriction note on ncgen/Makefile.am.makeparser task.
2. invoked makeparser using bison 3.0.4 and flex 2.5.35
2017-02-22 15:56:29 -07:00
Ward Fisher
4208a875c4 Updated generated ncgen files. 2017-02-22 13:22:50 -07:00
Ward Fisher
f96e0e8112 Merge branch 'master' into issue365.dmh 2017-02-22 12:17:01 -07:00
Ward Fisher
169866d5b3 Generated files on OSX. 2017-02-22 09:55:57 -07:00
Ward Fisher
fa1c96a67f Attempting to fix an issue. 2017-02-22 09:55:13 -07:00
Ward Fisher
c2ee17acf6 Corrected for new cmake variables used by hdf5. 2017-02-21 17:00:45 -07:00
Dennis Heimbigner
ee2916f60a Originally, libdap2 was also going to provide
a dap2->netcdf-4 translation. That is now
superceded by dap4. But there is some cruft
in the dap2 code around this that should be removed.
2017-02-21 15:13:37 -07:00
Dennis Heimbigner
f71b695530 Followon to
re: https://github.com/Unidata/netcdf-c/issues/365

1. Added to RELEASENOTES.md
2. Add a range check to more closely
   mimic unix sscanf
3. locate and fix same sscanf problems in ncgen/cvt.c

Still need a stable url for a test case.
2017-02-20 13:19:25 -07:00
Dennis Heimbigner
96bd037560 re: https://github.com/Unidata/netcdf-c/issues/365
Following command fails under visual studio.
    ncdump -h http://thredds.ucar.edu/thredds/dodsC/nexrad/composite/gini/n0r/1km/20170216/Level3_Composite_n0r_1km_20170216_1635.gini

The problem is that sscanf for windows does not appear to support
scanning 8bit integers: it appears to only allow scanning of characters.

Solution:
Scan the input as an integer (for type Byte) or unsigned int (for type UByte)
and then recast the result as a char or unsigned char.

Primary code fix is in libdap2/dapcvt.c#dapcvtattrval
2017-02-19 21:41:51 -07:00