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.

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

Primary change is HDFFV-11212 - new refs and JNI #372

Merged
merged 82 commits into from
Feb 25, 2021
Merged
Show file tree
Hide file tree
Changes from 75 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
23e0df3
OESS-98 convert plugin option to FetchContent, add tests
byrnHDF Dec 10, 2020
84293f5
Fixes for pkcfg files because of plugin option
byrnHDF Dec 11, 2020
544bd61
OESS-98 fix tools test for plugins
byrnHDF Dec 15, 2020
ffb182f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 8, 2021
2561b6b
Keep doxygen comments under 100 chars long - format hint
byrnHDF Jan 8, 2021
1c73615
Whitespace
byrnHDF Jan 8, 2021
b71a853
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 11, 2021
b68973c
HDFFV-11144 - Reclassify CMake messages
byrnHDF Jan 11, 2021
f64497d
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 13, 2021
c854ffe
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 14, 2021
0f90d26
HDFFV-11099/11100 added help text
byrnHDF Jan 14, 2021
20757d6
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 15, 2021
d161733
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 20, 2021
f03b095
Reworked switch statement to compare string instead
byrnHDF Jan 22, 2021
bd52065
Fix typo
byrnHDF Jan 22, 2021
238c060
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 25, 2021
f12b2ae
Update CDash mode
byrnHDF Jan 26, 2021
673aac8
Correct name of threadsafe
byrnHDF Jan 26, 2021
97df6db
Correct option name
byrnHDF Jan 26, 2021
e48f758
Undo accidental commit
byrnHDF Jan 26, 2021
2f364d8
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 27, 2021
f42f02b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 27, 2021
5b48b33
Note LLVM 10 to 11 format default changes
byrnHDF Jan 27, 2021
9927372
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 28, 2021
ad61d57
Update format plugin
byrnHDF Jan 28, 2021
613bc7a
Undo clang-format version 11 changes
byrnHDF Jan 28, 2021
0114098
One more correction
byrnHDF Jan 28, 2021
a685efa
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Jan 29, 2021
78f25ac
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 1, 2021
1899ba6
Update supported platforms
byrnHDF Feb 2, 2021
28d6d63
Revert whitespace changes
byrnHDF Feb 2, 2021
f1a0239
Correct whitespace
byrnHDF Feb 2, 2021
b656722
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 3, 2021
1c9eaf4
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 4, 2021
f85f7da
Changes from PR#3
byrnHDF Feb 4, 2021
464d08e
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 5, 2021
34ad32c
HDFFV-11213 added option to control gcc10 warnings diagnostics
byrnHDF Feb 5, 2021
d6db05b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into
byrnHDF Feb 8, 2021
264caff
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 9, 2021
9b42150
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 10, 2021
4569d39
HDFFV-11212 Use the new references correctly in JNI utility and tests
byrnHDF Feb 11, 2021
4a2865c
format source
byrnHDF Feb 11, 2021
1a2dc75
Fix typo
byrnHDF Feb 11, 2021
23679fa
Add new test file
byrnHDF Feb 11, 2021
232426b
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 16, 2021
020a40c
HDFFV-11212 - update test and remove unused arg
byrnHDF Feb 16, 2021
2352972
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 17, 2021
5806658
Minor non-space formatting changes
byrnHDF Feb 18, 2021
83b619f
Use H5I_INVALID_ID instead of "-1"
byrnHDF Feb 19, 2021
fbf97be
source formatting
byrnHDF Feb 19, 2021
ea94075
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
797a6c2
add missing testfile, update jni function
byrnHDF Feb 19, 2021
32d6ee9
Undo commit of debug code
byrnHDF Feb 19, 2021
71c4557
remove mislocated file
byrnHDF Feb 19, 2021
2c6df43
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
66d54a9
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
08c7738
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 19, 2021
46c620f
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 22, 2021
a4132c8
Fix h5repack test for handling of fapls and id close
byrnHDF Feb 22, 2021
498d7ec
Update h5diff test files usage text
byrnHDF Feb 22, 2021
82ff537
HDFFV-11212 add new ref tests for JNI export dataset
byrnHDF Feb 22, 2021
7e81307
src format update
byrnHDF Feb 22, 2021
4bda56f
Remove blank line typo
byrnHDF Feb 22, 2021
25884a6
src format typo
byrnHDF Feb 22, 2021
07d8cf2
long double requires %Lg
byrnHDF Feb 22, 2021
8735c2a
Another long double foramt specifer S.B. %Lg
byrnHDF Feb 22, 2021
140aca0
issue with t128bit test
byrnHDF Feb 22, 2021
c790f17
Windows issue with h5dump and type.
byrnHDF Feb 22, 2021
eb3f7cc
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 23, 2021
76d4fba
Fix review issues
byrnHDF Feb 23, 2021
7b96c23
refactor function nesting and fix error checks
byrnHDF Feb 23, 2021
90bb747
format fixes
byrnHDF Feb 23, 2021
321b926
Remove untested functions and javadoc quiet comments
byrnHDF Feb 23, 2021
2d40134
Restore TRY block.
byrnHDF Feb 24, 2021
b8cda57
Change string append errors to memory exception
byrnHDF Feb 24, 2021
ec3c879
revert to H5_JNI_FATAL_ERROR - support functions need work
byrnHDF Feb 24, 2021
0a56190
Add assertion error for h5util functions
byrnHDF Feb 24, 2021
282ac70
remove duplicate function
byrnHDF Feb 24, 2021
9eae4f5
format fix
byrnHDF Feb 24, 2021
a3d7f13
Revert HD function error handling
byrnHDF Feb 24, 2021
3ea3719
Merge branch 'develop' of https://github.com/HDFGroup/hdf5.git into d…
byrnHDF Feb 25, 2021
2a71393
Update copyright comments
byrnHDF Feb 25, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
Language: Cpp
BasedOnStyle: LLVM
AlignConsecutiveMacros: true
AlignConsecutiveAssignments: true
#llvm11: AlignConsecutiveBitFields: false
AlignConsecutiveDeclarations: true
AlignConsecutiveMacros: true
#llvm10-11: AlignOperands: true - Align
#llvm11: AllowShortEnumsOnASingleLine: true
AlwaysBreakAfterReturnType: AllDefinitions
Expand Down
3 changes: 3 additions & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -2019,6 +2019,7 @@
./tools/testfiles/tintsnodata.h5
./tools/testfiles/tlarge_objname.ddl
./tools/testfiles/tlarge_objname.h5
./tools/testfiles/tldouble.ddl
./tools/testfiles/tldouble.h5
./tools/testfiles/tlonglinks.ddl
./tools/testfiles/tlonglinks.h5
Expand Down Expand Up @@ -3428,6 +3429,7 @@
./java/test/testfiles/JUnit-TestH5Pvirtual.txt
./java/test/testfiles/JUnit-TestH5PL.txt
./java/test/testfiles/JUnit-TestH5R.txt
./java/test/testfiles/JUnit-TestH5Rref.txt
./java/test/testfiles/JUnit-TestH5Sbasic.txt
./java/test/testfiles/JUnit-TestH5S.txt
./java/test/testfiles/JUnit-TestH5Tparams.txt
Expand Down Expand Up @@ -3468,6 +3470,7 @@
./java/test/TestH5Pvirtual.java
./java/test/TestH5PL.java
./java/test/TestH5R.java
./java/test/TestH5Rref.java
./java/test/TestH5Sbasic.java
./java/test/TestH5S.java
./java/test/TestH5Tparams.java
Expand Down
10 changes: 5 additions & 5 deletions java/examples/datasets/H5Ex_D_Alloc.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ public static H5D_space_status get(int code) {
}

