Issue 224: Remove all mention of ENABLE_FETK

.build.sh

@@ -51,7 +51,6 @@ echo "Install dir: ${INSTALL_DIR}"
 : ${ENABLE_PYGBE:=ON}
 : ${ENABLE_BEM:=ON}
 : ${ENABLE_GEOFLOW:=ON}
-: ${ENABLE_FETK:=ON}
 : ${FETK_VERSION:="857a0cf6ae40410471ea10f0e67e370cbd8ed6a3"}
 : ${ENABLE_iAPBS:=ON}
 : ${ENABLE_OPENMP:=OFF}
@@ -134,7 +133,6 @@ cmake -S .. -B $BUILD_DIR                                 \
       -DENABLE_PYGBE=${ENABLE_PYGBE}                      \
       -DENABLE_BEM=${ENABLE_BEM}                          \
       -DENABLE_GEOFLOW=${ENABLE_GEOFLOW}                  \
-      -DENABLE_FETK=${ENABLE_FETK}                        \
       -DENABLE_iAPBS=${ENABLE_iAPBS}                      \
       -DENABLE_OPENMP=${ENABLE_OPENMP}                    \
       -DENABLE_PBAM=${ENABLE_PBAM}                        \

.github/workflows/build-alt-config.yaml

@@ -21,7 +21,6 @@ env:
   ENABLE_PYGBE: ON
   ENABLE_BEM: ON
   ENABLE_GEOFLOW: ON
-  ENABLE_FETK: ON
 #  FETK_VERSION: "1.9.2"
   FETK_VERSION: 857a0cf6ae40410471ea10f0e67e370cbd8ed6a3
   ENABLE_iAPBS: ON
@@ -80,7 +79,6 @@ jobs:
             --build-arg ENABLE_PYGBE=${ENABLE_PYGBE} \
             --build-arg ENABLE_BEM=${ENABLE_BEM} \
             --build-arg ENABLE_GEOFLOW=${ENABLE_GEOFLOW} \
-            --build-arg ENABLE_FETK=${ENABLE_FETK} \
             --build-arg FETK_VERSION=${FETK_VERSION} \
             --build-arg ENABLE_iAPBS=${ENABLE_iAPBS} \
             --build-arg ENABLE_OPENMP=${ENABLE_OPENMP} \
@@ -236,10 +234,10 @@ jobs:
           mkdir -p build/${RELEASE_TYPE}
           cd build
           echo $CMAKE_PREFIX_PATH
-          cmake -DCMAKE_TOOLCHAIN_FILE=${WIN_TOOLCHAIN_FILE} -DVCPKG_TARGET_TRIPLET=x86-windows -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_BUILD_TYPE=${RELEASE_TYPE} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DBUILD_TESTING=${BUILD_TESTING} -DBUILD_TOOLS=${BUILD_TOOLS} -DCHECK_EPSILON=ON -DBLA_VENDOR=${BLA_VENDOR} -DENABLE_FETK=${ENABLE_FETK} -DENABLE_BEM=${ENABLE_BEM} -DENABLE_GEOFLOW=${ENABLE_GEOFLOW} -DENABLE_iAPBS=${ENABLE_iAPBS} -DENABLE_PYGBE=${ENABLE_PYGBE} -DPYTHON_MIN_VERSION="${PYTHON_MIN_VERSION}" -DENABLE_INLINE=ON -DENABLE_PBAM=${ENABLE_PBAM} -DENABLE_PBSAM=${ENABLE_PBSAM} -DENABLE_PYTHON=${ENABLE_PYTHON} -DENABLE_TESTS=${ENABLE_TESTS} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DENABLE_VERBOSE_DEBUG=OFF -DGET_NanoShaper=${GET_NanoShaper} -DFETK_VERSION=${FETK_VERSION} -G "Visual Studio 17 2022" -A Win32 ..
+          cmake -DCMAKE_TOOLCHAIN_FILE=${WIN_TOOLCHAIN_FILE} -DVCPKG_TARGET_TRIPLET=x86-windows -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_BUILD_TYPE=${RELEASE_TYPE} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DBUILD_TESTING=${BUILD_TESTING} -DBUILD_TOOLS=${BUILD_TOOLS} -DCHECK_EPSILON=ON -DBLA_VENDOR=${BLA_VENDOR} -DENABLE_BEM=${ENABLE_BEM} -DENABLE_GEOFLOW=${ENABLE_GEOFLOW} -DENABLE_iAPBS=${ENABLE_iAPBS} -DENABLE_PYGBE=${ENABLE_PYGBE} -DPYTHON_MIN_VERSION="${PYTHON_MIN_VERSION}" -DENABLE_INLINE=ON -DENABLE_PBAM=${ENABLE_PBAM} -DENABLE_PBSAM=${ENABLE_PBSAM} -DENABLE_PYTHON=${ENABLE_PYTHON} -DENABLE_TESTS=${ENABLE_TESTS} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DENABLE_VERBOSE_DEBUG=OFF -DGET_NanoShaper=${GET_NanoShaper} -DFETK_VERSION=${FETK_VERSION} -G "Visual Studio 17 2022" -A Win32 ..
           cat CMakeCache.txt
         shell: bash
