diff --git a/Makefile.am b/Makefile.am
index fc46f45b..544aa350 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ ACLOCAL_AMFLAGS = -I config
 
 nodist_noinst_HEADERS = config.h
 
-EXTRA_DIST = COPYRIGHT VERSION BSD_LICENSE_README
+EXTRA_DIST = COPYRIGHT SILO_VERSION BSD_LICENSE_README
 
 MAINTAINERCLEANFILES = Makefile.in\
  aclocal.m4\
@@ -102,11 +102,11 @@ dist-xz-bsd: dist-xz
 	cp -R $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION)-bsd
 	rm -rf $(PACKAGE)-$(VERSION)-bsd/src/hzip
 	rm -rf $(PACKAGE)-$(VERSION)-bsd/src/fpzip
-	tar cf - $(PACKAGE)-$(VERSION)-bsd | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd.tar.xz
+	tar cf - $(PACKAGE)-$(VERSION)-bsd | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd.tar.xz
 	rm -rf $(PACKAGE)-$(VERSION)-bsd/tests/{amr3d.silo,pion0244.silo,amr2d.silo,xvers_data.tar.xz}
-	tar cf - $(PACKAGE)-$(VERSION)-bsd | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.xz
+	tar cf - $(PACKAGE)-$(VERSION)-bsd | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.xz
 	rm -rf $(PACKAGE)-$(VERSION)-bsd
-	tar cf - $(PACKAGE)-$(VERSION) | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION).tar.xz
+	tar cf - $(PACKAGE)-$(VERSION) | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION).tar.xz
 	rm -rf $(PACKAGE)-$(VERSION)
 
 .PHONY: help
diff --git a/Makefile.in b/Makefile.in
index baa3267c..dc2e046f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -464,7 +464,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I config
 nodist_noinst_HEADERS = config.h
-EXTRA_DIST = COPYRIGHT VERSION BSD_LICENSE_README
+EXTRA_DIST = COPYRIGHT SILO_VERSION BSD_LICENSE_README
 MAINTAINERCLEANFILES = Makefile.in\
  aclocal.m4\
  configure
@@ -976,11 +976,11 @@ dist-xz-bsd: dist-xz
 	cp -R $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION)-bsd
 	rm -rf $(PACKAGE)-$(VERSION)-bsd/src/hzip
 	rm -rf $(PACKAGE)-$(VERSION)-bsd/src/fpzip
-	tar cf - $(PACKAGE)-$(VERSION)-bsd | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd.tar.xz
+	tar cf - $(PACKAGE)-$(VERSION)-bsd | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd.tar.xz
 	rm -rf $(PACKAGE)-$(VERSION)-bsd/tests/{amr3d.silo,pion0244.silo,amr2d.silo,xvers_data.tar.xz}
-	tar cf - $(PACKAGE)-$(VERSION)-bsd | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.xz
+	tar cf - $(PACKAGE)-$(VERSION)-bsd | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.xz
 	rm -rf $(PACKAGE)-$(VERSION)-bsd
-	tar cf - $(PACKAGE)-$(VERSION) | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION).tar.xz
+	tar cf - $(PACKAGE)-$(VERSION) | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION).tar.xz
 	rm -rf $(PACKAGE)-$(VERSION)
 
 .PHONY: help
diff --git a/VERSION b/SILO_VERSION
similarity index 100%
rename from VERSION
rename to SILO_VERSION
diff --git a/configure.ac b/configure.ac
index 3133b1dd..96a68d96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,7 +155,7 @@ dnl The esyscmd macro invokation allows us to keep version number in
 dnl VERSION file and just re-generate configure instead of having to
 dnl also checkout and edit configure.ac
 dnl
-m4_define(SILO_VERSION, m4_esyscmd([cat VERSION | tr -d '\n']))
+m4_define(SILO_VERSION, m4_esyscmd([cat SILO_VERSION | tr -d '\n']))
 m4_define(SILO_NAME, silo)
 m4_define(SILO_BUGS,visit-users@elist.ornl.gov)
 m4_define(SILO_TOP_SRC_DIR, `pwd`)
diff --git a/src/hdf5_drv/silo_hdf5.c b/src/hdf5_drv/silo_hdf5.c
index 18fb5deb..e0af49b8 100644
--- a/src/hdf5_drv/silo_hdf5.c
+++ b/src/hdf5_drv/silo_hdf5.c
@@ -4973,10 +4973,13 @@ db_hdf5_process_file_options(int opts_set_id, int mode, hid_t *fcpl)
     H5AC_cache_config_t h5mdc_config;
 #endif
 