private static void allocation() {
long file_id = -1;
long filespace_id = -1;
long dataset_id1 = -1;
long dataset_id2 = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id1 = HDF5Constants.H5I_INVALID_HID;
long dataset_id2 = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];
int space_status = 0;
Expand Down
14 changes: 7 additions & 7 deletions java/examples/datasets/H5Ex_D_Checksum.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ private static boolean checkFletcher32Filter() {
}

private static void writeChecksum() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
long[] chunk_dims = { CHUNK_X, CHUNK_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];
Expand Down Expand Up @@ -193,9 +193,9 @@ private static void writeChecksum() {
}

private static void readChecksum() {
long file_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open an existing file.
Expand Down
16 changes: 8 additions & 8 deletions java/examples/datasets/H5Ex_D_Chunk.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ public static H5D_layout get(int code) {
}

private static void writeChunk() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
long[] chunk_dims = { CHUNK_X, CHUNK_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];
Expand Down Expand Up @@ -201,10 +201,10 @@ private static void writeChunk() {
}

private static void readChunk() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open an existing file.
Expand Down
16 changes: 8 additions & 8 deletions java/examples/datasets/H5Ex_D_Compact.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ public static H5D_layout get(int code) {
}

private static void writeCompact() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];

Expand Down Expand Up @@ -163,10 +163,10 @@ private static void writeCompact() {
}

