Shorten the name of the dirs.

.gitattributes

@@ -71,13 +71,13 @@
 1_10/JAVA/HDF5SubsetSelect.java -text
 1_10/JAVA/makefile.am -text
 1_10/JAVA/runExample.sh.in -text
-1_10/JAVA/testfiles/HDF5AttributeCreate.txt -text
-1_10/JAVA/testfiles/HDF5DatasetCreate.txt -text
-1_10/JAVA/testfiles/HDF5DatasetRead.txt -text
-1_10/JAVA/testfiles/HDF5FileCreate.txt -text
-1_10/JAVA/testfiles/HDF5FileStructure.txt -text
-1_10/JAVA/testfiles/HDF5GroupCreate.txt -text
-1_10/JAVA/testfiles/HDF5SubsetSelect.txt -text
+1_10/JAVA/tfiles/HDF5AttributeCreate.txt -text
+1_10/JAVA/tfiles/HDF5DatasetCreate.txt -text
+1_10/JAVA/tfiles/HDF5DatasetRead.txt -text
+1_10/JAVA/tfiles/HDF5FileCreate.txt -text
+1_10/JAVA/tfiles/HDF5FileStructure.txt -text
+1_10/JAVA/tfiles/HDF5GroupCreate.txt -text
+1_10/JAVA/tfiles/HDF5SubsetSelect.txt -text
 1_10/config/cmake/UseJava.cmake -text
 1_10/config/cmake/UseJavaClassFilelist.cmake -text
 1_10/config/cmake/UseJavaSymlinks.cmake -text

.github/workflows/cmake-ctest.yml

@@ -301,8 +301,12 @@ jobs:
 
       # symlinks the compiler executables to a common location 
       - name: Setup GNU Fortran
-        uses: modflowpy/install-gfortran-action@v1
-
+        uses: fortran-lang/setup-fortran@v1
+        id: setup-fortran
+        with:
+          compiler: gcc
+          version: 12
+
       - name: Run ctest (MacOS)
         id: run-ctest
         env:

C/CMakeLists.txt

@@ -9,12 +9,12 @@ add_subdirectory (${PROJECT_SOURCE_DIR}/H5G)
 add_subdirectory (${PROJECT_SOURCE_DIR}/H5T)
 
 if (${H5_LIBVER_DIR} GREATER 16)
-#  add_subdirectory (${PROJECT_SOURCE_DIR}/Performance)
+#  add_subdirectory (${PROJECT_SOURCE_DIR}/Perf)
   if (USE_SHARED_LIBS AND HDF_BUILD_FILTERS AND HDF5_ENABLE_PLUGIN_SUPPORT)
-    add_subdirectory (${PROJECT_SOURCE_DIR}/H5Filters)
+    add_subdirectory (${PROJECT_SOURCE_DIR}/H5F)
   endif ()
 endif ()
 
 if (H5_HAVE_PARALLEL AND HDF5_ENABLE_PARALLEL)
-  add_subdirectory (${PROJECT_SOURCE_DIR}/H5Parallel)
+  add_subdirectory (${PROJECT_SOURCE_DIR}/H5P)
 endif ()

C/H5D/CMakeLists.txt

@@ -70,7 +70,7 @@ if (H5EX_BUILD_TESTING)
         TARGET     ${EXAMPLE_VARNAME}_${example_name}
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${example_name}.tst ${testdest}.tst
+        ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${example_name}.tst ${testdest}.tst
     )
     if (HDF5_BUILD_TOOLS)
       if (${example_name} STREQUAL "h5ex_d_nbit")
@@ -79,29 +79,29 @@ if (H5EX_BUILD_TESTING)
               TARGET     ${EXAMPLE_VARNAME}_${example_name}
               POST_BUILD
               COMMAND    ${CMAKE_COMMAND}
-              ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${example_name}22.ddl ${testdest}.ddl
+              ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${example_name}22.ddl ${testdest}.ddl
           )
         elseif (HDF5_VERSION_MAJOR VERSION_EQUAL "1.10" AND HDF5_VERSION_STRING VERSION_LESS_EQUAL "1.10.7")
           add_custom_command (
               TARGET     ${EXAMPLE_VARNAME}_${example_name}
               POST_BUILD
               COMMAND    ${CMAKE_COMMAND}
-              ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${example_name}07.ddl ${testdest}.ddl
+              ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${example_name}07.ddl ${testdest}.ddl
           )
         else ()
           add_custom_command (
               TARGET     ${EXAMPLE_VARNAME}_${example_name}
               POST_BUILD
               COMMAND    ${CMAKE_COMMAND}
-              ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${example_name}.ddl ${testdest}.ddl
+              ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${example_name}.ddl ${testdest}.ddl
           )
         endif ()
       else ()
         add_custom_command (
             TARGET     ${EXAMPLE_VARNAME}_${example_name}
             POST_BUILD
             COMMAND    ${CMAKE_COMMAND}
-            ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${example_name}.ddl ${testdest}.ddl
+            ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${example_name}.ddl ${testdest}.ddl
         )
       endif ()
     endif ()