-    /* Performance optimizations for memory footprint */
+#if HDF5_VERSION_GE(1,10,2)
+    H5Pset_libver_bounds(retval, H5F_LIBVER_V18, H5F_LIBVER_V18);
+#endif
+
     if (mode & DB_PERF_OVER_COMPAT)
         H5Pset_libver_bounds(retval, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
-#if HDF5_VERSION_GE(1,10,0)
+#if HDF5_VERSION_GE(1,10,2)
     if (mode & DB_COMPAT_OVER_PERF)
         H5Pset_libver_bounds(retval, H5F_LIBVER_V18, H5F_LIBVER_V18);
 #endif
diff --git a/src/pdb/Makefile.am b/src/pdb/Makefile.am
index cb99770a..eb0d317b 100644
--- a/src/pdb/Makefile.am
+++ b/src/pdb/Makefile.am
@@ -59,11 +59,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/score -I$(top_srcdir)/src/silo
 
 EXTRA_DIST = detect.c
 
-noinst_HEADERS = pdb.h
 nodist_noinst_HEADERS = pdform.h
 
 if INSTALL_LITE_HEADERS
+noinst_HEADERS = pdb.h
 nodist_include_HEADERS = lite_pdb.h
+else
+noinst_HEADERS = pdb.h lite_pdb.h
 endif
 
 FILES = \
diff --git a/src/pdb/Makefile.in b/src/pdb/Makefile.in
index 9b12ab13..dba37f7a 100644
--- a/src/pdb/Makefile.in
+++ b/src/pdb/Makefile.in
@@ -155,7 +155,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -240,6 +240,7 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(includedir)"
+am__noinst_HEADERS_DIST = pdb.h lite_pdb.h
 HEADERS = $(nodist_include_HEADERS) $(nodist_noinst_HEADERS) \
 	$(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -446,8 +447,9 @@ noinst_LTLIBRARIES = libsilo_pdb.la
 libsilo_pdb_la_SOURCES = $(FILES)
 AM_CPPFLAGS = -I$(top_srcdir)/src/score -I$(top_srcdir)/src/silo
 EXTRA_DIST = detect.c
-noinst_HEADERS = pdb.h
 nodist_noinst_HEADERS = pdform.h
+@INSTALL_LITE_HEADERS_FALSE@noinst_HEADERS = pdb.h lite_pdb.h
+@INSTALL_LITE_HEADERS_TRUE@noinst_HEADERS = pdb.h
 @INSTALL_LITE_HEADERS_TRUE@nodist_include_HEADERS = lite_pdb.h
 FILES = \
  pdb.c \
diff --git a/src/score/Makefile.am b/src/score/Makefile.am
index e5b2c77c..94622bad 100644
--- a/src/score/Makefile.am
+++ b/src/score/Makefile.am
@@ -57,10 +57,12 @@ noinst_LTLIBRARIES = libsilo_score.la
 libsilo_score_la_SOURCES = $(FILES)
 
 if INSTALL_LITE_HEADERS
+noinst_HEADERS = score.h
 nodist_include_HEADERS = lite_score.h
+else
+noinst_HEADERS = score.h lite_score.h
 endif
 
-noinst_HEADERS = score.h
 
 CLEANFILES = lite_score.h
 
diff --git a/src/score/Makefile.in b/src/score/Makefile.in
index 8e9f5b01..c25b260a 100644
--- a/src/score/Makefile.in
+++ b/src/score/Makefile.in
@@ -155,7 +155,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -239,6 +239,7 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(includedir)"
+am__noinst_HEADERS_DIST = score.h lite_score.h
 HEADERS = $(nodist_include_HEADERS) $(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
@@ -442,8 +443,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libsilo_score.la
 libsilo_score_la_SOURCES = $(FILES)
+@INSTALL_LITE_HEADERS_FALSE@noinst_HEADERS = score.h lite_score.h
+@INSTALL_LITE_HEADERS_TRUE@noinst_HEADERS = score.h
 @INSTALL_LITE_HEADERS_TRUE@nodist_include_HEADERS = lite_score.h
-noinst_HEADERS = score.h
 CLEANFILES = lite_score.h
 FILES = \
  memmove.c \
diff --git a/src/silo/silo.inc b/src/silo/silo.inc
index e8b25488..5c06e965 100644
--- a/src/silo/silo.inc
+++ b/src/silo/silo.inc
@@ -1,21 +1,23 @@
-!cccccccccccccccccccccccccccccccccccccccccccccccccccccccc -*- fortran -*-
-! 
-!      SILO include file for Fortan applications.
-! 
-!  WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
-!     This file is generated automatically from C header files in the
-!     SILO distribution.  Do not make changes to this file manually,
-!     as those changes will disappear.
-!  WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
-! 
-!  This file was generated by the following commands...
-!        mv silo.inc silo.inc~
-!        cat silo.h silo_f.h | mkinc > silo.inc
-! 
-! cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+Ccccccccccccccccccccccccccccccccccccccccccccccccccccccccc -*- fortran -*-
+C 
+C      SILO include file for Fortan applications.
+C 
+C  Programmer:   miller86 Tue Sep 12 10:09:10 PDT 2023
+C 
+C  WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+C     This file is generated automatically from C header files in the
+C     SILO distribution.  Do not make changes to this file manually,
+C     as those changes will disappear.
+C  WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+C 
+C  This file was generated by the following commands...
+C        mv silo.inc silo.inc~
+C        cat silo.h silo_f.h | mkinc > silo.inc
+C 
+C cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
 
 
-!...Functions.
+C...Functions.
       EXTERNAL  DBADDCAOPT
       EXTERNAL  DBADDCCMP
       EXTERNAL  DBADDCOPT
@@ -33,6 +35,7 @@
       EXTERNAL  DBERRLVL
       EXTERNAL  DBERRNO
       EXTERNAL  DBFGETCA
+      EXTERNAL  DBFREECAOPT
       EXTERNAL  DBFREEMRGTREE
       EXTERNAL  DBFREEOBJECT
       EXTERNAL  DBFREEOPTLIST
@@ -103,434 +106,435 @@
       EXTERNAL  DBWRITESLICE
       EXTERNAL  DBWRTFL
 
-      INTEGER*4  DBADDCAOPT
-      INTEGER*4  DBADDCCMP
-      INTEGER*4  DBADDCOPT
-      INTEGER*4  DBADDDOPT
-      INTEGER*4  DBADDIAOPT
-      INTEGER*4  DBADDICMP
-      INTEGER*4  DBADDIOPT
-      INTEGER*4  DBADDRCMP
-      INTEGER*4  DBADDREGION
-      INTEGER*4  DBADDREGIONA
-      INTEGER*4  DBADDROPT
-      INTEGER*4  DBCALCFL
-      INTEGER*4  DBCLOSE
-      INTEGER*4  DBCREATE
-      INTEGER*4  DBERRLVL
-      INTEGER*4  DBERRNO
-      INTEGER*4  DBFGETCA
-      INTEGER*4  DBFREEMRGTREE
-      INTEGER*4  DBFREEOBJECT
-      INTEGER*4  DBFREEOPTLIST
-      INTEGER*4  DBGET2DSTRLEN
-      INTEGER*4  DBGETCA
-      INTEGER*4  DBGETCKSUMS
-      INTEGER*4  DBGETCOMPRESS
-      INTEGER*4  DBGETCURVE
-      INTEGER*4  DBGETDEPWARN
-      INTEGER*4  DBGETEMPTYOK
-      INTEGER*4  DBGETHDFNMS
-      INTEGER*4  DBGETOVRWRT
-      INTEGER*4  DBGETQV1
-      INTEGER*4  DBINQBLEN
-      INTEGER*4  DBINQCA
-      INTEGER*4  DBINQDTYP
-      INTEGER*4  DBINQFILE
-      INTEGER*4  DBINQLEN
-      INTEGER*4  DBINQMTYP
-      INTEGER*4  DBINQVTYP
-      INTEGER*4  DBMKDIR
-      INTEGER*4  DBMKMRGTREE
-      INTEGER*4  DBMKOBJECT
-      INTEGER*4  DBMKOPTLIST
-      INTEGER*4  DBMKPTR
-      INTEGER*4  DBOPEN
-      INTEGER*4  DBPMRGV
-      INTEGER*4  DBPUTCA
-      INTEGER*4  DBPUTCSGM
-      INTEGER*4  DBPUTCSGV
-      INTEGER*4  DBPUTCSGZL
-      INTEGER*4  DBPUTCURVE
-      INTEGER*4  DBPUTDEFVARS
-      INTEGER*4  DBPUTFL
-      INTEGER*4  DBPUTGRPLMAP
-      INTEGER*4  DBPUTMAT
-      INTEGER*4  DBPUTMMAT
-      INTEGER*4  DBPUTMMESH
-      INTEGER*4  DBPUTMRGTREE
-      INTEGER*4  DBPUTMSP
-      INTEGER*4  DBPUTMVAR
-      INTEGER*4  DBPUTPM
-      INTEGER*4  DBPUTPV1
-      INTEGER*4  DBPUTQM
-      INTEGER*4  DBPUTQV
-      INTEGER*4  DBPUTQV1
-      INTEGER*4  DBPUTUM
-      INTEGER*4  DBPUTUV1
-      INTEGER*4  DBPUTZL
-      INTEGER*4  DBPUTZL2
-      INTEGER*4  DBRDVAR
-      INTEGER*4  DBRDVARSLICE
-      INTEGER*4  DBREGFOPTS
-      INTEGER*4  DBRMPTR
-      INTEGER*4  DBSET2DSTRLEN
-      INTEGER*4  DBSETCKSUMS
-      INTEGER*4  DBSETCOMPRESS
-      INTEGER*4  DBSETCWR
-      INTEGER*4  DBSETDEPWARN
-      INTEGER*4  DBSETDIR
-      INTEGER*4  DBSETEMPTYOK
-      INTEGER*4  DBSETHDFNMS
-      INTEGER*4  DBSETOVRWRT
-      INTEGER*4  DBSHOWERRORS
-      INTEGER*4  DBUNREGAFOPTS
-      INTEGER*4  DBUNREGFOPTS
-      INTEGER*4  DBWRITE
-      INTEGER*4  DBWRITESLICE
-      INTEGER*4  DBWRTFL
+      INTEGER  DBADDCAOPT
+      INTEGER  DBADDCCMP
+      INTEGER  DBADDCOPT
+      INTEGER  DBADDDOPT
+      INTEGER  DBADDIAOPT
+      INTEGER  DBADDICMP
+      INTEGER  DBADDIOPT
+      INTEGER  DBADDRCMP
+      INTEGER  DBADDREGION
+      INTEGER  DBADDREGIONA
+      INTEGER  DBADDROPT
+      INTEGER  DBCALCFL
+      INTEGER  DBCLOSE
+      INTEGER  DBCREATE
+      INTEGER  DBERRLVL
+      INTEGER  DBERRNO
+      INTEGER  DBFGETCA
+      INTEGER  DBFREECAOPT
+      INTEGER  DBFREEMRGTREE
+      INTEGER  DBFREEOBJECT
+      INTEGER  DBFREEOPTLIST
+      INTEGER  DBGET2DSTRLEN
+      INTEGER  DBGETCA
+      INTEGER  DBGETCKSUMS
+      INTEGER  DBGETCOMPRESS
+      INTEGER  DBGETCURVE
+      INTEGER  DBGETDEPWARN
+      INTEGER  DBGETEMPTYOK
+      INTEGER  DBGETHDFNMS
+      INTEGER  DBGETOVRWRT
+      INTEGER  DBGETQV1
+      INTEGER  DBINQBLEN
+      INTEGER  DBINQCA
+      INTEGER  DBINQDTYP
+      INTEGER  DBINQFILE
+      INTEGER  DBINQLEN
+      INTEGER  DBINQMTYP
+      INTEGER  DBINQVTYP
+      INTEGER  DBMKDIR
+      INTEGER  DBMKMRGTREE
+      INTEGER  DBMKOBJECT
+      INTEGER  DBMKOPTLIST
+      INTEGER  DBMKPTR
+      INTEGER  DBOPEN
+      INTEGER  DBPMRGV
+      INTEGER  DBPUTCA
+      INTEGER  DBPUTCSGM
+      INTEGER  DBPUTCSGV
+      INTEGER  DBPUTCSGZL
+      INTEGER  DBPUTCURVE
+      INTEGER  DBPUTDEFVARS
+      INTEGER  DBPUTFL
+      INTEGER  DBPUTGRPLMAP
+      INTEGER  DBPUTMAT
+      INTEGER  DBPUTMMAT
+      INTEGER  DBPUTMMESH
+      INTEGER  DBPUTMRGTREE
+      INTEGER  DBPUTMSP
+      INTEGER  DBPUTMVAR
+      INTEGER  DBPUTPM
+      INTEGER  DBPUTPV1
+      INTEGER  DBPUTQM
+      INTEGER  DBPUTQV
+      INTEGER  DBPUTQV1
+      INTEGER  DBPUTUM
+      INTEGER  DBPUTUV1
+      INTEGER  DBPUTZL
+      INTEGER  DBPUTZL2
+      INTEGER  DBRDVAR
+      INTEGER  DBRDVARSLICE
+      INTEGER  DBREGFOPTS
+      INTEGER  DBRMPTR
+      INTEGER  DBSET2DSTRLEN
+      INTEGER  DBSETCKSUMS
+      INTEGER  DBSETCOMPRESS
+      INTEGER  DBSETCWR
+      INTEGER  DBSETDEPWARN
+      INTEGER  DBSETDIR
+      INTEGER  DBSETEMPTYOK
+      INTEGER  DBSETHDFNMS
+      INTEGER  DBSETOVRWRT
+      INTEGER  DBSHOWERRORS
+      INTEGER  DBUNREGAFOPTS
+      INTEGER  DBUNREGFOPTS
+      INTEGER  DBWRITE
+      INTEGER  DBWRITESLICE
+      INTEGER  DBWRTFL
 
 
-!...Parameters.
-      INTEGER*4  DBCSG_ANGLE_PNLA
-      INTEGER*4  DBCSG_ANGLE_PPA
-      INTEGER*4  DBCSG_BOX_XYXY
-      INTEGER*4  DBCSG_BOX_XYZXYZ
-      INTEGER*4  DBCSG_CIRCLE_PR
-      INTEGER*4  DBCSG_COMPLIMENT
-      INTEGER*4  DBCSG_CONE_PNLA
-      INTEGER*4  DBCSG_CONE_PPA
-      INTEGER*4  DBCSG_CYLINDER_PNLR
-      INTEGER*4  DBCSG_CYLINDER_PPR
-      INTEGER*4  DBCSG_DIFF
-      INTEGER*4  DBCSG_ELLIPSE_PRR
-      INTEGER*4  DBCSG_ELLIPSOID_PRRR
-      INTEGER*4  DBCSG_HEX_6F
-      INTEGER*4  DBCSG_INNER
-      INTEGER*4  DBCSG_INTERSECT
-      INTEGER*4  DBCSG_LINE_G
-      INTEGER*4  DBCSG_LINE_PN
-      INTEGER*4  DBCSG_LINE_PP
-      INTEGER*4  DBCSG_LINE_X
-      INTEGER*4  DBCSG_LINE_Y
-      INTEGER*4  DBCSG_ON
-      INTEGER*4  DBCSG_OUTER
-      INTEGER*4  DBCSG_PLANE_G
-      INTEGER*4  DBCSG_PLANE_PN
-      INTEGER*4  DBCSG_PLANE_PPP
-      INTEGER*4  DBCSG_PLANE_X
-      INTEGER*4  DBCSG_PLANE_Y
-      INTEGER*4  DBCSG_PLANE_Z
-      INTEGER*4  DBCSG_POLYGON_KP
-      INTEGER*4  DBCSG_POLYHEDRON_KF
-      INTEGER*4  DBCSG_PRISM_5F
-      INTEGER*4  DBCSG_PYRAMID_5F
-      INTEGER*4  DBCSG_QUADRATIC_G
-      INTEGER*4  DBCSG_QUADRIC_G
-      INTEGER*4  DBCSG_QUAD_4P
-      INTEGER*4  DBCSG_SPHERE_PR
-      INTEGER*4  DBCSG_SWEEP
-      INTEGER*4  DBCSG_TET_4F
-      INTEGER*4  DBCSG_TRI_3P
-      INTEGER*4  DBCSG_UNION
-      INTEGER*4  DBCSG_XFORM
-      INTEGER*4  DBOPT_ALIGN
-      INTEGER*4  DBOPT_ALLOWMAT0
-      INTEGER*4  DBOPT_ALT_NODENUM_VARS
-      INTEGER*4  DBOPT_ALT_ZONENUM_VARS
-      INTEGER*4  DBOPT_ASCII_LABEL
-      INTEGER*4  DBOPT_BASEINDEX
-      INTEGER*4  DBOPT_BLOCKORIGIN
-      INTEGER*4  DBOPT_BNDNAMES
-      INTEGER*4  DBOPT_CONSERVED
-      INTEGER*4  DBOPT_COORDSYS
-      INTEGER*4  DBOPT_CYCLE
-      INTEGER*4  DBOPT_DISJOINT_MODE
-      INTEGER*4  DBOPT_DTIME
-      INTEGER*4  DBOPT_EXTENSIVE
-      INTEGER*4  DBOPT_EXTENTS
-      INTEGER*4  DBOPT_EXTENTS_SIZE
-      INTEGER*4  DBOPT_FACETYPE
-      INTEGER*4  DBOPT_FIRST
-      INTEGER*4  DBOPT_GHOST_NODE_LABELS
-      INTEGER*4  DBOPT_GHOST_ZONE_LABELS
-      INTEGER*4  DBOPT_GROUPINGNAMES
-      INTEGER*4  DBOPT_GROUPINGS
-      INTEGER*4  DBOPT_GROUPINGS_SIZE
-      INTEGER*4  DBOPT_GROUPNUM
-      INTEGER*4  DBOPT_GROUPORIGIN
-      INTEGER*4  DBOPT_H5_ALIGN_MIN
-      INTEGER*4  DBOPT_H5_ALIGN_VAL
-      INTEGER*4  DBOPT_H5_CACHE_NBYTES
-      INTEGER*4  DBOPT_H5_CACHE_NELMTS
-      INTEGER*4  DBOPT_H5_CACHE_POLICY
-      INTEGER*4  DBOPT_H5_CORE_ALLOC_INC
-      INTEGER*4  DBOPT_H5_CORE_CLOSE_BUFINFO
-      INTEGER*4  DBOPT_H5_CORE_CREAT_BUFINFO
-      INTEGER*4  DBOPT_H5_CORE_NO_BACK_STORE
-      INTEGER*4  DBOPT_H5_CORE_OPEN_BUFINFO
-      INTEGER*4  DBOPT_H5_DIRECT_BLOCK_SIZE
-      INTEGER*4  DBOPT_H5_DIRECT_BUF_SIZE
-      INTEGER*4  DBOPT_H5_DIRECT_MEM_ALIGN
-      INTEGER*4  DBOPT_H5_FAM_FILE_OPTS
-      INTEGER*4  DBOPT_H5_FAM_SIZE
-      INTEGER*4  DBOPT_H5_FAPL_HID_T
-      INTEGER*4  DBOPT_H5_FCPL_HID_T
-      INTEGER*4  DBOPT_H5_FIC_BUF
-      INTEGER*4  DBOPT_H5_FIC_SIZE
-      INTEGER*4  DBOPT_H5_FIRST
-      INTEGER*4  DBOPT_H5_LAST
-      INTEGER*4  DBOPT_H5_LOG_BUF_SIZE
-      INTEGER*4  DBOPT_H5_LOG_NAME
-      INTEGER*4  DBOPT_H5_META_BLOCK_SIZE
-      INTEGER*4  DBOPT_H5_META_EXTENSION
-      INTEGER*4  DBOPT_H5_META_FILE_OPTS
-      INTEGER*4  DBOPT_H5_MPIO_COMM
-      INTEGER*4  DBOPT_H5_MPIO_INFO
-      INTEGER*4  DBOPT_H5_MPIP_NO_GPFS_HINTS
-      INTEGER*4  DBOPT_H5_RAW_EXTENSION
-      INTEGER*4  DBOPT_H5_RAW_FILE_OPTS
-      INTEGER*4  DBOPT_H5_SIEVE_BUF_SIZE
-      INTEGER*4  DBOPT_H5_SILO_BLOCK_COUNT
-      INTEGER*4  DBOPT_H5_SILO_BLOCK_SIZE
-      INTEGER*4  DBOPT_H5_SILO_LOG_STATS
-      INTEGER*4  DBOPT_H5_SILO_USE_DIRECT
-      INTEGER*4  DBOPT_H5_SMALL_RAW_SIZE
-      INTEGER*4  DBOPT_H5_USER_DRIVER_ID
-      INTEGER*4  DBOPT_H5_USER_DRIVER_INFO
-      INTEGER*4  DBOPT_H5_VFD
-      INTEGER*4  DBOPT_HAS_EXTERNAL_ZONES
-      INTEGER*4  DBOPT_HIDE_FROM_GUI
-      INTEGER*4  DBOPT_HI_OFFSET
-      INTEGER*4  DBOPT_LABEL
-      INTEGER*4  DBOPT_LAST
-      INTEGER*4  DBOPT_LLONGNZNUM
-      INTEGER*4  DBOPT_LO_OFFSET
-      INTEGER*4  DBOPT_MAJORORDER
-      INTEGER*4  DBOPT_MATCOLORS
-      INTEGER*4  DBOPT_MATCOUNTS
-      INTEGER*4  DBOPT_MATLISTS
-      INTEGER*4  DBOPT_MATNAME
-      INTEGER*4  DBOPT_MATNAMES
-      INTEGER*4  DBOPT_MATNOS
-      INTEGER*4  DBOPT_MB_BLOCK_NS
-      INTEGER*4  DBOPT_MB_BLOCK_TYPE
-      INTEGER*4  DBOPT_MB_EMPTY_COUNT
-      INTEGER*4  DBOPT_MB_EMPTY_LIST
-      INTEGER*4  DBOPT_MB_FILE_NS
-      INTEGER*4  DBOPT_MB_REPR_BLOCK_IDX
-      INTEGER*4  DBOPT_MISSING_VALUE
-      INTEGER*4  DBOPT_MIXLENS
-      INTEGER*4  DBOPT_MMESH_NAME
-      INTEGER*4  DBOPT_MRGTREE_NAME
-      INTEGER*4  DBOPT_MRGV_ONAMES
-      INTEGER*4  DBOPT_MRGV_RNAMES
-      INTEGER*4  DBOPT_NGROUPS
-      INTEGER*4  DBOPT_NMAT
-      INTEGER*4  DBOPT_NMATNOS
-      INTEGER*4  DBOPT_NMATSPEC
-      INTEGER*4  DBOPT_NODENUM
-      INTEGER*4  DBOPT_NSPACE
-      INTEGER*4  DBOPT_ORIGIN
-      INTEGER*4  DBOPT_PHZONELIST
-      INTEGER*4  DBOPT_PLANAR
-      INTEGER*4  DBOPT_REFERENCE
-      INTEGER*4  DBOPT_REGION_PNAMES
-      INTEGER*4  DBOPT_REGNAMES
-      INTEGER*4  DBOPT_SPECCOLORS
-      INTEGER*4  DBOPT_SPECNAMES
-      INTEGER*4  DBOPT_TENSOR_RANK
-      INTEGER*4  DBOPT_TIME
-      INTEGER*4  DBOPT_TOPO_DIM
-      INTEGER*4  DBOPT_TV_CONNECTIVITY
-      INTEGER*4  DBOPT_UNITS
-      INTEGER*4  DBOPT_USESPECMF
-      INTEGER*4  DBOPT_XLABEL
-      INTEGER*4  DBOPT_XUNITS
-      INTEGER*4  DBOPT_XVARNAME
-      INTEGER*4  DBOPT_YLABEL
-      INTEGER*4  DBOPT_YUNITS
-      INTEGER*4  DBOPT_YVARNAME
-      INTEGER*4  DBOPT_ZLABEL
-      INTEGER*4  DBOPT_ZONECOUNTS
-      INTEGER*4  DBOPT_ZONENAMES
-      INTEGER*4  DBOPT_ZONENUM
-      INTEGER*4  DBOPT_ZUNITS
-      INTEGER*4  DBOPT_ZVARNAME
-      INTEGER*4  DB_ABORT
-      INTEGER*4  DB_ABUTTING
-      INTEGER*4  DB_ALL
-      INTEGER*4  DB_ALL_AND_DRVR
-      INTEGER*4  DB_APPEND
-      INTEGER*4  DB_AREA
-      INTEGER*4  DB_ARRAY
-      INTEGER*4  DB_BLOCKCENT
-      INTEGER*4  DB_BNDCENT
-      INTEGER*4  DB_CARTESIAN
-      INTEGER*4  DB_CHAR
-      INTEGER*4  DB_CLOBBER
-      INTEGER*4  DB_COLLINEAR
-      INTEGER*4  DB_COLMAJOR
-      INTEGER*4  DB_CRAY
-      INTEGER*4  DB_CSGMESH
-      INTEGER*4  DB_CSGVAR
-      INTEGER*4  DB_CSGZONELIST
-      INTEGER*4  DB_CURVE
-      INTEGER*4  DB_CURVILINEAR
-      INTEGER*4  DB_CYLINDRICAL
-      INTEGER*4  DB_DEBUG
-      INTEGER*4  DB_DEFVARS
-      INTEGER*4  DB_DIR
-      INTEGER*4  DB_DOUBLE
-      INTEGER*4  DB_EDGECENT
-      INTEGER*4  DB_EDGELIST
-      INTEGER*4  DB_F77NULL
-      INTEGER*4  DB_FACECENT
-      INTEGER*4  DB_FACELIST
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_CORE
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_DEFAULT
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_DIRECT
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_FAMILY
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_LOG
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_MPIO
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_MPIP
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_SEC2
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_SILO
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_SPLIT
-      INTEGER*4  DB_FILE_OPTS_H5_DEFAULT_STDIO
-      INTEGER*4  DB_FILE_OPTS_LAST
-      INTEGER*4  DB_FLOAT
-      INTEGER*4  DB_FLOATING
-      INTEGER*4  DB_FROMCWR
-      INTEGER*4  DB_GHOSTTYPE_INTDUP
-      INTEGER*4  DB_GHOSTTYPE_NOGHOST
-      INTEGER*4  DB_GROUPELMAP
-      INTEGER*4  DB_H5VFD_CORE
-      INTEGER*4  DB_H5VFD_DEFAULT
-      INTEGER*4  DB_H5VFD_DIRECT
-      INTEGER*4  DB_H5VFD_FAMILY
-      INTEGER*4  DB_H5VFD_FIC
-      INTEGER*4  DB_H5VFD_LOG
-      INTEGER*4  DB_H5VFD_MPIO
-      INTEGER*4  DB_H5VFD_MPIP
-      INTEGER*4  DB_H5VFD_SEC2
-      INTEGER*4  DB_H5VFD_SILO
-      INTEGER*4  DB_H5VFD_SPLIT
-      INTEGER*4  DB_H5VFD_STDIO
-      INTEGER*4  DB_HDF5
-      INTEGER*4  DB_HDF5X
-      INTEGER*4  DB_HDF5_CORE
-      INTEGER*4  DB_HDF5_CORE_OBSOLETE
-      INTEGER*4  DB_HDF5_DIRECT
-      INTEGER*4  DB_HDF5_FAMILY
-      INTEGER*4  DB_HDF5_LOG
-      INTEGER*4  DB_HDF5_MPIO
-      INTEGER*4  DB_HDF5_MPIOP
-      INTEGER*4  DB_HDF5_MPIOP_OBSOLETE
-      INTEGER*4  DB_HDF5_MPIO_OBSOLETE
-      INTEGER*4  DB_HDF5_MPIP
-      INTEGER*4  DB_HDF5_SEC2
-      INTEGER*4  DB_HDF5_SEC2_OBSOLETE
-      INTEGER*4  DB_HDF5_SILO
-      INTEGER*4  DB_HDF5_SPLIT
-      INTEGER*4  DB_HDF5_STDIO
-      INTEGER*4  DB_HDF5_STDIO_OBSOLETE
-      INTEGER*4  DB_INT
-      INTEGER*4  DB_INTEL
-      INTEGER*4  DB_INVALID_OBJECT
-      INTEGER*4  DB_LOCAL
-      INTEGER*4  DB_LONG
-      INTEGER*4  DB_LONG_LONG
-      INTEGER*4  DB_MATERIAL
-      INTEGER*4  DB_MATSPECIES
-      INTEGER*4  DB_MAX_COMPATABILITY
-      INTEGER*4  DB_MAX_H5_OBJ_VALS
-      INTEGER*4  DB_MAX_PERFORMANCE
+C...Parameters.
+      INTEGER  DBCSG_ANGLE_PNLA
+      INTEGER  DBCSG_ANGLE_PPA
+      INTEGER  DBCSG_BOX_XYXY
+      INTEGER  DBCSG_BOX_XYZXYZ
+      INTEGER  DBCSG_CIRCLE_PR
+      INTEGER  DBCSG_COMPLIMENT
+      INTEGER  DBCSG_CONE_PNLA
+      INTEGER  DBCSG_CONE_PPA
+      INTEGER  DBCSG_CYLINDER_PNLR
+      INTEGER  DBCSG_CYLINDER_PPR
+      INTEGER  DBCSG_DIFF
+      INTEGER  DBCSG_ELLIPSE_PRR
+      INTEGER  DBCSG_ELLIPSOID_PRRR
+      INTEGER  DBCSG_HEX_6F
+      INTEGER  DBCSG_INNER
+      INTEGER  DBCSG_INTERSECT
+      INTEGER  DBCSG_LINE_G
+      INTEGER  DBCSG_LINE_PN
+      INTEGER  DBCSG_LINE_PP
+      INTEGER  DBCSG_LINE_X
+      INTEGER  DBCSG_LINE_Y
+      INTEGER  DBCSG_ON
+      INTEGER  DBCSG_OUTER
+      INTEGER  DBCSG_PLANE_G
+      INTEGER  DBCSG_PLANE_PN
+      INTEGER  DBCSG_PLANE_PPP
+      INTEGER  DBCSG_PLANE_X
+      INTEGER  DBCSG_PLANE_Y
+      INTEGER  DBCSG_PLANE_Z
+      INTEGER  DBCSG_POLYGON_KP
+      INTEGER  DBCSG_POLYHEDRON_KF
+      INTEGER  DBCSG_PRISM_5F
+      INTEGER  DBCSG_PYRAMID_5F
+      INTEGER  DBCSG_QUADRATIC_G
+      INTEGER  DBCSG_QUADRIC_G
+      INTEGER  DBCSG_QUAD_4P
+      INTEGER  DBCSG_SPHERE_PR
+      INTEGER  DBCSG_SWEEP
+      INTEGER  DBCSG_TET_4F
+      INTEGER  DBCSG_TRI_3P
+      INTEGER  DBCSG_UNION
+      INTEGER  DBCSG_XFORM
+      INTEGER  DBOPT_ALIGN
+      INTEGER  DBOPT_ALLOWMAT0
+      INTEGER  DBOPT_ALT_NODENUM_VARS
+      INTEGER  DBOPT_ALT_ZONENUM_VARS
+      INTEGER  DBOPT_ASCII_LABEL
+      INTEGER  DBOPT_BASEINDEX
+      INTEGER  DBOPT_BLOCKORIGIN
+      INTEGER  DBOPT_BNDNAMES
+      INTEGER  DBOPT_CONSERVED
+      INTEGER  DBOPT_COORDSYS
+      INTEGER  DBOPT_CYCLE
+      INTEGER  DBOPT_DISJOINT_MODE
+      INTEGER  DBOPT_DTIME
+      INTEGER  DBOPT_EXTENSIVE
+      INTEGER  DBOPT_EXTENTS
+      INTEGER  DBOPT_EXTENTS_SIZE
+      INTEGER  DBOPT_FACETYPE
+      INTEGER  DBOPT_FIRST
+      INTEGER  DBOPT_GHOST_NODE_LABELS
+      INTEGER  DBOPT_GHOST_ZONE_LABELS
+      INTEGER  DBOPT_GROUPINGNAMES
+      INTEGER  DBOPT_GROUPINGS
+      INTEGER  DBOPT_GROUPINGS_SIZE
+      INTEGER  DBOPT_GROUPNUM
+      INTEGER  DBOPT_GROUPORIGIN
+      INTEGER  DBOPT_H5_ALIGN_MIN
+      INTEGER  DBOPT_H5_ALIGN_VAL
+      INTEGER  DBOPT_H5_CACHE_NBYTES
+      INTEGER  DBOPT_H5_CACHE_NELMTS
+      INTEGER  DBOPT_H5_CACHE_POLICY
+      INTEGER  DBOPT_H5_CORE_ALLOC_INC
+      INTEGER  DBOPT_H5_CORE_NO_BACK_STORE
+      INTEGER  DBOPT_H5_DIRECT_BLOCK_SIZE
+      INTEGER  DBOPT_H5_DIRECT_BUF_SIZE
+      INTEGER  DBOPT_H5_DIRECT_MEM_ALIGN
+      INTEGER  DBOPT_H5_FAM_FILE_OPTS
+      INTEGER  DBOPT_H5_FAM_SIZE
+      INTEGER  DBOPT_H5_FAPL_HID_T
+      INTEGER  DBOPT_H5_FCPL_HID_T
+      INTEGER  DBOPT_H5_FIC_BUF
+      INTEGER  DBOPT_H5_FIC_SIZE
+      INTEGER  DBOPT_H5_FIRST
+      INTEGER  DBOPT_H5_LAST
+      INTEGER  DBOPT_H5_LOG_BUF_SIZE
+      INTEGER  DBOPT_H5_LOG_NAME
+      INTEGER  DBOPT_H5_META_BLOCK_SIZE
+      INTEGER  DBOPT_H5_META_EXTENSION
+      INTEGER  DBOPT_H5_META_FILE_OPTS
+      INTEGER  DBOPT_H5_MPIO_COMM
+      INTEGER  DBOPT_H5_MPIO_INFO
+      INTEGER  DBOPT_H5_MPIP_NO_GPFS_HINTS
+      INTEGER  DBOPT_H5_RAW_EXTENSION
+      INTEGER  DBOPT_H5_RAW_FILE_OPTS
+      INTEGER  DBOPT_H5_SIEVE_BUF_SIZE
+      INTEGER  DBOPT_H5_SILO_BLOCK_COUNT
+      INTEGER  DBOPT_H5_SILO_BLOCK_SIZE
+      INTEGER  DBOPT_H5_SILO_LOG_STATS
+      INTEGER  DBOPT_H5_SILO_USE_DIRECT
+      INTEGER  DBOPT_H5_SMALL_RAW_SIZE
+      INTEGER  DBOPT_H5_USER_DRIVER_ID
+      INTEGER  DBOPT_H5_USER_DRIVER_INFO
+      INTEGER  DBOPT_H5_VFD
+      INTEGER  DBOPT_HAS_EXTERNAL_ZONES
+      INTEGER  DBOPT_HIDE_FROM_GUI
+      INTEGER  DBOPT_HI_OFFSET
+      INTEGER  DBOPT_LABEL
+      INTEGER  DBOPT_LAST
+      INTEGER  DBOPT_LLONGNZNUM
+      INTEGER  DBOPT_LO_OFFSET
+      INTEGER  DBOPT_MAJORORDER
+      INTEGER  DBOPT_MATCOLORS
+      INTEGER  DBOPT_MATCOUNTS
+      INTEGER  DBOPT_MATLISTS
+      INTEGER  DBOPT_MATNAME
+      INTEGER  DBOPT_MATNAMES
+      INTEGER  DBOPT_MATNOS
+      INTEGER  DBOPT_MB_BLOCK_NS
+      INTEGER  DBOPT_MB_BLOCK_TYPE
+      INTEGER  DBOPT_MB_EMPTY_COUNT
+      INTEGER  DBOPT_MB_EMPTY_LIST
+      INTEGER  DBOPT_MB_FILE_NS
+      INTEGER  DBOPT_MB_REPR_BLOCK_IDX
+      INTEGER  DBOPT_MISSING_VALUE
+      INTEGER  DBOPT_MIXLENS
+      INTEGER  DBOPT_MMESH_NAME
+      INTEGER  DBOPT_MRGTREE_NAME
+      INTEGER  DBOPT_MRGV_ONAMES
+      INTEGER  DBOPT_MRGV_RNAMES
+      INTEGER  DBOPT_NGROUPS
+      INTEGER  DBOPT_NMAT
+      INTEGER  DBOPT_NMATNOS
+      INTEGER  DBOPT_NMATSPEC
+      INTEGER  DBOPT_NODENUM
+      INTEGER  DBOPT_NSPACE
+      INTEGER  DBOPT_ORIGIN
+      INTEGER  DBOPT_PHZONELIST
+      INTEGER  DBOPT_PLANAR
+      INTEGER  DBOPT_REFERENCE
+      INTEGER  DBOPT_REGION_PNAMES
+      INTEGER  DBOPT_REGNAMES
+      INTEGER  DBOPT_SPECCOLORS
+      INTEGER  DBOPT_SPECNAMES
+      INTEGER  DBOPT_TENSOR_RANK
+      INTEGER  DBOPT_TIME
+      INTEGER  DBOPT_TOPO_DIM
+      INTEGER  DBOPT_TV_CONNECTIVITY
+      INTEGER  DBOPT_UNITS
+      INTEGER  DBOPT_USESPECMF
+      INTEGER  DBOPT_XLABEL
+      INTEGER  DBOPT_XUNITS
+      INTEGER  DBOPT_XVARNAME
+      INTEGER  DBOPT_YLABEL
+      INTEGER  DBOPT_YUNITS
+      INTEGER  DBOPT_YVARNAME
+      INTEGER  DBOPT_ZLABEL
+      INTEGER  DBOPT_ZONECOUNTS
+      INTEGER  DBOPT_ZONENAMES
+      INTEGER  DBOPT_ZONENUM
+      INTEGER  DBOPT_ZUNITS
+      INTEGER  DBOPT_ZVARNAME
+      INTEGER  DB_ABORT
+      INTEGER  DB_ABUTTING
+      INTEGER  DB_ALL
+      INTEGER  DB_ALL_AND_DRVR
+      INTEGER  DB_APPEND
+      INTEGER  DB_AREA
+      INTEGER  DB_ARRAY
+      INTEGER  DB_BLOCKCENT
+      INTEGER  DB_BNDCENT
+      INTEGER  DB_CARTESIAN
+      INTEGER  DB_CHAR
+      INTEGER  DB_CLOBBER
+      INTEGER  DB_COLLINEAR
+      INTEGER  DB_COLMAJOR
+      INTEGER  DB_COMPAT_OVER_PERF
+      INTEGER  DB_CRAY
+      INTEGER  DB_CSGMESH
+      INTEGER  DB_CSGVAR
+      INTEGER  DB_CSGZONELIST
+      INTEGER  DB_CURVE
+      INTEGER  DB_CURVILINEAR
+      INTEGER  DB_CYLINDRICAL
+      INTEGER  DB_DEBUG
+      INTEGER  DB_DEFVARS
+      INTEGER  DB_DIR
+      INTEGER  DB_DOUBLE
+      INTEGER  DB_EDGECENT
+      INTEGER  DB_EDGELIST
+      INTEGER  DB_EOA
+      INTEGER  DB_F77NULL
+      INTEGER  DB_FACECENT
+      INTEGER  DB_FACELIST
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_CORE
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_DEFAULT
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_DIRECT
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_FAMILY
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_LOG
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_MPIO
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_MPIP
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_SEC2
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_SILO
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_SPLIT
+      INTEGER  DB_FILE_OPTS_H5_DEFAULT_STDIO
+      INTEGER  DB_FILE_OPTS_LAST
+      INTEGER  DB_FLOAT
+      INTEGER  DB_FLOATING
+      INTEGER  DB_FROMCWR
+      INTEGER  DB_GHOSTTYPE_INTDUP
+      INTEGER  DB_GHOSTTYPE_NOGHOST
+      INTEGER  DB_GROUPELMAP
+      INTEGER  DB_H5VFD_CORE
+      INTEGER  DB_H5VFD_DEFAULT
+      INTEGER  DB_H5VFD_DIRECT
+      INTEGER  DB_H5VFD_FAMILY
+      INTEGER  DB_H5VFD_FIC
+      INTEGER  DB_H5VFD_LOG
+      INTEGER  DB_H5VFD_MPIO
+      INTEGER  DB_H5VFD_MPIP
+      INTEGER  DB_H5VFD_SEC2
+      INTEGER  DB_H5VFD_SILO
+      INTEGER  DB_H5VFD_SPLIT
+      INTEGER  DB_H5VFD_STDIO
+      INTEGER  DB_HDF5
+      INTEGER  DB_HDF5X
+      INTEGER  DB_HDF5_CORE
+      INTEGER  DB_HDF5_CORE_OBSOLETE
+      INTEGER  DB_HDF5_DIRECT
+      INTEGER  DB_HDF5_FAMILY
+      INTEGER  DB_HDF5_LOG
+      INTEGER  DB_HDF5_MPIO
+      INTEGER  DB_HDF5_MPIOP
+      INTEGER  DB_HDF5_MPIOP_OBSOLETE
+      INTEGER  DB_HDF5_MPIO_OBSOLETE
+      INTEGER  DB_HDF5_MPIP
+      INTEGER  DB_HDF5_SEC2
+      INTEGER  DB_HDF5_SEC2_OBSOLETE
+      INTEGER  DB_HDF5_SILO
+      INTEGER  DB_HDF5_SPLIT
+      INTEGER  DB_HDF5_STDIO
+      INTEGER  DB_HDF5_STDIO_OBSOLETE
+      INTEGER  DB_INT
+      INTEGER  DB_INTEL
+      INTEGER  DB_INVALID_OBJECT
+      INTEGER  DB_LOCAL
+      INTEGER  DB_LONG
+      INTEGER  DB_LONG_LONG
+      INTEGER  DB_MATERIAL
+      INTEGER  DB_MATSPECIES
+      INTEGER  DB_MAX_H5_OBJ_VALS
       DOUBLE PRECISION DB_MISSING_VALUE_NOT_SET
-      INTEGER*4  DB_MRGTREE
-      INTEGER*4  DB_MRGVAR
-      INTEGER*4  DB_MULTIBLOCKMESH
-      INTEGER*4  DB_MULTIBLOCKVAR
-      INTEGER*4  DB_MULTIMAT
-      INTEGER*4  DB_MULTIMATSPECIES
-      INTEGER*4  DB_MULTIMESH
-      INTEGER*4  DB_MULTIMESHADJ
-      INTEGER*4  DB_MULTIVAR
-      INTEGER*4  DB_NETCDF
-      INTEGER*4  DB_NFILES
-      INTEGER*4  DB_NFILTERS
-      INTEGER*4  DB_NOCLOBBER
-      INTEGER*4  DB_NODECENT
-      INTEGER*4  DB_NONCOLLINEAR
-      INTEGER*4  DB_NONE
-      INTEGER*4  DB_NOTCENT
-      INTEGER*4  DB_NOTYPE
-      INTEGER*4  DB_NUMERICAL
-      INTEGER*4  DB_OFF
-      INTEGER*4  DB_ON
-      INTEGER*4  DB_OTHER
-      INTEGER*4  DB_PARTIO_HSLABS
-      INTEGER*4  DB_PARTIO_POINTS
-      INTEGER*4  DB_PDB
-      INTEGER*4  DB_PDBP
-      INTEGER*4  DB_PHZONELIST
-      INTEGER*4  DB_POINTMESH
-      INTEGER*4  DB_POINTVAR
-      INTEGER*4  DB_POSTORDER
-      INTEGER*4  DB_PREORDER
-      INTEGER*4  DB_QUADCURV
-      INTEGER*4  DB_QUADMESH
-      INTEGER*4  DB_QUADRECT
-      INTEGER*4  DB_QUADVAR
-      INTEGER*4  DB_QUAD_CURV
-      INTEGER*4  DB_QUAD_RECT
-      INTEGER*4  DB_READ
-      INTEGER*4  DB_RECTILINEAR
-      INTEGER*4  DB_RESUME
-      INTEGER*4  DB_ROWMAJOR
-      INTEGER*4  DB_RS6000
-      INTEGER*4  DB_SGI
-      INTEGER*4  DB_SHORT
-      INTEGER*4  DB_SPHERICAL
-      INTEGER*4  DB_SUN3
-      INTEGER*4  DB_SUN4
-      INTEGER*4  DB_SUSPEND
-      INTEGER*4  DB_TAURUS
-      INTEGER*4  DB_TOP
-      INTEGER*4  DB_UCDMESH
-      INTEGER*4  DB_UCDVAR
-      INTEGER*4  DB_UNKNOWN
-      INTEGER*4  DB_USERDEF
-      INTEGER*4  DB_VARIABLE
-      INTEGER*4  DB_VARTYPE_ARRAY
-      INTEGER*4  DB_VARTYPE_LABEL
-      INTEGER*4  DB_VARTYPE_MATERIAL
-      INTEGER*4  DB_VARTYPE_SCALAR
-      INTEGER*4  DB_VARTYPE_SPECIES
-      INTEGER*4  DB_VARTYPE_SYMTENSOR
-      INTEGER*4  DB_VARTYPE_TENSOR
-      INTEGER*4  DB_VARTYPE_VECTOR
-      INTEGER*4  DB_VOLUME
-      INTEGER*4  DB_ZONECENT
-      INTEGER*4  DB_ZONELIST
-      INTEGER*4  DB_ZONETYPE_BEAM
-      INTEGER*4  DB_ZONETYPE_HEX
-      INTEGER*4  DB_ZONETYPE_POLYGON
-      INTEGER*4  DB_ZONETYPE_POLYHEDRON
-      INTEGER*4  DB_ZONETYPE_PRISM
-      INTEGER*4  DB_ZONETYPE_PYRAMID
-      INTEGER*4  DB_ZONETYPE_QUAD
-      INTEGER*4  DB_ZONETYPE_TET
-      INTEGER*4  DB_ZONETYPE_TRIANGLE
-      INTEGER*4  SILO_VERS_MAJ
-      INTEGER*4  SILO_VERS_MIN
-      INTEGER*4  SILO_VERS_PAT
-      INTEGER*4  SILO_VERS_PRE
+      INTEGER  DB_MRGTREE
+      INTEGER  DB_MRGVAR
+      INTEGER  DB_MULTIBLOCKMESH
+      INTEGER  DB_MULTIBLOCKVAR
+      INTEGER  DB_MULTIMAT
+      INTEGER  DB_MULTIMATSPECIES
+      INTEGER  DB_MULTIMESH
+      INTEGER  DB_MULTIMESHADJ
+      INTEGER  DB_MULTIVAR
+      INTEGER  DB_NETCDF
+      INTEGER  DB_NFILES
+      INTEGER  DB_NFILTERS
+      INTEGER  DB_NOBJ_TYPES
+      INTEGER  DB_NOCLOBBER
+      INTEGER  DB_NODECENT
+      INTEGER  DB_NONCOLLINEAR
+      INTEGER  DB_NONE
+      INTEGER  DB_NOTCENT
+      INTEGER  DB_NOTYPE
+      INTEGER  DB_NUMERICAL
+      INTEGER  DB_OFF
+      INTEGER  DB_ON
+      INTEGER  DB_OTHER
+      INTEGER  DB_PARTIO_HSLABS
+      INTEGER  DB_PARTIO_POINTS
+      INTEGER  DB_PDB
+      INTEGER  DB_PDBP
+      INTEGER  DB_PERF_OVER_COMPAT
+      INTEGER  DB_PHZONELIST
+      INTEGER  DB_POINTMESH
+      INTEGER  DB_POINTVAR
+      INTEGER  DB_POSTORDER
+      INTEGER  DB_PREORDER
+      INTEGER  DB_QUADCURV
+      INTEGER  DB_QUADMESH
+      INTEGER  DB_QUADRECT
+      INTEGER  DB_QUADVAR
+      INTEGER  DB_QUAD_CURV
+      INTEGER  DB_QUAD_RECT
+      INTEGER  DB_READ
+      INTEGER  DB_RECTILINEAR
+      INTEGER  DB_RESUME
+      INTEGER  DB_ROWMAJOR
+      INTEGER  DB_RS6000
+      INTEGER  DB_SGI
+      INTEGER  DB_SHORT
+      INTEGER  DB_SPHERICAL
+      INTEGER  DB_SUN3
+      INTEGER  DB_SUN4
+      INTEGER  DB_SUSPEND
+      INTEGER  DB_SYMLINK
+      INTEGER  DB_TAURUS
+      INTEGER  DB_TOP
+      INTEGER  DB_UCDMESH
+      INTEGER  DB_UCDVAR
+      INTEGER  DB_UNKNOWN
+      INTEGER  DB_USERDEF
+      INTEGER  DB_VARIABLE
+      INTEGER  DB_VARTYPE_ARRAY
+      INTEGER  DB_VARTYPE_LABEL
+      INTEGER  DB_VARTYPE_MATERIAL
+      INTEGER  DB_VARTYPE_SCALAR
+      INTEGER  DB_VARTYPE_SPECIES
+      INTEGER  DB_VARTYPE_SYMTENSOR
+      INTEGER  DB_VARTYPE_TENSOR
+      INTEGER  DB_VARTYPE_VECTOR
+      INTEGER  DB_VOLUME
+      INTEGER  DB_ZONECENT
+      INTEGER  DB_ZONELIST
+      INTEGER  DB_ZONETYPE_BEAM
+      INTEGER  DB_ZONETYPE_HEX
+      INTEGER  DB_ZONETYPE_POLYGON
+      INTEGER  DB_ZONETYPE_POLYHEDRON
+      INTEGER  DB_ZONETYPE_PRISM
+      INTEGER  DB_ZONETYPE_PYRAMID
+      INTEGER  DB_ZONETYPE_QUAD
+      INTEGER  DB_ZONETYPE_TET
+      INTEGER  DB_ZONETYPE_TRIANGLE
+      INTEGER  SILO_VERS_MAJ
+      INTEGER  SILO_VERS_MIN
+      INTEGER  SILO_VERS_PAT
+      INTEGER  SILO_VERS_PRE
       CHARACTER*10  DB_F77NULLSTRING
 
       PARAMETER (SILO_VERS_MAJ=4)
-      PARAMETER (SILO_VERS_MIN=10)
-      PARAMETER (SILO_VERS_PAT=4)
+      PARAMETER (SILO_VERS_MIN=11)
+      PARAMETER (SILO_VERS_PAT=1)
       PARAMETER (SILO_VERS_PRE=0)
       PARAMETER (DB_NETCDF=0)
       PARAMETER (DB_PDB=2)
@@ -615,6 +619,7 @@
       PARAMETER (DB_POINTVAR=571)
       PARAMETER (DB_ARRAY=580)
       PARAMETER (DB_DIR=600)
+      PARAMETER (DB_SYMLINK=601)
       PARAMETER (DB_VARIABLE=610)
       PARAMETER (DB_MRGTREE=611)
       PARAMETER (DB_GROUPELMAP=612)
@@ -632,6 +637,8 @@
       PARAMETER (DB_NOCLOBBER=1)
       PARAMETER (DB_READ=1)
       PARAMETER (DB_APPEND=2)
+      PARAMETER (DB_COMPAT_OVER_PERF=16)
+      PARAMETER (DB_PERF_OVER_COMPAT=32)
       PARAMETER (DB_LOCAL=0)
       PARAMETER (DB_SUN3=10)
       PARAMETER (DB_SUN4=11)
@@ -756,11 +763,8 @@
       PARAMETER (DBOPT_H5_SILO_USE_DIRECT=530)
       PARAMETER (DBOPT_H5_FIC_SIZE=531)
       PARAMETER (DBOPT_H5_FIC_BUF=532)
-      PARAMETER (DBOPT_H5_CORE_CREAT_BUFINFO=533)
-      PARAMETER (DBOPT_H5_CORE_OPEN_BUFINFO=534)
-      PARAMETER (DBOPT_H5_CORE_CLOSE_BUFINFO=535)
-      PARAMETER (DBOPT_H5_FCPL_HID_T=536)
-      PARAMETER (DBOPT_H5_FAPL_HID_T=537)
+      PARAMETER (DBOPT_H5_FCPL_HID_T=533)
+      PARAMETER (DBOPT_H5_FAPL_HID_T=534)
       PARAMETER (DBOPT_H5_LAST=599)
       PARAMETER (DB_TOP=0)
       PARAMETER (DB_NONE=1)
@@ -801,8 +805,6 @@
       PARAMETER (DB_VARTYPE_LABEL=207)
       PARAMETER (DB_GHOSTTYPE_NOGHOST=0)
       PARAMETER (DB_GHOSTTYPE_INTDUP=1)
-      PARAMETER (DB_MAX_COMPATABILITY=0)
-      PARAMETER (DB_MAX_PERFORMANCE=1)
       PARAMETER (DBCSG_QUADRIC_G=16777216)
       PARAMETER (DBCSG_SPHERE_PR=33619968)
       PARAMETER (DBCSG_ELLIPSOID_PRRR=33685504)
@@ -852,6 +854,8 @@
       PARAMETER (DB_PARTIO_POINTS=1)
       PARAMETER (DB_PARTIO_HSLABS=2)
       PARAMETER (DB_MISSING_VALUE_NOT_SET=1.0D+308)
+      PARAMETER (DB_EOA=0)
+      PARAMETER (DB_NOBJ_TYPES=25)
       PARAMETER (DB_ZONETYPE_BEAM=10)
       PARAMETER (DB_ZONETYPE_POLYGON=20)
       PARAMETER (DB_ZONETYPE_TRIANGLE=23)
@@ -865,4 +869,4 @@
       PARAMETER (DB_F77NULLSTRING="NULLSTRING")
 
 
-! End.
+C End.
diff --git a/src/silo/silo_f9x.inc b/src/silo/silo_f9x.inc
index ab3dea5c..7296c53c 100644
--- a/src/silo/silo_f9x.inc
+++ b/src/silo/silo_f9x.inc
@@ -2,6 +2,8 @@
 ! 
 !      SILO include file for Fortan applications.
 ! 
+!  Programmer:   miller86 Tue Sep 12 10:09:10 PDT 2023
+! 
 !  WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 !     This file is generated automatically from C header files in the
 !     SILO distribution.  Do not make changes to this file manually,
@@ -33,6 +35,7 @@
       integer, external :: dberrlvl
       integer, external :: dberrno
       integer, external :: dbfgetca
+      integer, external :: dbfreecaopt
       integer, external :: dbfreemrgtree
       integer, external :: dbfreeobject
       integer, external :: dbfreeoptlist
@@ -106,8 +109,8 @@
 
 !...Parameters.
       integer, parameter :: SILO_VERS_MAJ = 4
-      integer, parameter :: SILO_VERS_MIN = 10
-      integer, parameter :: SILO_VERS_PAT = 4
+      integer, parameter :: SILO_VERS_MIN = 11
+      integer, parameter :: SILO_VERS_PAT = 1
       integer, parameter :: SILO_VERS_PRE = 0
       integer, parameter :: DB_NETCDF = 0
       integer, parameter :: DB_PDB = 2
@@ -192,6 +195,7 @@
       integer, parameter :: DB_POINTVAR = 571
       integer, parameter :: DB_ARRAY = 580
       integer, parameter :: DB_DIR = 600
+      integer, parameter :: DB_SYMLINK = 601
       integer, parameter :: DB_VARIABLE = 610
       integer, parameter :: DB_MRGTREE = 611
       integer, parameter :: DB_GROUPELMAP = 612
@@ -209,6 +213,8 @@
       integer, parameter :: DB_NOCLOBBER = 1
       integer, parameter :: DB_READ = 1
       integer, parameter :: DB_APPEND = 2
+      integer, parameter :: DB_COMPAT_OVER_PERF = 16
+      integer, parameter :: DB_PERF_OVER_COMPAT = 32
       integer, parameter :: DB_LOCAL = 0
       integer, parameter :: DB_SUN3 = 10
       integer, parameter :: DB_SUN4 = 11
@@ -333,11 +339,8 @@
       integer, parameter :: DBOPT_H5_SILO_USE_DIRECT = 530
       integer, parameter :: DBOPT_H5_FIC_SIZE = 531
       integer, parameter :: DBOPT_H5_FIC_BUF = 532
-      integer, parameter :: DBOPT_H5_CORE_CREAT_BUFINFO = 533
-      integer, parameter :: DBOPT_H5_CORE_OPEN_BUFINFO = 534
-      integer, parameter :: DBOPT_H5_CORE_CLOSE_BUFINFO = 535
-      integer, parameter :: DBOPT_H5_FCPL_HID_T = 536
-      integer, parameter :: DBOPT_H5_FAPL_HID_T = 537
+      integer, parameter :: DBOPT_H5_FCPL_HID_T = 533
+      integer, parameter :: DBOPT_H5_FAPL_HID_T = 534
       integer, parameter :: DBOPT_H5_LAST = 599
       integer, parameter :: DB_TOP = 0
       integer, parameter :: DB_NONE = 1
@@ -378,8 +381,6 @@
       integer, parameter :: DB_VARTYPE_LABEL = 207
       integer, parameter :: DB_GHOSTTYPE_NOGHOST = 0
       integer, parameter :: DB_GHOSTTYPE_INTDUP = 1
-      integer, parameter :: DB_MAX_COMPATABILITY = 0
-      integer, parameter :: DB_MAX_PERFORMANCE = 1
       integer, parameter :: DBCSG_QUADRIC_G = 16777216
       integer, parameter :: DBCSG_SPHERE_PR = 33619968
       integer, parameter :: DBCSG_ELLIPSOID_PRRR = 33685504
@@ -429,6 +430,8 @@
       integer, parameter :: DB_PARTIO_POINTS = 1
       integer, parameter :: DB_PARTIO_HSLABS = 2
       real (kind=8), parameter :: DB_MISSING_VALUE_NOT_SET = 1.0D+308
+      integer, parameter :: DB_EOA = 0
+      integer, parameter :: DB_NOBJ_TYPES = 25
       integer, parameter :: DB_ZONETYPE_BEAM = 10
       integer, parameter :: DB_ZONETYPE_POLYGON = 20
       integer, parameter :: DB_ZONETYPE_TRIANGLE = 23
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9208a266..bfd6338c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -137,13 +137,10 @@ AM_CPPFLAGS = \
 testpdb_CPPFLAGS = $(AM_CPPFLAGS) -I../src/pdb -I../src/score
 pdbtst_CPPFLAGS = $(AM_CPPFLAGS) -I../src/pdb -I../src/score
 mk_nasf_pdb_CPPFLAGS = $(AM_CPPFLAGS) -I../src/pdb -I../src/score
-PDBTESTS =
-if INSTALL_LITE_HEADERS
- testpdb_CPPFLAGS += -DPDB_LITE
- pdbtst_CPPFLAGS += -DPDB_LITE
- mk_nasf_pdb_CPPFLAGS += -DPDB_LITE
- PDBTESTS += testpdb pdbtst
-endif
+testpdb_CPPFLAGS += -DPDB_LITE
+pdbtst_CPPFLAGS += -DPDB_LITE
+mk_nasf_pdb_CPPFLAGS += -DPDB_LITE
+PDBTESTS = testpdb pdbtst
 JSONTESTS =
 if JSON_NEEDED
  json_CPPFLAGS = -I$(prefix)/json/include $(AM_CPPFLAGS)
@@ -434,11 +431,11 @@ clean-local:
 	rm -f testsuite.log
 	rm -rf testsuite.dir
 
-testsuite: $(srcdir)/testsuite.at $(top_srcdir)/VERSION
+testsuite: $(srcdir)/testsuite.at $(top_srcdir)/SILO_VERSION
 	$(AUTOTEST) -I $(srcdir) $@.at -o $@.tmp
 	-mv -f $@.tmp $@
 
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_srcdir)/VERSION
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_srcdir)/SILO_VERSION
 	{					\
 	  echo '# Signature of the current package.'; \
 	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ffb4a394..0c0a6fdd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -150,11 +150,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @JSON_NEEDED_TRUE@am__append_1 = ../tools/json/json-c-0.10/libjson.la
-@INSTALL_LITE_HEADERS_TRUE@am__append_2 = -DPDB_LITE
-@INSTALL_LITE_HEADERS_TRUE@am__append_3 = -DPDB_LITE
-@INSTALL_LITE_HEADERS_TRUE@am__append_4 = -DPDB_LITE
-@INSTALL_LITE_HEADERS_TRUE@am__append_5 = testpdb pdbtst
-@JSON_NEEDED_TRUE@am__append_6 = json
+@JSON_NEEDED_TRUE@am__append_2 = json
 check_PROGRAMS = arbpoly$(EXEEXT) arbpoly2d$(EXEEXT) array$(EXEEXT) \
 	extface$(EXEEXT) multi_test$(EXEEXT) partial_io$(EXEEXT) \
 	point$(EXEEXT) group_test$(EXEEXT) listtypes$(EXEEXT) \
@@ -173,13 +169,13 @@ check_PROGRAMS = arbpoly$(EXEEXT) arbpoly2d$(EXEEXT) array$(EXEEXT) \
 	readstuff$(EXEEXT) testfs$(EXEEXT) empty$(EXEEXT) \
 	majorder$(EXEEXT) realloc_obj_and_opts$(EXEEXT) \
 	test_mat_compression$(EXEEXT) bcastopen$(EXEEXT) \
-	memfile_simple$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_4) \
-	$(am__EXEEXT_6) $(am__EXEEXT_8)
-@HDF5_DRV_NEEDED_TRUE@am__append_7 = $(HDF5PROGS)
-@HDF5_DRV_NEEDED_TRUE@am__append_8 = $(HDF5PROGS)
-@HDF5_DRV_NEEDED_TRUE@am__append_9 = $(HDF5CKLTLIBS)
-@FORTRAN_NEEDED_TRUE@am__append_10 = $(FCPROGS)
-@FORTRAN_NEEDED_TRUE@am__append_11 = $(FCPROGS)
+	memfile_simple$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_3) \
+	$(am__EXEEXT_5) $(am__EXEEXT_7)
+@HDF5_DRV_NEEDED_TRUE@am__append_3 = $(HDF5PROGS)
+@HDF5_DRV_NEEDED_TRUE@am__append_4 = $(HDF5PROGS)
+@HDF5_DRV_NEEDED_TRUE@am__append_5 = $(HDF5CKLTLIBS)
+@FORTRAN_NEEDED_TRUE@am__append_6 = $(FCPROGS)
+@FORTRAN_NEEDED_TRUE@am__append_7 = $(FCPROGS)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
@@ -245,19 +241,17 @@ rocket_silo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(rocket_silo_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
-@INSTALL_LITE_HEADERS_TRUE@am__EXEEXT_1 = testpdb$(EXEEXT) \
-@INSTALL_LITE_HEADERS_TRUE@	pdbtst$(EXEEXT)
-am__EXEEXT_2 = $(am__EXEEXT_1)
-@JSON_NEEDED_TRUE@am__EXEEXT_3 = json$(EXEEXT)
-am__EXEEXT_4 = $(am__EXEEXT_3)
-am__EXEEXT_5 = compression$(EXEEXT) grab$(EXEEXT) mk_nasf_h5$(EXEEXT) \
+am__EXEEXT_1 = testpdb$(EXEEXT) pdbtst$(EXEEXT)
+@JSON_NEEDED_TRUE@am__EXEEXT_2 = json$(EXEEXT)
+am__EXEEXT_3 = $(am__EXEEXT_2)
+am__EXEEXT_4 = compression$(EXEEXT) grab$(EXEEXT) mk_nasf_h5$(EXEEXT) \
 	testhdf5$(EXEEXT)
-@HDF5_DRV_NEEDED_TRUE@am__EXEEXT_6 = $(am__EXEEXT_5)
-am__EXEEXT_7 = arrayf77$(EXEEXT) arrayf90$(EXEEXT) curvef77$(EXEEXT) \
+@HDF5_DRV_NEEDED_TRUE@am__EXEEXT_5 = $(am__EXEEXT_4)
+am__EXEEXT_6 = arrayf77$(EXEEXT) arrayf90$(EXEEXT) curvef77$(EXEEXT) \
 	matf77$(EXEEXT) pointf77$(EXEEXT) quadf77$(EXEEXT) \
 	ucdf77$(EXEEXT) testallf77$(EXEEXT) csgmesh$(EXEEXT) \
 	qmeshmat2df77$(EXEEXT)
-@FORTRAN_NEEDED_TRUE@am__EXEEXT_8 = $(am__EXEEXT_7)
+@FORTRAN_NEEDED_TRUE@am__EXEEXT_7 = $(am__EXEEXT_6)
 TestReadMask_SOURCES = TestReadMask.c
 TestReadMask_OBJECTS = TestReadMask.$(OBJEXT)
 TestReadMask_LDADD = $(LDADD)
@@ -1213,13 +1207,13 @@ AM_CPPFLAGS = \
 
 #quad_CPPFLAGS = $(AM_CPPFLAGS)
 testpdb_CPPFLAGS = $(AM_CPPFLAGS) -I../src/pdb -I../src/score \
-	$(am__append_2)
+	-DPDB_LITE
 pdbtst_CPPFLAGS = $(AM_CPPFLAGS) -I../src/pdb -I../src/score \
-	$(am__append_3)
+	-DPDB_LITE
 mk_nasf_pdb_CPPFLAGS = $(AM_CPPFLAGS) -I../src/pdb -I../src/score \
-	$(am__append_4)
-PDBTESTS = $(am__append_5)
-JSONTESTS = $(am__append_6)
+	-DPDB_LITE
+PDBTESTS = testpdb pdbtst
+JSONTESTS = $(am__append_2)
 @JSON_NEEDED_TRUE@json_CPPFLAGS = -I$(prefix)/json/include $(AM_CPPFLAGS)
 #TestReadMask_CPPFLAGS = $(AM_CPPFLAGS)
 AM_FFLAGS = $(AM_CPPFLAGS)
@@ -1236,7 +1230,7 @@ PROGS = array dir extface multi_test partial_io point quad simple ucd \
 	efcentering mk_nasf_pdb ioperf arbpoly2d readstuff \
 	mat3d_3across merge_block test_mat_compression bcastopen \
 	memfile_simple empty majorder realloc_obj_and_opts $(PDBTESTS) \
-	$(JSONTESTS) $(am__append_7) $(am__append_10)
+	$(JSONTESTS) $(am__append_3) $(am__append_6)
 dir_SOURCES = dir.c testlib.c
 listtypes_SOURCES = listtypes.c listtypes_main.c
 bcastopen_SOURCES = listtypes.c bcastopen.c bcastopen_main.c
@@ -1250,7 +1244,7 @@ newsami_SOURCES = newsami.cxx
 # plugins for rocket and for ioperf
 HDF5CKLTLIBS = ioperf_hdf5.la
 check_LTLIBRARIES = rocket_silo.la ioperf_silo.la ioperf_pdb.la \
-	ioperf_sec2.la ioperf_stdio.la $(am__append_9)
+	ioperf_sec2.la ioperf_stdio.la $(am__append_5)
 rocket_silo_la_SOURCES = rocket_silo.cxx
 # the '-rpath /nowhere' is some trick to force libtool to produce a shared lib
 rocket_silo_la_LDFLAGS = -module -avoid-version -rpath /nowhere
@@ -2295,11 +2289,11 @@ clean-local:
 	rm -f testsuite.log
 	rm -rf testsuite.dir
 
-testsuite: $(srcdir)/testsuite.at $(top_srcdir)/VERSION
+testsuite: $(srcdir)/testsuite.at $(top_srcdir)/SILO_VERSION
 	$(AUTOTEST) -I $(srcdir) $@.at -o $@.tmp
 	-mv -f $@.tmp $@
 
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_srcdir)/VERSION
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_srcdir)/SILO_VERSION
 	{					\
 	  echo '# Signature of the current package.'; \
 	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
diff --git a/tests/multi_file.c b/tests/multi_file.c
index e8243e6e..4d052fdd 100644
--- a/tests/multi_file.c
+++ b/tests/multi_file.c
@@ -68,7 +68,9 @@ product endorsement purposes.
 #  include <unistd.h>
 #endif
 
+#ifdef HAVE_HDF5_H
 #include <hdf5.h>
+#endif
 #include <silo.h>
 #include <std.c>
 
@@ -1282,6 +1284,7 @@ build_block_ucd3d(char *basename, int driver, char *file_ext,
          */
         if (!i_am_a_writer) /* this rank sends its block to its writer */
         {
+#ifdef HAVE_HDF5_H
             hid_t hdf5_file_id;
             void *file_buf_ptr = 0;
             hsize_t hdf5_file_size = 0;
@@ -1290,16 +1293,12 @@ build_block_ucd3d(char *basename, int driver, char *file_ext,
 
             hdf5_file_id = *((hid_t*) DBGrabDriver(dbfile));
 
-#if 0
-            H5Fget_vfd_handle(hdf5_file_id, H5P_DEFAULT, &file_buf_ptr);
-            H5Fget_filesize(hdf5_file_id, &hdf5_file_size);
-#else
             hdf5_file_size = H5Fget_file_image(hdf5_file_id, NULL, 0);
             file_buf_ptr = malloc(hdf5_file_size);
             H5Fget_file_image(hdf5_file_id, file_buf_ptr, hdf5_file_size);
-#endif
-            DBUngrabDriver(dbfile,0);
 
+            DBUngrabDriver(dbfile,0);
+#endif
 
 #ifdef HAVE_MPI
             MPI_Isend(file_buf_ptr, (int) hdf5_file_size, MPI_CHAR, my_writer_rank,
@@ -1307,6 +1306,8 @@ build_block_ucd3d(char *basename, int driver, char *file_ext,
             sendinfo[block].dbfile = dbfile;
             sendinfo[block].buf = file_buf_ptr;
 #endif
+
+            DBClose(dbfile);
         }
         else
         {
diff --git a/tests/multi_test.c b/tests/multi_test.c
index 1f9a8a9f..2399a381 100644
--- a/tests/multi_test.c
+++ b/tests/multi_test.c
@@ -2930,6 +2930,7 @@ build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
     float           xstrip[NX + NY + NZ], ystrip[NX + NY + NZ], zstrip[NX + NY + NZ];
 
     int             one = 1;
+    int             reset_mixlen = 0;
     DBoptlist      *optlist;
 
     DBfacelist     *fl;
@@ -3159,6 +3160,7 @@ build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
                 }
 
         iz = 0;
+        reset_mixlen = 1;
         for (k = 0, n_z = kmin; n_z < kmax - 1; k++, n_z++)
             for (j = 0, n_y = jmin; n_y < jmax - 1; j++, n_y++)
                 for (i = 0, n_x = imin; n_x < imax - 1; i++, n_x++)
@@ -3178,6 +3180,9 @@ build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
                     mix_zone_map[n_z * NX * NY + n_y * NX + n_x] =
                         k * (nx - 1) * (ny - 1) + j * (nx - 1) + i;
 
+                    if (matlist2[k * (nx - 1) * (ny - 1) + j * (nx - 1) + i] < 0)
+                        reset_mixlen = 0;
+
                     if (((k == 0 || n_z == kmax - 2) &&
                          (n_z != 0 && n_z != NZ - 1)) ||
                         ((j == 0 || n_y == jmax - 2) &&
@@ -3189,6 +3194,7 @@ build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
                         ghost[k * (nx - 1) * (ny - 1) + j * (nx - 1) + i] = 0;
                 }
 
+
         /*
          * Compute mix_zone2 array from mix_zone array and mix_zone_map
          */
@@ -3358,7 +3364,8 @@ build_block_ucd3d(DBfile *dbfile, char dirnames[MAXBLOCKS][STRLEN],
             int dims[1];
             dims[0] = nzones;
             TESTMAT(dbfile, matname, meshname, nmats, matnos, matlist2, dims,
-                    1, mix_next, mix_mat, mix_zone2, mix_vf, mixlen, DB_FLOAT, optlist);
+                    1, mix_next, mix_mat, mix_zone2, mix_vf,
+                    (reset_mixlen ? 0 : mixlen), DB_FLOAT, optlist);
         }
 
         DBFreeOptlist(optlist);
diff --git a/tests/testsuite b/tests/testsuite
index 242f9f44..98db5c0d 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Generated from ../../tests/testsuite.at by GNU Autoconf 2.69.
+# Generated from testsuite.at by GNU Autoconf 2.69.
 #
 # Copyright (C) 2009-2012 Free Software Foundation, Inc.
 #