Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into threading_updates
Browse files Browse the repository at this point in the history
  • Loading branch information
qkoziol committed Apr 16, 2024
2 parents 32383de + 3f0649c commit 0754dc8
Show file tree
Hide file tree
Showing 16 changed files with 1,675 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/intel-auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
id: setup-fortran
with:
compiler: intel
version: '2024.0'
version: '2024.1'

- name: Autotools Configure
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/intel-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
id: setup-fortran
with:
compiler: intel
version: '2024.0'
version: '2024.1'

- name: CMake Configure (Linux)
shell: bash
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
id: setup-fortran
with:
compiler: intel
version: '2024.0'
version: '2024.1'

- name: CMake Configure (Windows)
shell: pwsh
Expand Down
4 changes: 2 additions & 2 deletions doxygen/dox/GettingStarted.dox
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ A brief introduction to Parallel HDF5. If you are new to HDF5 please see the @re
HDF5-1.10 New Features
</td>
<td>
\li <a href="https://docs.hdfgroup.org/hdf5/develop/intro_VDS.html">Introduction to the Virtual Dataset - VDS</a>
\li <a href="https://docs.hdfgroup.org/hdf5/develop/intro_SWMR.html">Introduction to Single-Writer/Multiple-Reader (SWMR)</a>
\li \ref VDS
\li \ref SWMR
</td>
</tr>
<tr>
Expand Down
17 changes: 13 additions & 4 deletions doxygen/dox/Glossary.dox
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,13 @@

<DL>
<DT>Compact layout</DT>
<DD></DD>
<DD>
<P>A dataset storage layout where the dataset elements are stored in the
object header of the dataset. This layout is suitable for very small
datasets that can easily fit in the object header.</P>
<P>Compact layout can improve storage and access performance for files
that have many very small datasets.</P>
</DD>
</DL>

<DL>
Expand Down Expand Up @@ -174,17 +180,20 @@ and an HDF5 path name in that file.</DD>

<DL>
<DT>File format</DT>
<DD></DD>
<DD>HDF5 file format refers to the structure and organization of the HDF5 data
being stored within the file.</DD>
</DL>

<DL>
<DT>Fill value</DT>
<DD></DD>
<DD>A default value assigned to data elements that have not yet been written.</DD>
</DL>

<DL>
<DT>Filter</DT>
<DD></DD>
<DD>
Filters are optional stages that can be inserted in the data pipeline to implement
compression and error checking. User applications may also add custom filters.</DD>
</DL>

\section GLS_G G
Expand Down
2 changes: 1 addition & 1 deletion doxygen/dox/IntroHDF5.dox
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ on the <a href="http://hdfeos.org/">HDF-EOS Tools and Information Center</a> pag
\section secHDF5Examples Examples
\li \ref LBExamples
\li \ref ExAPI
\li <a href="https://github.com/HDFGroup/hdf5/tree/develop/examples">Examples in the Source Code</a>
\li <a href="https://github.com/HDFGroup/hdf5/blob/develop/HDF5Examples">Other Examples</a>

\section secHDF5ExamplesCompile How To Compile
For information on compiling in C, C++ and Fortran, see: \ref LBCompiling
Expand Down
7 changes: 7 additions & 0 deletions doxygen/dox/TechnicalNotes.dox
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
\li \ref api-compat-macros
\li \ref APPDBG
\li \ref FMTDISC
\li \ref FILEIMGOPS
\li \ref FILTER
\li \ref IOFLOW
\li \ref TNMDC
Expand Down Expand Up @@ -43,6 +44,12 @@

*/

/** \page FILEIMGOPS HDF5 File Image Operations

\htmlinclude FileImageOps.html

*/

/** \page FILTER HDF5 Filters

\htmlinclude Filters.html
Expand Down
2 changes: 1 addition & 1 deletion doxygen/dox/ViewTools.dox
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ In other words, it is an array of four elements, in which each element is a 3 by

This dataset is much more complex. Also note that subsetting cannot be done on Array datatypes.

See this <a href="https://docs.hdfgroup.org/hdf5/develop/_l_b_datatypes.html">section</a> for more information on the Array datatype.
See this <a href="https://docs.hdfgroup.org/hdf5/develop/_l_b_datatypes.html#title4">section</a> for more information on the Array datatype.

\subsubsection subsubsecViewToolsViewDtypes_objref Object Reference
An Object Reference is a reference to an entire object (dataset, group, or named datatype).
Expand Down
Loading

0 comments on commit 0754dc8

Please sign in to comment.