Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

YAA (Yet Another Aggregation) #1264

Merged
merged 30 commits into from
Jan 2, 2019
Merged

YAA (Yet Another Aggregation) #1264

merged 30 commits into from
Jan 2, 2019

Conversation

WardF
Copy link
Member

@WardF WardF commented Dec 31, 2018

DennisHeimbigner and others added 30 commits December 4, 2018 19:22
@DennisHeimbigner
Fix failings of nc_test/run_inmemory.sh
30d63bb 
re: issue #1233

Changes:

1. remove exit that was there for testing.
2. the program tst_open_mem must be netcdf-4 only.
3. fix some diff problems
   - Change dataset name for tst_inmemory4_create to tst_inmemory4
   - Modify tst_inmemory.c to reorder the variables (somewhat major rewrite)

Minor Unrelated Fixes:
1. fix comment problem in nc_provenance.h
2. Fix memory leak in tst_open_mem.c
3. fix ncdump/bindata.c to properly compile if netcdf4 is disabled.
4. minor changes to ncgen.l
@gsjaardema
Eliminate nested comments
3054002 
Looks like extra comment begin and a missing comment end resulted in nested comments.  Results in warning on at least the ibm compiler:
```
In file included from /g/g16/TPL/netcdf/netcdf-c/include/nc4internal.h:24:0,
                 from /g/g16/TPL/netcdf/netcdf-c/ncgen/includes.h:50,
                 from /g/g16/TPL/netcdf/netcdf-c/ncgen/genc.c:7:
/g/g16/TPL/netcdf/netcdf-c/include/nc_provenance.h:4:1: warning: "/*" within comment [-Wcomment]
 /**
 ^
```
@edhartnett
merged ejh_next_23
da58a31
@edhartnett
moved function detect_preserve_dimids and made it static
3c9a141
@edhartnett
cleaned up hdf5internal.c
ef5a39e
@edhartnett
cleaned up nc4internal.c
7d168f7
@edhartnett
added benchmark program tst_wrf_reads.c
89b2c48
@edhartnett
uncommented test in tst_interops.c
f724fe6
@edhartnett
fixed error handling of write_netcdf4_dimid()
53bdb74
@edhartnett
cleaned up comments, changed loop to use ncindexlookup() instead of l…
d7b657a 
…ooping through the names
@edhartnett
changed loop to use ncindexlookup() instead of looping through the names
39a0f82
@edhartnett
fixed error handling in attach_dimscales()
7b72d0b
@edhartnett
cleaned up loop reattaching dimscales
26239a0
@edhartnett
fixed error handling in write_var()
1a0cfb7
@edhartnett
fixed error handling in write_dim(), also converted dimscale creation…
8e1d781 
… to H5Dcreate2()
@edhartnett
cleanup and some comments for rec_write_metadata()
28aa22f
@edhartnett
moved rec_match_dimscales() to hdf5open.c, made it faster by skipping…
dc1115a 
… already-identified dims
@edhartnett
cleanup of hdf5open.c, now check for COORDINATES hidden att and use i…
aaa5a50 
…t to find dimids if available
@edhartnett
Merge branch 'master' into ejh_fast_var_prep
8ca5a1a
@edhartnett
whitespace fixes in header file, fixed enable-benchmarks doc string i…
3697f43 
…n configure.ac
@edhartnett
starting to deal with var metadata separately
77b3a81
@edhartnett
split out some var meta reading, fixed setting of var->container
e9bd948
@edhartnett
fixed comment
aa16d29
@edhartnett
moved tst_attsperf to be with rest of benchmarks
dc982ef
@edhartnett
added test, uncommented some test code
b2fbc71
@WardF
Merge branch 'master' into patch-30
6b2156b
@WardF
A bit of cleanup.
718537a
@WardF
Merge remote-tracking branch 'origin/gh1233.dmh' into pr-aggregation.wif
c62d7eb
@WardF
Merge branch 'ejh_fast_var_prep' of https://github.com/NetCDF-World-D…
e6f768b 
…omination-Council/netcdf-c into pr-aggregation.wif
@WardF
Merge branch 'ejh_fast_var_prep_2' of https://github.com/NetCDF-World…
9e94e32 
…-Domination-Council/netcdf-c into pr-aggregation.wif
@WardF WardF added this to the 4.6.3 milestone Dec 31, 2018
@WardF WardF self-assigned this Dec 31, 2018
@WardF WardF changed the title YAA (Yet Another Aggregation YAA (Yet Another Aggregation) Dec 31, 2018
@WardF WardF merged commit a26d188 into master Jan 2, 2019
@WardF WardF deleted the pr-aggregation.wif branch January 2, 2019 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DennisHeimbigner DennisHeimbigner Awaiting requested review from DennisHeimbigner

Assignees

@WardF WardF

Labels
None yet
Projects
None yet
Milestone
4.6.3
Development

Successfully merging this pull request may close these issues.
4 participants
@WardF @DennisHeimbigner @gsjaardema @edhartnett