Dennis Heimbigner
959c213c18
conflict resolution
2019-02-23 22:17:53 -07:00
Dennis Heimbigner
45a8a265b8
master merge
2019-02-23 17:14:12 -07:00
Ward Fisher
3ea1ea7b01
Merge pull request #1328 from NetCDF-World-Domination-Council/ejh_whitespace
...
whitespace changes only
2019-02-21 14:04:04 -07:00
Ward Fisher
af2e115712
Merge pull request #1322 from Unidata/v4.6.2.1-dev.wif
...
Preparing Maintenance Release
2019-02-20 17:14:58 -07:00
Ward Fisher
404f87b8c2
Turned of filterparser test when building static library.
2019-02-20 15:11:06 -07:00
Ward Fisher
288c9a7c52
Update to fix an environmental issue in ncconfigure.h
2019-02-19 14:42:34 -07:00
Ed Hartnett
a22e895c10
cleanup of whitespace in include directory
2019-02-19 06:10:30 -07:00
Ed Hartnett
58a801c91a
cleanup of whitespace in include directory
2019-02-19 06:09:10 -07:00
Ed Hartnett
298e8dc737
cleanup of whitespace in libsrc4 directory
2019-02-19 05:56:40 -07:00
Ed Hartnett
7c8f3a7ee6
cleanup of whitespace in libsrc4 directory
2019-02-19 05:56:30 -07:00
Ed Hartnett
ae313334b5
cleanup of whitespace in libsrc4 directory
2019-02-19 05:56:22 -07:00
Ed Hartnett
cb107c2b60
cleanup of whitespace in libsrc4 directory
2019-02-19 05:56:04 -07:00
Ed Hartnett
be6a58772e
cleanup of whitespace in libsrc4 directory
2019-02-19 05:55:36 -07:00
Ed Hartnett
af91209981
cleanup of whitespace in HDF5 directory
2019-02-19 05:55:22 -07:00
Ed Hartnett
cfa8e3808f
cleanup of whitespace in HDF5 directory
2019-02-19 05:19:37 -07:00
Ed Hartnett
b1d30a0f67
cleanup of whitespace in HDF5 directory
2019-02-19 05:18:53 -07:00
Ed Hartnett
c771443e43
cleanup of whitespace in HDF5 directory
2019-02-19 05:18:25 -07:00
Ed Hartnett
8b1f5a8fad
cleanup of whitespace in HDF5 directory
2019-02-19 05:18:02 -07:00
Ed Hartnett
384a6f1303
cleanup of whitespace in HDF5 directory
2019-02-19 05:17:47 -07:00
Ed Hartnett
bb9a7dee53
cleanup of whitespace in HDF4 directory
2019-02-19 05:17:23 -07:00
Ed Hartnett
f9a9100d9a
cleanup of whitespace in HDF4 directory
2019-02-19 05:17:00 -07:00
Ed Hartnett
2dd6ce54b8
cleanup of whitespace in HDF4 directory
2019-02-19 05:16:14 -07:00
Ward Fisher
9f55a5376d
Corrected typo.
2019-02-16 00:10:52 -07:00
Ward Fisher
6830cfa4f2
Restored EXTERNL definition to netcdf_mem.h in support of https://github.com/Unidata/netcdf-c/issues/1148
2019-02-15 17:17:06 -07:00
Ward Fisher
f767148aad
Updated mainpage.dox to make the netCDF-Fortran documentation link more obvious.
2019-02-15 16:44:45 -07:00
Ward Fisher
496a9cb185
Merge branch 'doc-update.wif' into v4.6.2.1-dev.wif
2019-02-15 16:41:30 -07:00
Ward Fisher
e69432704a
Corrected cmake error on OSX in plugins compilation.
2019-02-15 16:07:22 -07:00
Ward Fisher
0098f4c9f1
Merge branch 'master' into v4.6.2.1-dev.wif
2019-02-15 15:46:14 -07:00
Ward Fisher
05dadede2b
Merge pull request #1321 from Unidata/dap4endianfix2.dmh
...
Fix additional big-endian machine error in dap4.
2019-02-15 15:45:48 -07:00
Ward Fisher
c75794b40a
Updated Release notes for impending v4.6.2.1 release.
2019-02-15 15:31:24 -07:00
Ward Fisher
53ba2ff316
Merge pull request #1311 from Unidata/filterexpr.dmh
...
Extend nccopy -F option syntax.
2019-02-15 15:16:25 -07:00
Ward Fisher
1efe8333ac
Merge pull request #1308 from NetCDF-World-Domination-Council/ejh_more_rename_woes_3
...
Fix bug which changed varids after var rename
2019-02-15 15:16:04 -07:00
Ward Fisher
802209dcfe
Merge pull request #1318 from Unidata/rename-aggregation.wif
...
Combination of the remaining rename-related PR's
2019-02-15 15:15:46 -07:00
Ward Fisher
0092599cc7
Merge pull request #1319 from Unidata/dap2groups.dmh
...
Fix handling of '/' characters in names in DAP2.
2019-02-15 15:15:26 -07:00
Dennis Heimbigner
ddd324c1f0
Fix LGTM complaint
2019-02-15 12:40:30 -07:00
Dennis Heimbigner
d13619b3e1
Fix additional big-endian machine error in dap4.
...
Follow on to PR: https://github.com/Unidata/netcdf-c/pull/1302
2019-02-15 11:36:29 -07:00
Dennis Heimbigner
c59d5ce205
Fix handling of '/' characters in names in DAP2.
...
re: https://github.com/Unidata/thredds/issues/1224
[note that this is an issue in thredds, but the fix is in netcdf-c]
A thredds server can encode a netcdf-4 file into DAP2
by flattening names to include the containing group path,
where the group names are separated by '/'.
But the '/' is prohibited in netcdf names even if escaped
(a decision before my time).
So, if the netcdf-c/libdap2 code encounters a DAP2 name with '/'
characters, the '/' characters are converted to the string
%2f. Unfortunately, there is a glitch, namely that converting
the leading '/' produces a name that is still illegal. This PR
modifies the code to just drop the leading '/' character.
2019-02-14 20:25:40 -07:00
Ed Hartnett
c61afffae3
Merge branch 'master' into ejh_more_rename_woes_3
2019-02-14 14:07:33 -07:00
Ward Fisher
30c2ca2413
Merge pull request #1312 from Unidata/urlauth.dmh
...
URL with username+pwd in url is not working.
2019-02-14 13:27:20 -07:00
Dennis Heimbigner
24510f2ffb
Forgot to distribute ncmodel.h
2019-02-13 21:46:01 -07:00
Dennis Heimbigner
f19cac7d59
Merge branch 'master' into byterange.dmh
2019-02-13 21:35:36 -07:00
Ward Fisher
acbc4a2e41
Merge branch 'master' into filterexpr.dmh
2019-02-13 16:55:21 -07:00
Ward Fisher
df03fd3240
Merge branch 'ejh_more_rename_woes_3' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into rename-aggregation.wif
2019-02-13 16:37:50 -07:00
Ward Fisher
e9aeafe0fd
Merge branch 'master' into ejh_more_rename_woes_3
2019-02-13 16:37:28 -07:00
Ward Fisher
4a06f24813
Merge branch 'master' into ejh_more_rename_woes_2
2019-02-13 16:35:54 -07:00
Ward Fisher
6c3b7a0077
Merge branch 'master' into urlauth.dmh
2019-02-13 16:32:38 -07:00
Ward Fisher
29d2643f8e
Merge pull request #1317 from Unidata/fillhack.dmh
...
Add hack to deal with DAP2 signed byte conversion.
2019-02-13 16:07:19 -07:00
Dennis Heimbigner
a1f080db19
Merge branch 'master' into byterange.dmh
2019-02-13 14:45:53 -07:00
Dennis Heimbigner
724128ad3b
Add hack to deal with DAP2 signed byte hack.
...
re: issue https://github.com/Unidata/netcdf-c/issues/1316
The DAP2 data model does not have a signed byte type,
but netcdf-3 does have (only) a signed byte type.
So, when converting a netcdf-3 signed byte typed variable to
a DAP2 unsigned byte, the following actions are taken by thredds:
1. The variable type is marked as DAP2 (unsigned) byte.
2. A special attribute, "_Unsigned=false" is set for the variable
3. The corresponding "_FillValue" attribute, if any, is up-converted
to the DAP2 Int16 type in order to hold, with sign, any signed byte
fill value.
On the netcdf-c side, this looks like a fillvalue type mismatch and causes
an error. Instead, the netcdf-c dap2 conversion code needs to recognize
this hack and undo it locally.
So this change looks for the above case, and if found, then it properly
converts the _FillValue type to netcdf-3 signed byte.
Since DAP2 supports both signed and unsigned integers of sizes 16 and 32 bits,
this should be the only hack needed (famous last words).
It may later be desirable for the thredds DAP2 converter to modify its
behavior as well.
2019-02-13 14:36:14 -07:00
Ed Hartnett
f937ed7b25
Merge branch 'master' into ejh_more_rename_woes_2
2019-02-12 15:05:34 -07:00