-#          cmake -DCMAKE_TOOLCHAIN_FILE=${WIN_TOOLCHAIN_FILE} -DVCPKG_TARGET_TRIPLET=x86-windows -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_BUILD_TYPE=${RELEASE_TYPE} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DBUILD_TESTING=${BUILD_TESTING} -DBUILD_TOOLS=${BUILD_TOOLS} -DCHECK_EPSILON=ON -DBLA_VENDOR=${BLA_VENDOR} -DENABLE_FETK=${ENABLE_FETK} -DENABLE_BEM=${ENABLE_BEM} -DENABLE_GEOFLOW=${ENABLE_GEOFLOW} -DENABLE_iAPBS=${ENABLE_iAPBS} -DENABLE_PYGBE=${ENABLE_PYGBE} -DPYTHON_MIN_VERSION="${PYTHON_MIN_VERSION}" -DPYTHON_MAX_VERSION="${PYTHON_MAX_VERSION}" -DENABLE_INLINE=ON -DENABLE_PBAM=${ENABLE_PBAM} -DENABLE_PBSAM=${ENABLE_PBSAM} -DENABLE_PYTHON=${ENABLE_PYTHON} -DENABLE_TESTS=${ENABLE_TESTS} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DENABLE_VERBOSE_DEBUG=OFF -DGET_NanoShaper=${GET_NanoShaper} -DFETK_VERSION=${FETK_VERSION} -G "Visual Studio 17 2022" -A Win32 ..
+#          cmake -DCMAKE_TOOLCHAIN_FILE=${WIN_TOOLCHAIN_FILE} -DVCPKG_TARGET_TRIPLET=x86-windows -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_BUILD_TYPE=${RELEASE_TYPE} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DBUILD_TESTING=${BUILD_TESTING} -DBUILD_TOOLS=${BUILD_TOOLS} -DCHECK_EPSILON=ON -DBLA_VENDOR=${BLA_VENDOR} -DENABLE_BEM=${ENABLE_BEM} -DENABLE_GEOFLOW=${ENABLE_GEOFLOW} -DENABLE_iAPBS=${ENABLE_iAPBS} -DENABLE_PYGBE=${ENABLE_PYGBE} -DPYTHON_MIN_VERSION="${PYTHON_MIN_VERSION}" -DPYTHON_MAX_VERSION="${PYTHON_MAX_VERSION}" -DENABLE_INLINE=ON -DENABLE_PBAM=${ENABLE_PBAM} -DENABLE_PBSAM=${ENABLE_PBSAM} -DENABLE_PYTHON=${ENABLE_PYTHON} -DENABLE_TESTS=${ENABLE_TESTS} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DENABLE_VERBOSE_DEBUG=OFF -DGET_NanoShaper=${GET_NanoShaper} -DFETK_VERSION=${FETK_VERSION} -G "Visual Studio 17 2022" -A Win32 ..
 
       - name: Configure and Build for Mac
         if: startsWith(matrix.os, 'macos')  # Mac only

.github/workflows/build.yaml

@@ -19,7 +19,6 @@ env:
   ENABLE_PYGBE: ON
   ENABLE_BEM: ON
   ENABLE_GEOFLOW: ON
-  ENABLE_FETK: ON
 #  FETK_VERSION: "1.9.2"
   FETK_VERSION: 857a0cf6ae40410471ea10f0e67e370cbd8ed6a3
   ENABLE_iAPBS: ON
@@ -173,7 +172,7 @@ jobs:
           mkdir -p build/${RELEASE_TYPE}
           cd build
           echo $CMAKE_PREFIX_PATH