private static void readCompact() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open file and dataset using the default properties.
Expand Down
14 changes: 7 additions & 7 deletions java/examples/datasets/H5Ex_D_External.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ public class H5Ex_D_External {
private static final int NAME_BUF_SIZE = 32;

private static void writeExternal() {
long file_id = -1;
long dcpl_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];

Expand Down Expand Up @@ -138,9 +138,9 @@ private static void writeExternal() {
}

private static void readExternal() {
long file_id = -1;
long dcpl_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];
String[] Xname = new String[1];

Expand Down
8 changes: 4 additions & 4 deletions java/examples/datasets/H5Ex_D_FillValue.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public class H5Ex_D_FillValue {
private static final int FILLVAL = 99;

private static void fillValue() {
long file_id = -1;
long dcpl_id = -1;
long dataspace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
long[] extdims = { EDIM_X, EDIM_Y };
long[] chunk_dims = { CHUNK_X, CHUNK_Y };
Expand Down
14 changes: 7 additions & 7 deletions java/examples/datasets/H5Ex_D_Gzip.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ private static boolean checkGzipFilter() {
}

private static void writeGzip() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
long[] chunk_dims = { CHUNK_X, CHUNK_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];
Expand Down Expand Up @@ -196,9 +196,9 @@ private static void writeGzip() {
}

private static void readGzip() {
long file_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open an existing file.
Expand Down
14 changes: 7 additions & 7 deletions java/examples/datasets/H5Ex_D_Hyperslab.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ public class H5Ex_D_Hyperslab {
private static final int RANK = 2;

private static void writeHyperslab() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];

Expand Down Expand Up @@ -142,10 +142,10 @@ private static void writeHyperslab() {
}

private static void readHyperslab() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open an existing file.
Expand Down
16 changes: 8 additions & 8 deletions java/examples/datasets/H5Ex_D_Nbit.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ private static boolean checkNbitFilter() {
}

private static void writeData() throws Exception {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dtype_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dtype_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
long[] chunk_dims = { CHUNK_X, CHUNK_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];
Expand Down Expand Up @@ -157,9 +157,9 @@ private static void writeData() throws Exception {
}

private static void readData() throws Exception {
long file_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open an existing file.
Expand Down
10 changes: 5 additions & 5 deletions java/examples/datasets/H5Ex_D_ReadWrite.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ public class H5Ex_D_ReadWrite {
private static final int RANK = 2;

private static void WriteDataset() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];

Expand Down Expand Up @@ -109,8 +109,8 @@ private static void WriteDataset() {
}

private static void ReadDataset() {
long file_id = -1;
long dataset_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open file using the default properties.
Expand Down
14 changes: 7 additions & 7 deletions java/examples/datasets/H5Ex_D_Shuffle.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ private static boolean checkShuffleFilter() {
}

private static void writeShuffle() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
long[] chunk_dims = { CHUNK_X, CHUNK_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];
Expand Down Expand Up @@ -229,9 +229,9 @@ private static void writeShuffle() {
}

private static void readShuffle() {
long file_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open an existing file.
Expand Down
14 changes: 7 additions & 7 deletions java/examples/datasets/H5Ex_D_Sofloat.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ private static boolean checkScaleoffsetFilter() {
}

private static void writeData() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
long[] chunk_dims = { CHUNK_X, CHUNK_Y };
double[][] dset_data = new double[DIM_X][DIM_Y];
Expand Down Expand Up @@ -213,9 +213,9 @@ private static void writeData() {
}

private static void readData() {
long file_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
double[][] dset_data = new double[DIM_X][DIM_Y];

// Open file using the default properties.
Expand Down
14 changes: 7 additions & 7 deletions java/examples/datasets/H5Ex_D_Soint.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ private static boolean checkScaleoffsetFilter() {
}

private static void writeData() {
long file_id = -1;
long filespace_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long filespace_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] dims = { DIM_X, DIM_Y };
long[] chunk_dims = { CHUNK_X, CHUNK_Y };
int[][] dset_data = new int[DIM_X][DIM_Y];
Expand Down Expand Up @@ -195,9 +195,9 @@ private static void writeData() {
}

private static void readData() {
long file_id = -1;
long dataset_id = -1;
long dcpl_id = -1;
long file_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long dcpl_id = HDF5Constants.H5I_INVALID_HID;
int[][] dset_data = new int[DIM_X][DIM_Y];

// Open file using the default properties.
Expand Down
Loading