Remove JSON-Fortran

INSTALL.md

@@ -171,19 +171,13 @@ A library for finding and handling crystal symmetries
   * The spglib can be downloaded from https://github.com/atztogo/spglib
   * For building CP2K with the spglib add `-D__SPGLIB` to DFLAGS
 
-### 2q. JSON-Fortran (optional, required for SIRIUS)
-JSON-Fortran is a Fortran 2008 JSON API.
-  * The code is available at https://github.com/jacobwilliams/json-fortran
-  * For building CP2K with JSON-Fortran add `-D__JSON` to DFLAGS.
-
-### 2r. SIRIUS (optional, plane wave calculations)
+### 2q. SIRIUS (optional, plane wave calculations)
 SIRIUS is a domain specific library for electronic structure calculations.
   * The code is available at https://github.com/electronic-structure/SIRIUS
   * For building CP2K with SIRIUS add `-D__SIRIUS` to DFLAGS.
-  * Furthermore, SIRIUS depends on JSON-Fortran.
   * See https://electronic-structure.github.io/SIRIUS/ for more information.
 
-### 2s. FPGA (optional, plane wave FFT calculations)
+### 2r. FPGA (optional, plane wave FFT calculations)
   * Use `-D__PW_FPGA` to enable FPGA support for PW (fft) calculations. Currently tested only for Intel Stratix 10 and Arria 10 GX1150 FPGAs.
   * Supports single precision and double precision fft calculations with the use of dedicated APIs.
   * Double precision is the default API chosen when set using the `-D__PW_FPGA` flag.

src/cp2k_info.F

@@ -271,9 +271,6 @@ FUNCTION cp2k_flags() RESULT(flags)
 #if defined __MKL
       flags = TRIM(flags)//" mkl"
 #endif
-#if defined __JSON
-      flags = TRIM(flags)//" json"
-#endif
 #if defined __SIRIUS
       flags = TRIM(flags)//" sirius"
 #endif

tools/autotools/configure.ac

@@ -207,13 +207,6 @@ dnl check for libvdwxc
 ACX_LIBVDWXC([options="$options libvdwxc"; LIBVDWXC_DFLAGS="-D__LIBVDWXC"], [])
 AC_SUBST(LIBVDWXC_DFLAGS)
 
-SECTION_TITLE([json fortran (SIRIUS dependency)])
-dnl check for libvdwxc
-ACX_JSON_FORTRAN([options="$options json-fortran"; JSON_FORTRAN_DFLAGS="-D__JSON"], [])
-AC_SUBST(JSON_FORTRAN_DFLAGS)
-
-
-
 SECTION_TITLE([ParMETIS, PTSCOTCH and SuperLU])
 dnl check for parmetis
 ACX_PARMETIS([options="$options ParMETIS"; PARMETIS_DFLAGS="-D__PARMETIS"], [])

tools/toolchain/Dockerfile

@@ -126,9 +126,6 @@ RUN ./scripts/install_libvdwxc.sh && rm -rf ./build
 COPY ./scripts/install_sirius.sh ./scripts/
 RUN ./scripts/install_sirius.sh && rm -rf ./build
 
-COPY ./scripts/install_json_fortran.sh ./scripts/
-RUN ./scripts/install_json_fortran.sh && rm -rf ./build
-
 COPY ./scripts/arch_base.tmpl \
      ./scripts/generate_arch_files.sh ./scripts/
 RUN ./scripts/generate_arch_files.sh && rm -rf ./build

tools/toolchain/install_cp2k_toolchain.sh

@@ -212,7 +212,7 @@ The --with-PKG options follow the rules:
   --with-quip             Enable interface to QUIP library
                           Default = no
   --with-sirius           Enable interface to the plane wave SIRIUS library.
-                          This package requires: gsl, libspg, elpa, scalapack, json-fortran, hdf5 and libxc.
+                          This package requires: gsl, libspg, elpa, scalapack, hdf5 and libxc.
                           Default = install
   --with-gsl              Enable the gnu scientific library
                           Default = install
@@ -223,10 +223,6 @@ The --with-PKG options follow the rules:
                           Default = install
   --with-hdf5             Enable the hdf5 library (used by the sirius library)
                           Default = install
-  --with-json-fortran     Enable the json fortran library (used by cp2k when sirius is activated)
-                          This package depends on cmake.
-                          Default = install
-
 
 FURTHER INSTRUCTIONS
 
@@ -263,7 +259,7 @@ tool_list="valgrind cmake gcc"
 mpi_list="mpich openmpi"
 math_list="mkl acml openblas reflapack"
 lib_list="fftw libint libxc libsmm libxsmm scalapack elpa \
-          ptscotch parmetis metis superlu pexsi quip gsl spglib hdf5 libvdwxc sirius json_fortran"
+          ptscotch parmetis metis superlu pexsi quip gsl spglib hdf5 libvdwxc sirius"
 package_list="$tool_list $mpi_list $math_list $lib_list"
 # ------------------------------------------------------------------------
 
@@ -304,7 +300,6 @@ with_sirius="__INSTALL__"
 with_gsl="__INSTALL__"
 with_spglib="__INSTALL__"
 with_hdf5="__INSTALL__"
-with_json_fortran="__INSTALL__"
 with_elpa="__INSTALL__"
 with_libvdwxc="__INSTALL__"
 
@@ -600,9 +595,6 @@ while [ $# -ge 1 ] ; do
         --with-hdf5*)
             with_hdf5=$(read_with $1)
             ;;
-        --with-json*)
-            with_json_fortran=$(read_with $1)
-            ;;
         --with-libvdwxc*)
             with_libvdwxc=$(read_with $1)
             ;;
@@ -741,11 +733,6 @@ if [ "$with_spglib" = "__INSTALL__" ] ; then
     [ "$with_cmake" = "__DONTUSE__" ] && with_cmake="__INSTALL__"
 fi
 
-# json-fortran requires cmake.
-if [ "$with_json_fortran" = "__INSTALL__" ] ; then
-    [ "$with_cmake" = "__DONTUSE__" ] && with_cmake="__INSTALL__"
-fi
-
 # SIRIUS dependencies. Remove the gsl library from the dependencies if SIRIUS is not activated
 if [ "$with_sirius" = "__INSTALL__" ] ; then
     if [ "$with_gsl" = "__DONTUSE__" ] ; then
@@ -768,10 +755,6 @@ if [ "$with_sirius" = "__INSTALL__" ] ; then
         report_error "For SIRIUS to work you need a working hdf5 library use --with-hdf5 option to specify if you wish to install the library or specify its location."
         exit 1
     fi
-    if [ "$with_json_fortran" = "__DONTUSE__"  ] ; then
-        report_error "For SIRIUS to work you need a working json-fortran library use --with-json option to specify if you wish to install it or specify its location."
-    exit 1
-    fi
 fi
 
 
@@ -945,7 +928,6 @@ else
     ./scripts/install_hdf5.sh
     ./scripts/install_libvdwxc.sh
     ./scripts/install_sirius.sh
-    ./scripts/install_json_fortran.sh
     ./scripts/generate_arch_files.sh
 fi