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

Y.A.A. (Yet Another Another Aggregation) #1293

Merged
merged 28 commits into from
Jan 24, 2019
Merged

Y.A.A. (Yet Another Another Aggregation) #1293

merged 28 commits into from
Jan 24, 2019

Conversation

WardF
Copy link
Member

@WardF WardF commented Jan 23, 2019

edhartnett and others added 28 commits January 2, 2019 03:55
@edhartnett
Merge branch 'master' into ejh_fast_var
7eeb87a
@edhartnett
fixed some tests
133d0e2
@edhartnett
fixed some tests
0e6a62d
@edhartnett
merged ejh_relax
867bbad
@edhartnett
merged ejh_fast_var
4f2d505
@edhartnett
merged ejh_test_null_vars_stride and ejh_coords_3
9ec2540
@edhartnett
merged ejh_test_null_vars_stride this time I mean it!
f8a33aa
@edhartnett
warnings fixes
c03432a
@gsjaardema
Tests on equalp are always true
1ab5392 
If `equalp` is NULL, then the function returns early, so all subsequent tests on `equalp` are not needed.
@t-b
CMakeLists.txt: Fix compilation with default settings on debian stretch
531df26 
Since 209c31d (Bringing config.h as generagted by cmake in line with config.h as generated by autotools., 2017-01-27)
we check that we can find the hdf5.h main include file.

But this file may reside in non-standard location so we have to search
in HDF5_INCLUDE_DIR as well.
@edhartnett
Merge branch 'master' into ejh_test_pnetcdf
f100da6
@edhartnett
change to trigger CI
151f022
@edhartnett
Merge branch 'master' into ejh_test_pnetcdf
64f0ac6
@WardF
Added newline after ncdump -k in support of #1246
9aa003e
@edhartnett
removed unneeded variable
e1cd401
@edhartnett
removed unneeded variable, shortened function name
15e6a78
@edhartnett
removed unneeded var, fixed broken log statements that cause segfaults
c6a9948
@edhartnett
merged ejh_test_pnetcdf, fixes broken logging statement, added comments
adb3356
@edhartnett
removed unneeded vars, fixed and added comments
281f67d
@edhartnett
made function static, removed unneeded if statement
9d40e0a
@edhartnett
made function static, removed unneeded if statement
60132a0
@edhartnett
removed unneeded var
2024f0b
@edhartnett
fixed parallel build issue in ncdump tests
69d0ac1
@edhartnett
fixed parallel build problem with tst_files2.c when --enable-benchmar…
59ee728 
…ks is used
@WardF
Merge branch 'ejh_test_pnetcdf' of https://github.com/NetCDF-World-Do…
1242e30 
…mination-Council/netcdf-c into pr-aggregation.wif
@WardF
Merge branch 'patch-32' of https://github.com/gsjaardema/netcdf-c int…
cb2affb 
…o pr-aggregation.wif
@WardF
Merge branch 'bugfix/debian-stable-default-compilation' of https://gi…
591b1fd 
…thub.com/t-b/netcdf-c into pr-aggregation.wif
@WardF
Merge branch 'ejh_tidy' of https://github.com/NetCDF-World-Domination…
237f0c6 
…-Council/netcdf-c into pr-aggregation.wif
@WardF WardF added this to the 4.7.0 milestone Jan 23, 2019
@WardF WardF self-assigned this Jan 23, 2019
@WardF WardF merged commit 9b07389 into master Jan 24, 2019
@WardF WardF deleted the pr-aggregation.wif branch January 24, 2019 23:41
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.7.0
Development

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