C/H5D/Makefile.am

@@ -21,18 +21,18 @@ h5ex_d_szip h5ex_d_nbit h5ex_d_soint h5ex_d_sofloat h5ex_d_extern \
 h5ex_d_compact h5ex_d_unlimadd h5ex_d_unlimmod h5ex_d_unlimgzip \
 h5ex_d_checksum h5ex_d_shuffle h5ex_d_transform h5ex_d_fillval h5ex_d_alloc
 
-EXTRA_DIST = testfiles/h5ex_d_rdwr.tst testfiles/h5ex_d_hyper.tst testfiles/h5ex_d_chunk.tst \
-testfiles/h5ex_d_gzip.tst testfiles/h5ex_d_szip.tst testfiles/h5ex_d_nbit.tst testfiles/h5ex_d_soint.tst \
-testfiles/h5ex_d_sofloat.tst testfiles/h5ex_d_extern.tst testfiles/h5ex_d_compact.tst \
-testfiles/h5ex_d_unlimadd.tst testfiles/h5ex_d_unlimmod.tst testfiles/h5ex_d_unlimgzip.tst \
-testfiles/h5ex_d_checksum.tst testfiles/h5ex_d_shuffle.tst testfiles/h5ex_d_transform.tst \
-testfiles/h5ex_d_fillval.tst testfiles/h5ex_d_alloc.tst \
-testfiles/h5ex_d_rdwr.ddl testfiles/h5ex_d_hyper.ddl testfiles/h5ex_d_chunk.ddl \
-testfiles/h5ex_d_gzip.ddl testfiles/h5ex_d_szip.ddl testfiles/h5ex_d_nbit.ddl testfiles/h5ex_d_soint.ddl \
-testfiles/h5ex_d_sofloat.ddl testfiles/h5ex_d_extern.ddl testfiles/h5ex_d_compact.ddl \
-testfiles/h5ex_d_unlimadd.ddl testfiles/h5ex_d_unlimmod.ddl testfiles/h5ex_d_unlimgzip.ddl \
-testfiles/h5ex_d_checksum.ddl testfiles/h5ex_d_shuffle.ddl testfiles/h5ex_d_transform.ddl \
-testfiles/h5ex_d_fillval.ddl testfiles/h5ex_d_alloc.ddl test.sh
+EXTRA_DIST = tfiles/h5ex_d_rdwr.tst tfiles/h5ex_d_hyper.tst tfiles/h5ex_d_chunk.tst \
+tfiles/h5ex_d_gzip.tst tfiles/h5ex_d_szip.tst tfiles/h5ex_d_nbit.tst tfiles/h5ex_d_soint.tst \
+tfiles/h5ex_d_sofloat.tst tfiles/h5ex_d_extern.tst tfiles/h5ex_d_compact.tst \
+tfiles/h5ex_d_unlimadd.tst tfiles/h5ex_d_unlimmod.tst tfiles/h5ex_d_unlimgzip.tst \
+tfiles/h5ex_d_checksum.tst tfiles/h5ex_d_shuffle.tst tfiles/h5ex_d_transform.tst \
+tfiles/h5ex_d_fillval.tst tfiles/h5ex_d_alloc.tst \
+tfiles/h5ex_d_rdwr.ddl tfiles/h5ex_d_hyper.ddl tfiles/h5ex_d_chunk.ddl \
+tfiles/h5ex_d_gzip.ddl tfiles/h5ex_d_szip.ddl tfiles/h5ex_d_nbit.ddl tfiles/h5ex_d_soint.ddl \
+tfiles/h5ex_d_sofloat.ddl tfiles/h5ex_d_extern.ddl tfiles/h5ex_d_compact.ddl \
+tfiles/h5ex_d_unlimadd.ddl tfiles/h5ex_d_unlimmod.ddl tfiles/h5ex_d_unlimgzip.ddl \
+tfiles/h5ex_d_checksum.ddl tfiles/h5ex_d_shuffle.ddl tfiles/h5ex_d_transform.ddl \
+tfiles/h5ex_d_fillval.ddl tfiles/h5ex_d_alloc.ddl test.sh
 
 TESTS = test.sh
 

C/H5D/Makefile.in