-          cmake -DCMAKE_TOOLCHAIN_FILE=${WIN_TOOLCHAIN_FILE} -DVCPKG_TARGET_TRIPLET=x86-windows -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_BUILD_TYPE=${RELEASE_TYPE} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DBUILD_TESTING=${BUILD_TESTING} -DBUILD_TOOLS=${BUILD_TOOLS} -DCHECK_EPSILON=ON -DBLA_VENDOR=${BLA_VENDOR} -DENABLE_FETK=${ENABLE_FETK} -DENABLE_BEM=${ENABLE_BEM} -DENABLE_GEOFLOW=${ENABLE_GEOFLOW} -DENABLE_iAPBS=${ENABLE_iAPBS} -DENABLE_PYGBE=${ENABLE_PYGBE} -DPYTHON_MIN_VERSION="${PYTHON_MIN_VERSION}" -DPYTHON_MAX_VERSION="${PYTHON_MAX_VERSION}" -DENABLE_INLINE=ON -DENABLE_PBAM=${ENABLE_PBAM} -DENABLE_PBSAM=${ENABLE_PBSAM} -DENABLE_PYTHON=${ENABLE_PYTHON} -DENABLE_TESTS=${ENABLE_TESTS} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DENABLE_VERBOSE_DEBUG=OFF -DGET_NanoShaper=${GET_NanoShaper} -DFETK_VERSION=${FETK_VERSION} -G "Visual Studio 17 2022" -A Win32 ..
+          cmake -DCMAKE_TOOLCHAIN_FILE=${WIN_TOOLCHAIN_FILE} -DVCPKG_TARGET_TRIPLET=x86-windows -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_BUILD_TYPE=${RELEASE_TYPE} -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DBUILD_TESTING=${BUILD_TESTING} -DBUILD_TOOLS=${BUILD_TOOLS} -DCHECK_EPSILON=ON -DBLA_VENDOR=${BLA_VENDOR} -DENABLE_BEM=${ENABLE_BEM} -DENABLE_GEOFLOW=${ENABLE_GEOFLOW} -DENABLE_iAPBS=${ENABLE_iAPBS} -DENABLE_PYGBE=${ENABLE_PYGBE} -DPYTHON_MIN_VERSION="${PYTHON_MIN_VERSION}" -DPYTHON_MAX_VERSION="${PYTHON_MAX_VERSION}" -DENABLE_INLINE=ON -DENABLE_PBAM=${ENABLE_PBAM} -DENABLE_PBSAM=${ENABLE_PBSAM} -DENABLE_PYTHON=${ENABLE_PYTHON} -DENABLE_TESTS=${ENABLE_TESTS} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DENABLE_VERBOSE_DEBUG=OFF -DGET_NanoShaper=${GET_NanoShaper} -DFETK_VERSION=${FETK_VERSION} -G "Visual Studio 17 2022" -A Win32 ..
           cat CMakeCache.txt
         shell: bash
 

Dockerfile.centos

@@ -69,7 +69,6 @@ ARG RELEASE_TYPE=Debug
 ARG ENABLE_PYGBE=ON
 ARG ENABLE_BEM=ON
 ARG ENABLE_GEOFLOW=ON
-ARG ENABLE_FETK=ON
 #ARG FETK_VERSION="1.9.1"
 ARG FETK_VERSION=857a0cf6ae40410471ea10f0e67e370cbd8ed6a3
 ARG ENABLE_iAPBS=ON
@@ -98,7 +97,6 @@ RUN source scl_source enable devtoolset-11 && \
       -DENABLE_BEM=${ENABLE_BEM} \
       -DENABLE_iAPBS=${ENABLE_iAPBS} \
       -DENABLE_GEOFLOW=${ENABLE_GEOFLOW} \
-      -DENABLE_FETK=${ENABLE_FETK}  \
       -DENABLE_OPENMP=${ENABLE_OPENMP} \
       -DENABLE_PBAM=${ENABLE_PBAM} \
       -DENABLE_PBSAM=${ENABLE_PBSAM} \

Dockerfile.ubuntu

@@ -53,7 +53,6 @@ ARG RELEASE_TYPE=Debug
 ARG ENABLE_PYGBE=ON
 ARG ENABLE_BEM=ON
 ARG ENABLE_GEOFLOW=ON
