summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #838 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-12-241-1/+1
|\ | | | | | | | | * commit '718006f8606f784ab7795ce5e50281fe318abadc': Increase maximum number of retries for h5watch tests.
| * Increase maximum number of retries for h5watch tests.lrknox2017-12-241-1/+1
|/
* Merge pull request #836 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-12-2237-3309/+1471
|\ | | | | | | | | * commit '86d8a4c267eccbc66d6ee6120c9099788853c40f': Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop"
| * Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to ↵lrknox2017-12-2237-3309/+1471
|/ | | | | | | develop" This reverts commit b1223dd653e65e076af92b2dfe236f3704da81c8, reversing changes made to b25f123f5f5e25c1447a6a02861cb7c7265c12f2.
* Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-12-2037-1471/+3309
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e94ed99c5bf7c4ae5df56f75606ef1b486e16bb2': Add HD prefix HDFFV-9724 Remove VDS file cache functionality Removed incorrect MPI text Par example needs to link with mpi libs Because of MPI requirements in library ALWAYS add include path Cleanup comments and if() in TRY blocks Skip test if 1.6 API HDFFV-9724 Add ENV VAR to vds test HDFFV-9724 Copy efc_open search from Lextern_traverse Add prefix dir to the clear command HDFFV-9724 Add H5LS prefix test with ${ORIGIN} Add h5dump VDS prefix tests HDFFV-9724 combine efc and vds into one function Correct var name Fix VDS file cache var names Remove return from void functions Added java wrappers and tests HDFFV-9724 Initial changes and test Changed reference from dl to CMake variable H5detect and H5make_libsettings need include folder
| * Add HD prefixAllen Byrne2017-12-201-1/+1
| |
| * HDFFV-9724 Remove VDS file cache functionalityAllen Byrne2017-12-209-194/+30
| |
| * Removed incorrect MPI textAllen Byrne2017-12-201-1/+1
| |
| * Par example needs to link with mpi libsAllen Byrne2017-12-201-2/+2
| |
| * Because of MPI requirements in library ALWAYS add include pathAllen Byrne2017-12-203-129/+171
| |
| * Cleanup comments and if() in TRY blocksAllen Byrne2017-12-201-608/+497
| |
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2017-12-201-1/+15
| |\ | |/ |/| | | | | * commit 'b25f123f5f5e25c1447a6a02861cb7c7265c12f2': Fix -- HDFFV-10363 Fortran compilation fails for xlf and cmake builds
* | Merge pull request #830 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to developScot Breitenfeld2017-12-191-1/+15
|\ \ | | | | | | | | | | | | * commit '0065fd4b6d5edf61b21cd352c74268de13fd516a': Fix -- HDFFV-10363 Fortran compilation fails for xlf and cmake builds
| * | Fix -- HDFFV-10363 Fortran compilation fails for xlf and cmake buildsM. Scot Breitenfeld2017-12-191-1/+15
|/ /
| * Skip test if 1.6 APIAllen Byrne2017-12-191-30/+44
| |
| * HDFFV-9724 Add ENV VAR to vds testAllen Byrne2017-12-192-1/+191
| |
| * HDFFV-9724 Copy efc_open search from Lextern_traverseAllen Byrne2017-12-152-20/+212
| |
| * Add prefix dir to the clear commandAllen Byrne2017-12-131-2/+2
| |
| * HDFFV-9724 Add H5LS prefix test with ${ORIGIN}Allen Byrne2017-12-139-0/+136
| |
| * Add h5dump VDS prefix testsAllen Byrne2017-12-131-0/+67
| |
| * HDFFV-9724 combine efc and vds into one functionAllen Byrne2017-12-132-102/+31
| |
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2017-12-1341-1413/+1524
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '758b9667b3e07a7562107f19f7dabee027e5bd53': (41 commits) HDFFV-10223 Shared libraries fail test on OSX with fortran enabled with cmake removed duplicate exports of DS subroutines removed duplicate exports of DS subroutines Normalization with VOL integration branch. clean-up moved dll export to Module Fixed typo. removed parameters added missing parameter added missing parameter removed duplicate exports of DS subroutines removed fortran comments Various code cleanup Description: - Replaced H5Location::exists with H5Location::nameExists and marked H5Location::exists as deprecated. - Miscellaneous test cleanup for consistency. Platforms tested: Linux/32 2.6 (jam) Linux/64 (jelly) Darwin (osx1010test) exported global variables for windows export var. initialized integer constants Update macros Changed casts to const void * Casted pointers to void to quiet warnings on Linux. Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows. ...
* | Merge pull request #817 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to developScot Breitenfeld2017-12-0710-52/+38
|\ \ | | | | | | | | | | | | | | | | | | HDFFV-10223 * commit '6eab04894e88f7dcc0e684271328efc409a98662': HDFFV-10223 Shared libraries fail test on OSX with fortran enabled with cmake
| * | HDFFV-10223 Shared libraries fail test on OSX with fortran enabled with cmakeM. Scot Breitenfeld2017-12-0710-52/+38
|/ / | | | | | | This is now fixed via the HDFFV-10325 fix.
* | Merge pull request #815 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:vol_normalize ↵Dana Robinson2017-12-079-132/+109
|\ \ | | | | | | | | | | | | | | | | | | to develop * commit 'ec1e00a55f7b005fa9d87f92e58bc312286d0b8a': Normalization with VOL integration branch.
| * | Normalization with VOL integration branch.Dana Robinson2017-12-059-132/+109
| | |
* | | Merge pull request #807 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:noF77 to developScot Breitenfeld2017-12-063-687/+857
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbe6c69097c03cfe3f37d9ab114c0ad438fd434e': (37 commits) removed duplicate exports of DS subroutines removed duplicate exports of DS subroutines clean-up moved dll export to Module removed parameters added missing parameter added missing parameter removed duplicate exports of DS subroutines removed fortran comments exported global variables for windows export var. initialized integer constants Update macros Changed casts to const void * Casted pointers to void to quiet warnings on Linux. Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows. Fixed misc Warnings flagged by VS2017. Made a dcpl layout struct in H5Z.c dynamic to quiet a stack size warning. Fixed an uninitialized filter callback struct in H5Dchunk.c and unified the naming and initialization of said struct throughout the library. This was causing a crash on VS2015 in debug mode when the debug heap complained. Fixes HDFFV-10330. Fixed Windows code in H5PLpath.c ...
| * | Merge branch 'noF77' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb ↵M. Scot Breitenfeld2017-12-060-0/+0
| |\ \ | | | | | | | | | | | | into noF77
| | * \ Merge branch 'noF77' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb ↵M. Scot Breitenfeld2017-12-060-0/+0
| | |\ \ | | | | | | | | | | | | | | | into noF77
| | | * | clean-upM. Scot Breitenfeld2017-12-051-7/+1
| | | | |
| | | * | moved dll export to ModuleM. Scot Breitenfeld2017-12-052-338/+336
| | | | |
| | | * | removed parametersM. Scot Breitenfeld2017-12-041-2/+0
| | | | |
| | | * | added missing parameterM. Scot Breitenfeld2017-12-041-0/+2
| | | | |
| | | * | added missing parameterM. Scot Breitenfeld2017-12-041-0/+1
| | | | |
| | | * | removed duplicate exports of DS subroutinesM. Scot Breitenfeld2017-12-041-62/+3
| | | | |
| | | * | removed fortran commentsM. Scot Breitenfeld2017-12-041-7/+7
| | | | |
| | | * | exported global variables for windowsM. Scot Breitenfeld2017-12-042-2/+331
| | | | |
| | * | | removed duplicate exports of DS subroutinesM. Scot Breitenfeld2017-12-063-406/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added missing parameter added missing parameter removed parameters moved dll export to Module clean-up
| | * | | Merge branch 'develop' into noF77M. Scot Breitenfeld2017-12-0627-1199/+1356
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exported global variables for windows removed fortran comments
| * | | | | removed duplicate exports of DS subroutinesM. Scot Breitenfeld2017-12-063-79/+342
| | |_|/ / | |/| | |
| * | | | Merge branch 'develop' into noF77M. Scot Breitenfeld2017-12-0425-1197/+1025
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| * | | export var.M. Scot Breitenfeld2017-11-292-64/+66
| | | |
| * | | initialized integer constantsM. Scot Breitenfeld2017-11-291-63/+63
| | | |
| * | | Merge branch 'noF77' of ssh://bitbucket.hdfgroup.org:7999/~brtnfld/hdf5_msb ↵M. Scot Breitenfeld2017-11-290-0/+0
| |\ \ \ | | | | | | | | | | | | | | | into noF77
| | * | | misc. clean-upM. Scot Breitenfeld2017-11-291-2/+2
| | | | |
| | * | | Merge branch 'develop' into noF77M. Scot Breitenfeld2017-11-2941-1410/+1520
| | |\ \ \
| | * | | | intialized h5open_f arraysM. Scot Breitenfeld2017-11-291-3/+3
| | | | | |
| | * | | | misc clean-upM. Scot Breitenfeld2017-11-211-24/+24
| | | | | |
| | * | | | added public, privateM. Scot Breitenfeld2017-11-211-102/+106
| | | | | |
| | * | | | misc. code clean-upM. Scot Breitenfeld2017-11-202-76/+75
| | | | | |