@@ -541,18 +541,18 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = testfiles/h5ex_d_rdwr.tst testfiles/h5ex_d_hyper.tst testfiles/h5ex_d_chunk.tst \
-testfiles/h5ex_d_gzip.tst testfiles/h5ex_d_szip.tst testfiles/h5ex_d_nbit.tst testfiles/h5ex_d_soint.tst \
-testfiles/h5ex_d_sofloat.tst testfiles/h5ex_d_extern.tst testfiles/h5ex_d_compact.tst \
-testfiles/h5ex_d_unlimadd.tst testfiles/h5ex_d_unlimmod.tst testfiles/h5ex_d_unlimgzip.tst \
-testfiles/h5ex_d_checksum.tst testfiles/h5ex_d_shuffle.tst testfiles/h5ex_d_transform.tst \
-testfiles/h5ex_d_fillval.tst testfiles/h5ex_d_alloc.tst \
-testfiles/h5ex_d_rdwr.ddl testfiles/h5ex_d_hyper.ddl testfiles/h5ex_d_chunk.ddl \
-testfiles/h5ex_d_gzip.ddl testfiles/h5ex_d_szip.ddl testfiles/h5ex_d_nbit.ddl testfiles/h5ex_d_soint.ddl \
-testfiles/h5ex_d_sofloat.ddl testfiles/h5ex_d_extern.ddl testfiles/h5ex_d_compact.ddl \
-testfiles/h5ex_d_unlimadd.ddl testfiles/h5ex_d_unlimmod.ddl testfiles/h5ex_d_unlimgzip.ddl \
-testfiles/h5ex_d_checksum.ddl testfiles/h5ex_d_shuffle.ddl testfiles/h5ex_d_transform.ddl \
-testfiles/h5ex_d_fillval.ddl testfiles/h5ex_d_alloc.ddl test.sh
+EXTRA_DIST = tfiles/h5ex_d_rdwr.tst tfiles/h5ex_d_hyper.tst tfiles/h5ex_d_chunk.tst \
+tfiles/h5ex_d_gzip.tst tfiles/h5ex_d_szip.tst tfiles/h5ex_d_nbit.tst tfiles/h5ex_d_soint.tst \
+tfiles/h5ex_d_sofloat.tst tfiles/h5ex_d_extern.tst tfiles/h5ex_d_compact.tst \
+tfiles/h5ex_d_unlimadd.tst tfiles/h5ex_d_unlimmod.tst tfiles/h5ex_d_unlimgzip.tst \
+tfiles/h5ex_d_checksum.tst tfiles/h5ex_d_shuffle.tst tfiles/h5ex_d_transform.tst \
+tfiles/h5ex_d_fillval.tst tfiles/h5ex_d_alloc.tst \
+tfiles/h5ex_d_rdwr.ddl tfiles/h5ex_d_hyper.ddl tfiles/h5ex_d_chunk.ddl \
+tfiles/h5ex_d_gzip.ddl tfiles/h5ex_d_szip.ddl tfiles/h5ex_d_nbit.ddl tfiles/h5ex_d_soint.ddl \
+tfiles/h5ex_d_sofloat.ddl tfiles/h5ex_d_extern.ddl tfiles/h5ex_d_compact.ddl \
+tfiles/h5ex_d_unlimadd.ddl tfiles/h5ex_d_unlimmod.ddl tfiles/h5ex_d_unlimgzip.ddl \
+tfiles/h5ex_d_checksum.ddl tfiles/h5ex_d_shuffle.ddl tfiles/h5ex_d_transform.ddl \
+tfiles/h5ex_d_fillval.ddl tfiles/h5ex_d_alloc.ddl test.sh
 
 TESTS = test.sh
 CLEANFILES = Makefile test.sh maketestref.sh

C/H5D/maketestref.sh.in