-ARG ENABLE_FETK=ON
 #ARG FETK_VERSION="1.9.1"
 ARG FETK_VERSION=857a0cf6ae40410471ea10f0e67e370cbd8ed6a3
 ARG ENABLE_iAPBS=ON
@@ -79,7 +78,6 @@ RUN cd /tmp_source && \
       -DENABLE_BEM=${ENABLE_BEM} \
       -DENABLE_iAPBS=${ENABLE_iAPBS} \
       -DENABLE_GEOFLOW=${ENABLE_GEOFLOW} \
-      -DENABLE_FETK=${ENABLE_FETK}  \
       -DENABLE_OPENMP=${ENABLE_OPENMP} \
       -DENABLE_PBAM=${ENABLE_PBAM} \
       -DENABLE_PBSAM=${ENABLE_PBSAM} \

docs/getting/source.rst

@@ -130,15 +130,15 @@ That variable will be set to a working default if not manually set.
 .. code:: bash
 
    cd $APBS_BUILD_DIR
-   cmake -DENABLE_FETK_=ON -DFETK_VERSION=v1.9.2
+   cmake -DFETK_VERSION=v1.9.2
 
 For advanced users, you can use a version of FETK other than a released version by setting ``FETK_VERSION``
 to the desired git commit hash instead of a version number:
 
 .. code:: bash
 
    cd $APBS_BUILD_DIR
-   cmake -DENABLE_FETK=ON -DFETK_VERSION=[git hash]
+   cmake -DFETK_VERSION=[git hash]
 
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -194,7 +194,6 @@ Building the code - advanced
       -DCMAKE_BUILD_TYPE=$RELEASE_TYPE          \
       -DENABLE_GEOFLOW=ON                       \
       -DENABLE_BEM=ON                           \
-      -DENABLE_FETK=ON                          \
       -DFETK_VERSION=[version]                  \
       -DENABLE_OPENMP=ON                        \
       -DENABLE_PBAM=ON                          \

src/.config/apbscfg.h.in

@@ -40,9 +40,6 @@
 
 
 
-// FEtk components is enabled
-#cmakedefine ENABLE_FETK
-
 // have FEtk component PUNC
 #cmakedefine HAVE_PUNC
 

src/CMakeLists.txt

@@ -47,9 +47,7 @@ add_subdirectory(generic)
 add_subdirectory(pmgc)
 add_subdirectory(mg)
 
-if(ENABLE_FETK)
-   add_subdirectory(fem)
-endif(ENABLE_FETK)
+add_subdirectory(fem)
 
 if(ENABLE_GEOFLOW)
 #    add_items(SOURCES geoflow_wrap_apbs.c)

src/apbs.h

@@ -94,9 +94,7 @@
 #include "mg/vpmgp.h"
 
 /* FEM headers */
-#if defined(ENABLE_FETK)
-    #include "fem/vfetk.h"
-    #include "fem/vpee.h"
-#endif
+#include "fem/vfetk.h"
+#include "fem/vpee.h"
 
 #endif /* _APBSHEADERS_H_ */

src/routines.c

@@ -6129,14 +6129,7 @@ VPUBLIC void dump_options()
     puts("0");
 #endif
 
-    printf("ENABLE_FETK:");
-#ifdef ENABLE_FETK
-    printf("1");
-#else
-    puts("0");
-#endif
-
-    printf("HAVE_PUNC:");
+     printf("HAVE_PUNC:");
 #ifdef HAVE_PUNC
     puts("1");
 #else

tools/manip/CMakeLists.txt

@@ -4,9 +4,7 @@ set(LIBS "")
 list(APPEND LIBS "apbs_generic")
 list(APPEND LIBS "apbs_mg")
 list(APPEND LIBS "apbs_pmgc")
-if(ENABLE_FETK)
-    list(APPEND LIBS "apbs_fem")
-endif(ENABLE_FETK)
+list(APPEND LIBS "apbs_fem")
 
 message(STATUS "libraries: ${LIBS}")
 

tools/mesh/CMakeLists.txt

@@ -4,9 +4,7 @@ set(LIBS "")
 list(APPEND LIBS "apbs_generic")
 list(APPEND LIBS "apbs_mg")
 list(APPEND LIBS "apbs_pmgc")
-if(ENABLE_FETK)
-    list(APPEND LIBS "apbs_fem")
-endif(ENABLE_FETK)
+list(APPEND LIBS "apbs_fem")
 
 message(STATUS "libraries: ${LIBS}")