@@ -49,8 +49,8 @@ version_compare() {
 H5_LIBVER=@H5_LIBVER@
 H5_LIBVER_DIR=@H5_LIBVER_DIR@
 
-if [ ! -d "$srcdir/testfiles/$H5_LIBVER_DIR" ]; then
-  mkdir $srcdir/testfiles/$H5_LIBVER_DIR
+if [ ! -d "$srcdir/tfiles/$H5_LIBVER_DIR" ]; then
+  mkdir $srcdir/tfiles/$H5_LIBVER_DIR
 fi
 
 topics="rdwr hyper chunk gzip szip soint sofloat extern compact unlimadd \
@@ -60,8 +60,8 @@ for topic in $topics
 do
     fname=h5ex_d_$topic
     $ECHO_N "Creating test reference file for $PWD/$fname...$ECHO_C"
-    exout ./$fname >$srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst
-    dumpout $fname.h5 >$srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl
+    exout ./$fname >$srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
+    dumpout $fname.h5 >$srcdir/tfiles/$H5_LIBVER_DIR/$fname.ddl
     rm -f $fname.h5
     echo "  Done."
 done
@@ -83,8 +83,8 @@ fi
 topic="nbit"
 fname=h5ex_d_$topic
 $ECHO_N "Creating test reference file for $PWD/$fname...$ECHO_C"
-exout ./$fname >$srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst
-dumpout $fname.h5 >$srcdir/testfiles/$H5_LIBVER_DIR/$fname$USE_ALT.ddl
+exout ./$fname >$srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
+dumpout $fname.h5 >$srcdir/tfiles/$H5_LIBVER_DIR/$fname$USE_ALT.ddl
 rm -f $fname.h5
 echo "  Done."
 
@@ -93,7 +93,7 @@ rm -f h5ex_d_extern.data
 
 fname=h5ex_d_transform
 $ECHO_N "Creating test reference file for $PWD/$fname...$ECHO_C"
-exout ./$fname >$srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst
-dumpout -n $fname.h5 >$srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl
+exout ./$fname >$srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
+dumpout -n $fname.h5 >$srcdir/tfiles/$H5_LIBVER_DIR/$fname.ddl
 rm -f $fname.h5
 echo "  Done."

C/H5D/test.sh.in

@@ -71,15 +71,15 @@ do
         echo "  Unsupported feature"
         status=0
     else
-        cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst
+        cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
         status=$?
         if test $status -ne 0
         then
             echo "  FAILED!"
         else
           dumpout $fname.h5 >tmp.test
           rm -f $fname.h5
-          cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl
+          cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.ddl
           status=$?
           if test $status -ne 0
           then
@@ -115,15 +115,15 @@ if test $status -eq 1
 then
     echo "  Unsupported feature"
 else
-    cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst
+    cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
     status=$?
     if test $status -ne 0
     then
         echo "  FAILED!"
     else
         dumpout $fname.h5 >tmp.test
         rm -f $fname.h5
-        cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/$fname$USE_ALT.ddl
+        cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname$USE_ALT.ddl
         status=$?
         if test $status -ne 0
         then
@@ -148,15 +148,15 @@ if test $status -eq 1
 then
     echo "  Unsupported feature"
 else
-    cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst
+    cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
     status=$?
     if test $status -ne 0
     then
         echo "  FAILED!"
     else
         dumpout -n $fname.h5 >tmp.test
         rm -f $fname.h5
-        cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl
+        cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.ddl
         status=$?
         if test $status -ne 0
         then

C/H5Filters/CMakeLists.txt → C/H5F/CMakeLists.txt

@@ -201,7 +201,7 @@ if (H5EX_BUILD_TESTING)
           NAME ${EXAMPLE_VARNAME}_${testname}
           COMMAND "${CMAKE_COMMAND}"
               -E copy_if_different
-              "${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${testname}.h5" "${PROJECT_BINARY_DIR}/${testname}.h5"
+              "${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${testname}.h5" "${PROJECT_BINARY_DIR}/${testname}.h5"
       )
       set_tests_properties (${EXAMPLE_VARNAME}_${testname} PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_${testname}-ERR)
     else ()
@@ -261,15 +261,15 @@ if (H5EX_BUILD_TESTING)
   # Copy all the HDF5 files from the source directory into the test directory
   # --------------------------------------------------------------------
   foreach (h5_file ${dyn_examples})
-    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${h5_file}.tst" "${PROJECT_BINARY_DIR}/${h5_file}.tst" "example_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${h5_file}.tst" "${PROJECT_BINARY_DIR}/${h5_file}.tst" "example_files")
     if (WIN32 AND MSVC_VERSION LESS 1900 AND ${h5_file} MATCHES "h5ex_d_zfp")
-      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/h5ex_d_zfp.wddl" "${PROJECT_BINARY_DIR}/h5ex_d_zfp.ddl" "example_files")
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/h5ex_d_zfp.wddl" "${PROJECT_BINARY_DIR}/h5ex_d_zfp.ddl" "example_files")
     else ()
-      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${h5_file}.ddl" "${PROJECT_BINARY_DIR}/${h5_file}.ddl" "example_files")
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${h5_file}.ddl" "${PROJECT_BINARY_DIR}/${h5_file}.ddl" "example_files")
     endif()
   endforeach ()
   foreach (h5_file ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${H5_LIBVER_DIR}/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "example_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/tfiles/${H5_LIBVER_DIR}/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "example_files")
   endforeach ()
   add_custom_target(${EXAMPLE_VARNAME}_example_files ALL COMMENT "Copying files needed by example tests" DEPENDS ${example_files_list})