diff --git a/.VERSION b/.VERSION
index 0786f722e..6aa584345 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1,6 +1,6 @@
 $Format:%d%n%n$
 # Fall back version, probably last release:
-2.9.2
+3.0.0
 
 # OpenCoarrays version file. This project uses semantic
 # versioning. For details see http://semver.org
diff --git a/AUTHORS.md b/AUTHORS.md
index ea1cae641..803af4be6 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -28,6 +28,7 @@ Download this file as a PDF document
  - [X] Götz Waschk <goetz.waschk@desy.de> @LaHaine
  - [ ] John C. Linford <jlinford@paratools.com>
  - [ ] Daniel Carrera  <dcarrera@gmail.com>
+ - [ ] Brad Richardson <brad@archaeologic.codes>
 
 [top]
 
diff --git a/INSTALL b/INSTALL
index 17b98134b..a64cccf9f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -156,3 +156,8 @@ Configure options
  For a look at all of the possible CMake settings, many/most of which are
  default CMake options, please run `ccmake /path/to/source` or
  `cmake-gui /path/to/source`.
+
+Experimental fpm build 
+----------------------
+
+./run-fpm.sh
diff --git a/example/hello.f90 b/example/hello.f90
new file mode 100644
index 000000000..504e39fe3
--- /dev/null
+++ b/example/hello.f90
@@ -0,0 +1,4 @@
+program main
+  implicit none
+  print*,"Hello from image ",this_image()
+end program
diff --git a/example/support-test/README.md b/example/support-test/README.md
new file mode 100644
index 000000000..bbdd8856e
--- /dev/null
+++ b/example/support-test/README.md
@@ -0,0 +1,3 @@
+Test Support
+------------
+The programs in this directory intentionally error-terminate to support the `error stop` tests in `test/caf_error_stop.f90`, which use Fortran's `execute_command_line` to run the programms in this directory and check for the expected non-zero stop codes.  Running the tests in this manner enables the Vegetable tests to continue executing in the presence of error-terminating tests.
diff --git a/example/support-test/error_stop_character_code.f90 b/example/support-test/error_stop_character_code.f90
new file mode 100644
index 000000000..78721bfae
--- /dev/null
+++ b/example/support-test/error_stop_character_code.f90
@@ -0,0 +1,7 @@
+program error_stop_character_code
+  implicit none
+
+  error stop ""
+
+  stop 0 ! ../../test/error_stop_test.f90 will report a test failure if this line runs
+end program 
diff --git a/example/support-test/error_stop_integer_code.f90 b/example/support-test/error_stop_integer_code.f90
new file mode 100644
index 000000000..6e61b3752
--- /dev/null
+++ b/example/support-test/error_stop_integer_code.f90
@@ -0,0 +1,7 @@
+program error_stop_integer_code
+  implicit none
+
+  error stop
+
+  stop 0 ! caffeine/test/error_stop_test.f90 reports a failure if this line runs
+end program 
diff --git a/example/support-test/normal_termination.f90 b/example/support-test/normal_termination.f90
new file mode 100644
index 000000000..8dfff9289
--- /dev/null
+++ b/example/support-test/normal_termination.f90
@@ -0,0 +1,7 @@
+program normal_termination
+  implicit none
+
+  stop 0
+
+  stop 1 ! opencoarrays/test/zzz_finalization_test.f90 reports a failure if this line runs
+end program 
diff --git a/fpm.toml b/fpm.toml
new file mode 100644
index 000000000..cd32e3e26
--- /dev/null
+++ b/fpm.toml
@@ -0,0 +1,13 @@
+name = "opencoarrays"
+version = "3.0.0"
+license = "BSD"
+author = ["Sourcery Institute"]
+maintainer = "damian@archaeologic.codes"
+copyright = "2015-2022 Sourcery Institute"
+
+[install]
+library = true
+
+[dev-dependencies]
+garden = {git = "https://gitlab.com/everythingfunctional/garden", tag = "v1.0.1"}
+assert= {git = "https://github.com/sourceryinstitute/assert", tag = "1.3.0"}
diff --git a/install.sh b/install.sh
index ffbcabc8a..28fde5839 100755
--- a/install.sh
+++ b/install.sh
@@ -1,354 +1,329 @@
-#!/usr/bin/env bash
-#
-# install.sh
-#
-# -- This script installs OpenCoarrays and its prerequisites.
-#
-# OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-# Copyright (c) 2015-2016, Sourcery, Inc.
-# Copyright (c) 2015-2016, Sourcery Institute
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice, this
-#    list of conditions and the following disclaimer in the documentation and/or
-#    other materials provided with the distribution.
-# 3. Neither the names of the copyright holders nor the names of their contributors
-#    may be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Portions of this script derive from BASH3 Boilerplate and are distributed under
-# the following license:
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2014 Kevin van Zonneveld
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-# The invocation of bootstrap.sh below performs the following tasks:
-# (1) Import several bash3boilerplate helper functions & default settings.
-# (2) Set several variables describing the current file and its usage page.
-# (3) Parse the usage information (default usage file name: current file's name with -usage appended).
-# (4) Parse the command line using the usage information.
-
-### Start of boilerplate -- do not edit this block #######################
-export OPENCOARRAYS_SRC_DIR="${OPENCOARRAYS_SRC_DIR:-${PWD%/}}"
-if [[ ! -f "${OPENCOARRAYS_SRC_DIR}/src/libcaf.h" ]]; then
-  echo "Please run this script inside the top-level OpenCoarrays source directory or "
-  echo "set OPENCOARRAYS_SRC_DIR to the OpenCoarrays source directory path."
-  exit 1
-fi
-export B3B_USE_CASE="${B3B_USE_CASE:-${OPENCOARRAYS_SRC_DIR}/prerequisites/use-case}"
-if [[ ! -f "${B3B_USE_CASE:-}/bootstrap.sh" ]]; then
-  echo "Please set B3B_USE_CASE to the bash3boilerplate use-case directory path."
-  exit 2
-else
-    # shellcheck source=./prerequisites/use-case/bootstrap.sh
-    source "${B3B_USE_CASE}/bootstrap.sh" "$@"
-fi
-### End of boilerplate -- start user edits below #########################
+#!/bin/sh
 
-# Set expected value of present flags that take no arguments
-export __flag_present=1
+set -e # exit on error
+set -o pipefail
 
-# Set up a function to call when receiving an EXIT signal to do some cleanup. Remove if
-# not needed. Other signals can be trapped too, like SIGINT and SIGTERM.
-function cleanup_before_exit () {
-  info "Cleaning up. Done"
+print_usage_info()
+{
+    echo "OpenCoarrays Installation Script"
+    echo ""
+    echo "USAGE:"
+    echo "./install.sh [--help | [--prefix=PREFIX]"
+    echo ""
+    echo " --help             Display this help text"
+    echo " --prefix=PREFIX    Install binary in 'PREFIX/bin'"
+    echo " --prereqs          Display a list of prerequisite software."
+    echo "                    Default prefix='\$HOME/.local/bin'"
+    echo ""
+    echo "For a non-interactive build with the 'yes' utility installed, execute"
+    echo "yes | ./install.sh"
 }
-trap cleanup_before_exit EXIT # The signal is specified here. Could be SIGINT, SIGTERM etc.
 
+GCC_VERSION=11
 
-### Validation (decide what's required for running your script and error out)
-#####################################################################
-
-[ -z "${LOG_LEVEL:-}" ] && emergency "Cannot continue without LOG_LEVEL. "
+list_prerequisites()
+{
+    echo "By default, OpenCoarrays and this installer use the following prerequisite package" 
+    echo "versions, which also indicate the versions that the installer will install if"
+    echo "missing and if granted permission:"
+    echo ""
+    echo "  GCC $GCC_VERSION"
+    echo "  fpm 0.5.0"
+    echo "  pkg-config 0.29.2"
+    echo "  realpath 9.0 (Homebrew coreutils 9.0)"
+    echo ""
+    echo "Some earlier versions will also work."
+}
 
-# shellcheck disable=SC2154
-if [[ "${arg_v}" == "${__flag_present}" || "${arg_l}" == "${__flag_present}" || ! -z "${arg_P:-${arg_U:-${arg_V:-${arg_D}}}}" ]]; then
-   print_debug_only=7
-   if [ "$(( LOG_LEVEL < print_debug_only ))" -ne 0 ]; then
-     debug "Supressing info and debug messages: one of {-l, -v, -P, -U, -V, -D} present."
-     suppress_info_debug_messages
-   fi
+while [ "$1" != "" ]; do
+    PARAM=$(echo "$1" | awk -F= '{print $1}')
+    VALUE=$(echo "$1" | awk -F= '{print $2}')
+    case $PARAM in
+        -h | --help)
+            print_usage_info
+            exit
+            ;;
+        --prereqs)
+            list_prerequisites
+            exit
+            ;;
+        --prefix)
+            PREFIX=$VALUE
+            ;;
+        *)
+            echo "ERROR: unknown parameter \"$PARAM\""
+            usage
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+set -u # error on use of undefined variable
+
+if [ -z ${MPIFC+x} ] || [ -z ${MPICC+x} ] ; then
+  if command -v mpifort > /dev/null 2>&1; then
+    MPIFC=`which mpifort`
+    echo "Setting MPIFC=$MPIFC"
+  fi
+  if command -v mpicc > /dev/null 2>&1; then
+    MPICC=`which mpicc`
+    echo "Setting MPICC=$MPICC"
+  fi
 fi
 
-[ ! -z "${arg_D}" ] && [ ! -z "${arg_P:-${arg_U:-${arg_V}}}" ] &&
-  emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 101]"
-
-[ ! -z "${arg_P}" ] && [ ! -z "${arg_U:-${arg_V}}" ] &&
-  emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 102]"
+if command -v pkg-config > /dev/null 2>&1; then
+  PKG_CONFIG=`which pkg-config`
+fi
+  
+if command -v realpath > /dev/null 2>&1; then
+  REALPATH=`which realpath`
+fi
 
-[ ! -z "${arg_U}" ] && [ ! -z "${arg_V}" ] &&
-  emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected). [exit 103]"
+if command -v fpm > /dev/null 2>&1; then
+  FPM=`which fpm`
+fi
 
-### Print bootstrapped magic variables to STDERR when LOG_LEVEL
-### is at the default value (6) or above.
-#####################################################################
-# shellcheck disable=SC2154
+ask_permission_to_use_homebrew()
 {
-info "__file: ${__file}"
-info "__dir: ${__dir}"
-info "__base: ${__base}"
-info "__os: ${__os}"
-info "__usage: ${__usage}"
-info "LOG_LEVEL: ${LOG_LEVEL}"
-
-info  "-b (--install-branch):   ${arg_b}"
-info  "-c (--with-c):           ${arg_c}"
-info  "-C (--with-cxx):         ${arg_C}"
-info  "-d (--debug):            ${arg_d}"
-info  "-D (--print-downloader): ${arg_D}"
-info  "-e (--verbose):          ${arg_e}"
-info  "-f (--with-fortran):     ${arg_f}"
-info  "-h (--help):             ${arg_h}"
-info  "-i (--install-prefix):   ${arg_i}"
-info  "-I (--install-version):  ${arg_I}"
-info  "-j (--num-threads):      ${arg_j}"
-info  "-l (--list-packages):    ${arg_l}"
-info  "-m (--with-cmake):       ${arg_m}"
-info  "-M (--with-mpi):         ${arg_M}"
-info  "-n (--no-color):         ${arg_n}"
-info  "-o (--only-download):    ${arg_o}"
-info  "-p (--package):          ${arg_p}"
-info  "-P (--print-path):       ${arg_P}"
-info  "-r (--prefix-root):      ${arg_r}"
-info  "-u (--from-url):         ${arg_u}"
-info  "-U (--print-url):        ${arg_U}"
-info  "-v (--version):          ${arg_v}"
-info  "-V (--print-version):    ${arg_V}"
-info  "-y (--yes-to-all):       ${arg_y}"
-info  "-Z (--bootstrap):        ${arg_Z}"
+  echo ""
+  echo "Either one or both of the environment variables MPIFC and MPICC are unset or"
+  echo "one or more of the following packages are not in the PATH: pkg-config, realpath, and fpm."
+  echo "If you grant permission to install prerequisites, you will be prompted before each installation." 
+  echo ""
+  echo "Press 'Enter' to choose the square-bracketed default answer:"
+  printf "Is it ok to use Homebrew to install prerequisite packages? [yes] "
 }
-# This file is organized into three sections:
-# 1. Command-line argument and environment variable processing.
-# 2. Function definitions.
-# 3. Main body.
-# The script depends on several external programs, including a second script that
-# builds prerequisite software.  Building prerequisites requires network access
-# unless tar balls of the prerequisites are present.
-
-# TODO:
-# 1. Collapse the body of the main conditional branches in the find_or_install function
-#    into one new function.
-# 2. Verify that script-installed packages meet the minimum version number.
-# 3. Add a script_transfer function to collapse the stack_pop x; stack_push z y
-#    pattern into one statement
-# 4. Consider adding mpich and cmake to the dependency stack before passing them to
-#    find_or_install to make the blocks inside find_or_install more uniform.
-#    Alternatively, check the dependency stacks for the package before entering the
-#    main conditional blocks in find_or_install.
-#
-
-
-# __________ Process command-line arguments and environment variables _____________
-
-this_script="$(basename "$0")"
-export this_script
-
-export install_path=${arg_i%/}
-export prefix_root="${arg_r:-}"
-
-export num_threads="${arg_j}"
-info "num_threads=\"${arg_j}\""
-
-export opencoarrays_src_dir="${OPENCOARRAYS_SRC_DIR}"
-info "opencoarrays_src_dir=${OPENCOARRAYS_SRC_DIR}"
-
-export build_path="${opencoarrays_src_dir}"/prerequisites/builds
-info "build_path=\"${opencoarrays_src_dir}\"/prerequisites/builds"
-
-export build_script="${opencoarrays_src_dir}"/prerequisites/build.sh
-info "build_script=\"${opencoarrays_src_dir}\"/prerequisites/build.sh"
-
-# ___________________ Define functions for use in the Main Body ___________________
-
-# Include stack management functions
-#. ./prerequisites/stack.sh
-# shellcheck source=./prerequisites/stack.sh
-source $opencoarrays_src_dir/prerequisites/stack.sh
-stack_new dependency_pkg
-stack_new dependency_exe
-stack_new dependency_path
-stack_new script_installed
-
-# shellcheck source=./prerequisites/install-functions/find_or_install.sh
-source $opencoarrays_src_dir/prerequisites/install-functions/find_or_install.sh
-
-# shellcheck source=./prerequisites/install-functions/print_header.sh
-source $opencoarrays_src_dir/prerequisites/install-functions/print_header.sh
-
-# shellcheck source=./prerequisites/install-functions/build_opencoarrays.sh
-source $opencoarrays_src_dir/prerequisites/install-functions/build_opencoarrays.sh
-
-# shellcheck source=./prerequisites/install-functions/report_results.sh
-source $opencoarrays_src_dir/prerequisites/install-functions/report_results.sh
-
-# shellcheck source=./prerequisites/install-functions/install-xcode-clt.sh
-source "${opencoarrays_src_dir}/prerequisites/install-functions/install-xcode-clt.sh"
-
-# ___________________ End of function definitions for use in the Main Body __________________
-
 
-# ________________________________ Start of the Main Body ___________________________________
-
-if [[ "${arg_v}" == "${__flag_present}" || "${arg_V}" == "opencoarrays" ]]; then
+ask_permission_to_install_homebrew()
+{
+  echo ""
+  echo "Homebrew not found. Installing Homebrew requires sudo privileges."
+  echo "If you grant permission to install Homebrew, you may be prompted to enter your password." 
+  echo ""
+  echo "Press 'Enter' to choose the square-bracketed default answer:"
+  printf "Is it ok to download and install Homebrew? [yes] "
+}
 
-  # Print script copyright & version if invoked with -v, -V, or
-  # --version argument git attributes handle .VERSION, making it more
-  # robust, but fallback version is still manually included. Search
-  # for the first version string we encounter and extract it using sed:
-  opencoarrays_version=$(sed -n '/[0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}/{s/^\([^.]*\)\([0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}\)\(.*\)/\2/p;q;}' "${opencoarrays_src_dir%/}/.VERSION")
-  if [[ "${arg_v}" == "${__flag_present}" ]]; then
-    echo "OpenCoarrays ${opencoarrays_version}"
-    echo ""
-    echo "OpenCoarrays installer"
-    echo "Copyright (C) 2015-2016 Sourcery, Inc."
-    echo "Copyright (C) 2015-2016 Sourcery Institute"
-    echo ""
-    echo "OpenCoarrays comes with NO WARRANTY, to the extent permitted by law."
-    echo "You may redistribute copies of ${this_script} under the terms of the"
-    echo "BSD 3-Clause License.  For more information about these matters, see"
-    echo "http://www.sourceryinstitute.org/license.html"
+ask_permission_to_install_homebrew_package()
+{
+  echo ""
+  if [ ! -z ${2+x} ]; then
+    echo "Homebrew installs $1 collectively in one package named '$2'."
     echo ""
-  elif [[ "${arg_V}" == "opencoarrays" ]]; then
-    echo "${opencoarrays_version//[[:space:]]/}"
   fi
+  printf "Is it ok to use Homebrew to install $1? [yes] "
+}
 
-elif [[ ! -z "${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}" ||  "${arg_l}" == "${__flag_present}" ]]; then
-
-  # Delegate to build.sh for the packages it builds
-  build_arg=${arg_D:-${arg_P:-${arg_U:-${arg_V:-${arg_p}}}}}
-  [ ! -z "${arg_D}" ] && build_flag="-D"
-  [ ! -z "${arg_P}" ] && build_flag="-P"
-  [ ! -z "${arg_U}" ] && build_flag="-U"
-  [ ! -z "${arg_V}" ] && build_flag="-V"
-  [ "${arg_l}" == "${__flag_present}" ] && build_flag="-l"
-
-  if [[ "${arg_P}" == "opencoarrays" ]]; then
-
-    version="$("${opencoarrays_src_dir}/install.sh" -V opencoarrays)"
-    echo "${install_path%/}/opencoarrays/${version}"
-
-  else
-
-    info "Invoking build script with the following command:"
-    info "\"${opencoarrays_src_dir}\"/prerequisites/build.sh \"${build_flag}\" \"${build_arg}\""
-    "${opencoarrays_src_dir}"/prerequisites/build.sh "${build_flag}" "${build_arg}"
+CI=${CI:-"false"} # GitHub Actions workflows set CI=true
 
-    # Add lines other packages the current script builds
-    if [[ "${arg_l}" == "${__flag_present}" ]]; then
-      echo "opencoarrays (version $("${opencoarrays_src_dir}/install.sh" -V opencoarrays))"
-      echo "ofp (version: ofp-sdf for OS X )"
-    fi
+exit_if_user_declines()
+{
+  if [ $CI = true ]; then 
+    echo " 'yes' assumed (GitHub Actions workflow detected)"
+    return
   fi
+  read answer
+  if [ -n "$answer" -a "$answer" != "y" -a "$answer" != "Y" -a "$answer" != "Yes" -a "$answer" != "YES" -a "$answer" != "yes" ]; then
+    echo "Installation declined."
+    case ${1:-} in  
+      *MPI*) 
+        echo "To use compilers other than Homebrew-installed mpifort and mpicc,"
+        echo "please set the MPIFC and MPICC environment variables and rerun './install.sh'." ;;
+      *) 
+        echo "Please ensure that $1 is installed and in your PATH and then rerun './install.sh'." ;;
+    esac
+    echo "OpenCoarrays was not installed." 
+    exit 1
+  fi
+}
 
-elif [[ "${arg_p:-}" == "opencoarrays" ]]; then
+DEPENDENCIES_DIR="build/dependencies"
+if [ ! -d $DEPENDENCIES_DIR ]; then
+  mkdir -p $DEPENDENCIES_DIR
+fi
 
-  if [[ "${arg_o}" == "${__flag_present}" ]]; then
+if [ -z ${MPIFC+x} ] || [ -z ${MPICC+x} ] || [ -z ${PKG_CONFIG+x} ] || [ -z ${REALPATH+x} ] || [ -z ${FPM+x} ] ; then
 
-    # Download all prerequisites and exit
-    info "source ${OPENCOARRAYS_SRC_DIR}/prerequisites/install-functions/download-all-prerequisites.sh"
-    source "${OPENCOARRAYS_SRC_DIR}/prerequisites/install-functions/download-all-prerequisites.sh"
-    info "download_all_prerequisites"
-    download_all_prerequisites
+  ask_permission_to_use_homebrew 
+  exit_if_user_declines "brew"
 
-  else
+  BREW="brew"
 
-    # Install Xcode command line tools (CLT) if on macOS and if needed
-    maybe_install_xcodeCLT
-    # Install OpenCoarrays
+  if ! command -v $BREW > /dev/null 2>&1; then
 
-    cd prerequisites || exit 1
-    installation_record=install-opencoarrays.log
-    # shellcheck source=./prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh
-    source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
-    version="$("${opencoarrays_src_dir}/install.sh" -V opencoarrays)"
+    ask_permission_to_install_homebrew
+    exit_if_user_declines "brew"
 
-    if [[ -z "${prefix_root:-}" ]]; then
-      set_SUDO_if_needed_to_write_to_directory "${install_path}"
-    else
-      set_SUDO_if_needed_to_write_to_directory "${prefix_root}"
+    if ! command -v curl > /dev/null 2>&1; then
+      echo "No download mechanism found. Please install curl and rerun ./install.sh"
+      exit 1
     fi
 
-    if grep -s -q Microsoft /proc/version  ; then
-      info "Windows Subsystem for Linux detected.  Invoking windows-install.sh with the following command:"
-      info "\"${opencoarrays_src_dir}\"/prerequisites/install-functions/windows-install.sh \"$@\""
-      "${opencoarrays_src_dir}"/prerequisites/install-functions/windows-install.sh "$@"
+    curl -L https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o $DEPENDENCIES_DIR/install-homebrew.sh --create-dirs
+    chmod u+x $DEPENDENCIES_DIR/install-homebrew.sh
+
+    if [ -p /dev/stdin ]; then 
+       echo ""
+       echo "Pipe detected.  Installing Homebrew requires sudo privileges, which most likely will"
+       echo "not work if you are installing non-interactively, e.g., via 'yes | ./install.sh'."
+       echo "To install OpenCoarrays non-interactiely, please rerun the OpenCoarrays installer after" 
+       echo "executing the following command to install Homebrew:"
+       echo "\"./$DEPENDENCIES_DIR/install-homebrew.sh\""
+       exit 1
     else
-      # Using process substitution "> >(...) -" instead of piping to tee via "2>&1 |" ensures that
-      # report_results gets the FC value set in build_opencoarrays
-      # Source: http://stackoverflow.com/questions/8221227/bash-variable-losing-its-value-strange
-      build_opencoarrays > >( tee ../"${installation_record}" ) -
-      report_results 2>&1 | tee -a ../"${installation_record}"
+      ./$DEPENDENCIES_DIR/install-homebrew.sh
+      rm $DEPENDENCIES_DIR/install-homebrew.sh
+    fi
+
+    if [ $(uname) = "Linux" ]; then
+      BREW=/home/linuxbrew/.linuxbrew/bin/brew
+      eval "$($BREW shellenv)"
     fi
   fi
 
-elif [[ "${arg_p:-}" == "ofp" ]]; then
+  if [ -z ${MPIFC+x} ] || [ -z ${MPICC+x} ]; then
+    ask_permission_to_install_homebrew_package "'mpifort' and 'mpicc'" "open-mpi"
+    exit_if_user_declines "mpifort and mpicc"
+    "$BREW" install open-mpi
+  fi
+  MPIFC=`which mpifort`
+  MPICC=`which mpicc`
+
+  if [ -z ${PKG_CONFIG+x} ]; then
+    ask_permission_to_install_homebrew_package "'pkg-config'"
+    exit_if_user_declines "pkg-config"
+    "$BREW" install pkg-config
+  fi
+  PKG_CONFIG=`which pkg-config`
 
-  # Install Xcode command line tools (CLT) if on macOS and if needed
-  maybe_install_xcodeCLT
+  if [ -z ${REALPATH+x} ] ; then
+    ask_permission_to_install_homebrew_package "'realpath'" "coreutils"
+    exit_if_user_declines "realpath"
+    "$BREW" install coreutils
+  fi
+  REALPATH=`which realpath`
+
+  if [ -z ${FPM+x} ] ; then
+    ask_permission_to_install_homebrew_package "'fpm'"
+    exit_if_user_declines "fpm"
+    "$BREW" tap awvwgk/fpm
+    "$BREW" install fpm
+  fi
+  FPM=`which fpm`
+fi
 
-  info "Invoking Open Fortran Parser build script with the following command:"
-  info "\"${opencoarrays_src_dir}\"/prerequisites/install-ofp.sh"
-  "${opencoarrays_src_dir}"/prerequisites/install-ofp.sh
+PREFIX=`$REALPATH ${PREFIX:-"${HOME}/.local"}`
+echo "PREFIX=$PREFIX"
+
+PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig"
+mkdir -p "$PKG_CONFIG_PATH"
+echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
+
+CAF_VERSION=$(sed -n '/[0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}/{s/^\([^.]*\)\([0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}\)\(.*\)/\2/p;q;}' .VERSION)
+Fortran_COMPILER="$(which $($MPIFC --showme:command))"
+CAF_MPI_Fortran_LINK_FLAGS="$($MPIFC --showme:link)"
+CAF_MPI_Fortran_COMPILE_FLAGS=""
+CAF_MPI_C_COMPILE_FLAGS="$($MPICC --showme:link)"
+CAF_LIBS="lib/libopencoarrays.a"
+
+MPIFC_LIBS="$($MPIFC --showme:libs)"
+MPIFC_LIBS="$(echo -L${MPIFC_LIBS} | sed -n -e 's/\ / -l/g')"
+
+MPIFC_LIB_DIRS="$($MPIFC --showme:libdirs)"
+MPIFC_LIB_DIRS="$(echo -L${MPIFC_LIB_DIRS} | sed -n -e 's/\ / -L/g')"
+
+OPENCOARRAYS_LIBS="-L$PREFIX/lib/ -lopencoarrays"
+
+OPENCOARRAYS_PC="$PKG_CONFIG_PATH/opencoarrays.pc"
+echo "OPENCOARRAYS_FC=$MPIFC"                                                    > $OPENCOARRAYS_PC
+echo "OPENCOARRAYS_CC=$MPICC"                                                   >> $OPENCOARRAYS_PC
+echo "OPENCOARRAYS_CFLAGS='-DPREFIX_NAME=_gfortran_caf_ -DGCC_GE_7 -DGCC_GE_8'" >> $OPENCOARRAYS_PC
+echo "OPENCOARRAYS_LIBS=$OPENCOARRAYS_LIBS"                                     >> $OPENCOARRAYS_PC
+echo ""                                                                         >> $OPENCOARRAYS_PC
+echo "Name: OpenCoarrays"                                                       >> $OPENCOARRAYS_PC
+echo "Description: Coarray Fortran parallel runtime library"                    >> $OPENCOARRAYS_PC
+echo "URL: https://github.com/sourceryinstitute/opencoarrays"                   >> $OPENCOARRAYS_PC
+echo "Version: $CAF_VERSION"                                                    >> $OPENCOARRAYS_PC
+echo "Libs: ${OPENCOARRAYS_LIBS}"                                               >> $OPENCOARRAYS_PC
+
+exit_if_pkg_config_pc_file_missing()
+{
+  export PKG_CONFIG_PATH
+  if ! $PKG_CONFIG $1 ; then
+    echo "$1.pc pkg-config file not found in $PKG_CONFIG_PATH"
+    exit 1
+  fi
+}
+exit_if_pkg_config_pc_file_missing "opencoarrays"
+
+build_script_dir="build/script-templates"
+mkdir -p $build_script_dir
+
+CAF_MPI_LIBS="$MPIFC_LIB_DIRS"
+
+cp src/script-templates/caf.in $build_script_dir/caf.in
+sed -i'' -e "s/@CAF_VERSION@/$CAF_VERSION/g"                                     $build_script_dir/caf.in
+sed -i'' -e "s:@Fortran_COMPILER@:$Fortran_COMPILER:g"                           $build_script_dir/caf.in
+sed -i'' -e "s:@CAF_MPI_Fortran_LINK_FLAGS@:$CAF_MPI_Fortran_LINK_FLAGS:g"       $build_script_dir/caf.in
+sed -i'' -e "s:@CAF_MPI_Fortran_COMPILE_FLAGS@:$CAF_MPI_Fortran_COMPILE_FLAGS:g" $build_script_dir/caf.in
+sed -i'' -e "s:@CAF_LIBS@:$CAF_LIBS:g"                                           $build_script_dir/caf.in
+sed -i'' -e "s:@CAF_MPI_LIBS@:$CAF_MPI_LIBS:g"                                   $build_script_dir/caf.in
+cp build/script-templates/caf.in "$PREFIX"/bin/caf
+
+MPIEXEC="$(which mpiexec)"
+HAVE_FAILED_IMG=false
+MPIEXEC_NUMPROC_FLAG="-n"
+MPIEXEC_PREFLAGS=""
+MPIEXEC_POSTFLAGS=""
+
+cp src/script-templates/cafrun.in $build_script_dir/cafrun.in
+sed -i'' -e "s/@CAF_VERSION@/$CAF_VERSION/g"                   $build_script_dir/cafrun.in
+sed -i'' -e "s:@MPIEXEC@:$MPIEXEC:g"                           $build_script_dir/cafrun.in
+sed -i'' -e "s/@MPIEXEC_NUMPROC_FLAG@/$MPIEXEC_NUMPROC_FLAG/g" $build_script_dir/cafrun.in
+sed -i'' -e "s/@MPIEXEC_PREFLAGS@/$MPIEXEC_PREFLAGS/g"         $build_script_dir/cafrun.in
+sed -i'' -e "s/@MPIEXEC_POSTFLAGS@/$MPIEXEC_POSTFLAGS/g"       $build_script_dir/cafrun.in
+sed -i'' -e "s/@HAVE_FAILED_IMG@/$HAVE_FAILED_IMG/g"           $build_script_dir/cafrun.in
+cp $build_script_dir/cafrun.in "$PREFIX"/bin/cafrun
+
+if [ ! -x "$PREFIX"/bin/caf ]; then
+  echo "caf not installed in '$PREFIX'/bin"
+  exit 1
+fi
 
-elif [[ ! -z "${arg_p:-}" ]]; then
+if [ ! -x "$PREFIX"/bin/cafrun ]; then
+  echo "cafrun not installed in '$PREFIX'/bin"
+  exit 1
+fi
 
-  # Install Xcode command line tools (CLT) if on macOS and if needed
-  maybe_install_xcodeCLT
+cp src/script-templates/install.rsp-template $build_script_dir
+sed -i'' -e "s:@MPIFC@:'$MPIFC':g" $build_script_dir/install.rsp-template
+sed -i'' -e "s:@MPICC@:'$MPICC':g" $build_script_dir/install.rsp-template
+mv $build_script_dir/install.rsp-template build/install.rsp
+fpm @build/install
 
-  info "Invoking build script with the following command:"
-  info "\"${opencoarrays_src_dir}\"/prerequisites/build.sh ${*:-}"
-  "${opencoarrays_src_dir}"/prerequisites/build.sh "${@:-}"
+cp "src/script-templates/test.rsp-template" $build_script_dir
+sed -i'' -e "s:@CAF@:'$PREFIX'/bin/caf:g" "$build_script_dir/test.rsp-template"
+sed -i'' -e "s:@MPICC@:'$MPICC':g" "$build_script_dir/test.rsp-template"
+mv "$build_script_dir/test.rsp-template" "build/test.rsp"
 
+if [ ! -f "$PREFIX"/lib/libopencoarrays.a ]; then
+  echo "libopencoarrays.a not installed in '$PREFIX'/lib"
+  exit 1
 fi
-# ____________________________________ End of Main Body ____________________________________________
+
+echo ""
+echo "________________ OpenCoarrays has been installed ________________"
+echo ""
+echo "OpenCoarrays users: compile and launch parallel Fortran programs the installed scripts:"
+echo ""
+echo "$PREFIX/bin/caf example/hello.f90"
+echo "$PREFIX/bin/cafrun -n 4 ./a.out"
+echo ""
+echo "The following command should work now to reinstall or test OpenCoarrays, respectively:"
+echo ""
+echo "fpm @build/install"
+echo "fpm @build/test -- -d -v"
+echo ""
+echo "where the '-- -d -v' arguments instruct the Garden unit testing framework to print"
+echo "verbose debugging information."
diff --git a/install.sh-usage b/install.sh-usage
deleted file mode 100644
index 937c4ef6a..000000000
--- a/install.sh-usage
+++ /dev/null
@@ -1,25 +0,0 @@
-  -b --install-branch [arg]   Install the specified repository development branch (Examples: -b master).
-  -c --with-c [arg]           Use specified C compiler (Example: -c /usr/local/bin/gcc).
-  -C --with-cxx [arg]         Use specified C++ compiler (Example: -C /usr/local/bin/g++).
-  -d --debug                  Enable debug mode.
-  -D --print-downloader [arg] Print download program for package specified in argument (Example: -D gcc).
-  -e --verbose                Enable verbose mode, print script as it is executed.
-  -f --with-fortran [arg]     Use specified Fortran compiler (Example: -f /usr/local/bin/gfortran).
-  -h --help                   Print this page.
-  -i --install-prefix [arg]   Install package in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/${package_name:-}/${version_to_build:-}"
-  -I --install-version [arg]  Install package version (Example: -I 7.2.0).
-  -j --num-threads [arg]      Number of threads to use when invoking make (Example: -j 8). Default="4"
-  -l --list-packages          Print packages this script can install.
-  -m --with-cmake [arg]       Use specified CMake installation (Example: -m /usr/local/bin/cmake).
-  -M --with-mpi [arg]         Use specified MPI installation (Examples: -M /usr/local/ or -m /opt/mpich-3.2/).
-  -n --no-color               Disable color output.
-  -o --only-download          Download (without building) the source for the package specified by -p or --package.
-  -p --package [arg]          Install specified package (Examples: -p gcc or -p mpich). Default="opencoarrays"
-  -P --print-path [arg]       Print installation directory for specified package (Example: -P gcc).
-  -r --prefix-root [arg]      Installation path to which package name/version will be appended. (Example: -r /opt).
-  -u --from-url [arg]         Specify a URL to use for downloading a package (Example: -u https://github.com/sourceryinstitute/gcc/archive/teams-rc3.tar.gz).
-  -U --print-url [arg]        Print download location for specified package (Example: -U gcc).
-  -v --version                Print OpenCoarrays version number.
-  -V --print-version [arg]    Print version number for specified package (Example: -V mpich).
-  -y --yes-to-all             Build non-interactively by assuming affirmative user responses.
-  -Z --bootstrap              Enable bootstrap build for robustness when building the required GCC version with an old GCC version.
diff --git a/prerequisites/acceptable_compiler.f90 b/prerequisites/acceptable_compiler.f90
deleted file mode 100644
index 879f7c2f3..000000000
--- a/prerequisites/acceptable_compiler.f90
+++ /dev/null
@@ -1,153 +0,0 @@
-!
-! acceptable_compiler
-!
-! -- Report whether the compiler version equals or exceeds the first
-!    OpenCoarrays-aware version
-!
-! OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-! Copyright (c) 2015, 2016, Sourcery, Inc.
-! Copyright (c) 2015, 2016, Sourcery Institute
-! All rights reserved.
-!
-! Redistribution and use in source and binary forms, with or without modification,
-! are permitted provided that the following conditions are met:
-!
-! 1. Redistributions of source code must retain the above copyright notice, this
-!    list of conditions and the following disclaimer.
-! 2. Redistributions in binary form must reproduce the above copyright notice, this
-!    list of conditions and the following disclaimer in the documentation and/or
-!    other materials provided with the distribution.
-! 3. Neither the names of the copyright holders nor the names of their contributors
-!    may be used to endorse or promote products derived from this software without
-!    specific prior written permission.
-!
-! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-! ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-! WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-! IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-! INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-! NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-! WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-! POSSIBILITY OF SUCH DAMAGE.
-
-program main
-  !! input: acceptable compiler version in the form major.minor.patch
-  !! output:
-  !!   .true. if compiler version >= acceptable version
-  !!   .false. otherwise
-  use iso_fortran_env, only : compiler_version
-  implicit none
-
-  integer, parameter :: first_argument=1, max_version_length=len('999.999.999')
-  integer stat
-  character(len=max_version_length) acceptable_version
-
-  call get_command_argument(first_argument,acceptable_version,status=stat)
-  call validate_command_line( stat )
-
-  print *, meets_minimum( acceptable_version )
-
-contains
-
-  pure function meets_minimum( required_version ) result( acceptable)
-    character(len=*), intent(in) :: required_version
-    logical acceptable
-
-    acceptable = .false. ! default result
-
-    associate( actual_version => compiler_version() )
-      associate(major_version=>major(actual_version), acceptable_major=>major(required_version))
-        if (major_version < acceptable_major) return
-        if (major_version > acceptable_major) then
-          acceptable = .true.
-          return
-        end if
-        associate(minor_version=>minor(actual_version), acceptable_minor=>minor(required_version))
-          if (minor_version < acceptable_minor) return
-          if (minor_version > acceptable_minor) then
-            acceptable = .true.
-            return
-          end if
-          associate(patch_version=>patch(actual_version), acceptable_patch=>patch(required_version))
-            if (patch_version < acceptable_patch) return
-            acceptable = .true.
-          end associate
-        end associate
-      end associate
-    end associate
-
-  end function
-
-  pure subroutine validate_command_line( command_line_status )
-    integer, intent(in) :: command_line_status
-    select case(command_line_status)
-      case(-1)
-         error stop "acceptable_compiler.f90: insufficient string length in attempt to read command argument"
-      case(0)
-        ! successful command argument read
-      case(1:)
-         error stop "acceptable_compiler.f90: no version-number supplied"
-      case default
-         error stop "invalid status"
-    end select
-   end subroutine
-
-  pure function major(version_string) result(major_value)
-    character(len=*), intent(in) :: version_string
-    integer major_value
-    character(len=:), allocatable :: leading_digits
-
-    associate( first_dot => scan(version_string, '.') )
-      associate( first_digit => scan( version_string(1:first_dot-1), '0123456789' ) )
-        leading_digits = version_string( first_digit : first_dot-1  )
-        read(leading_digits,*) major_value
-      end associate
-    end associate
-
-  end function
-
-  pure function minor(version_string) result(minor_value)
-    character(len=*), intent(in) :: version_string
-    integer minor_value
-    character(len=:), allocatable :: middle_digits
-
-    associate( first_dot => scan(version_string, '.') )
-      associate( second_dot => first_dot + scan(version_string(first_dot+1:), '.') )
-        middle_digits = version_string( first_dot+1 : second_dot-1 )
-        read(middle_digits,*) minor_value
-      end associate
-    end associate
-
-  end function
-
-  pure function patch(version_string) result(patch_value)
-    use iso_fortran_env, only : iostat_end
-    character(len=*), intent(in) :: version_string
-    integer patch_value, io_stat
-    character(len=:), allocatable :: trailing_digits
-
-    associate( first_dot => scan(version_string, '.') )
-      associate( second_dot => first_dot + scan(version_string(first_dot+1:), '.') )
-        associate( next_non_digit=> second_dot + next_printable_non_digit(version_string(second_dot+1:)) )
-          trailing_digits = version_string( second_dot+1 : next_non_digit-1 )
-          read(trailing_digits, * , iostat=io_stat) patch_value
-        end associate
-      end associate
-    end associate
-
-  end function
-
-  pure function next_printable_non_digit( string ) result(location)
-    character(len=*), intent(in) :: string
-    integer i, location
-    integer, parameter :: ASCII_non_digit(*)=[(i,i=32,47),(i,i=58,126)]
-    character(len=1), parameter :: non_digit(*)=[( char(ASCII_non_digit(i)) , i=1, size(ASCII_non_digit) )]
-    character(len=size(non_digit)) non_digit_string
-    write(non_digit_string,'(85a)') non_digit
-    location = scan(string,non_digit_string)
-    if (location==0) location=len(string)+1
-  end function
-
-end program
diff --git a/prerequisites/build-functions/build_and_install.sh b/prerequisites/build-functions/build_and_install.sh
deleted file mode 100644
index e995f4b0b..000000000
--- a/prerequisites/build-functions/build_and_install.sh
+++ /dev/null
@@ -1,153 +0,0 @@
-# shellcheck shell=bash
-# Make the build directory, configure, and build
-# shellcheck disable=SC2154
-
-# shellcheck source=prerequisites/build-functions/edit_GCC_download_prereqs_file_if_necessary.sh
-source "${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/edit_GCC_download_prereqs_file_if_necessary.sh"
-
-function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
-
-build_and_install()
-{
-  num_threads=${arg_j}
-  build_path="${OPENCOARRAYS_SRC_DIR}/prerequisites/builds/${package_to_build}-${version_to_build}"
-
-  info "Building ${package_to_build} ${version_to_build}"
-  info "Build path: ${build_path}"
-  info "Installation path: ${install_path}"
-
-  set_SUDO_if_needed_to_write_to_directory "${build_path}"
-  set_SUDO_if_needed_to_write_to_directory "${install_path}"
-  if [[ -d "${build_path}" ]]; then
-    rm -rf "${build_path}"
-  fi
-  mkdir -p "${build_path}"
-  info "pushd ${build_path}"
-  pushd "${build_path}" || emergency "build_and_install.sh: pushd failed"
-
-  if [[ "${package_to_build}" != "gcc" ]]; then
-
-    if [[ "${package_to_build}" == "mpich" ]]; then
-      if [[ "${version_to_build}" == "3.2" ]]; then
-        info "Patching MPICH 3.2 on Mac OS due to segfault bug (see http://lists.mpich.org/pipermail/discuss/2016-May/004764.html)."
-        sed 's/} MPID_Request ATTRIBUTE((__aligned__(32)));/} ATTRIBUTE((__aligned__(32))) MPID_Request;/g' \
-          "${download_path}/${package_source_directory}/src/include/mpiimpl.h" > "${download_path}/${package_source_directory}/src/include/mpiimpl.h.patched"
-        cp "${download_path}/${package_source_directory}/src/include/mpiimpl.h.patched" "${download_path}/${package_source_directory}/src/include/mpiimpl.h"
-      fi
-
-      FC_version=$($FC --version)
-      text_before_dot="${FC_version%%.*}" # grab text before first dot
-      major_version="${text_before_dot##* }" # grab text after final space
-      if (( ${major_version} >= 10 )); then
-       export FFLAGS="-w -fallow-argument-mismatch"
-      fi
-    fi
-
-    if [[ "${package_to_build}" == "cmake"  && $(uname) == "Linux" ]]; then
-
-      export cmake_binary_installer="${download_path}/cmake-${version_to_build}-Linux-x86_64.sh"
-      ${SUDO:-} mkdir -p "$install_path"
-      chmod u+x "${cmake_binary_installer}"
-      if [[ -n "${SUDO:-}" ]]; then
-        info "You do not have write permissions to the installation path ${install_path}"
-        info "If you have administrative privileges, enter your password to install ${package_to_build}"
-      fi
-      info "Installing Cmake with the following command: "
-      info "${SUDO:-} \"${cmake_binary_installer}\" --prefix=\"$install_path\" --exclude-subdir"
-      ${SUDO:-} "${cmake_binary_installer}" --prefix="$install_path" --exclude-subdir
-
-    else # build from source
-
-      info "Configuring ${package_to_build} ${version_to_build} with the following command:"
-      info "FFLAGS=${FFLAGS:-} FC=\"${FC:-'gfortran'}\" CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" \"${download_path}/${package_source_directory}\"/configure --prefix=\"${install_path}\""
-      FFLAGS=${FFLAGS:-} FC="${FC:-'gfortran'}" CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" "${download_path}/${package_source_directory}"/configure --prefix="${install_path}"
-      info "Building with the following command:"
-      info "FC=\"${FC:-'gfortran'}\" CC=\"${CC:-'gcc'}\" CXX=\"${CXX:-'g++'}\" make -j\"${num_threads}\""
-      FC="${FC:-'gfortran'}" CC="${CC:-'gcc'}" CXX="${CXX:-'g++'}" make "-j${num_threads}"
-      info "Installing ${package_to_build} in ${install_path}"
-      if [[ -n "${SUDO:-}" ]]; then
-        info "You do not have write permissions to the installation path ${install_path}"
-        info "If you have administrative privileges, enter your password to install ${package_to_build}"
-      fi
-      info "Installing with the following command: ${SUDO:-} make install"
-      ${SUDO:-} make install
-
-    fi
-
-  elif [[ ${package_to_build} == "gcc" ]]; then
-
-    # Warn about header prerequisite on macOS Mojave or subsequent versions
-    if [[ $(uname) == "Darwin" ]]; then
-      export kernel=$(uname -r)
-      export Mojave="18.0.0"
-      export Catalina="19.0.0"
-      if [ $(version $kernel) -ge $(version $Mojave) ]; then
-        if [ $(version $kernel) -ge $(version $Catalina) ]; then
-          export with_sysroot="--with-sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
-        else
-          info ""
-          info "______________________________________________________________________________"
-          info "Detected Darwin $kernel (Mojave).  If $package_to_build build fails due to a"
-          info "missing header (*.h) file, please try something like the following bash command:"
-          info "open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg"
-          info "Follow the prompts to install the missing headers. Then restart this $this_script."
-          info "See https://bit.ly/build-gcc-on-mojave for more details."
-          if [[ "${arg_y}" == "${__flag_present}" ]]; then
-            info "-y or --yes-to-all flag present. Proceeding with non-interactive build."
-          else
-            info "Would you like to proceed anyway? (Y/n)"
-            read -r proceed
-            if [[ "${proceed}" == "n" || "${proceed}" == "N" || "${proceed}" == "no"  ]]; then
-              info "n"
-              emergency "Aborting. [exit 80]"
-            else
-              info "y"
-            fi
-          fi
-        fi
-      fi
-    fi
-
-    info "pushd ${download_path}/${package_source_directory} "
-    pushd "${download_path}/${package_source_directory}" || emergency "build_and_install.sh: pushd failed"
-
-    # Patch gfortran if necessary
-    export patches_dir="${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/patches/${package_to_build}/${version_to_build}"
-    if [[ -d "${patches_dir:-}" ]]; then
-      for patch in "${patches_dir%/}"/*.diff ; do
-	info "Applying patch ${patch##*/} to $package_to_build ${version_to_build}."
-	patch -p1 < "$patch"
-      done
-    fi
-
-    # Use GCC's contrib/download_prerequisites script after modifying it, if necessary, to use the
-    # the preferred download mechanism set in prerequisites/build-functions/set_or_print_downloader.sh
-
-    # Switch download mechanism if wget is not available
-    edit_GCC_download_prereqs_file_if_necessary
-
-    # Download GCC prerequisities
-    "${PWD}"/contrib/download_prerequisites
-
-    info "popd"
-    popd || emergency "build_and_install.sh: popd failed"
-    info "Configuring gcc/g++/gfortran builds with the following command:"
-    info "${download_path}/${package_source_directory}/configure --prefix=${install_path} --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror ${bootstrap_configure} ${with_sysroot:-}"
-    "${download_path}/${package_source_directory}/configure" --prefix="${install_path}" --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror "${bootstrap_configure}" "${with_sysroot:-}"
-    info "Building with the following command: make -j ${num_threads} ${bootstrap_build}"
-    make -j ${num_threads} ${bootstrap_build:-}
-    if [[ -n "${SUDO:-}" ]]; then
-      info "You do not have write permissions to the installation path ${install_path}"
-      info "If you have administrative privileges, enter your password to install ${package_to_build}"
-    fi
-    info "Installing with the following command: ${SUDO:-} make install"
-    ${SUDO:-} make install
-
-  else
-     emergency "This branch should never be reached."
-  fi # end if [[ "${package_to_build}" != "gcc"  && "${package_to_build}" != "cmake"  ]]; then
-
-
-  info "popd"
-  popd || emergency "build_and_install.sh: popd failed"
-}
diff --git a/prerequisites/build-functions/download_if_necessary.sh b/prerequisites/build-functions/download_if_necessary.sh
deleted file mode 100644
index 254ce64e6..000000000
--- a/prerequisites/build-functions/download_if_necessary.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-# shellcheck shell=bash disable=SC2148
-# shellcheck source=./ftp_url.sh
-source "${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/ftp_url.sh"
-# shellcheck source=./set_SUDO_if_needed_to_write_to_directory.sh
-source "${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
-
-# Download package if the tar ball is not already in the present working directory
-# shellcheck disable=SC2154
-download_if_necessary()
-{
-  download_path="${OPENCOARRAYS_SRC_DIR}/prerequisites/downloads"
-  set_SUDO_if_needed_to_write_to_directory "${download_path}"
-
-  # We set args regardless of whether this function performs a download because
-  # GCC builds will need this to modify GCC's contrib/download_prerequisites script
-
-  case "${fetch}" in
-    "wget" )
-      args=("--no-check-certificate")
-      ;;
-    "ftp_url" )
-      args=("-n")
-      ;;
-    "git" )
-      args=("clone" "-b" "${arg_b}")
-      ;;
-    "curl" )
-      first_three_characters=$(echo "${package_url}" | cut -c1-3)
-      case "${first_three_characters}" in
-        "ftp"  )
-           args=("-LO" "-u" "anonymous: ")
-        ;;
-        "htt"  )
-           args=("-LO")
-        ;;
-        *)
-          emergency "download_if_necessary.sh: Unrecognized URL."
-        ;;
-      esac
-      ;;
-    *)
-      emergency "download_if_necessary.sh: Unrecognized \${fetch}=${fetch}."
-      ;;
-  esac
-
-  case "${gcc_prereqs_fetch}" in
-    "wget" )
-      gcc_prereqs_fetch_args=("--no-check-certificate")
-      ;;
-    "ftp_url" )
-      gcc_prereqs_fetch_args=("-n")
-      ;;
-    "curl" )
-      gcc_prereqs_fetch_args=("-LO" "-u" "anonymous: ")
-      ;;
-    *)
-      emergency "download_if_necessary.sh: Unrecognized \${gcc_prereqs_fetch}=${gcc_prereqs_fetch}."
-      ;;
-   esac
-
-  if  [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail}" ]]; then
-    info "Found '${url_tail##*branches/}' in ${download_path}."
-    info "If it resulted from an incomplete download, building ${package_name} could fail."
-    if [[ "${arg_y}" == "${__flag_present}" ]]; then
-      info "-y or --yes-to-all flag present. Proceeding with non-interactive build."
-    else
-      info "Would you like to proceed anyway? (Y/n)"
-      read -r proceed
-      if [[ "${proceed}" == "n" || "${proceed}" == "N" || "${proceed}" == "no"  ]]; then
-        info "n"
-        info "Please remove ${url_tail##*branches/} and restart the installation to to ensure a fresh download." 1>&2
-        emergency "Aborting. [exit 80]"
-      else
-        info "y"
-      fi
-    fi
-  elif ! type "${fetch}" &> /dev/null; then
-    # The download mechanism is missing
-    info "The default download mechanism for ${package_name} is ${fetch}."
-    info "Please either ensure that ${fetch} is installed and in your PATH"
-    info "or download the ${package_name} source from "
-    info "${package_url}"
-    info "Place the downloaded file in ${download_path} and restart this script."
-    emergency "Aborting [exit 90]"
-  else
-
-    if [[ "${fetch}" == "git" ]]; then
-      package_source_directory="${package_name}"
-    else
-      package_source_directory="${package_name}-${version_to_build}"
-    fi
-    info "Downloading ${package_name} ${version_to_build-} to the following location:"
-    info "${download_path}/${package_source_directory}"
-    info "Download command: \"${fetch}\" ${args[@]:-} ${package_url}"
-    info "Depending on the file size and network bandwidth, this could take several minutes or longer."
-    pushd "${download_path}"
-    "${fetch}" ${args[@]:-} "${package_url}"
-    popd
-    if [[ "${fetch}" == "git" ]]; then
-      search_path="${download_path}/${package_name}"
-    else
-      search_path="${download_path}/${url_tail}"
-    fi
-    if [[ -f "${search_path}" || -d "${search_path}" ]]; then
-      info "Download succeeded. The ${package_name} source is in the following location:"
-      info "${search_path}"
-    else
-      info "Download failed. The ${package_name} source is not in the following, expected location:"
-      info "${search_path}"
-      emergency "Aborting. [exit 110]"
-    fi
-  fi
-}
diff --git a/prerequisites/build-functions/edit_GCC_download_prereqs_file_if_necessary.sh b/prerequisites/build-functions/edit_GCC_download_prereqs_file_if_necessary.sh
deleted file mode 100644
index 5b4a6628a..000000000
--- a/prerequisites/build-functions/edit_GCC_download_prereqs_file_if_necessary.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-# shellcheck disable=SC2154
-replace_wget()
-{
-  # Define a file extension for the download_prerequisites backup
-  backup_extension=".original"
-  backup_file="${download_prereqs_file}${backup_extension}"
-  if [[ -f ${backup_file}  ]]; then
-    # Prevent overwriting an existing backup:
-    backup_extension=""
-  fi
-
-  if [[ "${gcc_prereqs_fetch}" == "ftp_url" ]]; then
-    # Insert a new line after line 2 to include ftp_url.sh as a download option
-    sed -i${backup_extension} -e '2 a\'$'\n'". ${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/ftp_url.sh"$'\n' "${download_prereqs_file}"
-  fi
-
-  arg_string="${gcc_prereqs_fetch_args[*]:-}"
-
-  info "Using the following command to replace wget in the GCC download_prerequisites file:"
-  info "sed -i${backup_extension} s/\"${wget_command}\"/\"${gcc_prereqs_fetch} ${arg_string} \"/ \"${download_prereqs_file}\""
-  if [[ "${__operating_system}" == "Linux" ]]; then
-    sed -i"${backup_extension}" s/wget/"${gcc_prereqs_fetch} ${arg_string} "/ "${download_prereqs_file}"
-  else
-    sed -i "${backup_extension}" s/wget/"${gcc_prereqs_fetch} ${arg_string} "/ "${download_prereqs_file}"
-  fi
-}
-
-edit_GCC_download_prereqs_file_if_necessary()
-{
-  __operating_system=$(uname)
-  download_prereqs_file="${PWD}/contrib/download_prerequisites"
-
-  # Grab the line with the first occurence of 'wget'
-  wget_line=$(grep wget "${download_prereqs_file}" | head -1) || true
-  wget_command="${wget_line%%ftp*}" # grab everything before ftp
-
-  # Check for wget format used before GCC 7
-  if [[ ! -z "${wget_command}" ]]; then
-    # Check whether wget is available on this system
-    if ! type wget &> /dev/null; then
-      replace_wget
-    fi
-  fi
-}
diff --git a/prerequisites/build-functions/ftp_url.sh b/prerequisites/build-functions/ftp_url.sh
deleted file mode 100644
index 8b15b08ed..000000000
--- a/prerequisites/build-functions/ftp_url.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-# Download a file from an anonymous ftp site
-#
-# Usage:
-#    ftp_url  <ftp-mode>  ftp://<fully-qualified-domain>:/<path-to-file>/<file-name>
-#
-# Example:
-#    ftp_url -n ftp://ftp.gnu.org:/gnu/gcc/gcc-6.1.0/gcc-6.1.0.tar.bz2
-ftp_url()
-{
-  ftp_mode="${1}"
-  url="${2}"
-
-  if [ "${ftp_mode}" != "-n" ]; then
-    echo "Unexpected ftp mode received by ftp_url.sh: ${ftp_mode}"
-  fi
-
-  protocol="${url%%:*}" # grab text_before_first_colon
-  if [ "${protocol}" != "ftp" ]; then
-    echo "URL with unexpected protocol received by ftp_url.sh: ${text_before_first_colon}"
-  fi
-
-  text_after_double_slash="${url##*//}"
-  FTP_SERVER="${text_after_double_slash%%/*}" # grab remaining text before first slash
-  FILE_NAME="${url##*/}" # grab text after final slash
-
-  text_after_final_colon="${url##*:}"
-  FILE_PATH="${text_after_final_colon#*//}"
-  FILE_PATH="${FILE_PATH#*/}" 
-  FILE_PATH="${FILE_PATH%/*}" 
-
-  USERNAME=anonymous
-  PASSWORD="noone@nowhere.com"
-  echo "starting anonymous download: ${protocol} ${ftp_mode} ${FTP_SERVER};... cd ${FILE_PATH}; ...; get ${FILE_NAME}"
-
-ftp "${ftp_mode}" "${FTP_SERVER}" <<Done-ftp
-user "${USERNAME}" "${PASSWORD}"
-cd "${FILE_PATH}"
-passive
-binary
-get "${FILE_NAME}"
-bye
-Done-ftp
-
-echo "finished anonymous ftp"
-}
diff --git a/prerequisites/build-functions/patches/gcc/8.1.0/partially-revert-rev259385.diff b/prerequisites/build-functions/patches/gcc/8.1.0/partially-revert-rev259385.diff
deleted file mode 100644
index bd3833932..000000000
--- a/prerequisites/build-functions/patches/gcc/8.1.0/partially-revert-rev259385.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
-index 3e14ddc25d8..a0bbd584947 100644
---- a/gcc/fortran/dependency.c
-+++ b/gcc/fortran/dependency.c
-@@ -2238,9 +2238,8 @@ gfc_dep_resolver (gfc_ref *lref, gfc_ref *rref, gfc_reverse *reverse)
- 	    break;
- 
- 	  /* Exactly matching and forward overlapping ranges don't cause a
--	     dependency, when they are not part of a coarray ref.  */
--	  if (fin_dep < GFC_DEP_BACKWARD
--	      && lref->u.ar.codimen == 0 && rref->u.ar.codimen == 0)
-+	     dependency.  */
-+	  if (fin_dep < GFC_DEP_BACKWARD)
- 	    return 0;
- 
- 	  /* Keep checking.  We only have a dependency if
-diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
-index 00edd447bb2..87b3ca72c05 100644
---- a/gcc/fortran/trans-intrinsic.c
-+++ b/gcc/fortran/trans-intrinsic.c
-@@ -1860,7 +1860,7 @@ conv_caf_send (gfc_code *code) {
- 
-   lhs_expr = code->ext.actual->expr;
-   rhs_expr = code->ext.actual->next->expr;
--  may_require_tmp = gfc_check_dependency (lhs_expr, rhs_expr, false) == 0
-+  may_require_tmp = gfc_check_dependency (lhs_expr, rhs_expr, true) == 0
- 		    ? boolean_false_node : boolean_true_node;
-   gfc_init_block (&block);
-
diff --git a/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh b/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh
deleted file mode 100644
index 52182113a..000000000
--- a/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-# Define the sudo command to be used if the installation path requires administrative permissions
-set_SUDO_if_needed_to_write_to_directory()
-{
-  if [[ $# != "1" ]]; then
-    emergency "set_SUDO_if_needed_to_write_to_directory takes exactly one argument"
-  else
-    directory_to_create=$1
-  fi
-  if [[ -z "${LD_LIBRARY_PATH:-}" ]]; then
-     info "\${LD_LIBRARY_PATH} is empty. Try setting it if the compiler encounters linking problems."
-  fi
-  SUDO_COMMAND="sudo env LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-} PATH=${PATH:-}"
-  info "Checking whether the directory ${directory_to_create} exists... "
-  if [[ -d "${directory_to_create}" ]]; then
-    info "yes"
-    info "Checking whether I have write permissions to ${directory_to_create} ... "
-    if [[ -w "${directory_to_create}" ]]; then
-      info "yes"
-    else
-      info "no"
-      SUDO="${SUDO_COMMAND}"
-    fi
-  else
-    info "no"
-    info "Checking whether I can create ${directory_to_create} ... "
-    if mkdir -p "${directory_to_create}" >& /dev/null; then
-      info "yes."
-    else
-      info "no."
-      # shellcheck disable=SC2034
-      SUDO="${SUDO_COMMAND}"
-    fi
-  fi
-}
diff --git a/prerequisites/build-functions/set_compilers.sh b/prerequisites/build-functions/set_compilers.sh
deleted file mode 100644
index 642e1f4a3..000000000
--- a/prerequisites/build-functions/set_compilers.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-# Set CC, CXX, and FC
-# shellcheck disable=SC2154
-set_compilers()
-{
-  # If FC is already set, use the set value.
-  # Else if FC is empty, use the value specified via the -f or --with-fortran command-line arguments.
-  # Else use the default specifed in ../build.sh-usage.
-  FC=${FC:-${arg_f}}
-  info "Fortran compiler: ${FC}"
-
-  if [[ $(uname) == "Darwin" && "${package_to_build}" == "cmake"  ]]; then
-    if [[ -x "/usr/bin/gcc" ]]; then
-      [ ! -z "${CC:-}" ] && info "Overriding CC: cmake build requires Apple LLVM gcc, which XCode command-line tools puts in /usr/bin"
-      CC=/usr/bin/gcc
-    else
-      info      "OS X detected.  Please install XCode command-line tools and "
-      emergency "ensure that /usr/bin/gcc exists and is executable. Aborting."
-    fi
-  else
-    # If CC is already set, use the set value.
-    # Else if CC is empty, use the value specified via the -c or --with-c command-line arguments.
-    # Else use the default specifed in ../build.sh-usage.
-    CC=${CC:-${arg_c}}
-  fi
-  info "C compiler: ${CC}"
-
-  if [[ $(uname) == "Darwin" && ${package_to_build} == "cmake"  ]]; then
-    if [[ -x "/usr/bin/g++" ]]; then
-      [ ! -z "${CXX:-}" ] && info "Overriding CXX: cmake build requires Apple LLVM g++, which XCode command-line tools puts in /usr/bin"
-      CXX=/usr/bin/g++
-    else
-      info      "OS X detected.  Please install XCode command-line tools and "
-      emergency "ensure that /usr/bin/g++ exists and is executable. Aborting."
-    fi
-  else
-    # If CXX is already set, use the set value.
-    # Else if CXX is empty, use the value specified via the -C or --with-cxx command-line arguments.
-    # Else use the default specifed in ../build.sh-usage.
-    CXX=${CXX:-${arg_C}}
-  fi
-  info "C++ compiler: ${CXX}"
-}
diff --git a/prerequisites/build-functions/set_or_print_default_version.sh b/prerequisites/build-functions/set_or_print_default_version.sh
deleted file mode 100644
index 204d96cd1..000000000
--- a/prerequisites/build-functions/set_or_print_default_version.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-# shellcheck shell=bash disable=SC2148
-# If -p, -D, -P, or -U specifies a package, set default_version
-# If -V specifies a package, print the default_version and exit with normal status
-# If -l is present, list all packages and versions and exit with normal status
-# shellcheck disable=SC2154
-set_or_print_default_version()
-{
-  # Verify requirements
-  [ "${arg_l}" == "${__flag_present}" ] && [ ! -z "${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}}" ] &&
-    emergency "Please pass only one of {-l, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
-
-  if [[ "${arg_l}" == "${__flag_present}" ]]; then
-    echo "This script can build the following packages:"
-  fi
-  # Get package name from argument passed with -p, -V, -D, or -U
-  package_name="${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}" # not needed for -l
-
-  if [[ "${package_name}" == "ofp" ]]; then
-    "${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh" "${@}"
-    exit 0
-  fi
-
-  if [[ $(uname) == "Darwin" ]]; then
-    apple_flex_version="2.5.35"
-  fi
-
-  [ "${package_name}" == "opencoarrays" ] &&
-    emergency "Please use this script with a previously downloaded opencoarrays source archive. This script does not download opencoarrays "
-  # This is a bash 3 hack standing in for a bash 4 hash (bash 3 is the lowest common
-  # denominator because, for licensing reasons, OS X only has bash 3 by default.)
-  # See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
-  package_version=(
-    "cmake:3.10.0"
-    "gcc:10.1.0"
-    "mpich:3.2"
-    "wget:1.16.3"
-    "flex:${apple_flex_version:-2.6.0}"
-    "bison:3.0.4"
-    "pkg-config:0.28"
-    "make:4.1"
-    "m4:1.4.17"
-    "subversion:1.9.4"
-    "ofp:sdf"
-  )
-  for package in "${package_version[@]}" ; do
-     KEY="${package%%:*}"
-     VALUE="${package##*:}"
-     if [[  "${arg_l}" == "${__flag_present}" ]]; then
-       # If the list was requested, print the current element of the name:version list.
-       printf "%s (default version %s)\n" "${KEY}" "${VALUE}"
-     elif [[ "${package_name}" == "${KEY}" ]]; then
-       # We recognize the package name so we set the default version:
-       default_version=${VALUE}
-       # If a printout of the default version number was requested, then print it and exit with normal status
-       [[ ! -z "${arg_V}" ]] && printf "%s\n" "${default_version}" && exit 0
-       break # exit the for loop
-     fi
-  done
-
- # Exit with normal status (package/version has been printed).
- [ "${arg_l}" == "${__flag_present}" ] && exit 0
-
- # Exit with error status and diagnostic output if empty default_version
- if [[ -z "${default_version:-}" ]]; then
-    emergency "set_or_print_default.sh: Package ${package_name:-} not recognized.  Use --l or --list-packages to list the allowable names."
- fi
-}
diff --git a/prerequisites/build-functions/set_or_print_downloader.sh b/prerequisites/build-functions/set_or_print_downloader.sh
deleted file mode 100644
index 711f37e33..000000000
--- a/prerequisites/build-functions/set_or_print_downloader.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-# shellcheck shell=bash disable=SC2148
-# If -p, -P, -U, or -V specifies a package, set fetch variable
-# If -D specifies a package, print "${fetch}" and exit with normal status
-# If -l is present, list all packages and versions and exit with normal status
-# shellcheck disable=SC2154
-set_or_print_downloader()
-{
-  # Verify requirements
-  [ ! -z "${arg_D}" ] && [ ! -z "${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}" ] &&
-    emergency "Please pass only one of {-D, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
-
-  package_name="${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}"
-
-  if [[ "${package_name}" == "ofp" ]]; then
-    "${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh" "${@}"
-    exit 0
-  fi
-
-  # Choose the first available download mechanism, prioritizing first any absolute requirement
-  # (git for gcc) and second robustness:
-  info "Checking available download mechanisms: ftp, wget, and curl."
-  info "\${package_name}=${package_name}  \${arg_b:-}=${arg_b:-}"
-
-  if type curl &> /dev/null; then
-    gcc_prereqs_fetch=curl
-  elif type wget &> /dev/null; then
-    gcc_prereqs_fetch=wget
-  elif type ftp &> /dev/null; then
-    if [[ "${package_name}" == "wget" || "${package_name}" == "make" ||
-          "${package_name}" == "bison" || "${package_name}" == "m4"   ]]; then
-      gcc_prereqs_fetch=ftp_url
-    fi
-  else
-    tried="curl, wget, and ftp"
-  fi
-
-  if [[ "${package_name}" == "gcc" && ! -z ${arg_b:-} ]]; then
-    if type git &> /dev/null; then
-      fetch=git
-    else
-      tried="git"
-    fi
-  else
-    fetch=${gcc_prereqs_fetch}
-  fi
-
-  if [[ -z "${fetch:-}" ]]; then
-    emergency "No available download mechanism. Option(s) tried: ${tried}"
-  fi
-
-  # If a printout of the download mechanism was requested, then print it and exit with normal status
-  if [[ ! -z "${arg_D}" ]]; then
-     printf "%s\n" "${fetch}"
-     exit 0
-  fi
-}
diff --git a/prerequisites/build-functions/set_or_print_installation_path.sh b/prerequisites/build-functions/set_or_print_installation_path.sh
deleted file mode 100644
index f0778eb54..000000000
--- a/prerequisites/build-functions/set_or_print_installation_path.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-# If -P specifies a package, print the installation path and exit with normal status
-# Otherwise, set install_path
-# shellcheck disable=SC2154
-set_or_print_installation_path()
-{
-  # Verify requirements
-  [ ! -z "${arg_P}" ] && [ ! -z "${arg_p:-${arg_D:-${arg_U:-${arg_V}}}}" ] &&
-    emergency "Please pass only one of {-D, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
-
-  if [[ $arg_p == "opencoarrays" ]]; then
-    export version_to_build=$(${OPENCOARRAYS_SRC_DIR}/install.sh -V opencoarrays)
-    export package_name="opencoarrays"
-  fi
-  arg_i_default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/"
-  if [[ "${arg_i%/}" == "${arg_i_default}" ]]; then
-    if [[ -z "${arg_r}" ]]; then
-      export install_path="${arg_i%/}/${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}/${version_to_build}"
-    else
-      export install_path="${arg_r%/}/${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}/${version_to_build}"
-    fi
-  else
-    if [[ ! "${arg_i%/}" != "${arg_r}" ]]; then
-      emergency "Please pass only one of {-i,-r} or a longer equivalent (multiple detected). [exit 105]"
-    fi
-    install_path="${arg_i%/}"
-  fi
-
-  # If -P is present, print ${install_path} and exit with normal status
-  if [[ ! -z "${arg_P:-}" ]]; then
-    printf "%s\n" "${install_path}"
-    exit 0
-  fi
-
-  info "${package_name} ${version_to_build} installation path: ${install_path}"
-}
diff --git a/prerequisites/build-functions/set_or_print_url.sh b/prerequisites/build-functions/set_or_print_url.sh
deleted file mode 100644
index 4665098db..000000000
--- a/prerequisites/build-functions/set_or_print_url.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-# shellcheck shell=bash
-# If -p, -D, -P, or -V specifies a package, set package_url
-# If -U specifies a package, print the package_url and exit with normal status
-# shellcheck disable=SC2154
-set_or_print_url()
-{
-  # Verify requirements
-  [[ -n "${arg_U}" && -n "${arg_D:-${arg_p:-${arg_P:-${arg_V}}}}" ]] &&
-    emergency "Please pass only one of {-B, -D, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
-
-  # Get package name from argument passed with  -p, -D, -P, -V, or -U
-  package_to_build="${arg_p:-${arg_D:-${arg_P:-${arg_U:-${arg_V}}}}}"
-
-if [[ -n "${arg_u:-}"  ]]; then
-  # User specified a URL from which to download the package
-  url_tail="${arg_u##*/}" # set url_tail to text_after_final_slash, greedy expansion needed
-  url_head="${arg_u%${url_tail}}" # set url_head text before url_tail
-else
-
-  if [[ "${package_to_build}" == 'cmake' ]]; then
-    major_minor="${version_to_build%.*}"
-  fi
-  package_url_head=(
-    "gcc;https://ftp.gnu.org/gnu/gcc/gcc-${version_to_build-}/"
-    "wget;https://ftpmirror.gnu.org/gnu/wget/"
-    "m4;https://ftpmirror.gnu.org/gnu/m4/"
-    "pkg-config;https://pkgconfig.freedesktop.org/releases/"
-    "mpich;https://www.mpich.org/static/downloads/${version_to_build-}/"
-    "flex;https://sourceforge.net/projects/flex/files/"
-    "make;https://ftpmirror.gnu.org/gnu/make/"
-    "bison;https://ftpmirror.gnu.org/gnu/bison/"
-    "cmake;https://www.cmake.org/files/v${major_minor:-}/"
-    "subversion;https://www.eu.apache.org/dist/subversion/"
-  )
-  for package in "${package_url_head[@]}" ; do
-     KEY="${package%%;*}"
-     VALUE="${package##*;}"
-     info "KEY=${KEY}  VALUE=${VALUE}"
-
-     if [[ "${package_to_build}" == "${KEY}" ]]; then
-       # We recognize the package name so we set the URL head:
-       url_head="${VALUE}"
-       break
-     fi
-  done
-
-  if [[ ! -z ${arg_b:-} && ${package_to_build} == 'gcc' ]]; then
-    url_head="https://gcc.gnu.org/git/"
-  fi
-
-  # Set differing tails for GCC release downloads versus development branch checkouts
-  package_url_tail=(
-    "gcc;gcc-${version_to_build-}.tar.gz"
-    "wget;wget-${version_to_build-}.tar.gz"
-    "m4;m4-${version_to_build-}.tar.bz2"
-    "pkg-config;pkg-config-${version_to_build-}.tar.gz"
-    "mpich;mpich-${version_to_build-}.tar.gz"
-    "flex;flex-${version_to_build-}.tar.bz2"
-    "bison;bison-${version_to_build-}.tar.gz"
-    "make;make-${version_to_build-}.tar.bz2"
-    "subversion;subversion-${version_to_build-}.tar.gz"
-  )
-  if [[ $(uname) == "Linux" ]]; then
-    package_url_tail+=("cmake;cmake-${version_to_build}-Linux-x86_64.sh")
-  else
-    package_url_tail+=("cmake;cmake-${version_to_build-}.tar.gz")
-  fi
-  for package in "${package_url_tail[@]}" ; do
-     KEY="${package%%;*}"
-     VALUE="${package##*;}"
-     if [[ "${package_to_build}" == "${KEY}" ]]; then
-       # We recognize the package name so we set the URL tail:
-       url_tail="${VALUE}"
-       break
-     fi
-  done
-
-  if [[ ! -z ${arg_b:-} && ${package_to_build} == 'gcc' ]]; then
-    url_tail="gcc"
-  fi
-
-  if [[ -z "${url_head:-}" || -z "${url_tail}" ]]; then
-    emergency "Package ${package_name:-} not recognized.  Use --l or --list-packages to list the allowable names."
-  fi
-
-fi # end if [[ -n "${arg_u:-}"  ]]; then
-
-  package_url="${url_head}""${url_tail}"
-
-  # If a printout of the package URL was requested, then print it and exit with normal status
-  if [[ -n "${arg_U:-}" ]]; then
-    printf "%s\n" "${package_url}"
-    exit 0
-  fi
-}
diff --git a/prerequisites/build-functions/unpack_if_necessary.sh b/prerequisites/build-functions/unpack_if_necessary.sh
deleted file mode 100644
index 05cd66619..000000000
--- a/prerequisites/build-functions/unpack_if_necessary.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-# Unpack if the unpacked tar ball is not in the present working directory
-# shellcheck disable=SC2154
-unpack_if_necessary()
-{
-  if [[ "${fetch}" == "git" ]]; then
-    package_source_directory="${package_name}"
-  else
-    if [[ "${url_tail}" == *tar.gz || "${url_tail}" == *tar.bz2 || "${url_tail}" == *.tar.xz ]]; then
-      info "Unpacking ${url_tail}."
-      info "pushd ${download_path}"
-      pushd "${download_path}"
-      info "Unpack command: tar xf ${url_tail}"
-      tar xf "${url_tail}"
-      info "popd"
-      popd
-    else
-      info "Skipping unpacking because ${url_tail} is not a compressed archive (matching one of *.tar.{gz,bz2,xz}). "
-    fi
-    # shellcheck disable=SC2034
-    package_source_directory="${package_name}-${version_to_build}"
-  fi
-}
diff --git a/prerequisites/build.sh b/prerequisites/build.sh
deleted file mode 100755
index 7cfdfcbd2..000000000
--- a/prerequisites/build.sh
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/env bash
-# BASH3 Boilerplate
-#
-# build.sh
-#
-#  - Build OpenCoarrays prerequisite packages and their prerequisites
-#
-# Usage: LOG_LEVEL=7 B3B_USE_CASE=/opt/bash3boilerplate/src/use-case ./my-script.sh -f script_input.txt
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-# The invocation of bootstrap.sh below performs the following tasks:
-# (1) Import several bash3boilerplate helper functions & default settings.
-# (2) Set several variables describing the current file and its usage page.
-# (3) Parse the usage information (default usage file name: current file's name with -usage appended).
-# (4) Parse the command line using the usage information.
-
-export OPENCOARRAYS_SRC_DIR="${OPENCOARRAYS_SRC_DIR:-${PWD%prerequisites*}}"
-export __usage=${OPENCOARRAYS_SRC_DIR}/prerequisites/build.sh-usage
-if [[ ! -f "${OPENCOARRAYS_SRC_DIR}/src/libcaf.h" ]]; then
-  echo "Please run this script inside the OpenCoarrays source \"prerequisites\" subdirectory"
-  echo "or set OPENCOARRAYS_SRC_DIR to the top-level OpenCoarrays source directory path."
-  exit 1
-fi
-export B3B_USE_CASE="${B3B_USE_CASE:-${OPENCOARRAYS_SRC_DIR}/prerequisites/use-case}"
-if [[ ! -f "${B3B_USE_CASE:-}/bootstrap.sh" ]]; then
-  echo "Please set B3B_USE_CASE to the bash3boilerplate use-case directory path."
-  exit 2
-fi
-# shellcheck source=./use-case/bootstrap.sh
-source "${B3B_USE_CASE}/bootstrap.sh" "$@"
-
-# Set up a function to call when receiving an EXIT signal to do some cleanup. Remove if
-# not needed. Other signals can be trapped too, like SIGINT and SIGTERM.
-function cleanup_before_exit () {
-  info "Cleaning up. Done"
-}
-trap cleanup_before_exit EXIT # The signal is specified here. Could be SIGINT, SIGTERM etc.
-
-### Validation (decide what's required for running your script and error out)
-#####################################################################
-
-export __flag_present=1
-
-# shellcheck disable=SC2154
-if [[ "${arg_l}" != "${__flag_present}" &&
-      "${arg_v}" != "${__flag_present}" &&
-      "${arg_h}" != "${__flag_present}" &&
-      -z "${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}}" ]]; then
-  help "${__base}: Insufficient arguments. Please pass either -B, -D, -h, -l, -L, -p, -P, -U, -v, -V, or a longer equivalent."
-fi
-
-# Suppress info and debug messages if -B, -l, -P, -U, -V, -D, or their longer equivalent is present:
- [[ "${arg_l}" == "${__flag_present}" || ! -z "${arg_P:-${arg_U:-${arg_V:-${arg_D}}}}" ]] && suppress_info_debug_messages
-
-[ -z "${LOG_LEVEL:-}" ] && emergency "Cannot continue without LOG_LEVEL. "
-
-### Enforce mutual exclusivity of arguments that print single-line output
-[ ! -z "${arg_P:-}" ] && [ ! -z "${arg_V:-}" ] && emergency "Only specify one of -P, -U, -V, or their long-form equivalents."
-[ ! -z "${arg_P:-}" ] && [ ! -z "${arg_U:-}" ] && emergency "Only specify one of -P, -U, -V, or their long-form equivalents."
-[ ! -z "${arg_U:-}" ] && [ ! -z "${arg_V:-}" ] && emergency "Only specify one of -P, -U, -V, or their long-form equivalents."
-
-### Print bootstrapped magic variables to STDERR when LOG_LEVEL
-### is at the default value (6) or above.
-#####################################################################
-# shellcheck disable=SC2154
-{
-info "__file: ${__file}"
-info "__dir: ${__dir}"
-info "__base: ${__base}"
-info "__os: ${__os}"
-info "__usage: ${__usage}"
-info "LOG_LEVEL: ${LOG_LEVEL}"
-
-info "-b (--install-branch):   ${arg_b} "
-info "-c (--with-c):           ${arg_c} "
-info "-C (--with-cxx):         ${arg_C} "
-info "-d (--debug):            ${arg_d} "
-info "-D (--print-downloader): ${arg_D} "
-info "-e (--verbose):          ${arg_e} "
-info "-f (--with-fortran):     ${arg_f} "
-info "-h (--help):             ${arg_h} "
-info "-i (--install-prefix):   ${arg_i} "
-info "-I (--install-version):  ${arg_I} "
-info "-j (--num-threads):      ${arg_j} "
-info "-l (--list-packages):    ${arg_l} "
-info "-m (--with-cmake):       ${arg_m} "
-info "-M (--with-mpi):         ${arg_M} "
-info "-n (--no-color):         ${arg_n} "
-info "-o (--only-download):    ${arg_o} "
-info "-p (--package):          ${arg_p} "
-info "-P (--print-path):       ${arg_P} "
-info "-r (--prefix-root):      ${arg_r} "
-info "-u (--from-url):         ${arg_u} "
-info "-U (--print-url):        ${arg_U} "
-info "-v (--version):          ${arg_v} "
-info "-V (--print-version):    ${arg_V} "
-info "-y (--yes-to-all):       ${arg_y} "
-info "-Z (--bootstrap):        ${arg_Z} "
-}
-
-# shellcheck source=./build-functions/set_or_print_default_version.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_default_version.sh"
-# shellcheck disable=SC2119
-set_or_print_default_version
-export version_to_build="${arg_I:-${arg_b:-${default_version}}}"
-
-# shellcheck source=./build-functions/set_or_print_downloader.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_downloader.sh"
-# shellcheck disable=SC2119
-set_or_print_downloader $@
-
-# shellcheck source=./build-functions/set_or_print_url.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_url.sh"
-set_or_print_url
-
-# shellcheck source=./build-functions/set_or_print_installation_path.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_installation_path.sh"
-
-set_or_print_installation_path
-
-# shellcheck source=./build-functions/download_if_necessary.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/download_if_necessary.sh"
-download_if_necessary
-
-# Exit if -o or --only-download was specified when invoking this script
-if [[ ${arg_o:-} == "${__flag_present}" ]]; then
-   info "No installation to perform: -o or --only-download specified.  Exiting."
-   exit 0
-fi
-
-# If -Z or --bootstrap was specified, enable bootstrap configure & build
-if [[ ${arg_Z:-} != "${__flag_present}" ]]; then
-   info "Disabling bootstrap. If the gcc/g++/gfortran build fails, try './install.sh --bootstrap'."
-   export bootstrap_configure="--disable-bootstrap"
-   export bootstrap_build=""
-else
-   export bootstrap_configure=""
-   export bootstrap_build="bootstrap"
-fi
-
-# shellcheck source=./build-functions/unpack_if_necessary.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/unpack_if_necessary.sh"
-unpack_if_necessary
-
-# shellcheck source=./build-functions/set_compilers.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_compilers.sh"
-set_compilers
-
-# shellcheck source=./build-functions/build_and_install.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/build_and_install.sh"
-build_and_install
diff --git a/prerequisites/build.sh-usage b/prerequisites/build.sh-usage
deleted file mode 100644
index 9eb637509..000000000
--- a/prerequisites/build.sh-usage
+++ /dev/null
@@ -1,25 +0,0 @@
-  -b --install-branch [arg]   Install the specified repository development branch (Examples: -b master).
-  -c --with-c [arg]           Use the specified C compiler. Default="gcc"
-  -C --with-cxx [arg]         Use the specified C++ compiler. Default="g++"
-  -d --debug                  Enable debug mode.
-  -D --print-downloader [arg] Print download program for package specified in argument. 
-  -e --verbose                Enable verbose mode, print script as it is executed.
-  -f --with-fortran [arg]     Specify Fortran compiler location. Default="gfortran"
-  -h --help                   This page.
-  -i --install-prefix [arg]   Install package in specified path. Default="${OPENCOARRAYS_SRC_DIR%/}/prerequisites/installations/"
-  -I --install-version [arg]  Package version to install. (To see default, use -V or --print-version)
-  -j --num-threads [arg]      Number of threads to use when invoking make. Default="4"
-  -l --list-packages          List the packages this script can install.
-  -m --with-cmake [arg]       Use the specified CMake installation. Default="cmake"
-  -M --with-mpi [arg]         Use the specified MPI installation. 
-  -n --no-color               Disable color output.
-  -o --only-download          Download (without building) the package source specified by -p or --package.
-  -p --package [arg]          Package to install. 
-  -P --print-path [arg]       Print installation path for package specified in argument.
-  -r --prefix-root [arg]      Installation path to which package name/version will be appended. (Example: -r /opt).
-  -u --from-url [arg]         Specify a URL from which to download a package. 
-  -U --print-url [arg]        Print URL for package specified in argument. 
-  -v --version                Print OpenCoarrays version number.
-  -V --print-version [arg]    Print installation version for package specified in argument.
-  -y --yes-to-all             Build non-interactively by assuming affirmative user responses.
-  -Z --bootstrap              Enable bootstrap build for robustness when building the required GCC version with an old GCC version.
diff --git a/prerequisites/check_version.sh b/prerequisites/check_version.sh
deleted file mode 100755
index fdc065c32..000000000
--- a/prerequisites/check_version.sh
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/bash
-#
-# check_version.sh
-#
-# -- Verify whether an OpenCoarrays prerequisite meets the required minimum version number.
-#
-# OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-# Copyright (c) 2015-2020, Sourcery, Inc.
-# Copyright (c) 2015-2020, Sourcery Institute
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice, this
-#    list of conditions and the following disclaimer in the documentation and/or
-#    other materials provided with the distribution.
-# 3. Neither the names of the copyright holders nor the names of their contributors
-#    may be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# Interpret the first argument as the package executable name
-package="$1"
-# Interpret the second argument as the minimimum acceptable package version number
-minimum_version="$2"
-# Interpret the third argument as indicating the desired verbosity
-verbose=$3
-
-this_script=$(basename "$0")
-
-usage()
-{
-    echo ""
-    echo " $this_script - Bash script for verifying minimum version numbers for OpenCoarrays prerequisites"
-    echo ""
-    echo " Usage (optional arguments in square brackets): "
-    echo "      $this_script [<option>]"
-    echo "      $this_script  <package-name> <minimum-version-number> [--verbose]"
-    echo ""
-    echo " Options:"
-    echo "   --help, -h           Show this help message"
-    echo "   --list , -l          List the packages whose versions this script can verify"
-    echo ""
-    echo " Examples:"
-    echo ""
-    echo "   $this_script cmake 3.4.0"
-    echo "   $this_script flex 2.6.0 --verbose"
-    echo "   $this_script flex $(./build.sh -V flex )"
-    echo "   $this_script --help"
-    echo "   $this_script --list"
-    echo ""
-    echo "[exit 10]"
-    exit 10
-}
-
-# Print usage information and exit if script is invoked without arguments or with --help or -h as the first argument
-if [ $# == 0 ]; then
-  usage | less
-  exit 20
-
-elif [[ $1 == '--help' || $1 == '-h' ]]; then
-  usage | less
-  exit 0
-
-elif [[ $1 == '--list' || $1 == '-l' ]]; then
- echo "$this_script currently verifies minimum version numbers for the following OpenCoarrays prerequisites:"
- echo "   cmake, flex, bison, m4"
- exit 40
-
-elif [[ $1 == '-v' || $1 == '-V' || $1 == '--version' ]]; then
-  # Print script copyright if invoked with -v, -V, or --version
-  # argument Extract version from .VERSION file. Git automatically
-  # inserts various things when performing git archive, so ensure we
-  # extract just the first version string
-  opencoarrays_version=$(sed -n '/[0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}/{s/^\([^.]*\)\([0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}\)\(.*\)/\2/p;q;}' ../.VERSION)
-  echo "opencoarrays $opencoarrays_version"
-  echo ""
-  echo "OpenCoarrays prerequisite version verifier"
-  echo "Copyright (C) 2015-2016 Sourcery, Inc."
-  echo "Copyright (C) 2015-2016 Sourcery Institute"
-  echo ""
-  echo "OpenCoarrays comes with NO WARRANTY, to the extent permitted by law."
-  echo "You may redistribute copies of $this_script under the terms of the"
-  echo "BSD 3-Clause License.  For more information about these matters, see"
-  echo "http://www.sourceryinstitute.org/license.html"
-  echo ""
-fi
-
-package_version_header=$($package --version | head -1)
-if [[ "$verbose" == "--verbose" ]]; then
-  echo "$package_version_header"
-fi
-
-before_first_dot="${package_version_header%%.*}"
-major="${before_first_dot##* }" # grab text after final space in remaining string
-
-after_first_dot="${package_version_header#*.}"
-minor="${after_first_dot%%.*}"
-
-after_final_dot="${package_version_header##*.}" # grab text after final dot
-if [[ "$after_final_dot" == "$after_first_dot" ]]; then
-  patch=""
-else
-  patch="${after_final_dot%% *}"
-fi
-
-if [[ "$verbose" == "--verbose" ]]; then
-  echo "$major . $minor . $patch"
-fi
-
-min_major=${minimum_version%%.*}
-min_minor_patch=${minimum_version#*.}
-min_minor=${min_minor_patch%%.*}
-min_patch=${minimum_version##*.}
-
-if [[ "$verbose" == "--verbose" ]]; then
-  echo "$minimum_version = $min_major . $min_minor . $min_patch"
-fi
-
-if [ "$(( major < min_major ))" -ne 0 ]; then
-  if [[ $verbose == "--verbose" ]]; then
-    echo "$major < $min_major"
-  fi
-  exit 10
-elif [[ $verbose == "--verbose" ]]; then
-  echo "$major >= $min_major"
-fi
-
-if [ "$(( minor < min_minor ))" -ne 0 ]; then
-  if [[ $verbose == "--verbose" ]]; then
-    echo "$minor < $min_minor"
-  fi
-  exit 20
-elif [[ $verbose == "--verbose" ]]; then
-  echo "$minor >= $min_minor"
-fi
-
-if [ "$(( patch < min_patch ))" -ne 0 ]; then
-  if [[ $verbose == "--verbose" ]]; then
-    echo "$patch < $min_patch"
-  fi
-  exit 30
-elif [[ $verbose == "--verbose" ]]; then
-  echo "$patch >= $min_patch"
-fi
-exit 0
diff --git a/prerequisites/install-binary-functions/build_parse_table.sh b/prerequisites/install-binary-functions/build_parse_table.sh
deleted file mode 100644
index a24727092..000000000
--- a/prerequisites/install-binary-functions/build_parse_table.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build the Open Fortran Parser parse table
-# shellcheck disable=SC2154
-function build_parse_table()
-{
-  info "Building parse table"
-  pushd "${install_path}/ofp-sdf/fortran/syntax"
-  info "Build command: make SDF2_PATH=\"${SDF2_PATH}\" ST_PATH=\"${ST_PATH}\" DYLD_LIBRARY_PATH=\"${DYLD_LIBRARY_PATH}\""
-  make SDF2_PATH="${SDF2_PATH}" ST_PATH="${ST_PATH}" DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}"
-  popd
-  pushd "${install_path}/ofp-sdf/fortran/trans"
-  make
-  popd
-}
diff --git a/prerequisites/install-binary-functions/move_binaries_to_install_path.sh b/prerequisites/install-binary-functions/move_binaries_to_install_path.sh
deleted file mode 100644
index 62702347d..000000000
--- a/prerequisites/install-binary-functions/move_binaries_to_install_path.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-install_or_skip()
-{
-  SUDO=${1}
-  install_path="${2}"
-  package_to_install="${3}"
-  download_path="${4}"
-  if [[ -d "${install_path}/${package_to_install}" ]]; then
-    info "The following installation path exists:"
-    info "${install_path}/${package_to_install}"
-    info "If you want to replace it, please remove it and restart this script."
-    info "Skipping ${package_to_install} installation."
-  else
-    info "Installing ${package_to_install} with the following command:"
-    info "${SUDO} mv ${download_path}/${package_to_install} ${install_path}"
-    ${SUDO:-} mv "${download_path}/${package_to_install}" "${install_path}"
-    if [[ -x "${install_path}/${package_to_install}"  ]]; then
-      info "Installation complete for ${package_to_install} in the following location:"
-      info "${install_path}/${package_to_install}"
-    else
-      info "Something went wrong.  Either ${package_to_install} is not in the following expected location"
-      info "or the user lacks executable permissions for the directory:"
-      emergency "${install_path}/${package_to_install}"
-    fi
-  fi
-}
-
-function move_binaries_to_install_path()
-{
-  info "Installation package names: ${install_names}"
-  package_to_install="${install_names%%,*}" # remove longest back-end match for ,*
-  remaining_packages="${install_names#*,}"  # remove shortest front-end match for *,
-  if [[ ! -d "${install_path}" ]]; then
-    ${SUDO:-} mkdir -p "${install_path}"
-  fi
-  while [[ "${package_to_install}" != "${remaining_packages}" ]]; do
-    install_or_skip  "${SUDO:-}" "${install_path}" "${package_to_install}" "${download_path}"
-    info "Remaining installation package names:  ${remaining_packages}"
-    install_names="${remaining_packages}"
-    package_to_install="${install_names%%,*}" # remove longest back-end match for ,*
-    remaining_packages="${install_names#*,}"  # remove shortest front-end for *,
-    info "Installing ${package_to_install} binary with the following command:"
-  done
-  install_or_skip  "${SUDO:-}" "${install_path}" "${package_to_install}" "${download_path}"
-}
diff --git a/prerequisites/install-binary-functions/set_or_print_csv_binary_names.sh b/prerequisites/install-binary-functions/set_or_print_csv_binary_names.sh
deleted file mode 100644
index 5f1c5a42a..000000000
--- a/prerequisites/install-binary-functions/set_or_print_csv_binary_names.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-# If -p, -P, -U, or -V specifies a package, set fetch variable
-# If -D specifies a package, print "${fetch}" and exit with normal status
-# If -l is present, list all packages and versions and exit with normal status
-# shellcheck disable=SC2154
-set_or_print_csv_binary_names()
-{
-  # Verify requirements
-  [ "${arg_N:-}" == "${__flag_present}" ] && [ ! -z "${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}}" ] &&
-    emergency "Please pass only one of {-D, -N, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
-
-  # This is a bash 3 hack standing in for a bash 4 hash (bash 3 is the lowest common
-  # denominator because, for licensing reasons, OS X only has bash 3 by default.)
-  # See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
-  package_install_names=(
-    "strategoxt-superbundle:aterm,sdf2-bundle,strategoxt"
-  )
-  for package in "${package_install_names[@]}" ; do
-     KEY="${package%%:*}"
-     VALUE="${package##*:}"
-     if [[ "${package_name}" == "${KEY}" ]]; then
-       # We recognize the package name so we set the download mechanism:
-       install_names=${VALUE}
-       # If a printout of the download mechanism was requested, then print it and exit with normal status
-       [[ "${arg_N:-}" == "${__flag_present}" ]] && printf "%s\n" "${install_names}" && exit 0
-       break # exit the for loop
-     fi
-  done
-  if [[ -z "${install_names:-}" ]]; then
-    emergency "Package ${package_name:-} not recognized.  Use -l or --list-packages to list the allowable names."
-  fi
-}
diff --git a/prerequisites/install-binary-functions/set_or_print_default_version.sh b/prerequisites/install-binary-functions/set_or_print_default_version.sh
deleted file mode 100644
index a880a05ab..000000000
--- a/prerequisites/install-binary-functions/set_or_print_default_version.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-# If -p, -D, -P, or -U specifies a package, set default_version
-# If -V specifies a package, print the default_version and exit with normal status
-# If -l is present, list all packages and versions and exit with normal status
-# shellcheck disable=SC2154
-set_or_print_default_version()
-{
-  # Verify requirements
-  if [[ "${arg_l}" == "${__flag_present}" ]]; then
-    if [[ "${arg_N:-}" == "${__flag_present}" || ! -z "${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}}" ]]; then
-      emergency "Please pass only one of {-l, -D, -N, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
-    fi
-  fi
-
-  if [[ "${arg_l}" == "${__flag_present}" ]]; then
-    echo "This script can install the following packages:"
-  fi
-  # Get package name from argument passed with -p, -V, -D, or -U
-  package_name="${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V:-}}}}}" # not needed for -l
-  # This is a bash 3 hack standing in for a bash 4 hash (bash 3 is the lowest common
-  # denominator because, for licensing reasons, OS X only has bash 3 by default.)
-  # See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
-  package_version=(
-    "strategoxt-superbundle:0.17-macosx"
-  )
-  for package in "${package_version[@]}" ; do
-     KEY="${package%%:*}"
-     VALUE="${package##*:}"
-     if [[  "${arg_l}" == "${__flag_present}" ]]; then
-       # If the list was requested, print the current element of the name:version list.
-       printf "%s (default version %s)\n" "${KEY}" "${VALUE}"
-     elif [[ "${package_name}" == "${KEY}" ]]; then
-       # We recognize the package name so we set the default version:
-       default_version=${VALUE}
-       # If a printout of the default version number was requested, then print it and exit with normal status
-       [[ ! -z "${arg_V}" ]] && printf "%s\n" "${default_version}" && exit 0
-       break # exit the for loop
-     fi
-  done
-
- # Exit with normal status (package/version has been printed).
- [ "${arg_l}" == "${__flag_present}" ] && exit 0
-
- # Exit with error status and diagnostic output if empty default_version
- if [[ -z "${default_version:-}" ]]; then
-    emergency "Package ${package_name:-} not recognized.  Use -l or --list-packages to list the allowable names."
- fi
-}
diff --git a/prerequisites/install-binary-functions/set_or_print_downloader.sh b/prerequisites/install-binary-functions/set_or_print_downloader.sh
deleted file mode 100644
index 422a159a3..000000000
--- a/prerequisites/install-binary-functions/set_or_print_downloader.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-# If -p, -P, -U, or -V specifies a package, set fetch variable
-# If -D specifies a package, print "${fetch}" and exit with normal status
-# If -l is present, list all packages and versions and exit with normal status
-# shellcheck disable=SC2154
-set_or_print_downloader()
-{
-  # Verify requirements
-  if [[ ! -z "${arg_D}" ]]; then
-    if  [[ "${arg_N:-}" == "${__flag_present}" || ! -z "${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}" ]]; then
-      emergency "Please pass only one of {-D, -N, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
-    fi
-  fi
-  package_name="${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}}"
-  if [[ $(uname) == "Darwin" ]]; then
-    wget_or_curl=curl
-  else
-    wget_or_curl=wget
-  fi  
-  # This is a bash 3 hack standing in for a bash 4 hash (bash 3 is the lowest common
-  # denominator because, for licensing reasons, OS X only has bash 3 by default.)
-  # See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
-  package_fetch=(
-    "strategoxt-superbundle:${wget_or_curl}"
-  )
-  for package in "${package_fetch[@]}" ; do
-     KEY="${package%%:*}"
-     VALUE="${package##*:}"
-     if [[ "${package_name}" == "${KEY}" ]]; then
-       # We recognize the package name so we set the download mechanism:
-       fetch=${VALUE}
-       # If a printout of the download mechanism was requested, then print it and exit with normal status
-       [[ ! -z "${arg_D}" ]] && printf "%s\n" "${fetch}" && exit 0
-       break # exit the for loop
-     fi
-  done
-  if [[ -z "${fetch:-}" ]]; then
-    emergency "Package ${package_name:-} not recognized.  Use -l or --list-packages to list the allowable names."
-  fi
-}
diff --git a/prerequisites/install-binary-functions/set_or_print_url.sh b/prerequisites/install-binary-functions/set_or_print_url.sh
deleted file mode 100644
index 9de3f0f23..000000000
--- a/prerequisites/install-binary-functions/set_or_print_url.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-# If -p, -D, -P, or -V specifies a package, set package_url
-# If -U specifies a package, print the package_url and exit with normal status
-# shellcheck disable=SC2154
-set_or_print_url()
-{
-  # Verify requirements
-  if [[ ! -z "${arg_U}" ]]; then
-    if [[ "${arg_N:-}" == "${__flag_present}" || ! -z "${arg_D:-${arg_p:-${arg_P:-${arg_V}}}}" ]]; then
-      emergency "Please pass only one of {-D, -N, -p, -P, -U, -V} or a longer equivalent (multiple detected)."
-    fi
-  fi
-  # Get package name from argument passed with  -p, -D, -P, -V, or -U
-  package_name="${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}}"
-
-  package_url_head=(
-    "strategoxt-superbundle;https://github.com/sourceryinstitute/opencoarrays/files/212509/"
-  )
-  for package in "${package_url_head[@]}" ; do
-     KEY="${package%%;*}"
-     VALUE="${package##*;}"
-     if [[ "${package_name}" == "${KEY}" ]]; then
-       # We recognize the package name so we set the URL head:
-       url_head="${VALUE}"
-       break
-     fi
-  done
-
-  package_url_tail=(
-    "strategoxt-superbundle;strategoxt-superbundle-${version_to_build}.tar.gz"
-  )
-  for package in "${package_url_tail[@]}" ; do
-     KEY="${package%%;*}"
-     VALUE="${package##*;}"
-     if [[ "${package_name}" == "${KEY}" ]]; then
-       # We recognize the package name so we set the URL tail:
-       url_tail="${VALUE}"
-       break
-     fi
-  done
-
-  if [[ -z "${url_head:-}" || -z "${url_tail:-}" ]]; then
-    emergency "Package ${package_name:-} not recognized.  Use -l or --list-packages to list the allowable names."
-  fi
-
-  package_url="${url_head}""${url_tail}"
-
-  # If a printout of the package URL was requested, then print it and exit with normal status
-  if [[ ! -z "${arg_U:-}" ]]; then
-    printf "%s\n" "${package_url}"
-    exit 0
-  fi
-}
diff --git a/prerequisites/install-binary.sh b/prerequisites/install-binary.sh
deleted file mode 100755
index 6a9f811a7..000000000
--- a/prerequisites/install-binary.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/usr/bin/env bash
-# BASH3 Boilerplate
-#
-# install-binary.sh
-#
-#  - Build OpenCoarrays prerequisite packages and their prerequisites
-#
-# Usage: LOG_LEVEL=7 B3B_USE_CASE=/opt/bash3boilerplate/src/use-case ./my-script.sh -f script_input.txt
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-# The invocation of bootstrap.sh below performs the following tasks:
-# (1) Import several bash3boilerplate helper functions & default settings.
-# (2) Set several variables describing the current file and its usage page.
-# (3) Parse the usage information (default usage file name: current file's name with -usage appended).
-# (4) Parse the command line using the usage information.
-
-
-### Start of boilerplate -- do not edit this block #######################
-export OPENCOARRAYS_SRC_DIR="${OPENCOARRAYS_SRC_DIR:-${PWD}/../}"
-if [[ ! -f "${OPENCOARRAYS_SRC_DIR}/src/libcaf.h" ]]; then
-  echo "Please run this script inside the top-level OpenCoarrays source \"prerequisites\" "
-  echo "subdirectory or set OPENCOARRAYS_SRC_DIR to the OpenCoarrays source directory path."
-  exit 1
-fi
-export __usage="${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh-usage"
-export B3B_USE_CASE="${B3B_USE_CASE:-${OPENCOARRAYS_SRC_DIR}/prerequisites/use-case}"
-if [[ ! -f "${B3B_USE_CASE:-}/bootstrap.sh" ]]; then
-  echo "Please set B3B_USE_CASE to the bash3boilerplate use-case directory path."
-  exit 2
-else
-    # shellcheck source=./use-case/bootstrap.sh
-    source "${B3B_USE_CASE}/bootstrap.sh" "$@"
-fi
-### End of boilerplate -- start user edits below #########################
-
-
-# Set up a function to call when receiving an EXIT signal to do some cleanup. Remove if
-# not needed. Other signals can be trapped too, like SIGINT and SIGTERM.
-function cleanup_before_exit () {
-  info "Cleaning up. Done"
-}
-trap cleanup_before_exit EXIT # The signal is specified here. Could be SIGINT, SIGTERM etc.
-
-### Validation (decide what's required for running your script and error out)
-#####################################################################
-
-export __flag_present=1
-# shellcheck disable=SC2154
-if [[ "${arg_l}" != "${__flag_present}" && "${arg_N}" != "${__flag_present}" &&
-      "${arg_v}" != "${__flag_present}" && "${arg_h}" != "${__flag_present}" &&
-      -z "${arg_D:-${arg_p:-${arg_P:-${arg_U:-${arg_V}}}}}" ]]; then
-  help "${__base}: Insufficient arguments. Please pass either -D, -h, -N, -l, -p, -P, -U, -v, -V, or a longer equivalent."
-fi
-
-# Suppress info and debug messages if -l, -P, -U, -V, -D, or their longer equivalent is present:
-[[ "${arg_l}" == "${__flag_present}" || ! -z "${arg_P:-${arg_U:-${arg_V:-${arg_D}}}}" ]] && suppress_info_debug_messages
-
-[ -z "${LOG_LEVEL:-}" ] && emergency "Cannot continue without LOG_LEVEL. "
-
-### Enforce mutual exclusivity of arguments that print single-line output
-[ ! -z "${arg_P:-}" ] && [ ! -z "${arg_V:-}" ] && emergency "Only specify one of -P, -U, -V, or their long-form equivalents."
-[ ! -z "${arg_P:-}" ] && [ ! -z "${arg_U:-}" ] && emergency "Only specify one of -P, -U, -V, or their long-form equivalents."
-[ ! -z "${arg_U:-}" ] && [ ! -z "${arg_V:-}" ] && emergency "Only specify one of -P, -U, -V, or their long-form equivalents."
-
-### Print bootstrapped magic variables to STDERR when LOG_LEVEL
-### is at the default value (6) or above.
-#####################################################################
-# shellcheck disable=SC2154
-{
-info "__file: ${__file}"
-info "__dir: ${__dir}"
-info "__base: ${__base}"
-info "__os: ${__os}"
-info "__usage: ${__usage}"
-info "LOG_LEVEL: ${LOG_LEVEL}"
-
-info "-d (--debug):            ${arg_d} "
-info "-D (--print-downloader): ${arg_D} "
-info "-e (--verbose):          ${arg_e} "
-info "-h (--help):             ${arg_h} "
-info "-i (--install-dir):      ${arg_i} "
-info "-I (--install-version):  ${arg_I} "
-info "-l (--list-packages):    ${arg_l} "
-info "-n (--no-color):         ${arg_n} "
-info "-p (--package):          ${arg_p}"
-info "-P (--print-path):       ${arg_P} "
-info "-U (--print-url):        ${arg_U} "
-info "-v (--version):          ${arg_v} "
-info "-V (--print-version):    ${arg_V} "
-}
-# shellcheck source=./install-binary-functions/set_or_print_default_version.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/install-binary-functions/set_or_print_default_version.sh"
-set_or_print_default_version
-export version_to_build="${arg_I:-${default_version}}"
-
-# shellcheck source=./install-binary-functions/set_or_print_downloader.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/install-binary-functions/set_or_print_downloader.sh"
-set_or_print_downloader
-
-# shellcheck source=./install-binary-functions/set_or_print_url.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/install-binary-functions/set_or_print_url.sh"
-set_or_print_url
-
-# shellcheck source=./build-functions/set_or_print_installation_path.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_installation_path.sh"
-set_or_print_installation_path
-
-# shellcheck source=./build-functions/download_if_necessary.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/download_if_necessary.sh"
-download_if_necessary
-
-# shellcheck source=./build-functions/unpack_if_necessary.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/unpack_if_necessary.sh"
-unpack_if_necessary
-
-# shellcheck source=./install-binary-functions/set_or_print_csv_binary_names.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/install-binary-functions/set_or_print_csv_binary_names.sh"
-set_or_print_csv_binary_names
-
-# shellcheck source=./build-functions/set_SUDO_if_needed_to_write_to_directory.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
-set_SUDO_if_needed_to_write_to_directory "${arg_i}"
-
-# shellcheck source=./install-binary-functions/move_binaries_to_install_path.sh
-source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/install-binary-functions/move_binaries_to_install_path.sh"
-move_binaries_to_install_path
diff --git a/prerequisites/install-binary.sh-usage b/prerequisites/install-binary.sh-usage
deleted file mode 100644
index f45f34554..000000000
--- a/prerequisites/install-binary.sh-usage
+++ /dev/null
@@ -1,14 +0,0 @@
-  -d --debug                  Enable debug mode.
-  -D --print-downloader [arg] Print download program for package specified in argument. 
-  -e --verbose                Enable verbose mode, print script as it is executed.
-  -h --help                   This page.
-  -i --install-dir [arg]      Install package in specified path. Default="/opt"
-  -I --install-version [arg]  Package version to install. (To see default, use -V or --print-version)
-  -l --list-packages          List the packages this script can install.
-  -n --no-color               Disable color output.
-  -N --print-names            Print the names of the files that install with the specified package.
-  -p --package [arg]          Package to install. 
-  -P --print-path [arg]       Print installation path for package specified in argument.
-  -U --print-url [arg]        Print URL for package specified in argument. 
-  -v --version                Print OpenCoarrays version number.
-  -V --print-version [arg]    Print installation version for package specified in argument.
diff --git a/prerequisites/install-functions/build_opencoarrays.sh b/prerequisites/install-functions/build_opencoarrays.sh
deleted file mode 100644
index e257cb232..000000000
--- a/prerequisites/install-functions/build_opencoarrays.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#shellcheck shell=bash
-# shellcheck disable=SC2154
-build_opencoarrays()
-{
-  print_header
-  info "Invoking find_or_install mpich"
-  find_or_install mpich
-  info "Invoking find_or_install cmake"
-  find_or_install cmake
-  build_path="${build_path}"/opencoarrays/$("${OPENCOARRAYS_SRC_DIR}"/install.sh -V opencoarrays)
-  if [[ -d "${build_path}" ]]; then
-    rm -rf "${build_path}"
-  fi
-  mkdir -p "$build_path"
-  pushd "$build_path"
-  if [[ -z ${MPIFC:-} || -z ${MPICC:-} ]]; then
-    emergency "build_opencoarrays.sh: empty \${MPIFC}=${MPIFC:-} or \${MPICC}=${MPICC:-}"
-  fi
-  MPIFC_show=($("$MPIFC" -show))
-  MPICC_show=($("$MPICC" -show))
-  if [[ "${MPIFC_show[0]}" != *gfortran* ]]; then
-    export fortran_compiler_identity="$(${MPIFC_show[0]} --version)"
-    if [[ $fortran_compiler_identity != "GNU Fortran"* ]]; then
-      emergency "build_opencoarrays.sh: MPI doesn't wrap gfortran/gcc: \${MPIFC_show}=${MPIFC_show[*]}"
-    fi
-  fi
-  if [[ -z "${OPENCOARRAYS_DEVELOPER:-}" ]]; then
-      # We should examine the value too, but CMake has many ways of saying "true"
-      WDEVFLAG=-Wno-dev
-  else
-      WDEVFLAG=-Wdev
-  fi
-    # Set FC to the MPI implementation's gfortran command with any preceding path but without any subsequent arguments:
-  FC="${MPIFC_show[0]}"
-  # Set CC to the MPI implementation's gcc command...
-  CC="${MPICC_show[0]}"
-  # try to find mpiexec
-  MPI_BIN_DIR="$(type -P "${MPICC}")"
-  MPIEXEC_CANDIDATES=($(find "${MPI_BIN_DIR%/*}" -name 'mpiexec' -o -name 'mpirun' -o -name 'lamexec' -o -name 'srun'))
-  if ! ((${#MPIEXEC_CANDIDATES[@]} >= 1)); then
-    emergency "Could not find a suitable \`mpiexec\` in directory containing mpi wrappers (${MPICC%/*})"
-  else
-    MPIEXEC="${MPIEXEC_CANDIDATES[0]}"
-  fi
-
-  source "${OPENCOARRAYS_SRC_DIR:-}/prerequisites/build-functions/set_or_print_installation_path.sh"
-  set_or_print_installation_path
-
-  info "Configuring OpenCoarrays in ${PWD} with the command:"
-  info "CC=\"${CC}\" FC=\"${FC}\" $CMAKE \"${OPENCOARRAYS_SRC_DIR}\" \"${WDEVFLAG}\" -DCMAKE_INSTALL_PREFIX=\"${install_path}\" -DMPIEXEC=\"${MPIEXEC}\" -DMPI_C_COMPILER=\"${MPICC}\" -DMPI_Fortran_COMPILER=\"${MPIFC}\""
-  CC="${CC}" FC="${FC}" $CMAKE "${OPENCOARRAYS_SRC_DIR}" "${WDEVFLAG}" -DCMAKE_INSTALL_PREFIX="${install_path}" -DMPIEXEC="${MPIEXEC}" -DMPI_C_COMPILER="${MPICC}" -DMPI_Fortran_COMPILER="${MPIFC}"
-  info "Building OpenCoarrays in ${PWD} with the command make -j${num_threads}"
-  make "-j${num_threads}"
-  if [[ ! -z ${SUDO:-} ]]; then
-    printf "\nThe chosen installation path requires sudo privileges. Please enter password if prompted.\n"
-  fi
-  info "Installing OpenCoarrays in ${install_path} with the command ${SUDO:-} make install"
-  ${SUDO:-} make install
-}
diff --git a/prerequisites/install-functions/download-all-prerequisites.sh b/prerequisites/install-functions/download-all-prerequisites.sh
deleted file mode 100755
index c47fbe4fb..000000000
--- a/prerequisites/install-functions/download-all-prerequisites.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-function download_all_prerequisites() 
-{
-  pushd ${OPENCOARRAYS_SRC_DIR}
-
-  download_list=( "m4" "bison" "flex" "mpich" "cmake" )
-
-  for package_to_download in "${download_list[@]}" ;
-  do
-    ./install.sh --package ${package_to_download} --only-download
-  done
-  
-  if [[ ! -z ${arg_b:-}  ]]; then
-    ./install.sh --package gcc  --only-download --install-branch "${arg_b}"
-    cd prerequisites/downloads/${arg_b:-}
-  else  # Download default version
-    ./install.sh --package gcc  --only-download
-    gcc_version=$(./install.sh -V gcc)
-    cd prerequisites/downloads/
-    tar xf gcc-${gcc_version}.tar.[bg]z* || emergency "tar didn't work"
-    listing=$(ls -lt)
-    cd gcc-${gcc_version}
-  fi
-
-  source ${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/set_or_print_downloader.sh
-  set_or_print_downloader
-  
-  source ${OPENCOARRAYS_SRC_DIR}/prerequisites/build-functions/edit_GCC_download_prereqs_file_if_necessary.sh
-  edit_GCC_download_prereqs_file_if_necessary
-  
-  ./contrib/download_prerequisites
-  
-  popd
-}
diff --git a/prerequisites/install-functions/find_or_install.sh b/prerequisites/install-functions/find_or_install.sh
deleted file mode 100644
index 59891c259..000000000
--- a/prerequisites/install-functions/find_or_install.sh
+++ /dev/null
@@ -1,681 +0,0 @@
-# shellcheck shell=bash disable=SC2154,SC2034,SC2148
-find_or_install()
-{
-  package="$1"
-  # This is a bash 3 hack standing in for a bash 4 hash (bash 3 is the lowest common
-  # denominator because, for licensing reasons, OS X only has bash 3 by default.)
-  # See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
-  package_executable_array=(
-    "gcc:gfortran"
-    "cmake:cmake"
-    "mpich:mpifort"
-    "flex:flex"
-    "bison:yacc"
-    "m4:m4"
-    "_unknown:0"
-  )
-  for element in "${package_executable_array[@]}" ; do
-     KEY="${element%%:*}"
-     VALUE="${element##*:}"
-     if [[ "$KEY" == "_unknown" ]]; then
-       # No recognizeable argument passed so print usage information and exit:
-       printf "%s: Package name (%s) not recognized in find_or_install function [exit 40].\n" "$this_script" "$package"
-       exit 40
-     elif [[ $package == "$KEY" ]]; then
-       executable=$VALUE
-       break
-     fi
-  done
-
-  if [[ "$package" == "$executable" ]]; then
-    printf "%s: Checking whether %s is in the PATH..." "$this_script" "$executable"
-  else
-    printf "%s: Checking whether %s executable $executable is in the PATH..." "$this_script" "$package"
-  fi
-  if type "$executable" >& /dev/null; then
-    printf "yes.\n"
-    package_in_path=true
-    package_version_in_path=$( ("${executable}" --version 2>/dev/null || "${executable}" -V) | head -1)
-  else
-    printf "no.\n"
-    package_in_path=false
-  fi
-
-  export default_package_install_path=$(./build.sh -P "$package")
-
-  printf "Checking whether %s is in %s..." "$executable" "$default_package_install_path"
-  if [[ -x "$default_package_install_path/bin/$executable" ]]; then
-    printf "yes.\n"
-    script_installed_package=true
-    stack_push script_installed "$package" "$executable"
-  else
-    script_installed_package=false
-    printf "no.\n"
-  fi
-
-  minimum_version=$(./build.sh -V "$package")
-
-  if [[ "$package" == "cmake" ]]; then
-
-    # We arrive here only by the explicit, direct call 'find_or_install cmake' inside
-    # the build_opencoarrays function. Because there is no possibility of arriving here
-    # by recursion (no packages depend on cmake except OpenCoarrays, which gets built
-    # after all dependencies have been found or installed), cmake must add itself to
-    # the dependency stack if no acceptable cmake is found.
-
-    # Every branch that discovers an acceptable pre-existing installation must set the
-    # CMAKE environment variable. Every branch must also manage the dependency stack.
-
-    # If the user specified a CMake binary, use it
-    if [[ ! -z "${arg_m:-}" ]]; then
-
-      echo -e "$this_script: Using the $package specified by -m or --with-cmake: ${arg_m}\n"
-      export CMAKE="${arg_m}"
-      # Halt the recursion
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$script_installed_package" == true ]]; then
-      echo -e "$this_script: Using the $package installed by $this_script\n"
-      export CMAKE=$default_package_install_path/bin/$executable
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$package_in_path" == "true" ]]; then
-      echo -e "$this_script: Checking whether $package in PATH is version < $minimum_version... "
-
-      if ! ./check_version.sh "$package" "$(./build.sh -V "$package")"; then
-        printf "yes.\n"
-        # Here we place $package on the dependency stack to trigger the build of the above file:
-        stack_push dependency_pkg "$package" "none"
-        stack_push dependency_exe "$package" "none"
-        stack_push dependency_path "$(./build.sh -P cmake)" "none"
-
-      else
-        printf "no.\n"
-        echo -e "$this_script: Using the $executable found in the PATH.\n"
-        export CMAKE=$executable
-        # Prevent recursion
-        stack_push dependency_pkg "none"
-        stack_push dependency_exe "none"
-        stack_push dependency_path "none"
-      fi
-
-    else # Build package ($package has no prerequisites)
-      stack_push dependency_pkg "$package" "none"
-      stack_push dependency_exe "$package" "none"
-      stack_push dependency_path "$(./build.sh -P "$package")" "none"
-    fi
-
-  elif [[ $package == "mpich" ]]; then
-
-    # We arrive here only by the explicit, direct call 'find_or_install mpich' inside
-    # the build_opencoarrays function. Because there is no possibility of arriving here
-    # by recursion (no packages depend on mpich except OpenCoarrays, which gets built
-    # after all dependencies have been found or installed), mpich must add itself to
-    # the dependency stack if no acceptable mpich is found.
-
-    # Every branch that discovers an acceptable pre-existing installation must set the
-    # MPIFC, MPICC, and MPICXX environment variables. Every branch must also manage the
-    # dependency stack.
-
-    # If the user specified a Fortran compiler, verify that mpifort wraps the specified compiler
-    if [[ ! -z "${arg_M:-}" ]]; then
-
-      echo -e "$this_script: Using the $package specified by -M or --with-mpi: ${arg_M}\n"
-      export MPIFC="${arg_M}"/bin/mpifort
-      export MPICC="${arg_M}"/bin/mpicc
-      export MPICXX="${arg_M}"/bin/mpicxx
-      # Halt the recursion
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$script_installed_package" == true ]]; then
-
-      echo -e "$this_script: Using the $package installed by $this_script\n"
-      export MPIFC=$default_package_install_path/bin/mpifort
-      export MPICC=$default_package_install_path/bin/mpicc
-      export MPICXX=$default_package_install_path/bin/mpicxx
-      # Halt the recursion
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$package_in_path" == "true" ]]; then
-
-      echo -e "$this_script: Checking whether $executable in PATH wraps gfortran... "
-      mpifort_version_header=$(mpifort --version | head -1)
-      first_three_characters=$(echo "$mpifort_version_header" | cut -c1-3)
-      if [[ "$first_three_characters" != "GNU" ]]; then
-        printf "no.\n"
-        # Trigger 'find_or_install gcc' and subsequent build of $package
-        stack_push dependency_pkg "none" "$package" "gcc"
-        stack_push dependency_exe "none" "$executable" "gfortran"
-        stack_push dependency_path "none" "$(./build.sh -P "$package")" "$(./build.sh -P gcc)"
-      else
-        printf "yes.\n"
-
-        if [[ ! -z "${arg_f:-}" ]]; then
-
-          info "-f (or --with-fortran) argument detected with value ${arg_f}"
-          printf "yes.\n %s: Using the specified %s.\n" "$this_script" "$executable"
-          export MPIFC=mpifort
-          export MPICC=mpicc
-          export MPICXX=mpicxx
-
-          # Halt the recursion
-          stack_push dependency_pkg "none"
-          stack_push dependency_exe "none"
-          stack_push dependency_path "none"
-
-        else
-
-          export minimum_compiler_version=$(./build.sh -V gcc)
-          info "$this_script: Checking whether $executable in PATH wraps gfortran version >= $minimum_compiler_version... "
-          $executable acceptable_compiler.f90 -o acceptable_compiler || true;
-          $executable print_true.f90 -o print_true || true;
-          if [[ -f ./acceptable_compiler && -f ./print_true ]]; then
-            acceptable=$(./acceptable_compiler $minimum_compiler_version)
-            is_true=$(./print_true)
-            rm acceptable_compiler print_true
-          else
-            acceptable=false
-          fi
-          if [[ "$acceptable" == "${is_true:-}" ]]; then
-            printf "yes.\n %s: Using the $executable found in the PATH.\n" "$this_script"
-            export MPIFC=mpifort
-            export MPICC=mpicc
-            export MPICXX=mpicxx
-
-            # Halt the recursion
-            stack_push dependency_pkg "none"
-            stack_push dependency_exe "none"
-            stack_push dependency_path "none"
-          else
-            printf "no\n"
-            # Trigger 'find_or_install gcc' and subsequent build of $package
-            stack_push dependency_pkg "none" "$package" "gcc"
-            stack_push dependency_exe "none" "$executable" "gfortran"
-            stack_push dependency_path "none" "$(./build.sh -P "$package")" "$(./build.sh -P gcc)"
-          fi
-        fi
-      fi
-
-    else # $package not in PATH and not yet installed by this script
-      # Trigger 'find_or_install gcc' and subsequent build of $package
-      stack_push dependency_pkg  "none" "$package" "gcc"
-      stack_push dependency_exe  "none" "$executable" "gfortran"
-      stack_push dependency_path "none" "$(./build.sh -P "$package")" "$(./build.sh -P gcc)"
-    fi
-
-    # Check consistency of MPIFC, if set, and user-specified Fortran compiler
-    if [[ ! -z ${MPIFC:-} && ! -z "${arg_f:-}" ]]; then
-      MPIFC_wraps=$("${MPIFC}" --version)
-      compiler=$(${arg_f} --version)
-      if [[ "${MPIFC_wraps}" != "${compiler}"   ]]; then
-        emergency "Specified MPI ${MPIFC_wraps} wraps a compiler other than the specified Fortran compiler ${compiler}"
-      fi
-    fi
-
-  elif [[ $package == "gcc" ]]; then
-
-    # We arrive here when the 'elif [[ $package == "mpich" ]]' block pushes "gcc" onto the
-    # the dependency_pkg stack, resulting in the recursive call 'find_or_install gcc'
-
-    # Every branch that discovers an acceptable pre-existing installation must set the
-    # FC, CC, and CXX environment variables. Every branch must also manage the dependency stack.
-
-    if [[ ! -z "${arg_f:-}" ]]; then
-
-      info "-f (or --with-fortran) argument detected with value ${arg_f}"
-      [ -z "${arg_c:-}" ] && emergency "-f (--with-fortran) specifies Fortran compiler; Please also specify C/C++ compilers"
-      [ -z "${arg_C:-}" ] && emergency "-f (--with-fortran) specifies Fortran compiler; Please also specify C/C++ compilers"
-
-      export FC="${arg_f}"
-      export CC="${arg_c}"
-      export CXX="${arg_C}"
-
-      # Remove $package from the dependency stack
-      stack_pop dependency_pkg package_done
-      stack_pop dependency_exe executable_done
-      stack_pop dependency_path package_done_path
-      # Halt the recursion and signal that none of $package's prerequisites need to be built
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$script_installed_package" == true ]]; then
-      echo -e "$this_script: Using the $package executable $executable installed by $this_script\n"
-      export FC=$default_package_install_path/bin/gfortran
-      export CC=$default_package_install_path/bin/gcc
-      export CXX=$default_package_install_path/bin/g++
-      gfortran_lib_paths="$default_package_install_path/lib64/:$default_package_install_path/lib"
-      if [[ -z "${LD_LIBRARY_PATH:-}" ]]; then
-        echo "$this_script: export LD_LIBRARY_PATH=\"$gfortran_lib_paths\""
-                            export LD_LIBRARY_PATH="$gfortran_lib_paths"
-      else
-        echo "$this_script: export LD_LIBRARY_PATH=\"$gfortran_lib_paths:$LD_LIBRARY_PATH\""
-                            export LD_LIBRARY_PATH="$gfortran_lib_paths:$LD_LIBRARY_PATH"
-      fi
-      # Remove $package from the dependency stack
-      stack_pop dependency_pkg package_done
-      stack_pop dependency_exe executable_done
-      stack_pop dependency_path package_done_path
-      # Put $package onto the script_installed log
-      stack_push script_installed package_done
-      stack_push script_installed executable_done
-      stack_push script_installed package_done_path
-      # Halt the recursion and signal that none of $package's prerequisites need to be built
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$package_in_path" == "true" ]]; then
-      info "$this_script: Checking whether $executable in PATH is version $minimum_version or later..."
-      $executable -o acceptable_compiler acceptable_compiler.f90 || true;
-      $executable -o print_true print_true.f90 || true;
-      if [[ -f ./acceptable_compiler && -f ./print_true ]]; then
-        is_true=$(./print_true)
-        info "Executing './acceptable_compiler $minimum_version'"
-        acceptable=$(./acceptable_compiler $minimum_version)
-        rm acceptable_compiler print_true
-      else
-        acceptable=false
-      fi
-
-      if [[ "$acceptable" == "${is_true:-}" ]]; then
-        printf "yes.\n"
-        echo -e "$this_script: Using the $executable found in the PATH.\n"
-        export FC=gfortran
-        export CC=gcc
-        export CXX=g++
-        # Remove $package from the dependency stack
-        stack_pop dependency_pkg package_done
-        stack_pop dependency_exe executable_done
-        stack_pop dependency_path package_done_path
-        # Put $package onto the script_installed log
-        stack_push script_installed package_done
-        stack_push script_installed executable_done
-        stack_push script_installed package_done_path
-        # Halt the recursion and signal that none of $package's prerequisites need to be built
-        stack_push dependency_pkg "none"
-        stack_push dependency_exe "none"
-        stack_push dependency_path "none"
-      else
-        printf "no.\n"
-        # Trigger 'find_or_install flex' and subsequent build of $package
-        stack_push dependency_pkg "flex"
-        stack_push dependency_exe "flex"
-        stack_push dependency_path "$(./build.sh -P flex)"
-      fi
-
-    else # $package is not in PATH and not yet installed by this script
-      # Trigger 'find_or_install flex' and subsequent build of $package
-      stack_push dependency_pkg "flex"
-      stack_push dependency_exe "flex"
-      stack_push dependency_path "$(./build.sh -P flex)"
-    fi
-
-  elif [[ $package == "flex" ]]; then
-
-    # We arrive here only if the 'elif [[ $package == "gcc" ]]' block has pushed "flex"
-    # onto the dependency_pkg stack, resulting in the recursive call 'find_or_install flex'.
-    # flex therefore does not need to add itself to the stack.
-
-    # Every branch that discovers an acceptable pre-existing installation must set the
-    # FLEX environment variable. Every branch must also manage the dependency stack.
-
-    if [[ "$script_installed_package" == true ]]; then
-      echo -e "$this_script: Using the $executable installed by $this_script\n"
-      export FLEX=$default_package_install_path/bin/$executable
-      # Remove flex from the dependency stack
-      stack_pop dependency_pkg package_done
-      stack_pop dependency_exe executable_done
-      stack_pop dependency_path package_done_path
-      # Put $package onto the script_installed log
-      stack_push script_installed package_done
-      stack_push script_installed executable_done
-      stack_push script_installed package_done_path
-      # Halt the recursion and signal that no prerequisites need to be built
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$package_in_path" == "true" ]]; then
-
-      echo -e "$this_script: Checking whether $package in PATH is version < $minimum_version... "
-      if ! ./check_version.sh "$package" "$(./build.sh -V "$package")"; then
-        printf "yes\n"
-
-        export FLEX="$default_package_install_path/bin/$executable"
-        # Trigger 'find_or_install bison' and subsequent build of $package
-        stack_push dependency_pkg "bison"
-        stack_push dependency_exe "yacc"
-        stack_push dependency_path "$(./build.sh -P bison)"
-      else
-        printf "no.\n"
-        echo -e "$this_script: Using the $executable found in the PATH.\n"
-        export FLEX=$executable
-        # Remove $package from the dependency stack
-        stack_pop dependency_pkg package_done
-        stack_pop dependency_exe executable_done
-        stack_pop dependency_path package_done_path
-        # Put $package onto the script_installed log
-        stack_push script_installed package_done
-        stack_push script_installed executable_done
-        stack_push script_installed package_done_path
-        # Halt the recursion and signal that none of $package's prerequisites need to be built
-        stack_push dependency_pkg "none"
-        stack_push dependency_exe "none"
-        stack_push dependency_path "none"
-      fi
-
-    else  # $package is not in the PATH and not yet installed by $this_script
-      # Trigger 'find_or_install bison' and subsequent build of $package
-      stack_push dependency_pkg "bison"
-      stack_push dependency_exe "yacc"
-      stack_push dependency_path "$(./build.sh -P bison)"
-    fi
-
-  elif [[ $package == "bison" ]]; then
-
-    # We arrive when the 'elif [[ $package == "flex" ]]' block pushes "bison" onto the
-    # the dependency_pkg stack, resulting in the recursive call 'find_or_install bison'
-
-    # Every branch that discovers an acceptable pre-existing installation must set the
-    # YACC environment variable. Every branch must also manage the dependency stack.
-
-    if [[ "$script_installed_package" == true ]]; then
-      echo -e "$this_script: Using the $package executable $executable installed by $this_script\n"
-      export YACC=$default_package_install_path/bin/yacc
-      # Remove bison from the dependency stack
-      stack_pop dependency_pkg package_done
-      stack_pop dependency_exe executable_done
-      stack_pop dependency_path package_done_path
-      # Put $package onto the script_installed log
-      stack_push script_installed package_done
-      stack_push script_installed executable_done
-      stack_push script_installed package_done_path
-      # Halt the recursion and signal that there are no prerequisites to build
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$package_in_path" == "true" ]]; then
-      echo -e "$this_script: Checking whether $package executable $executable in PATH is version < $minimum_version... "
-      if ! ./check_version.sh "$package" "$(./build.sh -V "$package")"; then
-        printf "yes.\n"
-        export YACC="$default_package_install_path/bin/$executable"
-        # Trigger 'find_or_install m4' and subsequent build of $package
-        stack_push dependency_pkg "m4"
-        stack_push dependency_exe "m4"
-        stack_push dependency_path "$(./build.sh -P m4)"
-      else
-        printf "no.\n"
-        echo -e "$this_script: Using the $package executable $executable found in the PATH.\n"
-        YACC=yacc
-        # Remove bison from the dependency stack
-        stack_pop dependency_pkg package_done
-        stack_pop dependency_exe executable_done
-        stack_pop dependency_path package_done_path
-        # Put $package onto the script_installed log
-        stack_push script_installed package_done
-        stack_push script_installed executable_done
-        stack_push script_installed package_done_path
-        # Halt the recursion and signal that there are no prerequisites to build
-        stack_push dependency_pkg "none"
-        stack_push dependency_exe "none"
-        stack_push dependency_path "none"
-      fi
-
-    else # $package not in PATH and not yet installed by this script
-      # Trigger 'find_or_install m4' and subsequent build of $package
-      stack_push dependency_pkg "m4"
-      stack_push dependency_exe "m4"
-      stack_push dependency_path "$(./build.sh -P m4)"
-    fi
-
-  elif [[ $package == "m4" ]]; then
-
-    # We arrive when the 'elif [[ $package == "bison" ]]' block pushes "m4" onto the
-    # the dependency_pkg stack, resulting in the recursive call 'find_or_install m4'
-
-    # Every branch that discovers an acceptable pre-existing installation must set the
-    # M4 environment variable. Every branch must also manage the dependency stack.
-
-    if [[ "$script_installed_package" == true ]]; then
-      echo -e "$this_script: Using the $package executable $executable installed by $this_script\n"
-      export M4=$default_package_install_path/bin/m4
-      # Remove m4 from the dependency stack
-      stack_pop dependency_pkg package_done
-      stack_pop dependency_exe executable_done
-      stack_pop dependency_path package_done_path
-      # Put $package onto the script_installed log
-      stack_push script_installed package_done
-      stack_push script_installed executable_done
-      stack_push script_installed package_done_path
-      # Halt the recursion and signal that there are no prerequisites to build
-      stack_push dependency_pkg "none"
-      stack_push dependency_exe "none"
-      stack_push dependency_path "none"
-
-    elif [[ "$package_in_path" == "true" ]]; then
-      echo -e "$this_script: Checking whether $package executable $executable in PATH is version < $minimum_version... "
-      if ! ./check_version.sh "$package" "$(./build.sh -V "$package")"; then
-        printf "yes.\n"
-        export M4="$default_package_install_path/bin/m4"
-        # Halt the recursion and signal that there are no prerequisites to build
-        stack_push dependency_pkg "none"
-        stack_push dependency_exe "none"
-        stack_push dependency_path "none"
-      else
-        printf "no.\n"
-        echo -e "$this_script: Using the $package executable $executable found in the PATH.\n"
-        M4=m4
-        # Remove m4 from the dependency stack
-        stack_pop dependency_pkg package_done
-        stack_pop dependency_exe executable_done
-        stack_pop dependency_path package_done_path
-        # Put $package onto the script_installed log
-        stack_push script_installed package_done
-        stack_push script_installed executable_done
-        stack_push script_installed package_done_path
-        # Halt the recursion and signal that there are no prerequisites to build
-        stack_push dependency_pkg "none"
-        stack_push dependency_exe "none"
-        stack_push dependency_path "none"
-      fi
-
-    else # $package not in PATH and not yet installed by this script
-      # Halt the recursion and signal that there are no prerequisites to build
-      export M4="$default_package_install_path/bin/m4"
-      stack_push dependency_pkg  "none"
-      stack_push dependency_exe  "none"
-      stack_push dependency_path "none"
-    fi
-
-  else
-    if [[ -z "${package:-}" ]]; then
-      echo -e "$this_script: empty package name passed to find_or_install function. [exit 50]\n"
-      exit 50
-    else
-      echo -e "$this_script: unknown package name ($package) passed to find_or_install function. [exit 55]\n"
-      exit 55
-    fi
-  fi
-
-  echo "$this_script: Updated dependency stack (top to bottom = left to right):"
-  stack_print dependency_pkg
-
-  stack_size dependency_pkg num_stacked
-  (( num_dependencies=num_stacked-1 )) || true
-
-  if [[ $num_dependencies -lt 0 ]]; then
-    emergency "The procedure named in the external call to find_or_install is not on the dependency stack. [exit 60]\n"
-
-  elif [[ $num_dependencies -gt 0 ]]; then
-    stack_pop  dependency_pkg  prerequisite_pkg
-    stack_pop  dependency_exe  prerequisite_exe
-    stack_pop  dependency_path prerequisite_path
-
-    if [[ $prerequisite_pkg != "none" ]]; then
-      stack_push dependency_pkg  "$prerequisite_pkg"
-      stack_push dependency_exe  "$prerequisite_exe"
-      stack_push dependency_path "$prerequisite_path"
-      echo -e "$this_script: Building $package from source requires $prerequisite_pkg.\n"
-      find_or_install "$prerequisite_pkg"
-    fi
-  fi
-
-  echo "$this_script: Remaining $package dependency stack (top to bottom = left to right):"
-  stack_print dependency_pkg
-
-  stack_pop dependency_pkg package
-  stack_pop dependency_exe executable
-  stack_pop dependency_path default_package_install_path
-
-  if [[ $package != "none" ]]; then
-
-    export default_package_version=$(./build.sh -V "${package}")
-    export package_version_to_install=${arg_I:-${default_package_version}}
-
-    prefix_root="${prefix_root:-${default_package_install_path%${package}/${package_version_to_install}}}"
-
-    if [[ ${package} == "gcc" ]]; then
-      export package_directory_name="gnu"
-    else
-      export package_directory_name=${package}
-    fi
-
-    package_install_prefix="${prefix_root}/${package_directory_name}/${package_version_to_install}"
-
-    if [[ "$package" == "$executable" ]]; then
-      echo "$this_script: Ready to install $executable in $package_install_prefix"
-    else
-      echo "$this_script: Ready to install $package executable $executable in $package_install_prefix"
-    fi
-
-
-    if [[ "${arg_y}" == "${__flag_present}" ]]; then
-      info "-y or --yes-to-all flag present. Proceeding with non-interactive build."
-    else
-      echo -e "$this_script: Ok to download (if necessary), build, and install $package from source? (Y/n) "
-      read -r proceed_with_build
-
-      if [[ "$proceed_with_build" == "n" || "$proceed_with_build" == "no" ]]; then
-        printf "n\n"
-        echo -e "$this_script: OpenCoarrays installation requires $package. Aborting. [exit 70]\n"
-        exit 70
-      else # permission granted to build
-        printf "Y\n"
-      fi
-    fi
-
-    # On OS X, CMake must be built with Apple LLVM gcc, which XCode command-line tools puts in /usr/bin
-    if [[ $(uname) == "Darwin" && $package == "cmake"  ]]; then
-      if [[ -x "/usr/bin/gcc" ]]; then
-        CC=/usr/bin/gcc
-      else
-        echo -e "$this_script: OS X detected.  Please install XCode command-line tools and \n"
-        echo -e "$this_script: ensure that /usr/bin/gcc exists and is executable. Aborting. [exit 75]\n"
-        exit 75
-      fi
-    # Otherwise, if no CC has been defined yet, use the gcc in the user's PATH
-    elif [[ -z "${CC:-}" ]]; then
-      CC=gcc
-    fi
-
-    # On OS X, CMake must be built with Apple LLVM g++, which XCode command-line tools puts in /usr/bin
-    if [[ $(uname) == "Darwin" && $package == "cmake"  ]]; then
-      if [[ -x "/usr/bin/g++" ]]; then
-        CXX=/usr/bin/g++
-      else
-        echo -e "$this_script: OS X detected.  Please install XCode command-line tools \n"
-        echo -e "$this_script: and ensure that /usr/bin/g++ exists and is executable. Aborting. [exit 76]\n"
-        exit 76
-      fi
-    # Otherwise, if no CXX has been defined yet, use the g++ in the user's PATH
-    elif [[ -z "${CXX:-}" ]]; then
-      CXX=g++
-    fi
-
-    # If no FC has been defined yet, use the gfortran in the user's PATH
-    if [[ -z "${FC:-}" ]]; then
-      FC=gfortran
-    fi
-
-    if [[ "${arg_y}" == "${__flag_present}" ]]; then
-      yes_to_all="-y"
-    fi
-
-    if [[ "${arg_Z}" == "${__flag_present}" ]]; then
-      bootstrap="-Z"
-    fi
-
-    echo -e "$this_script: Downloading, building, and installing $package \n"
-    echo "$this_script: Build command: FC=$FC CC=$CC CXX=$CXX ./build.sh -p $package -i $package_install_prefix -j $num_threads ${yes_to_all:-} ${bootstrap:-}"
-
-    FC="$FC" CC="$CC" CXX="$CXX" ./build.sh -p "$package" -i "$package_install_prefix" -j "$num_threads" "${yes_to_all:-}" "${bootstrap:-}"
-
-    if [[ ! -x "$package_install_prefix/bin/$executable" ]]; then
-
-      echo -e "$this_script: Installation unsuccessful. "
-      emergency "$executable is not in the path ($package_install_prefix/bin) or the user lacks executable permission."
-
-    else
-      echo -e "$this_script: Installation successful.\n"
-      if [[ "$package" == "$executable" ]]; then
-        echo -e "$this_script: $executable is in $package_install_prefix/bin \n"
-      else
-        echo -e "$this_script: $package executable $executable is in $package_install_prefix/bin \n"
-      fi
-
-      if [[ $package == "cmake" ]]; then
-        echo "$this_script: export CMAKE=$package_install_prefix/bin/$executable"
-                            export CMAKE="$package_install_prefix/bin/$executable"
-      elif [[ $package == "bison" ]]; then
-        echo "$this_script: export YACC=$package_install_prefix/bin/$executable"
-                            export YACC="$package_install_prefix/bin/$executable"
-      elif [[ $package == "flex" ]]; then
-        echo "$this_script: export FLEX=$package_install_prefix/bin/$executable"
-                            export FLEX="$package_install_prefix/bin/$executable"
-      elif [[ $package == "m4" ]]; then
-        echo "$this_script: export M4=$package_install_prefix/bin/$executable"
-                            export M4="$package_install_prefix/bin/$executable"
-      elif [[ $package == "gcc" ]]; then
-        echo "$this_script: export FC=$package_install_prefix/bin/gfortran"
-                            export FC="$package_install_prefix/bin/gfortran"
-        echo "$this_script: export CC=$package_install_prefix/bin/gcc"
-                            export CC="$package_install_prefix/bin/gcc"
-        echo "$this_script: export CXX=$package_install_prefix/bin/g++"
-                            export CXX="$package_install_prefix/bin/g++"
-        gfortran_lib_paths="$package_install_prefix/lib64/:$package_install_prefix/lib"
-        if [[ -z "${LD_LIBRARY_PATH:-}" ]]; then
-          export LD_LIBRARY_PATH="$gfortran_lib_paths"
-          else
-            export LD_LIBRARY_PATH="$gfortran_lib_paths:$LD_LIBRARY_PATH"
-          fi
-        elif [[ $package == "mpich" ]]; then
-          echo "$this_script: export MPIFC=$package_install_prefix/bin/mpifort"
-                              export MPIFC="$package_install_prefix/bin/mpifort"
-          echo "$this_script: export MPICC= $package_install_prefix/bin/mpicc"
-                              export MPICC="$package_install_prefix/bin/mpicc"
-          echo "$this_script: export MPICXX=$package_install_prefix/bin/mpicxx"
-                              export MPICXX="$package_install_prefix/bin/mpicxx"
-        else
-          echo -e "$this_script: WARNING: $package executable $executable installed correctly but the \n"
-          echo -e "$this_script:          corresponding environment variable(s) have not been set. This \n"
-          echo -e "$this_script:          could prevent a complete build of OpenCoarrays. Please report this\n"
-          echo -e "$this_script:          issue at https://github.com/sourceryinstitute/opencoarrays/issues\n"
-        fi
-        if [[ -z "${PATH:-}" ]]; then
-          export PATH="$package_install_prefix/bin"
-        else
-          export PATH="$package_install_prefix/bin:$PATH"
-        fi
-      fi
-    fi # End 'if [[ ! -x "$package_install_prefix/bin/$executable" ]]; then'
-}
diff --git a/prerequisites/install-functions/install-xcode-clt.sh b/prerequisites/install-functions/install-xcode-clt.sh
deleted file mode 100644
index 148a4e24b..000000000
--- a/prerequisites/install-functions/install-xcode-clt.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-# shellcheck shell=bash disable=SC2154,SC2148
-need_xcodeCLT() {
-  if [[ "${OSTYPE}" != [Dd][Aa][Rr][Ww][Ii][Nn]* ]]; then
-    echo "false"
-  else
-    local xcode_dir
-    xcode_dir="$(/usr/bin/xcode-select -print-path 2>/dev/null)" || true
-    if [[ ! -d "${xcode_dir}" || ! -x "${xcode_dir}/usr/bin/make" ]]; then
-      echo "true"
-    else
-      echo "false"
-    fi
-  fi
-}
-
-xcode_clt_install () {
-  app_store_label="$(softwareupdate -l | grep -B 1 -E "Command Line (Developer|Tools)" | awk -F"*" '/^ +\\*/ {print $2}' | sed 's/^ *//' | tail -n1)" || return 0
-  if [[ "${arg_y}" == "${__flag_present}" ]]; then
-    info "-y or --yes-to-all flag present. Proceeding with non-interactive download and install."
-  else
-    info "If you proceed with the Xcode-CLT installation you may be prompted for your password."
-    printf "Ready to install %s? (Y/n)" "${app_store_label}"
-    read -r install_xcodeclt
-    printf '%s\n' "${install_xcodeclt}"
-    if [[ "${install_xcodeclt}" == [nN]* ]]; then
-      emergency "${this_script}: Aborting: cannot proceed without XCode CLT."
-    fi
-  fi
-  info "install.sh will attempt to download and install XCode CLT for you now."
-  info "Note: sudo privileges required. Please enter your password if prompted."
-  place_holder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress"
-  sudo /usr/bin/touch "${place_holder}" || true
-  sudo /usr/sbin/softwareupdate -i app_store_label || return 0
-  sudo /bin/rm -f "${place_holder}" || true
-  sudo /usr/bin/xcode-select --switch "/Library/Developer/CommandLineTools" || return 1
-}
-
-headless_xcode_clt_install () {
-  # Fallback here if headless install/upgrade failed. This is the usual path through this code.
-  if [[ "${arg_y}" == "${__flag_present}" ]]; then
-    info "-y or --yes-to-all flag present. Proceeding with non-interactive download and install."
-  else
-    info "If you proceed with the Xcode-CLT installation you may be prompted for your password."
-    printf "Ready to install Xcode-CLT using xcode-select? (Y/n)"
-    read -r install_xcodeclt
-    printf '%s\n' "${install_xcodeclt}"
-    if [[ "${install_xcodeclt}" == [nN]* ]]; then
-      emergency "${this_script}: Aborting: cannot proceed without XCode CLT."
-    fi
-  fi
-  info "Installing Xcode Command Line Tools (CLT), using \`xcode-select --install\`."
-  info "Note: sudo privileges required. Please enter your password if prompted."
-  sudo /usr/bin/xcode-select --install || emergency "${this_script}: unable to run \`sudo xcode-select --install\`"
-  printf "Please press <enter> once installation of Xcode command line tools has completed."
-  read -r
-  sudo /usr/bin/xcode-select --switch "/Library/Developer/CommandLineTools" || \
-    emergency "${this_script}: Xcode-CLT installation and activation failed, unable to continue"
-}
-
-maybe_install_xcodeCLT () {
-  if [[ "$(need_xcodeCLT)" == "true" ]]; then
-    info "It appears that you are on Mac OS and do not have the Xcode command line tools (CLT) installed,"
-    info "or they need to be upgraded.install.sh will now attempt to install/upgrade the Xcode-CLT using \`softwareupdate\`"
-    info "This may take some time, please be patient."
-    xcode_clt_install || true # This usually fails since `softwareupdate -i` doesn't return CLTs needing update
-  fi
-  if [[ "$(need_xcodeCLT)" == "true" ]]; then
-    info "\`softwareupdate\` installation/upgrade failed. This is normal. Now trying with \`xcode-select --install\`"
-    headless_xcode_clt_install || emergency "${this_script}: Could not install Xcode command line tools, unable to proceed. Please install them via the app store before retrying this installation."
-  fi
-
-  clang_output="$(/usr/bin/xzrun clang 2>&1)" || true
-  if [[ "${clang_output}" =~ license ]]; then
-    emergency "${this_script}: It appears you have not agreed to the Xcode license. Please do so before attempting to run this script again. This may be achieved by opening Xcode.app or running \`sudo xcodebuild -license\`"
-  fi
-}
diff --git a/prerequisites/install-functions/print_header.sh b/prerequisites/install-functions/print_header.sh
deleted file mode 100644
index 85ca18a16..000000000
--- a/prerequisites/install-functions/print_header.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-# shellcheck shell=bash disable=SC2154,SC2148
-print_header() {
-  pushd "${__dir}" >/dev/null
-  local gccver mpichver cmakever flexver bisonver m4ver
-  gccver="$("${__file}" -V gcc)"
-  mpichver="$("${__file}" -V mpich)"
-  cmakever="$("${__file}" -V cmake)"
-  flexver="$("${__file}" -V flex)"
-  bisonver="$("${__file}" -V bison)"
-  m4ver="$("${__file}" -V m4)"
-  popd >/dev/null
-  clear
-  echo "__________ Please read these instructions carefully before proceeding. ___________"
-  echo "__________________________________________________________________________________"
-  echo "*** Most end users will find it easier to install OpenCoarrays via the native  ***"
-  echo "*** package manager for the target operating system.  Advanced developers will ***"
-  echo "*** find it best to install via CMake.  Please see the OpenCoarrays README.md  ***"
-  echo "*** for a list of supported package installers or for instructions on using    ***"
-  echo "*** CMake to install.  The current script offers a fallback when other methods ***"
-  echo "*** prove infeasible. This script builds any missing prerequisites from source ***"
-  echo "*** and then builds OpenCoarrays from source.  The process might take a few    ***"
-  echo "*** minutes if the script finds all prerequisites or several hours if the      ***"
-  echo "*** script finds no prerequisites. (Run './install.sh --help' without quotes   ***"
-  echo "*** to see the installation options.)  This script traverses the following     ***"
-  echo "*** dependency tree and asks permission to install packages that are not in    ***"
-  echo "*** your PATH, not in the prerequisites/installations subdirectory of the      ***"
-  echo "*** OpenCoarrays source tree, or have insufficiently recent version numbers:   ***"
-  echo ""
-  # Generate the following text using the `tree` command w/ dummy directory structure
-  cat <<-EOF
-    opencoarrays
-    |__ cmake-${cmakever}
-    |__ mpich-${mpichver}
-        |__ gcc-${gccver}
-            |__ flex-${flexver}
-            |   |__ bison-${bisonver}
-            |       |__ m4-${m4ver}
-            |__ gmp
-            |__ mpc
-            |__ mpfr
-
-EOF
-  echo "*** For a non-interactive installation, relaunch this script with the command  ***"
-  echo "*** './install.sh --yes-to-all' without quotes to instruct the script to       ***"
-  echo "*** assume affirmative answers to all user queries.                            ***"
-  echo ""
-  printf "%s will be installed in %s\n" "${arg_p}" "${prefix_root:-${install_path}}"
-  echo ""
-  if [[ "${arg_y}" == "${__flag_present}" ]]; then
-    info "-y or --yes-to-all flag present. Proceeding with non-interactive build."
-  else
-    printf "Ready to rock and roll? (Y/n)"
-    read -r install_now
-    printf '%s\n' "${install_now}"
-    if [[ "${install_now}" == "n" || "${install_now}" == "no" ]]; then
-      emergency "${this_script}: Aborting. [exit 85]"
-    fi
-  fi
-}
diff --git a/prerequisites/install-functions/report_results.sh b/prerequisites/install-functions/report_results.sh
deleted file mode 100644
index 03a60848a..000000000
--- a/prerequisites/install-functions/report_results.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-# shellcheck shell=bash disable=SC2154,SC2129,SC2148
-report_results()
-{
-  fully_qualified_FC="$(type -P "${FC}")"
-  compiler_install_root="${fully_qualified_FC%bin/${FC}}"
-
-  fully_qualified_MPIFC="$(type -P "${MPIFC}")"
-  mpi_install_root="${fully_qualified_MPIFC%bin/mpifort*}"
-
-  fully_qualified_CMAKE="$(type -P "${CMAKE}")"
-  cmake_install_path="${fully_qualified_CMAKE%/cmake*}"
-
-  # Report installation success or failure and record locations for software stack:
-  if [[ -x "${install_path%/}/bin/caf" && -x "${install_path%/}/bin/cafrun" ]]; then
-
-    # Installation succeeded
-    info "$this_script: Done."
-    info ""
-    info "*** The OpenCoarrays compiler wrapper (caf) and program  ***"
-    info "*** launcher (cafrun) are in the following directory:    ***"
-    info ""
-    info "${install_path%/}/bin."
-    info ""
-    if [[ -f setup.sh ]]; then
-      ${SUDO:-} rm setup.sh
-    fi
-    if [[ -f setup.csh ]]; then
-      ${SUDO:-} rm setup.csh
-    fi
-    # Prepend the OpenCoarrays license to the setup.sh script:
-    while IFS='' read -r line || [[ -n "${line}" ]]; do
-        echo "# ${line}" >> setup.sh
-    done < "${OPENCOARRAYS_SRC_DIR}/LICENSE"
-    while IFS='' read -r line || [[ -n "${line}" ]]; do
-        echo "# ${line}" >> setup.csh
-    done < "${OPENCOARRAYS_SRC_DIR}/LICENSE"
-    echo "#                                                                               " | tee -a setup.csh setup.sh
-    echo "# Execute this script via the following command:                                " | tee -a setup.csh setup.sh
-    echo "# source ${install_path%/}/setup.sh                                             " | tee -a setup.csh setup.sh
-    echo "                                                                                " | tee -a setup.csh setup.sh
-    if [[ -x "${cmake_install_path}/cmake" ]]; then
-      echo "# Prepend the CMake path to the PATH environment variable:" | tee -a setup.sh setup.csh
-      echo "if [[ -z \"\${PATH}\" ]]; then                                       " >> setup.sh
-      echo "  export PATH=\"${cmake_install_path%/}\"                            " >> setup.sh
-      echo "else                                                                 " >> setup.sh
-      echo "  if ! [[ \"\${PATH}\" =~ \"${cmake_install_path}\" ]] ; then        " >> setup.sh
-      echo "    export PATH=\"${cmake_install_path%/}\":\${PATH}                 " >> setup.sh
-      echo "  fi                                                                 " >> setup.sh
-      echo "fi                                                                   " >> setup.sh
-      echo "set path = (\"${cmake_install_path%/}\" \$path)                      " >> setup.csh
-    fi
-    if [[ -x "${fully_qualified_FC}" ]]; then
-      echo "# Prepend the compiler path to the PATH environment variable:" | tee -a setup.sh setup.csh
-      echo "if [[ -z \"\${PATH}\" ]]; then                                                " >> setup.sh
-      echo "  export PATH=\"${compiler_install_root%/}/bin\"                              " >> setup.sh
-      echo "else                                                                          " >> setup.sh
-      echo "  export PATH=\"${compiler_install_root%/}/bin:\${PATH}\"                     " >> setup.sh
-      echo "fi                                                                            " >> setup.sh
-      echo "set path = (\"${compiler_install_root%/}\"/bin \$path)                        " >> setup.csh
-    fi
-    LD_LIB_P_VAR=LD_LIBRARY_PATH
-    if [[ "${OSTYPE:-}" =~ [Dd]arwin ]]; then
-      LD_LIB_P_VAR=DYLD_LIBRARY_PATH
-    fi
-    if [[ -d "${compiler_install_root%/}/lib" || -d "${compiler_install_root%/}/lib64" ]]; then
-      echo "# Prepend the compiler library paths to the ${LD_LIB_P_VAR} environment variable:" | tee -a setup.sh setup.csh
-      compiler_lib_paths="${compiler_install_root%/}/lib64/:${compiler_install_root%/}/lib"
-      echo "if [[ -z \"\${${LD_LIB_P_VAR}}\" ]]; then                                    " >> setup.sh
-      echo "  export ${LD_LIB_P_VAR}=\"${compiler_lib_paths%/}\"                          " >> setup.sh
-      echo "else                                                                          " >> setup.sh
-      echo "  export ${LD_LIB_P_VAR}=\"${compiler_lib_paths%/}:\${${LD_LIB_P_VAR}}\"     " >> setup.sh
-      echo "fi                                                                            " >> setup.sh
-      echo "setenv LD_LIBRARY_PATH \"${compiler_lib_paths%/}:\${LD_LIBRARY_PATH}\"        " >> setup.csh
-    fi
-    echo "                                                                                " >> setup.sh
-    if [[ -x "${mpi_install_root}/bin/mpifort" ]]; then
-      echo "# Prepend the MPI path to the PATH environment variable:" | tee -a setup.sh setup.csh
-      echo "if [[ -z \"\${PATH}\" ]]; then                                       " >> setup.sh
-      echo "  export PATH=\"${mpi_install_root%/}/bin\"                          " >> setup.sh
-      echo "else                                                                 " >> setup.sh
-      echo "  export PATH=\"${mpi_install_root%/}/bin\":\${PATH}                 " >> setup.sh
-      echo "fi                                                                   " >> setup.sh
-      echo "set path = (\"${mpi_install_root%/}/bin\" \$path)                    " >> setup.csh
-    fi
-    # In all likelihood, the following paths are only needed if OpenCoarrays built them,
-    # In by far the most common such use case, they would have been built in a recursive
-    # build of all the OpenCoarrays dependency tree (rather than built indvidually via
-    # ./install --package) so we only need check the default location in which OpenCoarrays
-    # would install them.  If they are not there, then it is very likely the case that the
-    # the system versions of these packages are present and in the user's path or that the
-    # user doesn't need them at all (e.g. there was no need to build gfortran from source).
-    flex_install_path=$("${build_script}" -P flex)
-    if [[ -x "${flex_install_path}/bin/flex" ]]; then
-      echo "# Prepend the flex path to the PATH environment variable:" | tee -a setup.sh setup.csh
-      echo "if [[ -z \"\${PATH}\" ]]; then                                         " >> setup.sh
-      echo "  export PATH=\"${flex_install_path}/bin\"                             " >> setup.sh
-      echo "else                                                                 " >> setup.sh
-      echo "  export PATH=\"${flex_install_path}/bin\":\${PATH}                      " >> setup.sh
-      echo "set path = (\"$flex_install_path\"/bin \$path)                      " >> setup.csh
-      echo "fi                                                                   " >> setup.sh
-    fi
-    bison_install_path=$("${build_script}" -P bison)
-    if [[ -x "${bison_install_path}/bin/yacc" ]]; then
-      echo "# Prepend the bison path to the PATH environment variable:" | tee -a setup.sh setup.csh
-      echo "if [[ -z \"\${PATH}\" ]]; then                                         " >> setup.sh
-      echo "  export PATH=\"${bison_install_path}/bin\"                            " >> setup.sh
-      echo "else                                                                 " >> setup.sh
-      echo "  export PATH=\"${bison_install_path}/bin\":\${PATH}                     " >> setup.sh
-      echo "fi                                                                   " >> setup.sh
-      echo "set path = (\"$bison_install_path\"/bin \$path)                      " >> setup.csh
-    fi
-    m4_install_path=$("${build_script}" -P m4)
-    if [[ -x "${m4_install_path}/bin/m4" ]]; then
-      echo "# Prepend the m4 path to the PATH environment variable:" | tee -a setup.sh setup.csh
-      echo "if [[ -z \"\${PATH}\" ]]; then                                         " >> setup.sh
-      echo "  export PATH=\"${m4_install_path}/bin\"                               " >> setup.sh
-      echo "else                                                                 " >> setup.sh
-      echo "  export PATH=\"${m4_install_path}/bin\":\${PATH}                        " >> setup.sh
-      echo "fi                                                                   " >> setup.sh
-      echo "set path = (\"$m4_install_path\"/bin \$path)                      " >> setup.csh
-    fi
-    opencoarrays_install_path="${install_path}"
-    if [[ -x "${opencoarrays_install_path}/bin/caf" ]]; then
-      echo "# Prepend the OpenCoarrays path to the PATH environment variable:" | tee -a setup.sh setup.csh
-      echo "if [[ -z \"\${PATH}\" ]]; then                                         " >> setup.sh
-      echo "  export PATH=\"${opencoarrays_install_path%/}/bin\"                     " >> setup.sh
-      echo "else                                                                 " >> setup.sh
-      echo "  export PATH=\"${opencoarrays_install_path%/}/bin\":\${PATH}              " >> setup.sh
-      echo "fi                                                                   " >> setup.sh
-      echo "set path = (\"${opencoarrays_install_path%/}\"/bin \$path)                      " >> setup.csh
-    fi
-    if ${SUDO:-} mv setup.sh "${opencoarrays_install_path}"; then
-       setup_sh_location=${opencoarrays_install_path}
-    else
-       setup_sh_location=${PWD}
-    fi
-    if ${SUDO:-} mv setup.csh "${opencoarrays_install_path}"; then
-       setup_csh_location=${opencoarrays_install_path}
-    else
-       setup_csh_location=${PWD}
-    fi
-    echo "*** To set up your environment for using caf and cafrun, please ***"
-    echo "*** source the installed setup.sh file in bash or Z shell or    ***"
-    echo "*** source setup.csh in a C-shell or add one of the following   ***"
-    echo "*** statements to your login file:                              ***"
-    echo ""
-    echo " source ${setup_sh_location%/}/setup.sh"
-    echo " source ${setup_csh_location%/}/setup.csh"
-    echo ""
-    echo "*** Installation complete.                                        ***"
-
-  else # Installation failed
-
-    echo "Something went wrong. Either the user lacks executable permissions for the"
-    echo "OpenCoarrays compiler wrapper (caf), program launcher (cafrun), or prerequisite"
-    echo "package installer (build), or these programs are not in the following, expected"
-    echo "location:"
-    echo "${install_path}/bin."
-    echo "Please review the following file for more information:"
-    echo "${install_path}/${installation_record}"
-    echo "and submit an bug report at https://github.com/sourceryinstitute/opencoarrays/issues/new"
-    echo "[exit 100]"
-    exit 100
-
-  fi # Ending check for caf, cafrun, build not in expected path
-}
diff --git a/prerequisites/install-functions/windows-install.sh b/prerequisites/install-functions/windows-install.sh
deleted file mode 100755
index 677580dcc..000000000
--- a/prerequisites/install-functions/windows-install.sh
+++ /dev/null
@@ -1,295 +0,0 @@
-#!/usr/bin/env bash
-#
-# windows-install.sh
-#
-# -- This script installs OpenCoarrays and its prerequisites.
-#
-# OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-# Copyright (c) 2015-2016, Sourcery, Inc.
-# Copyright (c) 2015-2016, Sourcery Institute
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice, this
-#    list of conditions and the following disclaimer in the documentation and/or
-#    other materials provided with the distribution.
-# 3. Neither the names of the copyright holders nor the names of their contributors
-#    may be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Portions of this script derive from BASH3 Boilerplate and are distributed under
-# the following license:
-#
-# The MIT License (MIT)
-#
-# Copyright (c) 2014 Kevin van Zonneveld
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-# The invocation of bootstrap.sh below performs the following tasks:
-# (1) Import several bash3boilerplate helper functions & default settings.
-# (2) Set several variables describing the current file and its usage page.
-# (3) Parse the usage information (default usage file name: current file's name with -usage appended).
-# (4) Parse the command line using the usage information.
-
-### Start of boilerplate -- do not edit this block #######################
-export OPENCOARRAYS_SRC_DIR="${OPENCOARRAYS_SRC_DIR:-${PWD%/}}"
-if [[ ! -f "${OPENCOARRAYS_SRC_DIR}/src/libcaf.h" ]]; then
-  echo "Please run this script inside the top-level OpenCoarrays source directory or "
-  echo "set OPENCOARRAYS_SRC_DIR to the OpenCoarrays source directory path."
-  exit 1
-fi
-export B3B_USE_CASE="${B3B_USE_CASE:-${OPENCOARRAYS_SRC_DIR}/prerequisites/use-case}"
-if [[ ! -f "${B3B_USE_CASE:-}/bootstrap.sh" ]]; then
-  echo "Please set B3B_USE_CASE to the bash3boilerplate use-case directory path."
-  exit 2
-else
-    # shellcheck source=./prerequisites/use-case/bootstrap.sh
-    source "${B3B_USE_CASE}/bootstrap.sh" "$@"
-fi
-### End of boilerplate -- start user edits below #########################
-
-# Set expected value of present flags that take no arguments
-export __flag_present=1
-
-# Set up a function to call when receiving an EXIT signal to do some cleanup. Remove if
-# not needed. Other signals can be trapped too, like SIGINT and SIGTERM.
-function cleanup_before_exit () {
-  info "Cleaning up. Done"
-}
-trap cleanup_before_exit EXIT # The signal is specified here. Could be SIGINT, SIGTERM etc.
-
-### Validation (decide what's required for running your script and error out)
-#####################################################################
-
-[[ -z "${LOG_LEVEL:-}" ]] && emergency "Cannot continue without LOG_LEVEL. "
-
-# shellcheck disable=SC2154
-if [[ "${arg_d}" == "${__flag_present}" ]]; then
-   print_debug_only=7
-   if [[ "$(( LOG_LEVEL < print_debug_only ))" -ne 0 ]]; then
-     debug "Supressing info and debug messages: one of {-l, -v, -P, -U, -V, -D} present."
-     suppress_info_debug_messages
-   fi
-fi
-
-# Get linux_distribution name
-# shellcheck disable=SC2154
-{
-info "__file: ${__file}"
-info "__dir: ${__dir}"
-info "__base: ${__base}"
-info "__os: ${__os}"
-info "__usage: ${__usage}"
-info "LOG_LEVEL: ${LOG_LEVEL}"
-
-info  "-c (--with-c):     [arg] ${arg_c}"
-info  "-C (--with-cxx):   [arg] ${arg_C}"
-info  "-d (--debug):            ${arg_d}"
-info  "-e (--verbose):          ${arg_e}"
-info  "-f (--with-fortran):     ${arg_e}"
-info  "-i (--install-prefix):   ${arg_i}"
-info  "-j (--num-threads):      ${arg_j}"
-info  "-m (--with-cmake): [arg] ${arg_m}"
-info  "-n (--no-color):         ${arg_n}"
-info  "-v (--version):          ${arg_v}"
-info  "-V (--version-number):   ${arg_V}"
-}
-
-# __________ Process command-line arguments and environment variables _____________
-
-this_script="$(basename "${0}")"
-export this_script
-debug "this_script=\"${this_script}\""
-
-export install_prefix="${arg_i%/:-${PWD}/prerequisites/installations}"
-info "install_prefix=\"${install_prefix}\""
-
-export num_threads="${arg_j}"
-info "num_threads=\"${arg_j}\""
-
-opencoarrays_version=$(sed -n '/[0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}/{s/^\([^.]*\)\([0-9]\{1,\}\(\.[0-9]\{1,\}\)\{1,\}\)\(.*\)/\2/p;q;}' "${OPENCOARRAYS_SRC_DIR%/}/.VERSION")
-
-export build_path="${OPENCOARRAYS_SRC_DIR%/}"/prerequisites/builds/opencoarrays/${opencoarrays_version}
-info "build_path=\"${build_path}\""
-
-export CMAKE="${arg_m:-cmake}"
-
-verify_this_is_ubuntu()
-{
-  if [[ ${__os} != "Linux"  ]]; then
-    emergency "${__os} not supported: this script is intended for use in Windows Subsystem for Linux "
-  fi
-  linux_standard_base_i=$(lsb_release -i)
-  untrimmed_name=${linux_standard_base_i##*Distributor ID:}
-  linux_distribution="${untrimmed_name//[[:space:]]/}"
-  info "Linux distribution: ${linux_distribution}"
-  if [[ "${linux_distribution:-}" != "Ubuntu" ]]; then
-    info "Please run this script inside the Windows Subsystem for Linux (WSL) Ubuntu 16.04 or later,"
-    info "which might require joining the Windows Insider Preview program and selecting 'Fast' updates."
-    emergency "Error: see above."
-  fi
-}
-verify_this_is_ubuntu
-
-# Ubuntu 16.04 apt-get installs gfortran 5.4.0 or later, which is acceptable for many uses of OpenCoarrays
-verify_acceptable_release_number()
-{
-  linux_standard_base_r=$(lsb_release -r)
-  untrimmed_name=${linux_standard_base_r##*Release:}
-  release_number="${untrimmed_name//[[:space:]]/}"
-  major_release="${release_number%%.*}"
-  minor_release="${release_number##*.}"
-  info "Release: ${major_release}.${minor_release}"
-  if [[ ${major_release} -lt 16  ]]; then
-    emergency "Please upgrade to Windows Subsystem for Linux (WSL) Ubuntu 16.04 or later."
-  elif [[ ${major_release} -eq 16  ]]; then
-    if [[ ${minor_release} -lt "04"  ]]; then
-      emergency "Please upgrade to Windows Subsystem for Linux (WSL) Ubuntu 16.04 or later."
-    fi
-  fi
-}
-verify_acceptable_release_number
-
-if [[ "${arg_V}" == "${__flag_present}" ]]; then
-    # Print just the version number
-    info "${opencoarrays_version}"
-
-elif [[ "${arg_v}" == "${__flag_present}" ]]; then
-
-    # Print copyright info and version number
-    info "OpenCoarrays ${opencoarrays_version}"
-    info ""
-    info "OpenCoarrays installer"
-    info "Copyright (C) 2015-2017 Sourcery, Inc."
-    echo "Copyright (C) 2015-2017 Sourcery Institute"
-    info ""
-    info "OpenCoarrays comes with NO WARRANTY, to the extent permitted by law."
-    info "You may redistribute copies of ${this_script} under the terms of the"
-    echo "BSD 3-Clause License.  For more information about these matters, see"
-    info "http://www.sourceryinstitute.org/license.html"
-    info ""
-else
-
-  export FC=${arg_f:-gfortran}
-  export CC=${arg_c:-gcc}
-  export CXX=${arg_C:-g++}
-
-  # Check for and, if necessary, install OpenCoarrays prerequisites
-
-  if ! type "${CMAKE}" >& /dev/null; then
-    sudo apt-get install cmake
-  fi
-  if ! type "${CXX}" >& /dev/null; then
-    sudo apt-get install g++
-  fi
-  if ! type "${FC}" >& /dev/null; then
-    sudo apt-get install gfortran
-  fi
-
-  if ! type mpifort >& /dev/null; then
-    sudo apt-get install mpich
-  fi
-
-  set_SUDO_if_needed_to_write_to_install_dir()
-  {
-    info "Checking whether the directory ${install_prefix} exists... "
-    if [[ -d "${install_prefix}" ]]; then
-      info "yes"
-      info "Checking whether I have write permissions to ${install_prefix} ... "
-      if [[ -w "${install_prefix}" ]]; then
-        info "yes"
-      else
-        info "no"
-        SUDO="sudo"
-      fi
-    else
-      info "no"
-      info "Checking whether I can create ${install_prefix} ... "
-      if mkdir -p "${install_prefix}" >& /dev/null; then
-        info "yes."
-      else
-        info "no."
-        SUDO="sudo"
-      fi
-    fi
-  }
-  set_SUDO_if_needed_to_write_to_install_dir
-
-  # Install OpenCoarrays
-
-  if [[ -d "${build_path}" ]]; then
-    rm -rf "${build_path}"
-  fi
-  mkdir -p "${build_path}"
-  cd "${build_path}" || exit 25
-  info "Configuring OpenCoarrays with the following command:"
-  info "FC=\"${FC}\" CC=\"${CC}\"  \"${CMAKE}\" \"${OPENCOARRAYS_SRC_DIR}\" -DCMAKE_INSTALL_PREFIX=\"${install_prefix}\""
-  FC="${FC}" CC="${CC}" "${CMAKE}" "${OPENCOARRAYS_SRC_DIR}" -DCMAKE_INSTALL_PREFIX="${install_prefix}"
-  info "Building OpenCoarrays with the following command:"
-  info "make -j ${arg_j}"
-  make -j "${arg_j}"
-  info "Installing OpenCoarrays with the following command:"
-  info "${SUDO:-} make install"
-  ${SUDO:-} make install
-  if [[ -f "${install_prefix}"/lib/libcaf_mpi.a && -f "${install_prefix}/bin/caf"  && -f "${install_prefix}/bin/cafrun"  ]]; then
-    info "OpenCoarrays has been installed in"
-    info "${install_prefix}"
-  else
-    info "Something went wrong. OpenCoarrays is not in the expected location:"
-    emergency "${install_prefix}"
-  fi
-  # See http://stackoverflow.com/questions/31057694/gethostbyname-fail-after-switching-internet-connections/31222970
-  loopback_line=$(grep "${NAME}" /etc/hosts)
-  if [[ -z "${loopback_line:-}" ]]; then
-    info "To ensure the correct functioning of MPI, please add the following line to your /etc/hosts file:"
-    info "127.0.0.1 ${NAME}"
-  fi
-fi
diff --git a/prerequisites/install-functions/windows-install.sh-usage b/prerequisites/install-functions/windows-install.sh-usage
deleted file mode 100644
index 7d4c48a71..000000000
--- a/prerequisites/install-functions/windows-install.sh-usage
+++ /dev/null
@@ -1,13 +0,0 @@
-  -c --with-c [arg]           Use specified C compiler. Default="gcc"
-  -C --with-cxx [arg]         Use specified C++ compiler. Default="g++"
-  -d --debug                  Enable debug mode.
-  -e --verbose                Enable verbose mode, print script as it is executed.
-  -f --with-fortran [arg]     Use specified Fortran compiler. Default="gfortran"
-  -h --help                   Print this page.
-  -i --install-prefix [arg]   Install package in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/opencoarrays/${version_to_build:-}"
-  -j --num-threads [arg]      Number of threads to use when invoking make. Default="1"
-  -m --with-cmake [arg]       Use specified CMake installation. Default="cmake"
-  -n --no-color               Disable color output.
-  -v --version                Print OpenCoarrays version number and copyright.
-  -V --version-number         Print OpenCoarrays version number.
-  -y --yes-to-all             Build non-interactively by assuming affirmative user responses.
diff --git a/prerequisites/install-ofp.sh b/prerequisites/install-ofp.sh
deleted file mode 100755
index 7ad9223cb..000000000
--- a/prerequisites/install-ofp.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env bash
-# BASH3 Boilerplate
-#
-# install-ofp.sh
-#
-#  - Build the Open Fortran Parser
-#
-# Usage: ./install-ofp.sh -i /opt
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-# The invocation of bootstrap.sh below performs the following tasks:
-# (1) Import several bash3boilerplate helper functions & default settings.
-# (2) Set several variables describing the current file and its usage page.
-# (3) Parse the usage information (default usage file name: current file's name with -usage appended).
-# (4) Parse the command line using the usage information.
-
-export OPENCOARRAYS_SRC_DIR="${OPENCOARRAYS_SRC_DIR:-${PWD}/..}"
-if [[ ! -f "${OPENCOARRAYS_SRC_DIR}/src/libcaf.h" ]]; then
-  echo "Please run this script inside the OpenCoarrays source \"prerequisites\" subdirectory"
-  echo "or set OPENCOARRAYS_SRC_DIR to the top-level OpenCoarrays source directory path."
-  exit 1
-fi
-export __usage="${OPENCOARRAYS_SRC_DIR}/prerequisites/install-ofp.sh-usage"
-export B3B_USE_CASE="${B3B_USE_CASE:-${OPENCOARRAYS_SRC_DIR}/prerequisites/use-case}"
-if [[ ! -f "${B3B_USE_CASE:-}/bootstrap.sh" ]]; then
-  echo "Please set B3B_USE_CASE to the bash3boilerplate use-case directory path."
-  exit 2
-fi
-# shellcheck source=./use-case/bootstrap.sh
-source "${B3B_USE_CASE}/bootstrap.sh" "$@"
-
-# Set up a function to call when receiving an EXIT signal to do some cleanup. Remove if
-# not needed. Other signals can be trapped too, like SIGINT and SIGTERM.
-function cleanup_before_exit () {
-  info "Cleaning up. Done"
-}
-trap cleanup_before_exit EXIT # The signal is specified here. Could be SIGINT, SIGTERM etc.
-
-export __flag_present=1
-
-# Verify requirements
-
-[ -z "${LOG_LEVEL:-}" ] && emergency "Cannot continue without LOG_LEVEL. "
-
-# shellcheck disable=SC2154
-if [[ "${__os}" != "OSX" ]]; then
-   echo "Source tranlsation via OFP is currently supported only on OS X."
-   echo "Please submit an issue at https://github.com/sourceryinstitute/opencoarrays/issues."
-   emergency "${PWD}/install-ofp.sh: Aborting."
-fi
-
-if [[ $(uname) == "Darwin"  ]]; then
-  default_ofp_downloader=curl
-  args="-LO"
-else
-  default_ofp_downloader=wget
-  args="--no-check-certificate"
-fi
-
-# If -D is passed, print the download programs used for OFP and its prerequisites.
-# Then exit with normal status.
-# shellcheck  disable=SC2154
-if [[ "${arg_D}" == "${__flag_present}" ]]; then
-  echo "strategoxt-superbundle downloader: $("${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh" -D strategoxt-superbundle)"
-  echo "ofp-sdf default downloader: ${default_ofp_downloader}"
-  exit 0
-fi
-
-# If -P is passed, print the default installation paths for OFP and its prerequisites.
-# Then exit with normal status.
-# shellcheck disable=SC2154
-install_path="${arg_i}"
-strategoxt_superbundle_install_path=$("${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh" -P strategoxt-superbundle)
-# shellcheck disable=SC2154
-if [[ "${arg_P}" == "${__flag_present}" ]]; then
-  echo "strategoxt-superbundle default installation path: ${strategoxt_superbundle_install_path}"
-  echo "ofp default installation path: ${install_path}"
-  exit 0
-fi
-
-# If -V is passed, print the default versions of OFP and its prerequisites.
-# Then exit with normal status.
-default_ofp_version=sdf
-# shellcheck disable=SC2154
-if [[ "${arg_V}" == "${__flag_present}" ]]; then
-  echo "strategoxt-superbundle default version: $("${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh" -V strategoxt-superbundle)"
-  echo "ofp default version: ${default_ofp_version}"
-  exit 0
-fi
-
-# If -U is passed, print the URLs for OFP and its prerequisites.
-# Then exit with normal status.
-ofp_url_head="https://github.com/sourceryinstitute/opencoarrays/files/213108/"
-ofp_url_tail="ofp-sdf.tar.gz"
-# shellcheck disable=SC2154
-if [[ "${arg_U}" == "${__flag_present}" ]]; then
-  echo "strategoxt-superbundle URL: $("${OPENCOARRAYS_SRC_DIR}/prerequisites/install-binary.sh" -U strategoxt-superbundle)"
-  echo "ofp URL: ${ofp_url_head}${ofp_url_tail}"
-  exit 0
-fi
-
-### Print bootstrapped magic variables to STDERR when LOG_LEVEL
-### is at the default value (6) or above.
-#####################################################################
-# shellcheck disable=SC2154
-{
-info "__file: ${__file}"
-info "__dir: ${__dir}"
-info "__base: ${__base}"
-info "__os: ${__os}"
-info "__usage: ${__usage}"
-info "LOG_LEVEL: ${LOG_LEVEL}"
-
-info "-d (--debug):            ${arg_d}"
-info "-D (--print-downloader): ${arg_D}"
-info "-e (--verbose):          ${arg_e}"
-info "-h (--help):             ${arg_h}"
-info "-i (--install-dir):      ${arg_i}"
-info "-I (--install-version):  ${arg_i}"
-info "-j (--num-threads):      ${arg_j}"
-info "-n (--no-color):         ${arg_n}"
-info "-P (--print-path):       ${arg_P}"
-info "-U (--print-url):        ${arg_U}"
-info "-V (--print-version):    ${arg_V}"
-}
-# Set OFP installation path to the value of the -i argument if present.
-# Otherwise, install OFP in the OpenCoarrays prerequisites/installations directory.
-opencoarrays_prerequisites_dir="${OPENCOARRAYS_SRC_DIR}"/prerequisites/
-if [[ "${arg_i}" == "${__flag_present}" ]]; then
-  install_path="${arg_i}"
-else
-  install_path="${opencoarrays_prerequisites_dir}"/installations
-fi
-
-ofp_prereqs_install_dir="/opt"
-# Change present working directory to installation directory
-if [[ ! -d "${install_path}" ]]; then
-  # shellcheck source=./build-functions/set_SUDO_if_needed_to_write_to_directory.sh
-  source "${opencoarrays_prerequisites_dir}/build-functions/set_SUDO_if_needed_to_write_to_directory.sh"
-  set_SUDO_if_needed_to_write_to_directory "${install_path}"
-  ${SUDO:-} mkdir -p "${install_path}"
-fi
-
-# Install OFP prerequisites to /opt (currently the only option)
-"${opencoarrays_prerequisites_dir}"/install-binary.sh -p strategoxt-superbundle -i "${strategoxt_superbundle_install_path}"
-
-# Downlaod OFP
-pushd "${install_path}"
-info "OFP Download command: ${default_ofp_downloader} ${args:-} \"${ofp_url_head}${ofp_url_tail}\""
-${default_ofp_downloader} ${args:-} "${ofp_url_head}${ofp_url_tail}" 
-
-
-# Uncompress OFP
-tar xf ofp-sdf.tar.gz
-# Return to the original working directory
-popd
-
-export SDF2_PATH="${ofp_prereqs_install_dir}"/sdf2-bundle/v2.4/bin
-export ST_PATH="${ofp_prereqs_install_dir}"/strategoxt/v0.17/bin
-export DYLD_LIBRARY_PATH="${ofp_prereqs_install_dir}"/strategoxt/v0.17/lib:/opt/aterm/v2.5/lib
-
-export OFP_HOME="${install_path}"/ofp-sdf
-# shellcheck source=./install-binary-functions/build_parse_table.sh
-source "${opencoarrays_prerequisites_dir}"/install-binary-functions/build_parse_table.sh
-build_parse_table
diff --git a/prerequisites/install-ofp.sh-usage b/prerequisites/install-ofp.sh-usage
deleted file mode 100644
index 6d61049ca..000000000
--- a/prerequisites/install-ofp.sh-usage
+++ /dev/null
@@ -1,11 +0,0 @@
-  -d --debug                 Enable debug mode.
-  -D --print-downloader      Print default download program.
-  -e --verbose               Enable verbose mode, print script as it is executed.
-  -h --help                  This page.
-  -i --install-dir [arg]     Install OFP in specified path. Default="${OPENCOARRAYS_SRC_DIR}/prerequisites/installations/"
-  -I --install-version [arg] OFP version to install. (To see default, use -V or --print-version)
-  -j --num-threads [arg]     Number of threads to use when invoking make. Default="1"
-  -n --no-color              Disable color output.
-  -P --print-path            Print OFP installation path.
-  -U --print-url             Print OFP URL.
-  -V --print-version         Print OFP version.
diff --git a/prerequisites/print_true.f90 b/prerequisites/print_true.f90
deleted file mode 100644
index fdebe33d0..000000000
--- a/prerequisites/print_true.f90
+++ /dev/null
@@ -1,2 +0,0 @@
-print *,.true.
-end
diff --git a/prerequisites/stack.sh b/prerequisites/stack.sh
deleted file mode 100644
index 3022cd6f4..000000000
--- a/prerequisites/stack.sh
+++ /dev/null
@@ -1,269 +0,0 @@
-# A stack, using bash arrays.
-# ---------------------------------------------------------------------------
-# This software is released under a BSD license, adapted from
-# <http://opensource.org/licenses/bsd-license.php>
-#
-# Copyright &copy; 1989-2012 Brian M. Clapper.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#  this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#  this list of conditions and the following disclaimer in the documentation
-#  and/or other materials provided with the distribution.
-#
-# * Neither the name "clapper.org" nor the names of its contributors may be
-#  used to endorse or promote products derived from this software without
-#  specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-# Source: http://brizzled.clapper.org/blog/2011/10/28/a-bash-stack/
-
-# Destroy a stack
-#
-# Usage: stack_destroy name
-function stack_destroy
-{
-    : "${1?'Missing stack name'}"
-
-    if no_such_stack "$1"
-    then
-        echo "No such stack -- $1" >&2
-        return 1
-    fi
-
-    eval "unset _stack_$1 _stack_$1_i"
-    return 0
-}
-
-# Push one or more items onto a stack.
-#
-# Usage: stack_push stack item ...
-function stack_push
-{
-    : "${1?'Missing stack name'}"
-    : "${2?'Missing variable name in stack_push'}"
-
-    if no_such_stack "$1"
-    then
-        echo "No such stack -- $1" >&2
-        return 1
-    fi
-
-    stack=$1
-    shift 1
-
-    while (( $# > 0 ))
-    do
-        eval '_i=$'"_stack_${stack}_i"
-        eval "_stack_${stack}[$_i]='$1'"
-        eval "let _stack_${stack}_i+=1"
-        shift 1
-    done
-
-    unset _i
-    return 0
-}
-
-
-# Get the size of a stack
-#
-# Usage: stack_size name var
-#
-# Example:
-#    stack_size mystack n
-#    echo "Size is $n"
-function stack_size
-{
-    : "${1?'Missing stack name'}"
-    : "${2?'Missing name of variable for stack size result'}"
-    if no_such_stack "$1"
-    then
-        echo "No such stack -- $1" >&2
-        return 1
-    fi
-    # TODO: revise the eval below to eliminate the need for this pop/push
-    # sequene, which is a workaround to prevent an error that occurs with
-    # if the stack is new and has not been the target of a stack_push.
-    stack_push $1 __push_junk
-    stack_pop $1 __pop_trash
-    eval "$2"='$'"{#_stack_$1[*]}"
-}
-
-function no_such_stack
-{
-    : "${1?'Missing stack name'}"
-    stack_exists "$1"
-    ret=$?
-    declare -i x
-    let x="1-$ret" || true
-    return $x
-}
-
-#### Functions modified by Damian Rouson
-
-# These functions were modified to work with the shell settings in bash3boilerplate
-# (https://github.com/zbeekman/bash3boilerplate), primarily the "set -o unset" and
-# "set -o pipefail" settings.  The required modifications are described below.
-#
-
-# Pop the top element from the stack.
-#
-# Usage: stack_pop name var
-#
-# Example:
-#    stack_pop mystack top
-#    echo "Got $top"
-#
-# Modification for use with bash3boilerplate:
-#    replaced "let _i-=1" with  "(( _i-=1 )) || true"
-
-function stack_pop
-{
-    : "${1?'Missing stack name'}"
-    : "${2?'Missing variable name in stack_pop'}"
-
-    if no_such_stack "$1"
-    then
-        echo "No such stack -- $1" >&2
-        return 1
-    fi
-
-    eval 'let _i=$'"_stack_$1_i"
-
-    if [[ "$_i" -eq 0 ]]
-    then
-        echo "Empty stack -- $1" >&2
-        return 1
-    fi
-
-   (( _i-=1 )) || true
-    eval "$2"='$'"{_stack_$1[$_i]}"
-    eval "unset _stack_$1[$_i]"
-    eval "_stack_$1_i=$_i"
-    unset _i
-    return 0
-}
-
-# Print a stack to stdout.
-#
-# Usage: stack_print name
-#
-# Modification for use with bash3boilerplate:
-#    replaced "let _i=${_i}-1" with "(( _i=${_i}-1 )) || true" to support execution with "set -o nounset"
-
-function stack_print
-{
-    : "${1?'Missing stack name'}"
-
-    if no_such_stack "$1"
-    then
-        echo "No such stack -- $1" >&2
-        return 1
-    fi
-
-    tmp=""
-    eval 'let _i=$'"_stack_$1_i"
-
-    while (( _i > 0 ))
-    do
-        eval 'e=$'"{_stack_$1[$((--_i))]}" # pre-decrement
-	# shellcheck  disable=SC2154
-        tmp="$tmp $e"
-    done
-    # shellcheck  disable=SC2086
-    echo "(" $tmp ")"
-}
-
-# Create a new stack.
-#
-# Usage: stack_new name
-#
-# Example: stack_new x
-#
-# Modification for use with bash3boilerplate:
-#    added "|| true" to allow execution with "set -o nounset" on OS X
-
-function stack_new
-{
-    : "${1?'Missing stack name'}"
-    if stack_exists "$1"
-    then
-        echo "Stack already exists -- $1" >&2
-        return 1
-    fi
-
-    eval "_stack_$1=()"
-    eval "_stack_$1_i=0"
-
-    variableName="_stack_$1_i"
-    variableVal="0"
-    eval "${variableName}"="$(echo -ne \""${variableVal}"\")"
-
-    return 0
-}
-
-# Verify stack existence.
-#
-# Usage: stack_exists name
-#
-# Example: stack_new x
-#
-# Modification for use with bash3boilerplate:
-#    added curly braces in eval statement to allow execution with "set -o nounset"
-
-function stack_exists
-{
-    : "${1?'Missing stack name'}"
-
-    eval '_i=$'"{_stack_$1_i:-}"
-    if [[ -z "${_i:-}" ]]
-    then
-        return 1
-    else
-        return 0
-    fi
-}
-
-#### Functions added by Damian Rouson
-
-# Get the top element from the stack and return the stack
-# to its state before invocation of the function.
-#
-# Usage: stack_peek name var
-#
-# Example:
-#    stack_peek mystack top
-#    echo "Got $top"
-function stack_peek
-{
-  : "${1?'Missing stack name'}"
-  : "${2?'Missing variable name in stack_peek'}"
-
-  if no_such_stack "$1"
-  then
-      echo "No such stack -- $1" >&2
-      return 1
-  fi
-
-  stack_pop "$1" "$2"
-  eval argument_name="\$$2"
-  # shellcheck disable=SC2154
-  stack_push "$1" "$argument_name"
-}
diff --git a/prerequisites/use-case/bootstrap.sh b/prerequisites/use-case/bootstrap.sh
deleted file mode 100755
index 1b7fd85b7..000000000
--- a/prerequisites/use-case/bootstrap.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-# BASH3 Boilerplate
-#
-#  bootstrap.sh
-#
-#  - Exports bash3boilerplate features and variables to the invoking script
-#  - Invokes functions containing commands extracted from the bash3boilerplate
-#    main.sh as part of a refactoring to facilitate wholesale reuse of main.sh's
-#    contents of without modification.
-#
-# Usage (as invoked in my-script.sh):
-#
-#   source bootstrap.sh "${@}"
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.1.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-# shellcheck source=./set_environment_and_color.sh
-source "${B3B_USE_CASE}"/set_environment_and_color.sh         # turn on errexit, nounset, pipefail, default log level
-# shellcheck source=./set_magic_variables.sh
-source "${B3B_USE_CASE}"/set_magic_variables.sh "$(caller 0)" # set __dir, __file, __filename, __base, __os
-# shellcheck source=./define_functions.sh
-source "${B3B_USE_CASE}"/define_functions.sh                  # help/usage function and debug/info output functions
-# shellcheck source=./parse_command_line.sh
-source "${B3B_USE_CASE}"/parse_command_line.sh "${@:-}"       # parse the command line
-# shellcheck source=./set_common_switches.sh
-source "${B3B_USE_CASE}"/set_common_switches.sh               # provide defaults for -h, -V, and -d
diff --git a/prerequisites/use-case/define_functions.sh b/prerequisites/use-case/define_functions.sh
deleted file mode 100644
index 48d94bdf8..000000000
--- a/prerequisites/use-case/define_functions.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-# BASH3 Boilerplate
-#
-#  define_functions.sh
-#
-#  - Defines helper functions containing commands extracted from the
-#    bash3boilerplate main.sh as part of a refactoring to facilitate
-#    wholesale reuse of main.sh's contents of without modification.
-#
-# Usage (as invoked in bootstrap.sh):
-#
-#   source define_functions.sh
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-### Functions
-#####################################################################
-
-# shellcheck disable=SC2034
-function _fmt ()      {
-  local color_debug="\x1b[35m"
-  local color_info="\x1b[32m"
-  local color_notice="\x1b[34m"
-  local color_warning="\x1b[33m"
-  local color_error="\x1b[31m"
-  local color_critical="\x1b[1;31m"
-  local color_alert="\x1b[1;33;41m"
-  local color_emergency="\x1b[1;4;5;33;41m"
-  local colorvar=color_$1
-
-  local color="${!colorvar:-$color_error}"
-  local color_reset="\x1b[0m"
-  if [ "${NO_COLOR}" = "true" ] || [[ "${TERM:-}" != "xterm"* ]] || [ -t 1 ]; then
-    # Don't use colors on pipes or non-recognized terminals
-    color=""; color_reset=""
-  fi
-  echo -e "$(date -u +"%Y-%m-%d %H:%M:%S UTC") ${color}$(printf "[%9s]" "${1}")${color_reset}";
-}
-
-# The block of single-line functions below all print to STDERR,
-# leaving STDOUT for piping machine readable information to other
-# software. Above each such function is a commented demonstration
-# of its usage.  Execution continues after an invocation of each
-# function, except the "emergency" function, which causes
-# termination with a non-zero exit status.
-
-# shellcheck disable=SC2015
-{
-# emergency "A \"panic\" condition usually affecting multiple apps/servers/sites. At this level it would usually notify all tech staff on call."
-function emergency () {                             echo "$(_fmt emergency) ${*}" 1>&2 || true; exit 1; }
-# alert "Should be corrected immediately, therefore notify staff who can fix the problem. An example would be the loss of a primary ISP connection."
-function alert ()     { [ "${LOG_LEVEL}" -ge 1 ] && echo "$(_fmt alert) ${*}" 1>&2 || true; }
-# critical "Should be corrected immediately, but indicates failure in a primary system, an example is a loss of a backup ISP connection."
-function critical ()  { [ "${LOG_LEVEL}" -ge 2 ] && echo "$(_fmt critical) ${*}" 1>&2 || true; }
-# error "Non-urgent failures, these should be relayed to developers or admins; each item must be resolved within a given time."
-function error ()     { [ "${LOG_LEVEL}" -ge 3 ] && echo "$(_fmt error) ${*}" 1>&2 || true; }
-# warning "Warning messages, not an error, but indication that an error will occur if action is not taken, e.g. file system 85% full - each item must be resolved within a given time. This is a debug message"
-function warning ()   { [ "${LOG_LEVEL}" -ge 4 ] && echo "$(_fmt warning) ${*}" 1>&2 || true; }
-# notice "Events that are unusual but not error conditions - might be summarized in an email to developers or admins to spot potential problems - no immediate action required."
-function notice ()    { [ "${LOG_LEVEL}" -ge 5 ] && echo "$(_fmt notice) ${*}" 1>&2 || true; }
-# info "Normal operational messages - may be harvested for reporting, measuring throughput, etc. - no action required."
-function info ()      { [ "${LOG_LEVEL}" -ge 6 ] && echo "$(_fmt info) ${*}" 1>&2 || true; }
-# debug "Info useful to developers for debugging the application, not useful during operations."
-function debug ()     { [ "${LOG_LEVEL}" -ge 7 ] && echo "$(_fmt debug) ${*}" 1>&2 || true; }
-}
-function suppress_debug_messages() { export LOG_LEVEL=6; }
-function suppress_info_debug_messages () { export LOG_LEVEL=5; }
-function suppress_notice_info_debug_messages () { export LOG_LEVEL=4; }
-
-function help () {
-  echo "" 1>&2
-  echo " ${*}" 1>&2
-  echo "" 1>&2
-  # shellcheck disable=SC2154
-  cat "${__usage}" 1>&2
-  echo "" 1>&2
-  exit 1
-}
-export -f help
-export -f emergency
-export -f alert
-export -f critical
-export -f error
-export -f warning
-export -f notice
-export -f info
-export -f debug
-export suppress_debug_messages
-export suppress_info_debug_messages
-export suppress_notice_info_debug_messages
diff --git a/prerequisites/use-case/parse_command_line.sh b/prerequisites/use-case/parse_command_line.sh
deleted file mode 100644
index 5aad3477f..000000000
--- a/prerequisites/use-case/parse_command_line.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-# BASH3 Boilerplate
-#
-#  parse_command_line.sh
-#
-#  - Uses usage information defined in "${__usage}" to parse the command line.
-#  - Defines a function containing commands extracted from the bash3boilerplate
-#    main.sh as part of a refactoring to facilitate wholesale reuse of main.sh's
-#    contents of without modification.
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Usage (as invoked in bootstraph.sh):
-#
-#   source parse_command_line.sh
-#   parse_command_line ${@:2}
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-### Parse commandline options
-#####################################################################
-function parse_command_line(){
-# source this script and pass $@ as the argument
-
-# Translate usage string -> getopts arguments, and set $arg_<flag> defaults
-# shellcheck disable=SC2154
-while read -r line; do
-  # fetch single character version of option string
-  opt="$(echo "${line}" |awk '{print $1}' |sed -e 's#^-##')"
-
-  # fetch long version if present
-  long_opt="$(echo "${line}" |awk '/\-\-/ {print $2}' |sed -e 's#^--##')"
-  long_opt_mangled="$(sed 's#-#_#g' <<< "$long_opt")"
-
-  # map long name back to short name
-  varname="short_opt_${long_opt_mangled}"
-  eval "${varname}=\"${opt}\""
-
-  # check if option takes an argument
-  varname="has_arg_${opt}"
-  if ! echo "${line}" |egrep '\[.*\]' >/dev/null 2>&1; then
-    init="0" # it's a flag. init with 0
-    eval "${varname}=0"
-  else
-    opt="${opt}:" # add : if opt has arg
-    init=""  # it has an arg. init with ""
-    eval "${varname}=1"
-  fi
-  opts="${opts:-}${opt}"
-
-  varname="arg_${opt:0:1}"
-  if ! echo "${line}" |egrep '\. Default=' >/dev/null 2>&1; then
-    eval "${varname}=\"${init}\""
-  else
-    match="$(sed 's#^.*Default=\(\)#\1#g' <<< "${line}")"
-    eval "${varname}=\"${match}\""
-  fi
-done < "${__usage}"
-
-
-# Allow long options like --this
-opts="${opts}-:"
-
-# Reset in case getopts has been used previously in the shell.
-OPTIND=1
-
-# start parsing command line
-set +o nounset # unexpected arguments will cause unbound variables
-               # to be dereferenced
-# Overwrite $arg_<flag> defaults with the actual CLI options
-while getopts "${opts}" opt; do
-  [ "${opt}" = "?" ] && help "Invalid use of script: ${*} "
-
-  if [ "${opt}" = "-" ]; then
-    # OPTARG is long-option-name or long-option=value
-    if [[ "${OPTARG}" =~ .*=.* ]]; then
-      # --key=value format
-      long=${OPTARG/=*/}
-      long_mangled="$(sed 's#-#_#g' <<< "$long")"
-      # Set opt to the short option corresponding to the long option
-      eval "opt=\"\${short_opt_${long_mangled}}\""
-      OPTARG=${OPTARG#*=}
-    else
-      # --key value format
-      # Map long name to short version of option
-      long_mangled="$(sed 's#-#_#g' <<< "$OPTARG")"
-      eval "opt=\"\${short_opt_${long_mangled}}\""
-      # Only assign OPTARG if option takes an argument
-      eval "OPTARG=\"\${@:OPTIND:\${has_arg_${opt}}}\""
-      # shift over the argument if argument is expected
-      ((OPTIND+=has_arg_${opt}))
-    fi
-    # we have set opt/OPTARG to the short value and the argument as OPTARG if it exists
-  fi
-  varname="arg_${opt:0:1}"
-  default="${!varname}"
-
-  value="${OPTARG}"
-  if [ -z "${OPTARG}" ] && [ "${default}" = "0" ]; then
-    value="1"
-  fi
-
-  eval "${varname}=\"${value}\""
-  debug "cli arg ${varname} = ($default) -> ${!varname}"
-done
-
-set -o nounset # no more unbound variable references expected
-
-shift $((OPTIND-1))
-
-# shellcheck disable=SC2015
-[ "${1:-}" = "--" ] && shift || true
-}
-export -f parse_command_line # make function available to subshells
-parse_command_line "${@:-}"  # invoke parsing function and allow for empty argument list
diff --git a/prerequisites/use-case/set_common_switches.sh b/prerequisites/use-case/set_common_switches.sh
deleted file mode 100644
index 4271ff791..000000000
--- a/prerequisites/use-case/set_common_switches.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-# BASH3 Boilerplate
-#
-#  set_common_switches.sh
-#
-#  - Sets variables that are useful in conjunction with other bash3boilerplate features
-#  - Contains commands extracted from the bash3boilerplate main.sh as part of a refactoring
-#    to facilitate wholesale reuse of main.sh's contents of without modification.
-#
-# Usage (as invoked in bootstrap.sh):
-#
-#  source set_common_switches.sh
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-### Switches (like -d for debugmode, -h for showing helppage)
-#####################################################################
-
-# shellcheck disable=SC2154
-{
-# debug mode
-if [ "${arg_d}" = "1" ]; then
-  set -o xtrace
-  LOG_LEVEL="7"
-  export LOG_LEVEL
-fi
-
-# verbose mode
-if [ "${arg_e}" = "1" ]; then
-  set -o verbose
-fi
-
-# help mode
-if [ "${arg_h}" = "1" ]; then
-  # Help exists with code 1
-  help "Help using ${0}"
-fi
-}
diff --git a/prerequisites/use-case/set_environment_and_color.sh b/prerequisites/use-case/set_environment_and_color.sh
deleted file mode 100644
index 40a413b86..000000000
--- a/prerequisites/use-case/set_environment_and_color.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-# BASH3 Boilerplate
-#
-#  set_environment_and_color.sh
-#
-#  - Sets variables that control the behavior of the invoking script.
-#  - Contains commands extracted from the bash3boilerplate main.sh as
-#    part of a refactoring to facilitate wholesale reuse of main.sh's
-#    contents of without modification.
-#
-# Usage (as invoked in bootstrap.sh):
-#
-#  source set_environment_and_color.sh
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.0.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-# Exit on error. Append ||true if you expect an error.
-# `set` is safer than relying on a shebang like `#!/bin/bash -e` because that is neutralized
-# when someone runs your script as `bash yourscript.sh`
-set -o errexit
-set -o nounset
-
-# Bash will remember & return the highest exitcode in a chain of pipes.
-# This way you can catch the error in case mysqldump fails in `mysqldump |gzip`
-set -o pipefail
-# set -o xtrace
-
-# Environment variables and their defaults
-LOG_LEVEL="${LOG_LEVEL:-6}" # 7 = debug -> 0 = emergency
-NO_COLOR="${NO_COLOR:-}"    # true = disable color. otherwise autodetected
diff --git a/prerequisites/use-case/set_magic_variables.sh b/prerequisites/use-case/set_magic_variables.sh
deleted file mode 100644
index 50d74ddc0..000000000
--- a/prerequisites/use-case/set_magic_variables.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-# BASH3 Boilerplate
-#
-#  set_magic_variables.sh
-#
-#  - Sets the variables __dir, __file, __filename, __base, and __os
-#  - Defines a function containing commands extracted from the bash3boilerplate
-#    main.sh as part of a refactoring to facilitate wholesale reuse of main.sh's
-#    contents of without modification.
-#
-#  Usage (as invoked in bootstrap.sh):
-#
-#    source set_magic_variables.sh "$(caller 0)"
-#
-# More info:
-#
-#  - https://github.com/kvz/bash3boilerplate
-#  - http://kvz.io/blog/2013/02/26/introducing-bash3boilerplate/
-#
-# Version: 2.1.0
-#
-# Authors:
-#
-#  - Kevin van Zonneveld (http://kvz.io)
-#  - Izaak Beekman (https://izaakbeekman.com/)
-#  - Alexander Rathai (Alexander.Rathai@gmail.com)
-#  - Dr. Damian Rouson (http://www.sourceryinstitute.org/) (documentation)
-#
-# Licensed under MIT
-# Copyright (c) 2013 Kevin van Zonneveld (http://kvz.io)
-
-# shellcheck disable=SC2016
-[ -z "${1}" ] && echo 'Usage: source set_magic_variables.sh "$(caller 0)"'
-# shellcheck disable=SC2034
-function set_magic_variables(){
-  text_after_final_space="${1##* }"
-  __dir="$(cd "$(dirname "${text_after_final_space}")" && pwd)"
-  __file="${__dir}/$(basename "${text_after_final_space}")"
-  __filename="$(basename "${text_after_final_space}")"
-  __base="$(basename "${__file}" .sh)"
-  __os="Linux"
-  if [[ "${OSTYPE:-}" == "darwin"* ]]; then
-    __os="OSX"
-  fi
-  __usage="${__usage:-${__file}-usage}"
-}
-set_magic_variables "${@}"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cee444fc..00c1c1ff7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,3 @@
-set(directories_to_build mpi tests)
-if( CAF_ENABLE_ISO_Fortran_BINDING OR ( CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER} ) )
-  list( APPEND directories_to_build iso-fortran-binding )
-endif()
-foreach(directory ${directories_to_build})
-  add_subdirectory(${directory})
-endforeach()
-
 set(N_CPU ${N_CPU} PARENT_SCOPE)
 set(HOST_NAME ${HOST_NAME} PARENT_SCOPE)
 
@@ -16,3 +8,306 @@ endif()
 install( FILES libcaf.h libcaf-gfortran-descriptor.h libcaf-version-def.h
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
 )
+
+# Silence warnings about dereferencing unset variables
+if(NOT CMAKE_REQUIRED_FLAGS)
+  set(CMAKE_REQUIRED_FLAGS "")
+endif()
+if(NOT CMAKE_REQUIRED_LIBRARIES)
+  set(CMAKE_REQUIRED_LIBRARIES "")
+endif()
+if(NOT CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES "")
+endif()
+
+if (NOT MPI_C_FOUND)
+  find_package(MPI REQUIRED)
+endif()
+
+add_library(caf_mpi SHARED mpi-runtime/mpi_caf.c common/caf_auxiliary.c)
+add_library(caf_mpi_static STATIC  mpi-runtime/mpi_caf.c common/caf_auxiliary.c)
+target_link_libraries(caf_mpi
+  PUBLIC ${MPI_C_LINK_FLAGS}
+  PUBLIC ${MPI_C_LIBRARIES})
+target_link_libraries(caf_mpi_static
+  PUBLIC ${MPI_C_LINK_FLAGS}
+  PUBLIC ${MPI_C_LIBRARIES})
+set_target_properties(caf_mpi_static
+  PROPERTIES
+  POSITION_INDEPENDENT_CODE TRUE)
+target_include_directories(caf_mpi PUBLIC
+  $<$<COMPILE_LANGUAGE:C>:${MPI_C_INCLUDE_PATH}>
+  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+target_include_directories(caf_mpi_static PUBLIC
+  $<$<COMPILE_LANGUAGE:C>:${MPI_C_INCLUDE_PATH}>
+  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+target_compile_options(caf_mpi
+  PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_COMPILE_OPTIONS}>)
+target_compile_definitions(caf_mpi
+  PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_COMPILE_DEFINITIONS}>)
+target_compile_options(caf_mpi_static
+  PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_COMPILE_OPTIONS}>)
+target_compile_definitions(caf_mpi_static
+  PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_COMPILE_DEFINITIONS}>)
+
+set(CAF_SO_VERSION 0)
+if(gfortran_compiler)
+  if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0.0)
+    set(CAF_SO_VERSION 3)
+  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+    set(CAF_SO_VERSION 2)
+  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0.0)
+    set(CAF_SO_VERSION 1)
+  endif()
+endif()
+
+set_target_properties ( caf_mpi
+  PROPERTIES
+  SOVERSION ${CAF_SO_VERSION}
+#  VERSION ${PROJECT_VERSION}
+)
+
+# Create a symlink in the include dir
+if(UNIX)
+  add_custom_command(TARGET caf_mpi
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E create_symlink "./${mod_dir_tail}/opencoarrays.mod" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/opencoarrays.mod"
+    COMMENT "Creating symlink ${CMAKE_INSTALL_INCLUDEDIR}/opencoarrays.mod --> ${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}/opencoarrays.mod")
+endif()
+
+install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+  FILES_MATCHING PATTERN "opencoarrays.mod")
+
+set_target_properties( caf_mpi_static
+  PROPERTIES
+  SOVERSION ${CAF_SO_VERSION}
+#  VERSION ${PROJECT_VERSION}
+)
+
+if (gfortran_compiler)
+  target_compile_options(caf_mpi INTERFACE $<$<COMPILE_LANGUAGE:Fortran>:-fcoarray=lib>)
+  target_compile_options(caf_mpi_static INTERFACE $<$<COMPILE_LANGUAGE:Fortran>:-fcoarray=lib>)
+endif()
+
+#----------------------------------
+# Determine if we're using Open MPI
+#----------------------------------
+cmake_host_system_information(RESULT N_CPU QUERY NUMBER_OF_LOGICAL_CORES)
+set(N_CPU ${N_CPU} PARENT_SCOPE)
+cmake_host_system_information(RESULT HOST_NAME QUERY HOSTNAME)
+set(HOST_NAME ${HOST_NAME} PARENT_SCOPE)
+execute_process(COMMAND ${MPIEXEC} --version
+  OUTPUT_VARIABLE mpi_version_out)
+if (mpi_version_out MATCHES "[Oo]pen[ -][Mm][Pp][Ii]")
+  message( STATUS "OpenMPI detected")
+  set ( openmpi true PARENT_SCOPE)
+  # Write out a host file because OMPI's mpiexec is dumb
+  file(WRITE ${CMAKE_BINARY_DIR}/hostfile "${HOST_NAME} slots=${N_CPU}\n")
+  message( STATUS "hostfile written to: ${CMAKE_BINARY_DIR}/hostfile")
+  if(NOT DEFINED ENV{TRAVIS})
+    message( STATUS "Open-MPI back end detected, passing --allow-run-as-root to allow tests to pass when run with sudo or as root." )
+  endif()
+endif ()
+
+if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
+  set(gfortran_compiler true)
+elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
+  set(cray_compiler true)
+elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "PGI")
+  set(portland_group_compiler true)
+endif()
+
+option(CAF_EXPOSE_INIT_FINALIZE "Expose caf_init and caf_finalize in opencoarrays module" FALSE)
+
+include(CheckIncludeFile)
+CHECK_INCLUDE_FILE("alloca.h" HAVE_ALLOCA)
+if(NOT HAVE_ALLOCA)
+  target_compile_definitions(caf_mpi
+    PRIVATE -DALLOCA_MISSING)
+  target_compile_definitions(caf_mpi_static
+    PRIVATE -DALLOCA_MISSING)
+  message(WARNING "Could not find <alloca.h>. Assuming functionality is provided elsewhere.")
+endif()
+
+#----------------------------------------------------------------------
+# Test if MPI implementation provides features needed for failed images
+#----------------------------------------------------------------------
+set(MPI_HAS_FAULT_TOL_EXT YES)
+
+CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
+if (NOT HAVE_SIGNAL_H)
+  set(MPI_HAS_FAULT_TOL_EXT NO)
+  message( FATAL_ERROR "Currently, OpenCoarrays cannot build without signal.h")
+endif()
+
+include(CheckSymbolExists)
+CHECK_SYMBOL_EXISTS(SIGKILL "signal.h" HAVE_SIGKILL)
+if(NOT HAVE_SIGKILL) # try -D_POSIX, needed for mingw-w64, maybe others, see #435
+                     # https://github.com/sourceryinstitute/OpenCoarrays/issues/435#issuecomment-323592433
+  list( APPEND CMAKE_REQUIRED_DEFINITIONS -D_POSIX)
+  CHECK_SYMBOL_EXISTS(SIGKILL "signal.h" HAVE_SIGKILL2)
+  if(HAVE_SIGKILL2)
+    set(HAVE_SIGKILL ${HAVE_SIGKILL2})
+    foreach(lib caf_mpi caf_mpi_static)
+      target_compile_definitions(${lib}
+    	PUBLIC -D_POSIX)
+    endforeach()
+  endif()
+endif()
+
+if (NOT HAVE_SIGKILL)
+  set(MPI_HAS_FAULT_TOL_EXT NO)
+  message (FATAL_ERROR "Currently, OpenCoarrays cannot build without SIGKILL from signal.h")
+endif()
+
+set(NEEDED_SYMBOLS MPIX_ERR_PROC_FAILED;MPIX_ERR_REVOKED;MPIX_Comm_failure_ack;MPIX_Comm_failure_get_acked;MPIX_Comm_shrink;MPIX_Comm_agree)
+
+set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${MPI_C_INCLUDE_PATH})
+else()
+  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
+endif()
+set(old_cmake_required_flags "${CMAKE_REQUIRED_FLAGS}")
+if(CMAKE_REQUIRED_FLAGS)
+  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${MPI_C_COMPILE_FLAGS} ${MPI_C_LINK_FLAGS})
+else()
+  set(CMAKE_REQUIRED_FLAGS ${MPI_C_COMPILE_FLAGS} ${MPI_C_LINK_FLAGS})
+endif()
+set(old_cmake_required_libraries "${CMAKE_REQUIRED_LIBRARIES}")
+if(CMAKE_REQUIRED_LIBRARIES)
+  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${MPI_C_LIBRARIES})
+else()
+  set(CMAKE_REQUIRED_LIBRARIES ${MPI_C_LIBRARIES})
+endif()
+
+set(MPI_HEADERS mpi.h)
+include(CheckIncludeFiles)
+CHECK_INCLUDE_FILES("mpi.h;mpi-ext.h" HAVE_MPI_EXT)
+if(HAVE_MPI_EXT)
+    foreach(lib caf_mpi caf_mpi_static)
+      target_compile_definitions(${lib}
+    	PRIVATE -DHAVE_MPI_EXT_H)
+    endforeach()
+  set(MPI_HEADERS ${MPI_HEADERS};mpi-ext.h)
+endif()
+
+foreach(symbol ${NEEDED_SYMBOLS})
+  CHECK_SYMBOL_EXISTS(${symbol} "${MPI_HEADERS}" HAVE_${symbol})
+  if(NOT HAVE_${symbol})
+    message( STATUS "\${HAVE_${symbol}} = ${HAVE_${symbol}}")
+    message( STATUS
+      "Note: Failed Images not supported by the current MPI implementation! (Needs MPIX experimental features--as of MPI3)")
+    set(MPI_HAS_FAULT_TOL_EXT NO)
+    break() # no need to keep looking
+  endif()
+endforeach(symbol)
+set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
+set(CMAKE_REQUIRED_FLAGS ${old_cmake_required_flags})
+set(CMAKE_REQUIRED_LIBRARIES ${old_cmake_required_libraries})
+
+if(MPI_HAS_FAULT_TOL_EXT) # AND (NOT openmpi))
+  option(CAF_ENABLE_FAILED_IMAGES "Enable failed images support" FALSE)
+  message(STATUS "The MPI implementation appears to have the experimental features for ULFM
+that will allow you to build OpenCoarrays with failed images support. However,
+ULFM support did not make it into the MPI-4 standard, and it is known to
+trigger some bugs. Because of this we have disabled it by default. You may
+add the `-DCAF_ENABLE_FAILED_IMAGES:BOOL=ON` CMake flag or edit the value
+with ccmake or cmake-gui if you would like to experiment with failed images.")
+else()
+  set(CAF_ENABLE_FAILED_IMAGES FALSE
+    CACHE
+    BOOL
+    "Enable failed images support (no support in the selected MPI implementation)"
+    FORCE)
+endif()
+
+if(CAF_ENABLE_FAILED_IMAGES)
+  foreach(lib caf_mpi caf_mpi_static)
+    target_compile_definitions(${lib}
+      PUBLIC -DUSE_FAILED_IMAGES)
+  endforeach()
+endif()
+
+#---------------------------------------------------
+# Windows Intel MPI compatibility, see GH issue #435
+#---------------------------------------------------
+set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
+if(CMAKE_REQUIRED_INCLUDES)
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${MPI_C_INCLUDE_PATH})
+else()
+  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
+endif()
+CHECK_INCLUDE_FILES("mpi.h" HAVE_MPI_H)
+CHECK_SYMBOL_EXISTS(I_MPI_VERSION "mpi.h" HAVE_Intel_MPI)
+if(HAVE_Intel_MPI AND WIN32)
+  foreach(lib caf_mpi caf_mpi_static)
+    target_compile_definitions(${lib}
+      PUBLIC -DUSE_GCC)
+  endforeach()
+endif()
+set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
+
+##############################################
+# Configure `caf` and `cafrun` wrapper scripts
+##############################################
+# List of caf.in variables needing configuration:
+#
+# @CAF_VERSION@ @opencoarrays_aware_compiler@ @Fortran_COMPILER@ @CAF_MODDIR@
+# @CAF_MPI_Fortran_LINK_FLAGS@ @CAF_MPI_Fortran_COMPILE_FLAGS@
+# @CAF_LIBS@ @CAF_MPI_LIBS@
+#
+
+set(CAF_VERSION "${full_git_describe}")
+set(Fortran_COMPILER "${CMAKE_Fortran_COMPILER}")
+set(CAF_MODDIR "${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}")
+set(MOD_DIR_FLAG "${CMAKE_Fortran_MODDIR_FLAG}")
+set(CAF_MPI_LIBS "")
+foreach( lib IN LISTS MPI_Fortran_LIBRARIES)
+  set(CAF_MPI_LIBS "${CAF_MPI_LIBS} \"${lib}\"")
+endforeach()
+string(STRIP "${CAF_MPI_LIBS}" CAF_MPI_LIBS)
+set(CAF_MPI_Fortran_LINK_FLAGS "")
+foreach( lflag IN LISTS MPI_Fortran_LINK_FLAGS)
+  set(CAF_MPI_Fortran_LINK_FLAGS "${CAF_MPI_Fortran_LINK_FLAGS} ${lflag}" )
+endforeach()
+string(STRIP "${CAF_MPI_Fortran_LINK_FLAGS}" CAF_MPI_Fortran_LINK_FLAGS)
+set(CAF_MPI_Fortran_COMPILE_FLAGS "")
+foreach( fcflag IN LISTS MPI_Fortran_COMPILE_FLAGS)
+  set(CAF_MPI_Fortran_COMPILE_FLAGS "${CAF_MPI_Fortran_COMPILE_FLAGS} ${fcflag}" )
+endforeach()
+string(STRIP "${CAF_MPI_Fortran_COMPILE_FLAGS}" CAF_MPI_Fortran_COMPILE_FLAGS)
+set_target_properties(caf_mpi_static
+  PROPERTIES OUTPUT_NAME caf_mpi)
+get_target_property(libcaf_static caf_mpi_static OUTPUT_NAME)
+set(CAF_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libcaf_static}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
+configure_file("${CMAKE_SOURCE_DIR}/src/wrappers/caf.in" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf"
+  @ONLY)
+
+
+# List of cafrun.in variables needing configuration:
+#
+# @CAF_VERSION@ @MPIEXEC@ @MPIEXEC_NUMPROC_FLAG@ @MPIEXEC_PREFLAGS@ @MPIEXEC_POSTFLAGS@
+# @HAVE_FAILED_IMG@
+#
+
+if(CAF_ENABLE_FAILED_IMAGES)
+  set(HAVE_FAILED_IMG "true")
+else()
+  set(HAVE_FAILED_IMG "false")
+endif()
+
+configure_file("${CMAKE_SOURCE_DIR}/src/wrappers/cafrun.in" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun"
+  @ONLY)
+
+install(PROGRAMS "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun"
+  "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf"
+  DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
+
+lint_script("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" caf)
+check_script_style("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf")
+lint_script("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" cafrun)
+check_script_style("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun")
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 9e6fde42f..000000000
--- a/src/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# Makefile
-#
-# -- This Makefile builds the OpenCoarrays libraries using setings in make.inc.
-#    (Please edit make.inc before using this Makefile.)
-#
-#    Instead of using this Makefile, the preferred alternative is to invoke 
-#    ./install.sh, which builds the caf compiler wrapper, the cafrun program 
-#    launcher, the test suite, and any undetected prerequisite packages, and 
-#    which customizes the build for the environment.
-#
-# Usage (default: GASNET=no):
-#    make                      - Builds libcaf_mpi.a, the MPI transport layer.
-#    make GASNET=no all        - Builds libcaf_mpi.a and libcaf_gasnet.a.
-#    make clean                - Deletes *.o files. Retains *.a files.
-#
-# OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-# Copyright (c) 2015-2016, Sourcery, Inc.
-# Copyright (c) 2015-2016, Sourcery Institute
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice, this
-#    list of conditions and the following disclaimer in the documentation and/or
-#    other materials provided with the distribution.
-# 3. Neither the names of the copyright holders nor the names of their contributors
-#    may be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-include make.inc
-export
-
-# Conditionally enable the build of the GASNet library libcaf_gasnet.a,
-# an unmaintained but previously functional MPI alterntive.
-ifeq ($(GASNET),yes)
-  gasnet_=gasnet
-endif
-
-.PHONY : common
-.PHONY : gasnet
-.PHONY : mpi
-.PHONY : $(gasent_)
-
-all: common mpi $(gasnet_) 
-
-mpi: common
-	$(MAKE) -C $@
-
-common:
-	$(MAKE) -C $@
-
-ifeq ($(GASNET),yes)
-gasnet: common
-	$(MAKE) -C $@
-endif
-
-# Delete temporary files files:
-clean:
-	$(MAKE) -k -C mpi clean
-	$(MAKE) -k -C common clean
-ifeq ($(GASNET),yes)
-	$(MAKE) -k -C gasnet clean
-endif
-
-distclean: clean
-	$(MAKE) -k -C common distclean
-	$(MAKE) -k -C mpi distclean
-ifeq ($(GASNET),yes)
-	$(MAKE) -k -C gasnet distclean
-endif
diff --git a/src/common/Makefile b/src/common/Makefile
deleted file mode 100644
index c57aa20f8..000000000
--- a/src/common/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-include ../make.inc
-
-caf_auxiliary.o: caf_auxiliary.c ../libcaf.h ../libcaf-gfortran-descriptor.h
-	$(CC) -I.. $(CFLAGS) -c $< -o $@
-
-clean:
-	rm -f caf_auxiliary.o
-
-distclean: clean
diff --git a/src/common/caf_auxiliary.c b/src/common/caf_auxiliary.c
index a5e0c757f..54983d9c2 100644
--- a/src/common/caf_auxiliary.c
+++ b/src/common/caf_auxiliary.c
@@ -25,7 +25,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 
-#include "libcaf.h"
+#include "../libcaf.h"
 
 
 /* Check whether the array section is contiguous.  There are two possibilities
diff --git a/src/extensions/opencoarrays.F90 b/src/extensions/opencoarrays.F90
deleted file mode 100644
index 3fbc26b5a..000000000
--- a/src/extensions/opencoarrays.F90
+++ /dev/null
@@ -1,810 +0,0 @@
-! Fortran 2015 feature support for Fortran 2008 compilers
-!
-! Copyright (c) 2015-2016, Sourcery, Inc.
-! All rights reserved.
-!
-! Redistribution and use in source and binary forms, with or without
-! modification, are permitted provided that the following conditions are met:
-!     * Redistributions of source code must retain the above copyright
-!       notice, this list of conditions and the following disclaimer.
-!     * Redistributions in binary form must reproduce the above copyright
-!       notice, this list of conditions and the following disclaimer in the
-!       documentation and/or other materials provided with the distribution.
-!     * Neither the name of the Sourcery, Inc., nor the
-!       names of its contributors may be used to endorse or promote products
-!       derived from this software without specific prior written permission.
-!
-! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-! ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-! WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-! DISCLAIMED. IN NO EVENT SHALL SOURCERY, INC., BE LIABLE FOR ANY
-! DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-! (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-! LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-! ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-! (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-!
-module opencoarrays
-#ifdef COMPILER_SUPPORTS_ATOMICS
-  use iso_fortran_env, only : atomic_int_kind
-#endif
-  use iso_c_binding, only : c_int,c_char,c_ptr,c_loc,c_double,c_int32_t,c_ptrdiff_t,c_sizeof,c_bool,c_funloc
-  implicit none
-
-#ifndef MPI_WORKING_MODULE
-  include 'mpif.h'
-#endif
-
-  private
-  public :: co_reduce
-  public :: co_broadcast
-  public :: co_sum
-  public :: co_min
-  public :: co_max
-  public :: this_image
-  public :: num_images
-  public :: error_stop
-  public :: sync_all
-  public :: team_number
-#ifdef HAVE_MPI
-  public :: get_communicator
-#endif
-#ifdef COMPILER_SUPPORTS_ATOMICS
-  public :: event_type
-  public :: event_post
-
-  type event_type
-    private
-    integer(atomic_int_kind), allocatable :: atom[:]
-  end type
-#endif
-#ifdef EXPOSE_INIT_FINALIZE
-  public :: caf_init
-  public :: caf_finalize
-#endif
-
-  ! Generic interface to co_broadcast with implementations for various types, kinds, and ranks
-  interface co_reduce
-     module procedure co_reduce_c_int,co_reduce_c_double,co_reduce_logical
-  end interface
-
-  ! Generic interface to co_broadcast with implementations for various types, kinds, and ranks
-  interface co_broadcast
-     module procedure co_broadcast_c_int,co_broadcast_c_double,co_broadcast_c_char
-  end interface
-
-  ! Generic interface to co_sum with implementations for various types, kinds, and ranks
-  interface co_sum
-     module procedure co_sum_c_int,co_sum_c_double
-  end interface
-
-  ! Generic interface to co_sum with implementations for various types, kinds, and ranks
-  interface co_min
-     module procedure co_min_c_int,co_min_c_double
-  end interface
-
-  ! Generic interface to co_sum with implementations for various types, kinds, and ranks
-  interface co_max
-     module procedure co_max_c_int,co_max_c_double
-  end interface
-
-  abstract interface
-     pure function c_int_operator(lhs,rhs) result(lhs_op_rhs)
-       import c_int
-       integer(c_int), intent(in) :: lhs,rhs
-       integer(c_int) :: lhs_op_rhs
-     end function
-     pure function c_double_operator(lhs,rhs) result(lhs_op_rhs)
-       import c_double
-       real(c_double), intent(in) :: lhs,rhs
-       real(c_double) :: lhs_op_rhs
-     end function
-     pure function logical_operator(lhs,rhs) result(lhs_op_rhs)
-       logical, intent(in) :: lhs,rhs
-       logical :: lhs_op_rhs
-     end function
-  end interface
-
-  interface
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    function team_number(team_type_ptr) result(my_team_number) bind(C,name="_caf_extensions_team_number")
-#else
-    function team_number(team_type_ptr) result(my_team_number) bind(C,name="_gfortran_caf_team_number")
-#endif
-       use iso_c_binding, only : c_int,c_ptr
-       implicit none
-       type(c_ptr), optional :: team_type_ptr
-       integer(c_int) :: my_team_number
-    end function
-
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    function get_communicator(team_type_ptr) result(my_team) bind(C,name="_caf_extensions_get_communicator")
-#else
-    function get_communicator(team_type_ptr) result(my_team) bind(C,name="_gfortran_caf_get_communicator")
-#endif
-       use iso_c_binding, only : c_int,c_ptr
-       implicit none
-       type(c_ptr), optional :: team_type_ptr
-       integer(c_int) :: my_team
-    end function
-  end interface
-
-
-  ! __________ End Public Interface _____________
-
-
-  ! __________ Begin Private Implementation _____
-
-  ! Enumeration from ../libcaf-gfortran-descriptor.h:
-  !  enum
-  !{ BT_UNKNOWN = 0, BT_INTEGER, BT_LOGICAL, BT_REAL, BT_COMPLEX,
-  !  BT_DERIVED, BT_CHARACTER, BT_CLASS, BT_PROCEDURE, BT_HOLLERITH, BT_VOID,
-  !  BT_ASSUMED
-  !};
-
-  enum ,bind(C)
-    enumerator :: &
-     BT_UNKNOWN = 0, BT_INTEGER, BT_LOGICAL, BT_REAL, BT_COMPLEX, &
-     BT_DERIVED, BT_CHARACTER, BT_CLASS, BT_PROCEDURE, BT_HOLLERITH, BT_VOID, &
-     BT_ASSUMED
-  end enum
-
-  ! Type definition from ../libcaf-gfortran-descriptor.h:
-  !typedef struct descriptor_dimension
-  !{
-  !  ptrdiff_t _stride;
-  !  ptrdiff_t lower_bound;
-  !  ptrdiff_t _ubound;
-  !}
-  !descriptor_dimension;
-
-  ! Fortran derived type interoperable with like-named C type:
-  type, bind(C) :: descriptor_dimension
-     integer(c_ptrdiff_t) :: stride
-     integer(c_ptrdiff_t) :: lower_bound
-     integer(c_ptrdiff_t) :: ubound_
-  end type
-
-  ! Type definition from ../libcaf-gfortran-descriptor.h:
-  !typedef struct gfc_descriptor_t {
-  !  void *base_addr;
-  !  size_t offset;
-  !  ptrdiff_t dtype;
-  !  descriptor_dimension dim[];
-  !} gfc_descriptor_t;
-
-  integer, parameter :: max_dimensions=15
-
-  ! Fortran derived type interoperable with like-named C type:
-  type, bind(C) :: gfc_descriptor_t
-    type(c_ptr) :: base_addr
-    integer(c_ptrdiff_t) :: offset
-    integer(c_ptrdiff_t) :: dtype
-    type(descriptor_dimension) :: dim_(max_dimensions)
-  end type
-
-  ! C comment and source from ../libcaf.h
-  ! /* When there is a vector subscript in this dimension, nvec == 0, otherwise,
-  ! lower_bound, upper_bound, stride contains the bounds relative to the declared
-  ! bounds; kind denotes the integer kind of the elements of vector[].  */
-  ! type, bind(C) :: caf_vector_t {
-  !   size_t nvec;
-  !   union {
-  !     struct {
-  !       void *vector;
-  !       int kind;
-  !     } v;
-  !     struct {
-  !       ptrdiff_t lower_bound, upper_bound, stride;
-  !     } triplet;
-  !   } u;
-  ! }
-  ! caf_vector_t;
-
-  type, bind(C) :: v_t
-    type(c_ptr) :: vector
-    integer(c_int) :: kind_
-  end type
-
-  type, bind(C) :: triplet_t
-    integer(c_ptrdiff_t) :: lower_bound, upper_bound, stride
-  end type
-
-  type, bind(C) :: u_t
-     type(v_t) :: v
-     type(triplet_t) :: triplet
-  end type
-
-  type, bind(C) :: caf_vector_t
-    integer(c_ptrdiff_t) :: nvec
-    type(u_t) :: u
-  end type
-
-  ! --------------------
-
-  integer(c_int), save, volatile, bind(C,name="CAF_COMM_WORLD") :: CAF_COMM_WORLD
-  integer(c_int32_t), parameter  :: bytes_per_word=4_c_int32_t
-
-  interface gfc_descriptor
-    module procedure gfc_descriptor_c_int,gfc_descriptor_c_double,gfc_descriptor_logical
-  end interface
-
-  ! Bindings for OpenCoarrays C procedures
-  interface
-
-    ! C function signature from ../mpi/mpi_caf.c:
-    ! void
-    ! PREFIX (init) (int *argc, char ***argv)
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    subroutine caf_init(argc,argv) bind(C,name="_caf_extensions_init")
-#else
-    subroutine caf_init(argc,argv) bind(C,name="_gfortran_caf_init")
-#endif
-      import :: c_int,c_ptr
-      type(c_ptr), value :: argc
-      type(c_ptr), value :: argv
-    end subroutine
-
-    ! C function signature from ../mpi/mpi_caf.c:
-    ! void
-    ! PREFIX (finalize) (void)
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    subroutine caf_finalize() bind(C,name="_caf_extensions_finalize")
-#else
-    subroutine caf_finalize() bind(C,name="_gfortran_caf_finalize")
-#endif
-    end subroutine
-
-    ! C function signature from ../mpi/mpi_caf.c:
-    ! void
-    ! PREFIX (co_min) (gfc_descriptor_t *a, int result_image, int *stat, char *errmsg,
-    !                  int src_len, int errmsg_len)
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    subroutine opencoarrays_co_min(a,result_image, stat, errmsg, unused , errmsg_len) bind(C,name="_caf_extensions_co_min")
-#else
-    subroutine opencoarrays_co_min(a,result_image, stat, errmsg, unused, errmsg_len) bind(C,name="_gfortran_caf_co_min")
-#endif
-      import :: c_int,c_char,c_ptr
-      type(c_ptr), intent(in), value :: a
-      integer(c_int), intent(in),  value :: result_image,errmsg_len,unused
-      integer(c_int), intent(out), optional, volatile :: stat
-      character(kind=c_char), intent(out), optional, volatile :: errmsg(*)
-    end subroutine
-
-    ! C function signature from ../mpi/mpi_caf.c
-    ! void
-    ! PREFIX (co_reduce) (gfc_descriptor_t *a, void *(*opr) (void *, void *), int opr_flags,
-    !                     int result_image, int *stat, char *errmsg, int a_len, int errmsg_len)
-    subroutine opencoarrays_co_reduce(a, opr, opr_flags, result_image, stat, errmsg, a_len, errmsg_len) &
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-      bind(C,name="_caf_extensions_co_reduce")
-#else
-      bind(C,name="_gfortran_caf_co_reduce")
-#endif
-      use iso_c_binding, only : c_ptr,c_funptr,c_int,c_char
-      type(c_ptr), intent(in), value :: a
-      type(c_funptr), intent(in), value :: opr
-      integer(c_int), intent(in), value :: opr_flags,result_image
-      integer(c_int), intent(out) :: stat
-      character(kind=c_char), intent(out), optional, volatile :: errmsg(*)
-      integer(c_int), intent(in), value :: a_len
-      integer(c_int), intent(in), value :: errmsg_len
-    end subroutine
-
-    ! C function signature from ../mpi/mpi_caf.c:
-    ! void
-    ! PREFIX (get) (caf_token_t token, size_t offset,
-    !              int image_index,
-    !              gfc_descriptor_t *src ,
-    !              caf_vector_t *src_vector __attribute__ ((unused)),
-    !              gfc_descriptor_t *dest, int src_kind, int dst_kind,
-    !              bool mrt)
-    subroutine opencoarrays_get(token, offset, image_index_, src, src_vector_unused, dest, src_kind, dst_kind, mrt) &
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-      bind(C,name="_caf_extensions_get")
-#else
-      bind(C,name="_gfortran_caf_get")
-#endif
-      import c_ptrdiff_t,c_int,gfc_descriptor_t,c_bool,caf_vector_t,c_ptr
-      type(c_ptr), value :: token
-      integer(c_ptrdiff_t), value :: offset
-      integer(c_int), value :: image_index_
-      type(gfc_descriptor_t) :: src
-      type(caf_vector_t) :: src_vector_unused
-      type(gfc_descriptor_t) :: dest
-      integer(c_int), value :: src_kind
-      integer(c_int), value :: dst_kind
-      logical(c_bool), value :: mrt
-    end subroutine
-
-    ! C function signature from ../mpi/mpi_caf.c:
-    ! void
-    ! PREFIX (co_max) (gfc_descriptor_t *a, int result_image, int *stat,
-    !                  char *errmsg, int src_len, int errmsg_len)
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    subroutine opencoarrays_co_max(a,result_image, stat, errmsg, unused, errmsg_len) bind(C,name="_caf_extensions_co_max")
-#else
-    subroutine opencoarrays_co_max(a,result_image, stat, errmsg, unused, errmsg_len) bind(C,name="_gfortran_caf_co_max")
-#endif
-      import :: c_int,c_char,c_ptr
-      type(c_ptr), intent(in), value :: a
-      integer(c_int), intent(in),  value :: result_image,errmsg_len,unused
-      integer(c_int), intent(out), optional :: stat
-      character(kind=c_char), intent(out), optional :: errmsg(*)
-    end subroutine
-
-    ! C function signature from ../mpi/mpi_caf.c:
-    ! void
-    ! PREFIX (co_sum) (gfc_descriptor_t *a, int result_image, int *stat, char *errmsg,
-    !                  int errmsg_len)
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    subroutine opencoarrays_co_sum(a, result_image, stat, errmsg, errmsg_len) bind(C,name="_caf_extensions_co_sum")
-#else
-    subroutine opencoarrays_co_sum(a, result_image, stat, errmsg, errmsg_len) bind(C,name="_gfortran_caf_co_sum")
-#endif
-      import :: c_int,c_char,c_ptr
-      type(c_ptr), intent(in), value :: a
-      integer(c_int), intent(in),  value :: result_image,errmsg_len
-      integer(c_int), intent(out), optional :: stat
-      character(kind=c_char), intent(out), optional :: errmsg(*)
-    end subroutine
-
-    ! C function signature from ../mpi/mpi_caf.c
-    ! void
-    ! PREFIX (co_broadcast) (gfc_descriptor_t *a, int source_image, int *stat, char *errmsg,
-    !                  int errmsg_len)
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    subroutine opencoarrays_co_broadcast(a,source_image, stat, errmsg, errmsg_len) bind(C,name="_caf_extensions_co_broadcast")
-#else
-    subroutine opencoarrays_co_broadcast(a,source_image, stat, errmsg, errmsg_len) bind(C,name="_gfortran_caf_co_broadcast")
-#endif
-      import :: c_int,c_char,c_ptr
-      type(c_ptr), intent(in), value :: a
-      integer(c_int), intent(in),  value :: source_image,errmsg_len
-      integer(c_int), intent(out), optional :: stat
-      character(kind=c_char), intent(out), optional :: errmsg(*)
-    end subroutine
-
-    ! C function signature from ../mpi/mpi_caf.c:
-    ! int PREFIX (this_image) (int);
-    function opencoarrays_this_image(coarray) bind(C,name="_gfortran_caf_this_image") result(image_num)
-      import :: c_int
-      integer(c_int), value, intent(in) :: coarray
-      integer(c_int)  :: image_num
-    end function
-
-    ! C function signature from ../mpi/mpi_caf.c:
-    ! int PREFIX (num_images) (int, int);
-    function opencoarrays_num_images(coarray,dim_) bind(C,name="_gfortran_caf_num_images") result(num_images_)
-      import :: c_int
-      integer(c_int), value, intent(in) :: coarray,dim_
-      integer(c_int) :: num_images_
-    end function
-
-    ! C function signature from ../mpi_caf.c
-    ! void PREFIX (error_stop) (int32_t) __attribute__ ((noreturn));
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    subroutine opencoarrays_error_stop(stop_code) bind(C,name="_caf_extensions_error_stop")
-#else
-    subroutine opencoarrays_error_stop(stop_code) bind(C,name="_gfortran_caf_error_stop")
-#endif
-      import :: c_int32_t
-      integer(c_int32_t), value, intent(in) :: stop_code
-    end subroutine
-
-    ! C function signature from ../mpi_caf.c
-    ! void PREFIX (sync_all) (int *, char *, int);
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    subroutine opencoarrays_sync_all(stat,errmsg,unused) bind(C,name="_caf_extensions_sync_all")
-#else
-    subroutine opencoarrays_sync_all(stat,errmsg,unused) bind(C,name="_gfortran_caf_sync_all")
-#endif
-      import :: c_int,c_char
-      integer(c_int), intent(out) :: stat,unused
-      character(c_char), intent(out) :: errmsg(*)
-    end subroutine
-
-  end interface
-
-
-contains
-
-  ! __________ Descriptor constructors for for each supported type and kind ____________
-  ! ____________________________________________________________________________________
-
-  function my_dtype(type_,kind_,rank_) result(dtype_)
-    integer,parameter :: GFC_DTYPE_SIZE_SHIFT = 8, GFC_DTYPE_TYPE_SHIFT=3
-    integer(c_int32_t), intent(in) :: type_,kind_,rank_
-    integer(c_int32_t) :: dtype_
-
-    ! SIZE Type Rank
-    ! 0000  000  000
-
-    ! Rank is represented in the 3 least significant bits
-    dtype_ = ior(0_c_int32_t,rank_)
-    ! The next three bits represent the type id as expressed in libcaf-gfortran-descriptor.h
-    dtype_ = ior(dtype_,ishft(type_,GFC_DTYPE_TYPE_SHIFT))
-    ! The most significant bits represent the size of a the type (single or double precision).
-    ! We can express the precision in terms of 32-bit words: 1 for single, 2 for double.
-    dtype_ = ior(dtype_,ishft(kind_,GFC_DTYPE_SIZE_SHIFT))
-
-  end function
-
-  function gfc_descriptor_c_int(a) result(a_descriptor)
-    integer(c_int), intent(in), target, contiguous :: a(..)
-    type(gfc_descriptor_t) :: a_descriptor
-    integer(c_int), parameter :: unit_stride=1,scalar_offset=-1
-    integer(c_int) :: i
-
-    a_descriptor%dtype = my_dtype(type_=BT_INTEGER,kind_=int(c_sizeof(a)/bytes_per_word,c_int32_t),rank_=rank(a))
-    a_descriptor%offset = scalar_offset
-    a_descriptor%base_addr = c_loc(a) ! data
-    do concurrent(i=1:rank(a))
-      a_descriptor%dim_(i)%stride  = unit_stride
-      a_descriptor%dim_(i)%lower_bound = lbound(a,i)
-      a_descriptor%dim_(i)%ubound_ = ubound(a,i)
-    end do
-
-  end function
-
-  function gfc_descriptor_logical(a) result(a_descriptor)
-    logical, intent(in), target, contiguous :: a(..)
-    type(gfc_descriptor_t) :: a_descriptor
-    integer(c_int), parameter :: unit_stride=1,scalar_offset=-1,words=1
-    integer(c_int) :: i
-
-    a_descriptor%dtype = my_dtype(type_=BT_LOGICAL,kind_=words,rank_=rank(a))
-    a_descriptor%offset = scalar_offset
-    a_descriptor%base_addr = c_loc(a) ! data
-    do concurrent(i=1:rank(a))
-      a_descriptor%dim_(i)%stride  = unit_stride
-      a_descriptor%dim_(i)%lower_bound = lbound(a,i)
-      a_descriptor%dim_(i)%ubound_ = ubound(a,i)
-    end do
-
-  end function
-
-  function gfc_descriptor_c_double(a) result(a_descriptor)
-    real(c_double), intent(in), target, contiguous :: a(..)
-    type(gfc_descriptor_t) :: a_descriptor
-    integer(c_int), parameter :: unit_stride=1,scalar_offset=-1
-    integer(c_int) :: i
-
-    a_descriptor%dtype = my_dtype(type_=BT_REAL,kind_=int(c_sizeof(a)/bytes_per_word,c_int32_t),rank_=rank(a))
-    a_descriptor%offset = scalar_offset
-    a_descriptor%base_addr = c_loc(a) ! data
-    do concurrent(i=1:rank(a))
-      a_descriptor%dim_(i)%stride  = unit_stride
-      a_descriptor%dim_(i)%lower_bound = lbound(a,i)
-      a_descriptor%dim_(i)%ubound_ = ubound(a,i)
-    end do
-
-  end function
-
- ! This version should work for any rank but causes an ICE with gfortran 4.9.2
- !
- !function gfc_descriptor_c_char(a) result(a_descriptor)
- !  character(c_char), intent(in), target, contiguous :: a(..)
- !  type(gfc_descriptor_t) :: a_descriptor
- !  integer(c_int), parameter :: unit_stride=1,scalar_offset=-1
- !  integer(c_int) :: i
-
- !  a_descriptor%dtype = my_dtype(type_=BT_CHARACTER,kind_=int(c_sizeof(a)/bytes_per_word,c_int32_t),rank_=rank(a))
- !  a_descriptor%offset = scalar_offset
- !  a_descriptor%base_addr = c_loc(a) ! data
- !  do concurrent(i=1:rank(a))
- !    a_descriptor%dim_(i)%stride  = unit_stride
- !    a_descriptor%dim_(i)%lower_bound = lbound(a,i)
- !    a_descriptor%dim_(i)%ubound_ = ubound(a,i)
- !  end do
-
- !end function
-
-  ! ______ Assumed-rank co_reduce wrappers for each supported type and kind _________
-  ! _________________________________________________________________________________
-
-    subroutine co_reduce_c_int(a, opr, result_image, stat, errmsg)
-      ! Dummy variables
-      integer(c_int), intent(inout), volatile, contiguous :: a(..)
-      procedure(c_int_operator) :: opr
-      integer(c_int), intent(in), optional :: result_image
-      integer(c_int), intent(out), optional, volatile :: stat
-      character(kind=c_char), intent(out), optional, volatile :: errmsg(*)
-      ! Local variables
-      integer(c_int), volatile :: opr_flags_unused,a_len_unused,errmsg_len
-      type(gfc_descriptor_t), target :: a_descriptor
-      integer(c_int), parameter :: default_result_image=0
-      integer(c_int) :: result_image_
-
-      result_image_ = merge(result_image,default_result_image,present(result_image))
-      a_descriptor = gfc_descriptor(a)
-      call opencoarrays_co_reduce( &
-        c_loc(a_descriptor), c_funloc(opr), opr_flags_unused, result_image_, stat, errmsg, a_len_unused, errmsg_len &
-      )
-    end subroutine
-
-    subroutine co_reduce_logical(a, opr, result_image, stat, errmsg)
-      ! Dummy variables
-      logical, intent(inout), volatile, contiguous :: a(..)
-      procedure(logical_operator) :: opr
-      integer(c_int), intent(in), optional :: result_image
-      integer(c_int), intent(out),optional , volatile :: stat
-      character(kind=c_char), intent(out), optional, volatile :: errmsg(*)
-      ! Local variables
-      integer(c_int), volatile :: opr_flags_unused,a_len_unused,errmsg_len
-      type(gfc_descriptor_t), target :: a_descriptor
-      integer(c_int), parameter :: default_result_image=0
-      integer(c_int) :: result_image_
-
-      result_image_ = merge(result_image,default_result_image,present(result_image))
-      a_descriptor = gfc_descriptor(a)
-      call opencoarrays_co_reduce( &
-        c_loc(a_descriptor), c_funloc(opr), opr_flags_unused, result_image_, stat, errmsg, a_len_unused, errmsg_len &
-      )
-    end subroutine
-
-    subroutine co_reduce_c_double(a, opr, result_image, stat, errmsg)
-      ! Dummy variables
-      real(c_double), intent(inout), volatile, contiguous :: a(..)
-      procedure(c_double_operator) :: opr
-      integer(c_int), intent(in), optional :: result_image
-      integer(c_int), intent(out), optional, volatile :: stat
-      character(kind=c_char), intent(out), optional, volatile :: errmsg(*)
-      ! Local variables
-      integer(c_int), volatile :: opr_flags_unused,a_len_unused,errmsg_len
-      type(gfc_descriptor_t), target :: a_descriptor
-      integer(c_int), parameter :: default_result_image=0
-      integer(c_int) :: result_image_
-
-      result_image_ = merge(result_image,default_result_image,present(result_image))
-      a_descriptor = gfc_descriptor(a)
-      call opencoarrays_co_reduce( &
-        c_loc(a_descriptor), c_funloc(opr), opr_flags_unused, result_image_, stat, errmsg, a_len_unused, errmsg_len &
-      )
-    end subroutine
-
-  ! ______ Assumed-rank co_broadcast wrappers for each supported type and kind _________
-  ! ____________________________________________________________________________________
-
-  ! This provisional implementation incurs some overhead by converting the character argument
-  ! to an integer(c_int) array, invoking co_broadcast_c_int and then convering the received
-  ! message back from the integer(c_int) array to a character variable.
-  !
-  ! Replace this implementation with one that avoids the conversions and the associated copies
-  ! once the compiler provides support for co_broadcast with scalar arguments.
-  !
-  subroutine co_broadcast_c_char(a,source_image,stat,errmsg)
-    character(kind=c_char,len=*), intent(inout), volatile, target :: a
-    integer(c_int), intent(in), optional :: source_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants:
-    integer(c_int), allocatable :: a_cast_to_integer_array(:)
-    character(len=len(a)) :: dummy
-
-    ! Convert "a" to an integer(c_int) array where each 32-bit integer element holds four 1-byte characters
-    a_cast_to_integer_array = transfer(a,[0_c_int])
-    ! Broadcast the integer(c_int) array
-    call co_broadcast_c_int(a_cast_to_integer_array,source_image, stat, errmsg)
-    ! Recover the characters from the broadcasted integer(c_int) array
-    dummy = ' '
-    a = transfer(a_cast_to_integer_array,dummy)
-
-  end subroutine
-
-  subroutine co_broadcast_c_double(a,source_image,stat,errmsg)
-    real(c_double), intent(inout), volatile, target, contiguous :: a(..)
-    integer(c_int), intent(in), optional :: source_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants
-    integer(c_int), parameter :: default_source_image=0
-    integer(c_int) :: source_image_ ! Local replacement for the corresponding intent(in) dummy argument
-    type(gfc_descriptor_t), target :: a_descriptor
-
-    source_image_ = merge(source_image,default_source_image,present(source_image))
-    a_descriptor = gfc_descriptor(a)
-    call opencoarrays_co_broadcast(c_loc(a_descriptor),source_image_, stat, errmsg, len(errmsg))
-
-  end subroutine
-
-  subroutine co_broadcast_c_int(a,source_image,stat,errmsg)
-    integer(c_int), intent(inout), volatile, target, contiguous :: a(..)
-    integer(c_int), intent(in), optional :: source_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants:
-    integer(c_int), parameter :: default_source_image=0
-    integer(c_int) :: source_image_ ! Local replacement for the corresponding intent(in) dummy argument
-    type(gfc_descriptor_t), target :: a_descriptor
-
-    source_image_ = merge(source_image,default_source_image,present(source_image))
-    a_descriptor = gfc_descriptor(a)
-    call opencoarrays_co_broadcast(c_loc(a_descriptor),source_image_, stat, errmsg, len(errmsg))
-
-  end subroutine
-
-  ! ________ Assumed-rank get wrappers for each supported type and kind ________________
-  ! ________ (Incomplete, private and unsupported) _____________________________________
-  ! ____________________________________________________________________________________
-
-  subroutine get_c_int(src , dest, image_index_, offset, mrt)
-    use iso_fortran_env, only : error_unit
-    ! Dummy arguments:
-    integer(c_int), intent(in), target, contiguous :: src(..)
-    integer(c_int), intent(out), target, contiguous, volatile :: dest(..)
-    integer(c_int), intent(in) :: image_index_
-    integer(c_ptrdiff_t), intent(in) :: offset
-    logical(c_bool), intent(in) :: mrt
-    ! Local variables:
-    type(gfc_descriptor_t), target, volatile ::  dest_descriptor
-    type(gfc_descriptor_t), target :: src_descriptor
-    type(caf_vector_t) :: src_vector_unused
-    type(c_ptr) :: token
-
-    write(error_unit,*) "Remote access of coarrays not yet supported"
-    call error_stop
-
-    src_descriptor = gfc_descriptor(src)
-    dest_descriptor = gfc_descriptor(dest)
-    call opencoarrays_get( &
-     token, offset, image_index_, src_descriptor, src_vector_unused, dest_descriptor, kind(src), kind(dest), mrt &
-    )
-  end subroutine
-
-  ! ________ Assumed-rank co_min wrappers for each supported type and kind _____________
-  ! ____________________________________________________________________________________
-
-  subroutine co_min_c_int(a,result_image,stat,errmsg)
-    integer(c_int), intent(inout), volatile, target, contiguous :: a(..)
-    integer(c_int), intent(in), optional :: result_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants:
-    type(gfc_descriptor_t), target :: a_descriptor
-    integer(c_int), parameter :: default_result_image=0
-    integer(c_int) :: unused, result_image_ ! Local replacement for the corresponding intent(in) dummy argument
-
-    a_descriptor = gfc_descriptor(a)
-    result_image_ = merge(result_image,default_result_image,present(result_image))
-    call opencoarrays_co_min(c_loc(a_descriptor),result_image_, stat, errmsg, unused, len(errmsg))
-
-  end subroutine
-
-  subroutine co_min_c_double(a,result_image,stat,errmsg)
-    real(c_double), intent(inout), volatile, target, contiguous :: a(..)
-    integer(c_int), intent(in), optional :: result_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants:
-    type(gfc_descriptor_t), target :: a_descriptor
-    integer(c_int), parameter :: default_result_image=0
-    integer(c_int) :: unused, result_image_ ! Local replacement for the corresponding intent(in) dummy argument
-
-    a_descriptor = gfc_descriptor(a)
-    result_image_ = merge(result_image,default_result_image,present(result_image))
-    call opencoarrays_co_min(c_loc(a_descriptor),result_image_, stat, errmsg, unused, len(errmsg))
-
-  end subroutine
-
-
-  ! ________ Assumed-rank co_max wrappers for each supported type and kind _____________
-  ! ____________________________________________________________________________________
-
-  subroutine co_max_c_int(a,result_image,stat,errmsg)
-    integer(c_int), intent(inout), volatile, target, contiguous :: a(..)
-    integer(c_int), intent(in), optional :: result_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants:
-    type(gfc_descriptor_t), target :: a_descriptor
-    integer(c_int), parameter :: default_result_image=0
-    integer(c_int) :: unused, result_image_ ! Local replacement for the corresponding intent(in) dummy argument
-
-    a_descriptor = gfc_descriptor(a)
-    result_image_ = merge(result_image,default_result_image,present(result_image))
-    call opencoarrays_co_max(c_loc(a_descriptor),result_image_, stat, errmsg, unused, len(errmsg))
-
-  end subroutine
-
-  subroutine co_max_c_double(a,result_image,stat,errmsg)
-    real(c_double), intent(inout), volatile, target, contiguous :: a(..)
-    integer(c_int), intent(in), optional :: result_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants:
-    type(gfc_descriptor_t), target :: a_descriptor
-    integer(c_int), parameter :: default_result_image=0
-    integer(c_int) :: unused, result_image_ ! Local replacement for the corresponding intent(in) dummy argument
-
-    a_descriptor = gfc_descriptor(a)
-    result_image_ = merge(result_image,default_result_image,present(result_image))
-    call opencoarrays_co_max(c_loc(a_descriptor),result_image_, stat, errmsg, unused, len(errmsg))
-
-  end subroutine
-
-  ! ________ Assumed-rank co_sum wrappers for each supported type and kind _____________
-  ! ____________________________________________________________________________________
-
-  subroutine co_sum_c_double(a,result_image,stat,errmsg)
-    real(c_double), intent(inout), volatile, target, contiguous :: a(..)
-    integer(c_int), intent(in), optional :: result_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants:
-    type(gfc_descriptor_t), target :: a_descriptor
-    integer(c_int), parameter :: default_result_image=0
-    integer(c_int) :: result_image_ ! Local replacement for the corresponding intent(in) dummy argument
-
-    a_descriptor = gfc_descriptor(a)
-    result_image_ = merge(result_image,default_result_image,present(result_image))
-    call opencoarrays_co_sum(c_loc(a_descriptor),result_image_, stat, errmsg, len(errmsg))
-
-  end subroutine
-
-  subroutine co_sum_c_int(a,result_image,stat,errmsg)
-    integer(c_int), intent(inout), volatile, target, contiguous :: a(..)
-    integer(c_int), intent(in), optional :: result_image
-    integer(c_int), intent(out), optional:: stat
-    character(kind=1,len=*), intent(out), optional :: errmsg
-    ! Local variables and constants:
-    integer(c_int), parameter :: default_result_image=0
-    type(gfc_descriptor_t), target :: a_descriptor
-    integer(c_int) :: result_image_ ! Local replacement for the corresponding intent(in) dummy argument
-
-    a_descriptor = gfc_descriptor(a)
-    result_image_ = merge(result_image,default_result_image,present(result_image))
-    call opencoarrays_co_sum(c_loc(a_descriptor),result_image_, stat, errmsg, len(errmsg))
-
-  end subroutine
-
-  ! Return the image number (MPI rank + 1)
-  function this_image()  result(image_num)
-#ifdef MPI_WORKING_MODULE
-    use mpi, only : MPI_Comm_rank
-#endif
-    integer(c_int) :: image_num,ierr
-   !image_num = opencoarrays_this_image(unused)
-    call MPI_Comm_rank(CAF_COMM_WORLD,image_num,ierr)
-    if (ierr/=0) call error_stop
-    image_num = image_num + 1
-  end function
-
-  ! Return the total number of images
-  function num_images()  result(num_images_)
-#ifdef MPI_WORKING_MODULE
-    use mpi, only : MPI_Comm_size
-#endif
-    integer(c_int) :: num_images_,ierr
-   !num_images_ = opencoarrays_num_images(unused_coarray,unused_scalar)
-    call MPI_Comm_size(CAF_COMM_WORLD,num_images_,ierr)
-    if (ierr/=0) call error_stop
-  end function
-
-  ! Halt the execution of all images
-  subroutine error_stop(stop_code)
-    integer(c_int32_t), intent(in), optional :: stop_code
-    integer(c_int32_t), parameter :: default_code=-1_c_int32_t
-    integer(c_int32_t) :: code
-    code = merge(stop_code,default_code,present(stop_code))
-    call opencoarrays_error_stop(code)
-  end subroutine
-
-  ! Impose a global execution barrier
-  subroutine sync_all(stat,errmsg,unused)
-    integer(c_int), intent(out), optional :: stat,unused
-    character(c_char), intent(out), optional :: errmsg
-    call opencoarrays_sync_all(stat,errmsg,unused)
-  end subroutine
-
-#ifdef COMPILER_SUPPORTS_ATOMICS
-   ! Proposed Fortran 2015 event_post procedure
-   subroutine event_post(this)
-     class(event_type), intent(inout) ::  this
-     if (.not.allocated(this%atom)) this%atom=0
-     call atomic_define ( this%atom, this%atom + 1_atomic_int_kind )
-   end subroutine
-#endif
-
-end module
diff --git a/src/gasnet/CMakeLists.txt b/src/gasnet/CMakeLists.txt
deleted file mode 100644
index f5ead803b..000000000
--- a/src/gasnet/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_library(caf_gasnet gasnet.c ../common/caf_auxiliary.c)
diff --git a/src/gasnet/Makefile b/src/gasnet/Makefile
deleted file mode 100644
index b8ed66695..000000000
--- a/src/gasnet/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-include ../make.inc
-
-MY_GASNET_CFLAGS := $(GASNET_CFLAGS)
-MY_GASNET_CC := $(GASNET_CC)
-MY_GASNET_LD := $(GASNET_LD)
-MY_GASNET_LDFLAGS := $(GASNET_LDFLAGS)
-
-include $(GASNET_MAK)
-
-
-GASNET_CFLAGS += $(CFLAGS) $(MY_GASNET_CFLAGS)
-
-ifneq ($(MY_GASNET_CC),)
-  GASNET_CC = $(MY_GASNET_CC)
-endif
-
-ifneq ($(MY_GASNET_LD),)
-  GASNET_LD = $(MY_GASNET_LD)
-endif
-
-ifneq ($(MY_GASNET_LDFLAGS),)
-  GASNET_LDFLAGS = $(MY_GASNET_LDFLAGS)
-endif
-
-
-all: libcaf_gasnet.a
-
-libcaf_gasnet.a: gasnet.o ../common/caf_auxiliary.o
-	ar rcv $@ gasnet.o ../common/caf_auxiliary.o
-	ranlib $@
-
-.c.o:
-	$(GASNET_CC) $(GASNET_CPPFLAGS) $(GASNET_CFLAGS) -I.. -c -o $@ $<
-
-gasnet.o: gasnet.c ../libcaf.h ../libcaf-gfortran-descriptor.h
-
-../common/caf_auxiliary.o:
-	$(MAKE) -C ../common
-
-clean:
-	rm -f gasnet.o
-
-distclean: clean
-	rm -f libcaf_armci.a
diff --git a/src/gasnet/gasnet.c b/src/gasnet/gasnet.c
deleted file mode 100644
index 38402a6aa..000000000
--- a/src/gasnet/gasnet.c
+++ /dev/null
@@ -1,1201 +0,0 @@
-/* GASNet implementation of Libcaf
-
-Copyright (c) 2012-2014, Sourcery, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Sourcery, Inc., nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL SOURCERY, INC., BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
-
-/****l* gasnet/gasnet_caf.c
- * NAME
- *   gasnet_caf
- * SYNOPSIS
- *   This program implements the LIBCAF_GASNET transport layer.
-******
-*/
-
-
-#include "libcaf.h"
-#include "gasnet.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>	/* For memcpy.  */
-#include <stdarg.h>	/* For variadic arguments.  */
-#include <alloca.h>
-#ifdef STRIDED
-#include "gasnet_vis.h"
-#endif
-
-#ifndef MALLOC_ALIGNMENT
-#  define MALLOC_ALIGNMENT   (2 *sizeof(size_t) < __alignof__ (long double)   \
-                              ? __alignof__ (long double) : 2*sizeof(size_t))
-#endif
-
-/* Define GFC_CAF_CHECK to enable run-time checking.  */
-/* #define GFC_CAF_CHECK  1  */
-
-typedef gasnet_seginfo_t * gasnet_caf_token_t;
-#define TOKEN(X) ((gasnet_caf_token_t) (X))
-
-#define send_notify1_handler   201
-
-static void error_stop (int error) __attribute__ ((noreturn));
-
-/* Global variables.  */
-static int caf_this_image;
-static int caf_num_images;
-static int caf_is_finalized;
-
-/*Sync image part*/
-static int sizeOrders = 0;
-static int *orders;
-static int *arrived;
-static int *images_full;
-
-caf_static_t *caf_static_list = NULL;
-static size_t r_pointer;
-static void *remote_memory = NULL;
-static long remoteMemorySize = 0;
-
-
-static bool
-freeToGo ()
-{
-  int i = 0;
-  bool ret = false;
-
-  gasnet_hold_interrupts ();
-
-  sizeOrders = 0;
-
-  for (i = 0; i < caf_num_images; i++)
-    {
-      if(orders[i] != 0)
-	{
-	  sizeOrders++;
-	  if(arrived[i]!=0)
-	    {
-	      orders[i]--;
-	      sizeOrders--;
-	      arrived[i]--;
-	    }
-	}
-    }
-
-  if (sizeOrders == 0)
-    ret = true;
-
-  gasnet_resume_interrupts ();
-
-  return ret;
-}
-
-
-static void
-initImageSync()
-{
-  int i=0,j=0;
-  orders = (int *)calloc(caf_num_images,sizeof(int));
-  arrived = (int *)calloc(caf_num_images,sizeof(int));
-  images_full = (int *)calloc(caf_num_images-1,sizeof(int));
-
-  for(i=0;i<caf_num_images;i++)
-    {
-      if(i+1 != caf_this_image)
-	{
-	  images_full[j]=i+1;
-	  j++;
-	}
-    }
-}
-
-static void
-insOrders (int *images, int n)
-{
-  int i = 0;
-
-  for (i = 0; i < n; i++)
-    {
-      orders[images[i]-1]++;
-      /* printf("Process: %d order: %d\n",caf_this_image,images[i]); */
-      gasnet_AMRequestShort1 (images[i]-1, send_notify1_handler, caf_this_image);
-    }
-}
-
-static void
-insArrived (int image)
-{
-  arrived[image-1]++;
-  /* printf("Process: %d arrived: %d\n",caf_this_image,image); */
-}
-
-
-static void
-req_notify1_handler (gasnet_token_t token, int proc)
-{
-  insArrived (proc);
-  /* gasnet_AMReplyShort1 (token, recv_notify1_handler, caf_this_image-1);  */
-}
-
-
-#if 0
-static void
-rec_notify1_handler (gasnet_token_t token, int proc)
- {
- }
-#endif
-
-
-/* Keep in sync with single.c.  */
-static void
-caf_runtime_error (const char *message, ...)
-{
-  va_list ap;
-  fprintf (stderr, "Fortran runtime error on image %d: ", caf_this_image);
-  va_start (ap, message);
-  vfprintf (stderr, message, ap);
-  va_end (ap);
-  fprintf (stderr, "\n");
-
-  /* FIXME: Shutdown the Fortran RTL to flush the buffer.  PR 43849.  */
-  /* FIXME: Do some more effort than just to abort.  */
-  gasnet_exit(EXIT_FAILURE);
-
-  /* Should be unreachable, but to make sure also call exit.  */
-  exit (EXIT_FAILURE);
-}
-
-
-/* Initialize coarray program.  This routine assumes that no other
-   GASNet initialization happened before. */
-
-void
-PREFIX (init) (int *argc, char ***argv)
-{
-  if (caf_num_images == 0)
-    {
-      int ierr=0;
-
-      if (argc == NULL)
-	{
-	  /* GASNet hat the bug that it expects that argv[0] is always
-	     available.  Provide a summy argument.  */
-	  int i = 0;
-	  char *tmpstr = "CAF";
-          char **strarray = alloca (sizeof (char *));
-          strarray[0] = tmpstr;
-	  ierr = gasnet_init (&i, &strarray);
-	}
-      else
-	ierr = gasnet_init (argc, argv);
-
-      if (unlikely ((ierr != GASNET_OK)))
-	caf_runtime_error ("Failure when initializing GASNet: %d", ierr);
-
-      caf_num_images = gasnet_nodes ();
-      caf_this_image = gasnet_mynode ();
-
-      caf_this_image++;
-      caf_is_finalized = 0;
-
-      initImageSync ();
-
-      char *envvar = NULL;
-
-      envvar = getenv ("GASNET_NPAGES");
-
-      if(!envvar)
-        {
-          remoteMemorySize = gasnet_getMaxLocalSegmentSize();
-        }
-      else
-        {
-          long n_pages = 4096;
-          sscanf(envvar,"%ld",&n_pages);
-#ifdef DEBUG
-          printf("n_pages %ld\n",n_pages);
-#endif
-          remoteMemorySize = n_pages*GASNET_PAGESIZE;
-        }
-
-      /* It creates the remote memory on each image */
-      if (remote_memory==NULL)
-	{
-	  gasnet_handlerentry_t htable[] = {
-	    { send_notify1_handler,  req_notify1_handler },
-	  };
-
-	  if (gasnet_attach (htable, sizeof (htable)/sizeof (gasnet_handlerentry_t),
-			     remoteMemorySize, GASNET_PAGESIZE))
-	    goto error;
-
-	  r_pointer = 0;
-
-	  remote_memory = malloc (sizeof (gasnet_seginfo_t) * caf_num_images);
-
-	  if (remote_memory == NULL)
-	    goto error;
-
-	  /* gasnet_seginfo_t *tt = (gasnet_seginfo_t*)*token;  */
-
-	  ierr = gasnet_getSegmentInfo (TOKEN (remote_memory), caf_num_images);
-
-	  if (unlikely (ierr))
-	    {
-	      free (remote_memory);
-	      goto error;
-	    }
-
-	}
-
-    }
-
-  return;
-
-error:
-  {
-    char *msg;
-
-    if (caf_is_finalized)
-      msg = "Failed to create remote memory space - there are stopped images";
-    else
-      msg = "Failed during initialization and memory allocation";
-
-    caf_runtime_error (msg);
-  }
-
-}
-
-
-/* Finalize coarray program.   */
-
-void
-PREFIX (finalize) (void)
-{
-  gasnet_barrier_notify (0, GASNET_BARRIERFLAG_ANONYMOUS);
-  gasnet_barrier_wait (0, GASNET_BARRIERFLAG_ANONYMOUS);
-
-  while (caf_static_list != NULL)
-    {
-      caf_static_t *tmp = caf_static_list->prev;
-
-      /* (void) ARMCI_Free (caf_static_list->token[caf_this_image-1]);  */
-      /* free (caf_static_list->token);  */
-      free (caf_static_list);
-      caf_static_list = tmp;
-    }
-
-  /* (void) ARMCI_Finalize (); */
-  /* armci_msg_finalize (); */
-  gasnet_exit (0);
-
-  caf_is_finalized = 1;
-}
-
-
-int
-PREFIX (this_image) (int distance __attribute__ ((unused)))
-{
-  return caf_this_image;
-}
-
-
-int
-PREFIX (num_images) (int distance __attribute__ ((unused)),
-		     int failed __attribute__ ((unused)))
-{
-  return caf_num_images;
-}
-
-
-void *
-PREFIX (register) (size_t size, caf_register_t type, caf_token_t *token,
-		   int *stat, char *errmsg, int errmsg_len)
-{
-  int i;
-
-  if (unlikely (caf_is_finalized))
-    goto error;
-
-  /* Start GASNET if not already started.  */
-  if (caf_num_images == 0)
-    PREFIX (init) (NULL, NULL);
-
-  /* Here there was the if statement for remote allocation */
-  /* Now it is included in init */
-
-#ifdef DEBUG
-  printf("image: %d memorysize: %ld Requested: %ld, status: %ld\n",caf_this_image,remoteMemorySize,size,r_pointer);
-#endif
-
-  /* Allocation check */
-  if ((size+r_pointer) > remoteMemorySize)
-    goto error;
-
-  /* New variable registration.  */
-
-  /* Token contains only a list of pointers.  */
-  *token = malloc (caf_num_images * sizeof (void *));
-
-  for (i = 0; i < caf_num_images; i++)
-  {
-    gasnet_seginfo_t *rm = TOKEN (remote_memory);
-    char * tm = (char *) rm[i].addr;
-    tm += r_pointer;
-    void ** t = *token;
-    t[i] = (void *) tm;
-  }
-
-  r_pointer += size;
-  size_t align = r_pointer % MALLOC_ALIGNMENT;
-  if (align)
-    r_pointer += MALLOC_ALIGNMENT - align;
-
-  if (type == CAF_REGTYPE_COARRAY_STATIC)
-    {
-      caf_static_t *tmp = malloc (sizeof (caf_static_t));
-      tmp->prev  = caf_static_list;
-      tmp->token = *token;
-      caf_static_list = tmp;
-    }
-
-  if (stat)
-    *stat = 0;
-
-  void **tm = *token;
-  return tm[caf_this_image-1];
-
-error:
-  {
-    char *msg;
-
-    if (caf_is_finalized)
-      msg = "Failed to allocate coarray - there are stopped images";
-    else
-      msg = "Failed to allocate coarray";
-
-    if (stat)
-      {
-	*stat = caf_is_finalized ? STAT_STOPPED_IMAGE : 1;
-	if (errmsg_len > 0)
-	  {
-	    int len = ((int) strlen (msg) > errmsg_len) ? errmsg_len
-							: (int) strlen (msg);
-	    memcpy (errmsg, msg, len);
-	    if (errmsg_len > len)
-	      memset (&errmsg[len], ' ', errmsg_len-len);
-	  }
-      }
-    else
-      caf_runtime_error (msg);
-  }
-
-  return NULL;
-}
-
-
-void
-PREFIX (deregister) (caf_token_t *token, int *stat, char *errmsg,
-		     int errmsg_len)
-{
-  if (unlikely (caf_is_finalized))
-    {
-      const char msg[] = "Failed to deallocate coarray - "
-			  "there are stopped images";
-      if (stat)
-	{
-	  *stat = STAT_STOPPED_IMAGE;
-
-	  if (errmsg_len > 0)
-	    {
-	      int len = ((int) sizeof (msg) - 1 > errmsg_len)
-			? errmsg_len : (int) sizeof (msg) - 1;
-	      memcpy (errmsg, msg, len);
-	      if (errmsg_len > len)
-		memset (&errmsg[len], ' ', errmsg_len-len);
-	    }
-	  return;
-	}
-      caf_runtime_error (msg);
-    }
-
-  PREFIX(sync_all) (NULL, NULL, 0);
-
-  if (stat)
-    *stat = 0;
-
-  /* if (unlikely (ierr = ARMCI_Free ((*token)[caf_this_image-1]))) */
-  /*   caf_runtime_error ("ARMCI memory freeing failed: Error code %d", ierr); */
-  //gasnet_exit(0);
-
-  free (*token);
-}
-
-
-void
-PREFIX (sync_all) (int *stat, char *errmsg, int errmsg_len)
-{
-  int ierr;
-
-  if (unlikely (caf_is_finalized))
-    ierr = STAT_STOPPED_IMAGE;
-  else
-    {
-      gasnet_barrier_notify (0, GASNET_BARRIERFLAG_ANONYMOUS);
-      gasnet_barrier_wait (0, GASNET_BARRIERFLAG_ANONYMOUS);
-      ierr = 0;
-    }
-
-  if (stat)
-    *stat = ierr;
-
-  if (ierr)
-    {
-      char *msg;
-      if (caf_is_finalized)
-	msg = "SYNC ALL failed - there are stopped images";
-      else
-	msg = "SYNC ALL failed";
-
-      if (errmsg_len > 0)
-	{
-	  int len = ((int) strlen (msg) > errmsg_len) ? errmsg_len
-						      : (int) strlen (msg);
-	  memcpy (errmsg, msg, len);
-	  if (errmsg_len > len)
-	    memset (&errmsg[len], ' ', errmsg_len-len);
-	}
-      else
-	caf_runtime_error (msg);
-    }
-}
-
-
-/* Send scalar (or contiguous) data from buffer to a remote image.  */
-
-/* token: The token of the array to be written to. */
-/* offset: Difference between the coarray base address and the actual data, used for caf(3)[2] = 8 or caf[4]%a(4)%b = 7. */
-/* image_index: Index of the coarray (typically remote, though it can also be on this_image). */
-/* data: Pointer to the to-be-transferred data. */
-/* size: The number of bytes to be transferred. */
-/* asynchronous: Return before the data transfer has been complete  */
-
-void
-PREFIX (send) (caf_token_t token, size_t offset, int image_index,
-	       gfc_descriptor_t *dest,
-	       caf_vector_t *dst_vector __attribute__ ((unused)),
-	       gfc_descriptor_t *src, int dst_kind, int src_kind)
-{
-  int ierr = 0, j=0;
-  size_t i, size;
-  void **tm = token;
-  int rank = GFC_DESCRIPTOR_RANK (dest);
-  ptrdiff_t dst_offset = 0;
-  void *pad_str = NULL;
-  size_t src_size = GFC_DESCRIPTOR_SIZE (src);
-  size_t dst_size = GFC_DESCRIPTOR_SIZE (dest);
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = dest->dim[j]._ubound - dest->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-	dimextent = 0;
-      size *= dimextent;
-    }
-
-
-  if (unlikely (size == 0))
-    return;  /* Zero-sized array.  */
-
-  /* It works only if contiguous */
-  /*if (image_index == caf_this_image)
-    {
-       void *dest = (void *) ((char *) tm[image_index-1] + offset);
-       memmove (dest, src->base_addr, size*dst_size);
-       return;
-    }*/
-
-  if (GFC_DESCRIPTOR_TYPE (dest) == BT_CHARACTER && dst_size > src_size)
-    {
-      pad_str = alloca (dst_size - src_size);
-      if (dst_kind == 1)
-	memset (pad_str, ' ', dst_size-src_size);
-      else /* dst_kind == 4.  */
-	for (i = 0; i < (dst_size-src_size)/4; i++)
-	      ((int32_t*) pad_str)[i] = (int32_t) ' ';
-    }
-
-  if (rank == 0
-      || (GFC_DESCRIPTOR_TYPE (dest) == GFC_DESCRIPTOR_TYPE (src)
-	  && dst_kind == src_kind && GFC_DESCRIPTOR_RANK (src) != 0
-          && (GFC_DESCRIPTOR_TYPE (dest) != BT_CHARACTER || dst_size == src_size)
-	  && PREFIX (is_contiguous) (dest) && PREFIX (is_contiguous) (src)))
-    {
-      /* MPI_Win_lock (MPI_LOCK_EXCLUSIVE, image_index-1, 0, *p); */
-      if (GFC_DESCRIPTOR_TYPE (dest) == GFC_DESCRIPTOR_TYPE (src)
-	  && dst_kind == src_kind)
-	gasnet_put_bulk (image_index-1, tm[image_index-1]+offset, src->base_addr, (dst_size > src_size ? src_size : dst_size)*size);
-	/* ierr = MPI_Put (src->base_addr, dst_size*size, MPI_BYTE, */
-	/* 		image_index-1, offset, */
-	/* 		(dst_size > src_size ? src_size : dst_size) * size, */
-	/* 		MPI_BYTE, *p); */
-      if (pad_str)
-	gasnet_put_bulk (image_index-1, tm[image_index-1]+offset, pad_str, dst_size-src_size);
-	/* ierr = MPI_Put (pad_str, dst_size-src_size, MPI_BYTE, image_index-1, */
-	/* 		offset, dst_size - src_size, MPI_BYTE, *p); */
-      /* MPI_Win_unlock (image_index-1, *p); */
-      if (ierr != 0)
-	error_stop (ierr);
-      return;
-    }
-  else
-    {
-#ifdef STRIDED
-      gasnet_memvec_t * arr_dsp_s, *arr_dsp_d;
-
-      void *sr = src->base_addr;
-
-      arr_dsp_s = malloc (size * sizeof (gasnet_memvec_t));
-      arr_dsp_d = malloc (size * sizeof (gasnet_memvec_t));
-
-      for (i = 0; i < size; i++)
-	{
-	  ptrdiff_t array_offset_dst = 0;
-	  ptrdiff_t stride = 1;
-	  ptrdiff_t extent = 1;
-	  for (j = 0; j < rank-1; j++)
-	    {
-	      array_offset_dst += ((i / (extent*stride))
-				   % (dest->dim[j]._ubound
-				      - dest->dim[j].lower_bound + 1))
-		* dest->dim[j]._stride;
-	      extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-	      stride = dest->dim[j]._stride;
-	    }
-
-	  array_offset_dst += (i / extent) * dest->dim[rank-1]._stride;
-
-	  //arr_dsp_d[i] = calloc(1,sizeof(struct gasnet_memvec_t));
-
-	  arr_dsp_d[i].addr = tm[image_index-1]+(offset+array_offset_dst)*GFC_DESCRIPTOR_SIZE (dest);
-	  arr_dsp_d[i].len = GFC_DESCRIPTOR_SIZE (dest);
-
-	  //arr_dsp_s[i] = calloc(1,sizeof(struct gasnet_memvec_t));
-
-	  if (GFC_DESCRIPTOR_RANK (src) != 0)
-	    {
-	      ptrdiff_t array_offset_sr = 0;
-	      stride = 1;
-	      extent = 1;
-	      for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-		{
-		  array_offset_sr += ((i / (extent*stride))
-				      % (src->dim[j]._ubound
-					 - src->dim[j].lower_bound + 1))
-		    * src->dim[j]._stride;
-		  extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-		  stride = src->dim[j]._stride;
-		}
-
-	      array_offset_sr += (i / extent) * src->dim[rank-1]._stride;
-
-	      /* arr_dsp_s[i] = array_offset_sr; */
-
-	      arr_dsp_s[i].addr = sr+array_offset_sr*GFC_DESCRIPTOR_SIZE (src);
-	      arr_dsp_s[i].len = GFC_DESCRIPTOR_SIZE (src);
-	    }
-	  else
-	    {
-	      arr_dsp_s[i].addr = sr;
-	      arr_dsp_s[i].len = GFC_DESCRIPTOR_SIZE (src);
-	    }
-	  //dst_offset = offset + array_offset_dst*GFC_DESCRIPTOR_SIZE (dest);
-	  /* void *sr = (void *)((char *) src->base_addr */
-	  /* 			  + array_offset_sr*GFC_DESCRIPTOR_SIZE (src)); */
-
-	}
-
-      /* gasnet_puts_bulk(image_index-1, tm[image_index-1]+offset, arr_dsp_d, */
-      /* 		 sr, arr_dsp_s, arr_count, size); */
-      gasnet_putv_bulk(image_index-1,size,arr_dsp_d,size,arr_dsp_s);
-
-      free(arr_dsp_s);
-      free(arr_dsp_d);
-#else
-      for (i = 0; i < size; i++)
-	{
-	  ptrdiff_t array_offset_dst = 0;
-	  ptrdiff_t stride = 1;
-	  ptrdiff_t extent = 1;
-	  for (j = 0; j < rank-1; j++)
-	    {
-	      array_offset_dst += ((i / (extent*stride))
-				   % (dest->dim[j]._ubound
-				      - dest->dim[j].lower_bound + 1))
-		* dest->dim[j]._stride;
-	      extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-	      stride = dest->dim[j]._stride;
-	    }
-	  array_offset_dst += (i / extent) * dest->dim[rank-1]._stride;
-	  dst_offset = offset + array_offset_dst*GFC_DESCRIPTOR_SIZE (dest);
-
-	  void *sr;
-	  if (GFC_DESCRIPTOR_RANK (src) != 0)
-	    {
-	      ptrdiff_t array_offset_sr = 0;
-	      stride = 1;
-	      extent = 1;
-	      for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-		{
-		  array_offset_sr += ((i / (extent*stride))
-				      % (src->dim[j]._ubound
-					 - src->dim[j].lower_bound + 1))
-		    * src->dim[j]._stride;
-		  extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-		  stride = src->dim[j]._stride;
-		}
-	      array_offset_sr += (i / extent) * src->dim[rank-1]._stride;
-	      sr = (void *)((char *) src->base_addr
-			    + array_offset_sr*GFC_DESCRIPTOR_SIZE (src));
-	    }
-	  else
-	    sr = src->base_addr;
-
-	  gasnet_put_bulk (image_index-1, tm[image_index-1]+dst_offset, sr, dst_size);
-
-	  /* ierr = MPI_Put (sr, GFC_DESCRIPTOR_SIZE (dest), MPI_BYTE, image_index-1, */
-	  /* 		  dst_offset, GFC_DESCRIPTOR_SIZE (dest), MPI_BYTE, *p); */
-	  if (pad_str)
-	    gasnet_put_bulk (image_index-1, tm[image_index-1]+offset, pad_str, dst_size-src_size);
-	    /* ierr = MPI_Put (pad_str, dst_size - src_size, MPI_BYTE, image_index-1, */
-	    /* 		    dst_offset, dst_size - src_size, MPI_BYTE, *p); */
-	  if (ierr != 0)
-	    {
-	      error_stop (ierr);
-	      return;
-	    }
-	}
-#endif
-    }
-
-  /* if (async == false) */
-    /* gasnet_put_bulk (image_index-1, tm[image_index-1]+offset, data, size); */
-  /* else */
-  /*   ierr = ARMCI_NbPut(data,t.addr+offset,size,image_index-1,NULL); */
-  if(ierr != 0)
-    error_stop (ierr);
-}
-
-
-/* Send array data from src to dest on a remote image.  */
-
-/* void */
-/* PREFIX (send_desc) (caf_token_t token, size_t offset, int image_index, */
-/* 		    gfc_descriptor_t *dest, gfc_descriptor_t *src, bool async) */
-/* { */
-/*   int ierr = 0; */
-/*   size_t i, size; */
-/*   int j; */
-/*   int rank = GFC_DESCRIPTOR_RANK (dest); */
-/*   void **tm = token; */
-
-/*   size = 1; */
-/*   for (j = 0; j < rank; j++) */
-/*     { */
-/*       ptrdiff_t dimextent = dest->dim[j]._ubound - dest->dim[j].lower_bound + 1; */
-/*       if (dimextent < 0) */
-/* 	dimextent = 0; */
-/*       size *= dimextent; */
-/*     } */
-
-/*   if (size == 0) */
-/*     return; */
-
-/*   if (PREFIX (is_contiguous) (dest) && PREFIX (is_contiguous) (src)) */
-/*     { */
-/*       void *dst = (void *)((char *) tm[image_index-1] + offset); */
-/*       if (image_index == caf_this_image) */
-/* 	  memmove (dst, src->base_addr, GFC_DESCRIPTOR_SIZE (dest)*size); */
-/*       else /\* if (!async) *\/ */
-/*         gasnet_put_bulk (image_index-1, dst, src->base_addr, GFC_DESCRIPTOR_SIZE (dest)*size); */
-/*       /\* else *\/ */
-
-/*       if (ierr != 0) */
-/* 	error_stop (ierr); */
-/*       return; */
-/*     } */
-
-/*   for (i = 0; i < size; i++) */
-/*     { */
-/*       ptrdiff_t array_offset_dst = 0; */
-/*       ptrdiff_t stride = 1; */
-/*       ptrdiff_t extent = 1; */
-/*       for (j = 0; j < rank-1; j++) */
-/* 	{ */
-/* 	  array_offset_dst += ((i / (extent*stride)) */
-/* 			       % (dest->dim[j]._ubound */
-/* 				  - dest->dim[j].lower_bound + 1)) */
-/* 			      * dest->dim[j]._stride; */
-/* 	  extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1); */
-/*           stride = dest->dim[j]._stride; */
-/* 	} */
-/*       array_offset_dst += (i / extent) * dest->dim[rank-1]._stride; */
-
-/*       ptrdiff_t array_offset_sr = 0; */
-/*       stride = 1; */
-/*       extent = 1; */
-/*       for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++) */
-/* 	{ */
-/* 	  array_offset_sr += ((i / (extent*stride)) */
-/* 			   % (src->dim[j]._ubound */
-/* 			      - src->dim[j].lower_bound + 1)) */
-/* 			  * src->dim[j]._stride; */
-/* 	  extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1); */
-/*           stride = src->dim[j]._stride; */
-/* 	} */
-/*       array_offset_sr += (i / extent) * src->dim[rank-1]._stride; */
-
-/*       void *dst = (void *)((char *) tm[image_index-1] + offset */
-/* 			   + array_offset_dst*GFC_DESCRIPTOR_SIZE (dest)); */
-/*       void *sr = (void *)((char *) src->base_addr */
-/* 			  + array_offset_sr*GFC_DESCRIPTOR_SIZE (src)); */
-/*       if (image_index == caf_this_image) */
-/* 	memmove (dst, sr, GFC_DESCRIPTOR_SIZE (dest)); */
-/*       else /\* if (!async) *\/ */
-/*         gasnet_put_bulk (image_index-1, dst, sr, GFC_DESCRIPTOR_SIZE (dest)); */
-/*       /\* else *\/ */
-
-/*       if (ierr != 0) */
-/* 	{ */
-/* 	  error_stop (ierr); */
-/* 	  return; */
-/* 	} */
-/*     } */
-/* } */
-
-
-/* Send scalar data from src to array dest on a remote image.  */
-
-void
-PREFIX (send_desc_scalar) (caf_token_t token, size_t offset, int image_index,
-			   gfc_descriptor_t *dest, void *buffer, bool async)
-{
-  int ierr = 0;
-  size_t i, size;
-  int j;
-  int rank = GFC_DESCRIPTOR_RANK (dest);
-  void **tm = token;
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = dest->dim[j]._ubound - dest->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-	dimextent = 0;
-      size *= dimextent;
-    }
-
-  for (i = 0; i < size; i++)
-    {
-      ptrdiff_t array_offset = 0;
-      ptrdiff_t stride = 1;
-      ptrdiff_t extent = 1;
-      for (j = 0; j < rank-1; j++)
-	{
-	  array_offset += ((i / (extent*stride))
-			   % (dest->dim[j]._ubound
-			      - dest->dim[j].lower_bound + 1))
-			  * dest->dim[j]._stride;
-	  extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-          stride = dest->dim[j]._stride;
-	}
-      array_offset += (i / extent) * dest->dim[rank-1]._stride;
-      void *dst = (void *)((char *) tm[image_index-1] + offset
-			   + array_offset*GFC_DESCRIPTOR_SIZE (dest));
-      if (image_index == caf_this_image)
-	memmove (dst, buffer, GFC_DESCRIPTOR_SIZE (dest));
-      else /* if (!async) */
-        gasnet_put_bulk (image_index-1, dst, buffer,
-			 GFC_DESCRIPTOR_SIZE (dest));
-      /* else */
-
-      if (ierr != 0)
-	{
-	  error_stop (ierr);
-	  return;
-	}
-    }
-}
-
-
-void
-PREFIX (get) (caf_token_t token, size_t offset,
-	      int image_index __attribute__ ((unused)),
-	      gfc_descriptor_t *src ,
-	      caf_vector_t *src_vector __attribute__ ((unused)),
-	      gfc_descriptor_t *dest, int src_kind, int dst_kind)
-
-{
-  size_t i, size;
-  int ierr = 0, j = 0;
-  int rank = GFC_DESCRIPTOR_RANK (dest);
-  size_t src_size = GFC_DESCRIPTOR_SIZE (src);
-  size_t dst_size = GFC_DESCRIPTOR_SIZE (dest);
-  void *pad_str = NULL;
-
-  void **tm = token;
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = dest->dim[j]._ubound - dest->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-	dimextent = 0;
-      size *= dimextent;
-    }
-
-  if (unlikely (size == 0))
-    return;  /* Zero-sized array.  */
-
-  /* if (image_index == caf_this_image) */
-  /*   { */
-  /*      void *src = (void *) ((char *) tm[image_index-1] + offset); */
-  /*      memmove (data, src, size); */
-  /*      return; */
-  /*   } */
-
-  if (GFC_DESCRIPTOR_TYPE (dest) == BT_CHARACTER && dst_size > src_size)
-    {
-      pad_str = alloca (dst_size - src_size);
-      if (dst_kind == 1)
-	memset (pad_str, ' ', dst_size-src_size);
-      else /* dst_kind == 4.  */
-	for (i = 0; i < (dst_size-src_size)/4; i++)
-	      ((int32_t*) pad_str)[i] = (int32_t) ' ';
-    }
-
-  if (rank == 0
-      || (GFC_DESCRIPTOR_TYPE (dest) == GFC_DESCRIPTOR_TYPE (src)
-	  && dst_kind == src_kind
-          && (GFC_DESCRIPTOR_TYPE (dest) != BT_CHARACTER || dst_size == src_size)
-	  && PREFIX (is_contiguous) (dest) && PREFIX (is_contiguous) (src)))
-    {
-      gasnet_get_bulk (dest->base_addr, image_index-1, tm[image_index-1]+offset, size*dst_size);
-
-      if (pad_str)
-	memcpy ((char *) dest->base_addr + src_size, pad_str,
-		dst_size-src_size);
-    }
-  else
-    {
-#ifdef STRIDED
-      gasnet_memvec_t * arr_dsp_s, *arr_dsp_d;
-
-      void *dst = dest->base_addr;
-
-      arr_dsp_s = malloc (size * sizeof (gasnet_memvec_t));
-      arr_dsp_d = malloc (size * sizeof (gasnet_memvec_t));
-
-      for (i = 0; i < size; i++)
-	{
-	  ptrdiff_t array_offset_dst = 0;
-	  ptrdiff_t stride = 1;
-	  ptrdiff_t extent = 1;
-	  for (j = 0; j < rank-1; j++)
-	    {
-	      array_offset_dst += ((i / (extent*stride))
-				   % (dest->dim[j]._ubound
-				      - dest->dim[j].lower_bound + 1))
-		* dest->dim[j]._stride;
-	      extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-	      stride = dest->dim[j]._stride;
-	    }
-	  array_offset_dst += (i / extent) * dest->dim[rank-1]._stride;
-
-	  arr_dsp_d[i].addr = dst+array_offset_dst*GFC_DESCRIPTOR_SIZE (dest);
-	  arr_dsp_d[i].len = dst_size;
-
-	  ptrdiff_t array_offset_sr = 0;
-	  stride = 1;
-	  extent = 1;
-	  for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-	    {
-	      array_offset_sr += ((i / (extent*stride))
-				  % (src->dim[j]._ubound
-				     - src->dim[j].lower_bound + 1))
-		* src->dim[j]._stride;
-	      extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-	      stride = src->dim[j]._stride;
-	    }
-
-	  array_offset_sr += (i / extent) * src->dim[rank-1]._stride;
-
-	  arr_dsp_s[i].addr = tm[image_index-1]+(array_offset_sr+offset)*GFC_DESCRIPTOR_SIZE (src);
-	  arr_dsp_s[i].len = src_size;
-
-	}
-
-      gasnet_getv_bulk(size,arr_dsp_d,image_index-1,size,arr_dsp_s);
-
-      free(arr_dsp_s);
-      free(arr_dsp_d);
-#else
-      for (i = 0; i < size; i++)
-	{
-	  ptrdiff_t array_offset_dst = 0;
-	  ptrdiff_t stride = 1;
-	  ptrdiff_t extent = 1;
-	  for (j = 0; j < rank-1; j++)
-	    {
-	      array_offset_dst += ((i / (extent*stride))
-				   % (dest->dim[j]._ubound
-				      - dest->dim[j].lower_bound + 1))
-		* dest->dim[j]._stride;
-	      extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-	      stride = dest->dim[j]._stride;
-	    }
-	  array_offset_dst += (i / extent) * dest->dim[rank-1]._stride;
-
-	  ptrdiff_t array_offset_sr = 0;
-	  stride = 1;
-	  extent = 1;
-	  for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-	    {
-	      array_offset_sr += ((i / (extent*stride))
-				  % (src->dim[j]._ubound
-				     - src->dim[j].lower_bound + 1))
-		* src->dim[j]._stride;
-	      extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-	      stride = src->dim[j]._stride;
-	    }
-
-	  array_offset_sr += (i / extent) * src->dim[rank-1]._stride;
-
-	  size_t sr_off = offset + array_offset_sr*GFC_DESCRIPTOR_SIZE (src);
-	  void *dst = (void *) ((char *) dest->base_addr
-				+ array_offset_dst*GFC_DESCRIPTOR_SIZE (dest));
-	  /* FIXME: Handle image_index == this_image().  */
-	  /*  if (async == false) */
-	  gasnet_get_bulk (dst, image_index-1, tm[image_index-1]+sr_off, GFC_DESCRIPTOR_SIZE (dest));
-	  /* ierr = MPI_Get (dst, GFC_DESCRIPTOR_SIZE (dest), */
-	  /* 		    MPI_BYTE, image_index-1, sr_off, */
-	  /* 		    GFC_DESCRIPTOR_SIZE (src), MPI_BYTE, *p); */
-	  if (pad_str)
-	    memcpy ((char *) dst + src_size, pad_str, dst_size-src_size);
-
-	  if (ierr != 0)
-	    error_stop (ierr);
-	}
-#endif
-    }
-
-  /* if (async == false) */
-    /* gasnet_get_bulk (data, image_index-1, tm[image_index-1]+offset, size); */
-  /* else */
-  /*   ierr = ARMCI_NbPut(data,t.addr+offset,size,image_index-1,NULL); */
-  if (ierr != 0)
-    error_stop (ierr);
-
-}
-
-
-/* Get array data from a remote src to a local dest.  */
-
-void
-PREFIX (get_desc) (caf_token_t token, size_t offset, int image_index,
-		   gfc_descriptor_t *src, gfc_descriptor_t *dest,
-		   bool async __attribute__ ((unused)))
-{
-  size_t i, size;
-  int j;
-  int rank = GFC_DESCRIPTOR_RANK (dest);
-  void **tm = token;
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = dest->dim[j]._ubound - dest->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-	dimextent = 0;
-      size *= dimextent;
-    }
-
-  if (size == 0)
-    return;
-
-  if (PREFIX (is_contiguous) (dest) && PREFIX (is_contiguous) (src))
-    {
-      void *sr = (void *) ((char *) tm[image_index-1] + offset);
-      if (image_index == caf_this_image)
-	memmove (dest->base_addr, sr, GFC_DESCRIPTOR_SIZE (dest)*size);
-      else
-	gasnet_get_bulk (dest->base_addr, image_index-1, sr,
-			 GFC_DESCRIPTOR_SIZE (dest)*size);
-      return;
-    }
-
-  for (i = 0; i < size; i++)
-    {
-      ptrdiff_t array_offset_dst = 0;
-      ptrdiff_t stride = 1;
-      ptrdiff_t extent = 1;
-      for (j = 0; j < rank-1; j++)
-	{
-	  array_offset_dst += ((i / (extent*stride))
-			       % (dest->dim[j]._ubound
-				  - dest->dim[j].lower_bound + 1))
-			      * dest->dim[j]._stride;
-	  extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-          stride = dest->dim[j]._stride;
-	}
-      array_offset_dst += (i / extent) * dest->dim[rank-1]._stride;
-
-      ptrdiff_t array_offset_sr = 0;
-      stride = 1;
-      extent = 1;
-      for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-	{
-	  array_offset_sr += ((i / (extent*stride))
-			   % (src->dim[j]._ubound
-			      - src->dim[j].lower_bound + 1))
-			  * src->dim[j]._stride;
-	  extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-          stride = src->dim[j]._stride;
-	}
-      array_offset_sr += (i / extent) * src->dim[rank-1]._stride;
-
-      void *sr = (void *)((char *) tm[image_index-1] + offset
-			   + array_offset_sr*GFC_DESCRIPTOR_SIZE (src));
-      void *dst = (void *)((char *) dest->base_addr
-			  + array_offset_dst*GFC_DESCRIPTOR_SIZE (dest));
-      if (image_index == caf_this_image)
-	memmove (dst, sr, GFC_DESCRIPTOR_SIZE (dest));
-      else
-	gasnet_get_bulk (dst, image_index-1, sr, GFC_DESCRIPTOR_SIZE (dest));
-    }
-}
-
-
-/* SYNC IMAGES. Note: SYNC IMAGES(*) is passed as count == -1 while
-   SYNC IMAGES([]) has count == 0. Note further that SYNC IMAGES(*)
-   is not equivalent to SYNC ALL. */
-void
-PREFIX (sync_images) (int count, int images[], int *stat, char *errmsg,
-		      int errmsg_len)
-{
-  int ierr;
-  if (count == 0 || (count == 1 && images[0] == caf_this_image))
-    {
-      if (stat)
-	*stat = 0;
-      return;
-    }
-
-#ifdef GFC_CAF_CHECK
-  {
-    int i;
-    for (i = 0; i < count; i++)
-      if (images[i] < 1 || images[i] > caf_num_images)
-	{
-	  fprintf (stderr, "COARRAY ERROR: Invalid image index %d to SYNC "
-		   "IMAGES", images[i]);
-	  error_stop (1);
-	}
-  }
-#endif
-
-  if (unlikely (caf_is_finalized))
-    ierr = STAT_STOPPED_IMAGE;
-  else
-    {
-      if(count == -1)
-	insOrders (images_full, caf_num_images-1);
-      else
-	insOrders (images, count);
-
-      GASNET_BLOCKUNTIL(freeToGo() == true);
-
-      ierr = 0;
-    }
-
-  if (stat)
-    *stat = ierr;
-
-  if (ierr)
-    {
-      char *msg;
-      if (caf_is_finalized)
-	msg = "SYNC IMAGES failed - there are stopped images";
-      else
-	msg = "SYNC IMAGES failed";
-
-      if (errmsg_len > 0)
-	{
-	  int len = ((int) strlen (msg) > errmsg_len) ? errmsg_len
-						      : (int) strlen (msg);
-	  memcpy (errmsg, msg, len);
-	  if (errmsg_len > len)
-	    memset (&errmsg[len], ' ', errmsg_len-len);
-	}
-      else
-	caf_runtime_error (msg);
-    }
-}
-
-
-/* ERROR STOP the other images.  */
-
-static void
-error_stop (int error)
-{
-  /* FIXME: Shutdown the Fortran RTL to flush the buffer.  PR 43849.  */
-  /* FIXME: Do some more effort than just gasnet_exit().  */
-  gasnet_exit(error);
-
-  /* Should be unreachable, but to make sure also call exit.  */
-  exit (error);
-}
-
-
-/* ERROR STOP function for string arguments.  */
-
-void
-PREFIX (error_stop_str) (const char *string, int32_t len)
-{
-  fputs ("ERROR STOP ", stderr);
-  while (len--)
-    fputc (*(string++), stderr);
-  fputs ("\n", stderr);
-
-  error_stop (1);
-}
-
-
-/* ERROR STOP function for numerical arguments.  */
-
-void
-PREFIX (error_stop) (int32_t error)
-{
-  fprintf (stderr, "ERROR STOP %d\n", error);
-  error_stop (error);
-}
diff --git a/src/iso-fortran-binding/CMakeLists.txt b/src/iso-fortran-binding/CMakeLists.txt
deleted file mode 100644
index 0053da6df..000000000
--- a/src/iso-fortran-binding/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-add_library(ISO_Fortran_binding SHARED ISO_Fortran_binding.c)
-add_library(ISO_Fortran_binding_static STATIC ISO_Fortran_binding.c)
-
-set_target_properties(ISO_Fortran_binding_static  PROPERTIES OUTPUT_NAME ISO_Fortran_binding)
-
-set(CFI_SO_VERSION 0)
-if(gfortran_compiler)
-  if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0.0)
-    set(CFI_SO_VERSION 2)
-  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0.0)
-    set(CFI_SO_VERSION 1)
-  endif()
-endif()
-
-set_target_properties( ISO_Fortran_binding
-    PROPERTIES
-    VERSION ${PROJECT_VERSION}
-    SOVERSION ${CFI_SO_VERSION}
-    PUBLIC_HEADER ISO_Fortran_binding.h
-)
-
-set_target_properties( ISO_Fortran_binding_static
-    PROPERTIES
-    VERSION ${PROJECT_VERSION}
-    SOVERSION ${CFI_SO_VERSION}
-    PUBLIC_HEADER ISO_Fortran_binding.h
-)
-
-install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" FILES_MATCHING PATTERN "*.h")
-
-install( TARGETS ISO_Fortran_binding ISO_Fortran_binding_static
-  EXPORT OpenCoarraysTargets
-  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-)
diff --git a/src/iso-fortran-binding/ISO_Fortran_binding.c b/src/iso-fortran-binding/ISO_Fortran_binding.c
deleted file mode 100644
index 2e42afa16..000000000
--- a/src/iso-fortran-binding/ISO_Fortran_binding.c
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
-   OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-   OpenCoarrays -- ISO_Fortran_binding standard-compliant interoperability with
-   C.
-   Copyright (c) 2018, Sourcery, Inc.
-   Copyright (c) 2018, Sourcery Institute
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-   3. Neither the names of the copyright holders nor the names of their
-   contributors may be used to endorse or promote products derived from this
-   software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "ISO_Fortran_binding.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-/* Functions. */
-int CFI_establish (CFI_cdesc_t *dv, void *base_addr, CFI_attribute_t attribute,
-                   CFI_type_t type, size_t elem_len, CFI_rank_t rank,
-                   const CFI_index_t extents[])
-{
-  /* C descriptor must not be NULL. */
-  if (dv == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_establish: C descriptor is "
-                       "NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* Rank must be between 0 and CFI_MAX_RANK. */
-  if (rank < 0 || rank > CFI_MAX_RANK)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_establish: Rank must be "
-                       "between 0 and %d, 0 < rank (0 !< %d). (Error No. "
-                       "%d).\n",
-               CFI_MAX_RANK, rank, CFI_INVALID_RANK);
-      return CFI_INVALID_RANK;
-    }
-
-  /* C Descriptor must not be an allocated allocatable. */
-  if (dv->attribute == CFI_attribute_allocatable && dv->base_addr != NULL)
-    {
-      fprintf (stderr,
-               "ISO_Fortran_binding.c: CFI_establish: If the C Descriptor "
-               "represents an allocatable variable (dv->attribute = %d), its "
-               "base address must be NULL (dv->base_addr = NULL). (Error No. "
-               "%d).\n",
-               CFI_attribute_allocatable, CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* If base address is not NULL, the established C Descriptor is for a
-   * nonallocatable entity. */
-  if (attribute == CFI_attribute_allocatable && base_addr != NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_establish: If base address "
-                       "is not NULL (base_addr != NULL), the established C "
-                       "Descriptor is for a nonallocatable entity (attribute "
-                       "!= %d). (Error No. %d).\n",
-               CFI_attribute_allocatable, CFI_INVALID_ATTRIBUTE);
-      return CFI_INVALID_ATTRIBUTE;
-    }
-
-  dv->base_addr = base_addr;
-
-  /* elem_len is only used if the item is not a type with a kind parameter. */
-  if (type == CFI_type_char || type == CFI_type_ucs4_char ||
-      type == CFI_type_signed_char || type == CFI_type_struct ||
-      type == CFI_type_other)
-    {
-      dv->elem_len = elem_len;
-    }
-  else
-    {
-      /* base_type describes the intrinsic type with kind parameter. */
-      size_t base_type = type & CFI_type_mask;
-      /* base_type_size is the size in bytes of the variable as given by its
-       * kind parameter. */
-      size_t base_type_size = (type - base_type) >> CFI_type_kind_shift;
-      /* Kind types 10 have a size of 64 bytes. */
-      if (base_type_size == 10)
-        {
-          base_type_size = 64;
-        }
-      /* Complex numbers are twice the size of their real counterparts. */
-      if (base_type == CFI_type_Complex)
-        {
-          base_type_size *= 2;
-        }
-      dv->elem_len = base_type_size;
-    }
-
-  dv->version   = CFI_VERSION;
-  dv->rank      = rank;
-  dv->attribute = attribute;
-  dv->type      = type;
-
-  /* Extents must not be NULL if rank is greater than zero and base_addr is not
-   * NULL */
-  if (rank > 0 && base_addr != NULL)
-    {
-      if (extents == NULL)
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_establish: Extents must "
-                           "not be NULL (extents != NULL) if rank (= %d) > 0 "
-                           "and base address is not NULL (base_addr != NULL). "
-                           "(Error No. %d).\n",
-                   rank, CFI_INVALID_EXTENT);
-          return CFI_INVALID_EXTENT;
-        }
-      for (int i = 0; i < rank; i++)
-        {
-          /* If the C Descriptor is for a pointer then the lower bounds of every
-           * dimension are set to zero. */
-          if (attribute == CFI_attribute_pointer)
-            {
-              dv->dim[i].lower_bound = 0;
-            }
-          else
-            {
-              dv->dim[i].lower_bound = 1;
-            }
-          dv->dim[i].extent = extents[i];
-          dv->dim[i].sm     = dv->elem_len;
-        }
-    }
-
-  return CFI_SUCCESS;
-}
-
-int CFI_setpointer (CFI_cdesc_t *result, CFI_cdesc_t *source,
-                    const CFI_index_t lower_bounds[])
-{
-  /* Result must not be NULL. */
-  if (result == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_setpointer: Result is NULL. "
-                       "(Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* If source is NULL, the result is a C Descriptor that describes a
-   * disassociated pointer. */
-  if (source == NULL)
-    {
-      result->base_addr = NULL;
-      result->version   = CFI_VERSION;
-      result->attribute = CFI_attribute_pointer;
-    }
-  else
-    {
-      /* Check that element lengths, ranks and types of source and result are
-       * the same. */
-      if (result->elem_len != source->elem_len)
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_setpointer: Element "
-                           "lengths of result (result->elem_len = %ld) and "
-                           "source (source->elem_len = %ld) must be the same. "
-                           "(Error No. %d).\n",
-                   result->elem_len, source->elem_len, CFI_INVALID_ELEM_LEN);
-          return CFI_INVALID_ELEM_LEN;
-        }
-
-      if (result->rank != source->rank)
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_setpointer: Ranks of "
-                           "result (result->rank = %d) and source "
-                           "(source->rank = %d) must be the same. (Error "
-                           "No. %d).\n",
-                   result->rank, source->rank, CFI_INVALID_RANK);
-          return CFI_INVALID_RANK;
-        }
-
-      if (result->type != source->type)
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_setpointer: Types of "
-                           "result (result->type = %d) and source "
-                           "(source->type = %d) must be the same. (Error "
-                           "No. %d).\n",
-                   result->type, source->type, CFI_INVALID_TYPE);
-          return CFI_INVALID_TYPE;
-        }
-
-      /* If the source is a disassociated pointer, the result must also describe
-       * a disassociated pointer. */
-      if (source->base_addr == NULL &&
-          source->attribute == CFI_attribute_pointer)
-        {
-          result->base_addr = NULL;
-        }
-      else
-        {
-          result->base_addr = source->base_addr;
-        }
-      /* Assign components to result. */
-      result->version   = source->version;
-      result->attribute = source->attribute;
-
-      /* Dimension information. */
-      for (int i = 0; i < source->rank; i++)
-        {
-          if (lower_bounds != NULL)
-            {
-              result->dim[i].lower_bound = lower_bounds[i];
-            }
-          else
-            {
-              result->dim[i].lower_bound = source->dim[i].lower_bound;
-            }
-          result->dim[i].extent = source->dim[i].extent;
-          result->dim[i].sm     = source->dim[i].sm;
-        }
-    }
-
-  return CFI_SUCCESS;
-}
-
-void *CFI_address (const CFI_cdesc_t *dv, const CFI_index_t subscripts[])
-{
-  /* C Descriptor must not be NULL. */
-  if (dv == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_address: C Descriptor is "
-                       "NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return NULL;
-    }
-
-  /* Base address of C Descriptor must not be NULL. */
-  if (dv->base_addr == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_address: base address of C "
-                       "Descriptor must not be NULL. (Error No. %d).\n",
-               CFI_ERROR_BASE_ADDR_NULL);
-      return NULL;
-    }
-
-  /* Return base address if C descriptor is a scalar. */
-  if (dv->rank == 0)
-    {
-      return dv->base_addr;
-    }
-  /* Calculate the appropriate base address if dv is not a scalar. */
-  else
-    {
-      /* Base address is the C address of the element of the object specified by
-       * subscripts. */
-      void *base_addr;
-
-      /* In order to properly account for Fortran's column major order we need
-       * to transpose the subscripts, since columns are stored contiguously as
-       * opposed to rows like C. */
-      CFI_index_t *tr_subscripts;
-      CFI_dim_t *  tr_dim;
-      tr_subscripts = malloc (dv->rank * sizeof (CFI_index_t));
-      tr_dim        = malloc (dv->rank * sizeof (CFI_dim_t));
-      for (int i = 0; i < dv->rank; i++)
-        {
-          CFI_index_t idx  = dv->rank - i - 1;
-          tr_subscripts[i] = subscripts[idx];
-          tr_dim[i]        = dv->dim[idx];
-          /* Normalise the subscripts to start counting the address from 0. */
-          tr_subscripts[i] -= tr_dim[i].lower_bound;
-        }
-
-      /* We assume column major order as that is how Fortran stores arrays. We
-       * calculate the memory address of the specified element via the canonical
-       * array dimension reduction map and multiplying by the memory stride. */
-      CFI_index_t index = tr_subscripts[0] * tr_dim[0].sm;
-      /* Check that the first subscript is within the bounds of the Fortran
-       * array. */
-      if (subscripts[0] < dv->dim[0].lower_bound ||
-          subscripts[0] > dv->dim[0].lower_bound + dv->dim[0].extent - 1)
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_address: subscripts[0], "
-                           "is out of bounds. dim->[0].lower_bound <= "
-                           "subscripts[0] <= dv->dim[0].lower_bound + "
-                           "dv->dim[0].extent - 1 (%ld <= %ld <= %ld). (Error "
-                           "No. %d).\n",
-                   dv->dim[0].lower_bound, subscripts[0],
-                   dv->dim[0].lower_bound + dv->dim[0].extent - 1,
-                   CFI_ERROR_OUT_OF_BOUNDS);
-          return NULL;
-        }
-
-      /* Start calculating the memory offset. We use the transposed subscripts
-       * because we assume the array is coming from Fortran and the address is
-       * being queried in column-major order. */
-      CFI_index_t tmp_index = 1;
-      for (int i = 1; i < dv->rank; i++)
-        {
-          /* Check that the subsequent subscripts are within the bounds of the
-           * Fortran array. */
-          if (subscripts[i] < dv->dim[i].lower_bound ||
-              subscripts[i] > dv->dim[i].lower_bound + dv->dim[i].extent - 1)
-            {
-              fprintf (stderr, "ISO_Fortran_binding.c: CFI_address: "
-                               "subscripts[%d], is out of bounds. "
-                               "dv->dim[%d].lower_bound <= subscripts[%d] <= "
-                               "dv->dim[%d].lower_bound + dv->dim[%d].extent - "
-                               "1 (%ld <= %ld <= %ld). (Error No. %d).\n",
-                       i, i, i, i, i, dv->dim[i].lower_bound, subscripts[i],
-                       dv->dim[i].extent + dv->dim[i].lower_bound - 1,
-                       CFI_ERROR_OUT_OF_BOUNDS);
-              return NULL;
-            }
-
-          /* Use the canonical dimension reduction mapping to find the memory
-           * address of the relevant subscripts. It is assumed the arrays are
-           * stored in column-major order like in Fortran, and the provided
-           * subscripts are given as if we were operating on a Fortran array. */
-          tmp_index *=
-              tr_subscripts[i] * tr_dim[i - 1].extent * tr_dim[i - 1].sm;
-          index += tmp_index;
-        }
-      free (tr_subscripts);
-      free (tr_dim);
-
-      /* There's no way in C to do general arithmetic on a void pointer so we
-       * cast to a char pointer, do the arithmetic and cast back to a
-       * void pointer. */
-      base_addr = (char *) dv->base_addr + index;
-
-      return base_addr;
-    }
-}
-
-int CFI_is_contiguous (const CFI_cdesc_t *dv)
-{
-  /* C descriptor must not be NULL. */
-  if (dv == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_is_contiguous: C descriptor "
-                       "is NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* Base address must not be NULL. */
-  if (dv->base_addr == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_is_contiguous: Base address "
-                       "of C Descriptor is already NULL. (Error No. %d).\n",
-               CFI_ERROR_BASE_ADDR_NULL);
-      return CFI_ERROR_BASE_ADDR_NULL;
-    }
-
-  /* Must be an array. */
-  if (dv->rank == 0)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_is_contiguous: C Descriptor "
-                       "must describe an array (0 < dv->rank = %d). (Error No. "
-                       "%d).\n",
-               dv->rank, CFI_INVALID_RANK);
-      return CFI_INVALID_RANK;
-    }
-
-  /* If an array is not contiguous the memory stride is different to the element
-   * length. */
-  for (int i = 0; i < dv->rank; i++)
-    {
-      if (dv->dim[i].sm != dv->elem_len)
-        return 0;
-    }
-
-  /* Allocatable arrays are always contiguous. */
-  if (dv->attribute == CFI_attribute_allocatable)
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-int CFI_allocate (CFI_cdesc_t *dv, const CFI_index_t lower_bounds[],
-                  const CFI_index_t upper_bounds[], size_t elem_len)
-{
-  /* C Descriptor must not be NULL. */
-  if (dv == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_allocate: C Descriptor is "
-                       "NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* Base address of C Descriptor must be NULL. */
-  if (dv->base_addr != NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_allocate: Base address of C "
-                       "Descriptor must be NULL. (Error No. %d).\n",
-               CFI_ERROR_BASE_ADDR_NOT_NULL);
-      return CFI_ERROR_BASE_ADDR_NOT_NULL;
-    }
-
-  /* The C Descriptor must be for an allocatable or pointer object. */
-  if (dv->attribute == CFI_attribute_other)
-    {
-      fprintf (stderr,
-               "ISO_Fortran_binding.c: CFI_allocate: The object of the C "
-               "Descriptor must be a pointer or allocatable variable. "
-               "(Error No. %d).\n",
-               CFI_INVALID_ATTRIBUTE);
-      return CFI_INVALID_ATTRIBUTE;
-    }
-
-  /* If the type is a character, the descriptor's element length is replaced
-   * by the elem_len argument. */
-  if (dv->type == CFI_type_char || dv->type == CFI_type_ucs4_char ||
-      dv->type == CFI_type_signed_char)
-    {
-      dv->elem_len = elem_len;
-    }
-
-  /* Dimension information and calculating the array length. */
-  size_t arr_len = 1;
-  /* If rank is greater than 0, lower_bounds and upper_bounds are used. They're
-   * ignored otherwhise. */
-  if (dv->rank > 0)
-    {
-      if (lower_bounds == NULL || upper_bounds == NULL)
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_allocate: If 0 < rank "
-                           "(= %d) upper_bounds[] and lower_bounds[], must not "
-                           "be NULL. (Error No. %d).\n",
-                   dv->rank, CFI_INVALID_EXTENT);
-          return CFI_INVALID_EXTENT;
-        }
-      for (int i = 0; i < dv->rank; i++)
-        {
-          dv->dim[i].lower_bound = lower_bounds[i];
-          dv->dim[i].extent      = upper_bounds[i] - dv->dim[i].lower_bound + 1;
-          dv->dim[i].sm          = dv->elem_len;
-          arr_len *= dv->dim[i].extent;
-        }
-    }
-
-  dv->base_addr = calloc (arr_len, dv->elem_len);
-  if (dv->base_addr == NULL)
-    {
-      printf ("ISO_Fortran_binding.c: CFI_allocate: Failure in memory "
-              "allocation. (Error no. %d).\n",
-              CFI_ERROR_MEM_ALLOCATION);
-      return CFI_ERROR_MEM_ALLOCATION;
-    }
-
-  return CFI_SUCCESS;
-}
-
-int CFI_deallocate (CFI_cdesc_t *dv)
-{
-  /* C Descriptor must not be NULL */
-  if (dv == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_deallocate: C Descriptor. "
-                       "is NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* Base address must not be NULL. */
-  if (dv->base_addr == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_deallocate: Base address is "
-                       "NULL already. (Error No. %d).\n",
-               CFI_ERROR_BASE_ADDR_NULL);
-      return CFI_ERROR_BASE_ADDR_NULL;
-    }
-
-  /* C Descriptor must be for an allocatable or pointer variable. */
-  if (dv->attribute == CFI_attribute_other)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_deallocate: C Descriptor "
-                       "must describe a pointer or allocatabale object. (Error "
-                       "No. %d).\n",
-               CFI_INVALID_ATTRIBUTE);
-      return CFI_INVALID_ATTRIBUTE;
-    }
-
-  /* Free and nullify memory. */
-  free (dv->base_addr);
-  dv->base_addr = NULL;
-
-  return CFI_SUCCESS;
-}
-
-int CFI_section (CFI_cdesc_t *result, const CFI_cdesc_t *source,
-                 const CFI_index_t lower_bounds[],
-                 const CFI_index_t upper_bounds[], const CFI_index_t strides[])
-{
-  /* C Descriptors must not be NULL. */
-  if (source == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Source must not be "
-                       "NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-  if (result == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Result must not be "
-                       "NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* Base address of source must not be NULL. */
-  if (source->base_addr == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Base address of "
-                       "source must not be NULL. (Error No. %d).\n",
-               CFI_ERROR_BASE_ADDR_NULL);
-      return CFI_ERROR_BASE_ADDR_NULL;
-    }
-
-  /* Result must not be an allocatable array. */
-  if (result->attribute == CFI_attribute_allocatable)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Result must not "
-                       "describe an allocatable array. (Error No. %d).\n",
-               CFI_INVALID_ATTRIBUTE);
-      return CFI_INVALID_ATTRIBUTE;
-    }
-
-  /* Source must be some form of array (nonallocatable nonpointer array,
-   * allocated allocatable array or an associated pointer array). */
-  if (source->rank <= 0)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Source must "
-                       "describe an array (0 < source->rank, 0 !< %d). (Error No. "
-                       "%d).\n",
-               source->rank, CFI_INVALID_RANK);
-      return CFI_INVALID_RANK;
-    }
-
-  /* Element lengths of source and result must be equal. */
-  if (result->elem_len != source->elem_len)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: The element "
-                       "lengths of source (source->elem_len = %ld) and result "
-                       "(result->elem_len = %ld) must be equal. (Error No. "
-                       "%d).\n",
-               source->elem_len, result->elem_len, CFI_INVALID_ELEM_LEN);
-      return CFI_INVALID_ELEM_LEN;
-    }
-
-  /* Types must be equal. */
-  if (result->type != source->type)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Types of source "
-                       "(source->type = %d) and result (result->type = %d) "
-                       "must be equal. (Error No. %d).\n",
-               source->type, result->type, CFI_INVALID_TYPE);
-      return CFI_INVALID_TYPE;
-    }
-
-  /* Stride of zero in the i'th dimension means rank reduction in that
-   * dimension. */
-  int zero_count = 0;
-  for (int i = 0; i < source->rank; i++)
-    {
-      if (strides[i] == 0)
-        {
-          zero_count++;
-        }
-    }
-
-  /* Rank of result must be equal the the rank of source minus the number of
-   * zeros in strides. */
-  if (result->rank != source->rank - zero_count)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Rank of result "
-                       "must be equal to the rank of source minus the number "
-                       "of zeros in strides (result->rank = source->rank - "
-                       "zero_count, %d != %d - %d) (Error No. %d).\n",
-               result->rank, source->rank, zero_count, CFI_INVALID_RANK);
-      return CFI_INVALID_RANK;
-    }
-
-  /* Dimension information. */
-  CFI_index_t *lower;
-  CFI_index_t *upper;
-  CFI_index_t *stride;
-  lower  = malloc (source->rank * sizeof (CFI_index_t));
-  upper  = malloc (source->rank * sizeof (CFI_index_t));
-  stride = malloc (source->rank * sizeof (CFI_index_t));
-
-  /* Lower bounds. */
-  if (lower_bounds == NULL)
-    {
-      for (int i = 0; i < source->rank; i++)
-        {
-          lower[i] = source->dim[i].lower_bound;
-        }
-    }
-  else
-    {
-      for (int i = 0; i < source->rank; i++)
-        {
-          lower[i] = lower_bounds[i];
-        }
-    }
-
-  /* Upper bounds. */
-  if (upper_bounds == NULL)
-    {
-      if (source->dim[source->rank].extent == -1)
-        {
-          fprintf (stderr,
-                   "ISO_Fortran_binding.c: CFI_section: Source must not "
-                   "be an assumed size array if upper_bounds is NULL. (Error "
-                   "No. %d).\n",
-                   CFI_INVALID_EXTENT);
-          return CFI_INVALID_EXTENT;
-        }
-      for (int i = 0; i < source->rank; i++)
-        {
-          upper[i] = source->dim[i].lower_bound + source->dim[i].extent - 1;
-        }
-    }
-  else
-    {
-      for (int i = 0; i < source->rank; i++)
-        {
-          upper[i] = upper_bounds[i];
-        }
-    }
-
-  /* Stride */
-  if (strides == NULL)
-    {
-      for (int i = 0; i < source->rank; i++)
-        {
-          stride[i] = 1;
-        }
-    }
-  else
-    {
-      for (int i = 0; i < source->rank; i++)
-        {
-          stride[i] = strides[i];
-          /* If stride[i] = then lower[i] and upper[i] must be equal. */
-          if (stride[i] == 0 && lower[i] != upper[i])
-            {
-              fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: If "
-                               "strides[%d] = 0, then the lower bounds, "
-                               "lower_bounds[%d] = %ld, and upper_bounds[%d] = "
-                               "%ld, must be equal. (Error No. %d).\n",
-                       i, i, lower_bounds[i], i, upper_bounds[i],
-                       CFI_ERROR_OUT_OF_BOUNDS);
-              return CFI_ERROR_OUT_OF_BOUNDS;
-            }
-        }
-    }
-
-  /* Check that section upper and lower bounds are within the array bounds. */
-  for (int i = 0; i < source->rank; i++)
-    {
-      if (lower_bounds != NULL &&
-          (lower[i] < source->dim[i].lower_bound ||
-           lower[i] > source->dim[i].lower_bound + source->dim[i].extent - 1))
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Lower bounds "
-                           "must be within the bounds of the fortran array "
-                           "(source->dim[%d].lower_bound <= lower_bounds[%d] "
-                           "<= source->dim[%d].lower_bound + "
-                           "source->dim[%d].extent - 1, %ld <= %ld <= %ld). "
-                           "(Error No. %d).\n",
-                   i, i, i, i, source->dim[i].lower_bound, lower[i],
-                   source->dim[i].lower_bound + source->dim[i].extent - 1,
-                   CFI_ERROR_OUT_OF_BOUNDS);
-          return CFI_ERROR_OUT_OF_BOUNDS;
-        }
-      if (upper_bounds != NULL &&
-          (upper[i] < source->dim[i].lower_bound ||
-           upper[i] > source->dim[i].lower_bound + source->dim[i].extent - 1))
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: Upper bounds "
-                           "must be within the bounds of the fortran array "
-                           "(source->dim[%d].lower_bound <= upper_bounds[%d] "
-                           "<= source->dim[%d].lower_bound + "
-                           "source->dim[%d].extent - 1, %ld !<= %ld !<= %ld). "
-                           "(Error No. %d).\n",
-                   i, i, i, i, source->dim[i].lower_bound, upper[i],
-                   source->dim[i].lower_bound + source->dim[i].extent - 1,
-                   CFI_ERROR_OUT_OF_BOUNDS);
-          return CFI_ERROR_OUT_OF_BOUNDS;
-        }
-      if (upper[i] < lower[i] && stride[i] >= 0)
-        {
-          fprintf (stderr, "ISO_Fortran_binding.c: CFI_section: If the upper "
-                           "bound is smaller than the lower bound for a given "
-                           "dimension (upper[%d] < lower[%d], %ld < %ld), then "
-                           "the stride for said dimension must be negative "
-                           "(stride[%d] < 0, %ld < 0). (Error No. %d)\n",
-                   i, i, upper[i], lower[i], i, stride[i], CFI_INVALID_STRIDE);
-          return CFI_INVALID_STRIDE;
-        }
-    }
-
-  /* Update the result to describe the array section. */
-  /* Set appropriate memory address. */
-  result->base_addr = CFI_address (source, lower);
-
-  /* Set the appropriate dimension information that gives us access to the
-   * data. */
-  int aux = 0;
-  for (int i = 0; i < source->rank; i++)
-    {
-      if (stride[i] == 0)
-        {
-          aux++;
-          continue;
-        }
-      int idx                      = i - aux;
-      result->dim[idx].lower_bound = lower[i];
-      result->dim[idx].extent      = upper[i] - lower[i] + 1;
-      result->dim[idx].sm          = stride[i] * source->dim[i].sm;
-    }
-
-  free (lower);
-  free (upper);
-  free (stride);
-
-  return CFI_SUCCESS;
-}
-
-int CFI_select_part (CFI_cdesc_t *result, const CFI_cdesc_t *source,
-                     size_t displacement, size_t elem_len)
-{
-  /* C Descriptors must not be NULL. */
-  if (source == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_select_part: Source must "
-                       "not be NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-  if (result == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_select_part: Result must "
-                       "not be NULL. (Error No. %d).\n",
-               CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* Attribute of result will be CFI_attribute_other or CFI_attribute_pointer.
-   */
-  if (result->attribute == CFI_attribute_allocatable)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_select_part: Result must "
-                       "not describe an allocatabale object (result->attribute "
-                       "!= %d). (Error No. %d).\n",
-               CFI_attribute_allocatable, CFI_INVALID_ATTRIBUTE);
-      return CFI_INVALID_ATTRIBUTE;
-    }
-
-  /* Base address of source must not be NULL. */
-  if (source->base_addr == NULL)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_select_part: Base address "
-                       "of source must not be NULL. (Error No. %d).\n",
-               CFI_ERROR_BASE_ADDR_NULL);
-      return CFI_ERROR_BASE_ADDR_NULL;
-    }
-
-  /* Source and result must have the same rank. */
-  if (source->rank != result->rank)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_select_part: Source and "
-                       "result must have the same rank (source->rank = %d, "
-                       "result->rank = %d). (Error No. %d).\n",
-               source->rank, result->rank, CFI_INVALID_RANK);
-      return CFI_INVALID_RANK;
-    }
-
-  /* Nonallocatable nonpointer must not be an assumed size array. */
-  if (source->rank > 0 && source->dim[source->rank - 1].extent == -1)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_select_part: Source must "
-                       "not describe an assumed size array "
-                       "(source->dim[%d].extent != -1). (Error No. %d).\n",
-               source->rank - 1, CFI_INVALID_DESCRIPTOR);
-      return CFI_INVALID_DESCRIPTOR;
-    }
-
-  /* Element length. */
-  if (result->type == CFI_type_char || result->type == CFI_type_ucs4_char ||
-      result->type == CFI_type_signed_char)
-    {
-      result->elem_len = elem_len;
-    }
-
-  /* Ensure displacement is within the bounds of the element length of source.
-   */
-  if (displacement < 0 || displacement > source->elem_len - 1)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_select_part: Displacement "
-                       "must be within the bounds of source (0 <= displacement "
-                       "<= source->elem_len - 1, 0 <= %ld <= %ld). (Error No. "
-                       "%d).\n",
-               displacement, source->elem_len - 1, CFI_ERROR_OUT_OF_BOUNDS);
-      return CFI_ERROR_OUT_OF_BOUNDS;
-    }
-  /* Ensure displacement and element length of result are less than or equal to
-   * the element length of source. */
-  if (displacement + result->elem_len > source->elem_len)
-    {
-      fprintf (stderr, "ISO_Fortran_binding.c: CFI_select_part: Displacement "
-                       "plus the element length of result must be less than or "
-                       "equal to the element length of source (displacement + "
-                       "result->elem_len <= source->elem_len, %ld + %ld = %ld "
-                       "<= %ld). (Error No. %d).\n",
-               displacement, result->elem_len, displacement + result->elem_len,
-               source->elem_len, CFI_ERROR_OUT_OF_BOUNDS);
-      return CFI_ERROR_OUT_OF_BOUNDS;
-    }
-  if (result->rank > 0)
-    {
-      for (int i = 0; i < result->rank; i++)
-        {
-          result->dim[i].lower_bound = source->dim[i].lower_bound;
-          result->dim[i].extent      = source->dim[i].extent;
-          result->dim[i].sm =
-              source->dim[i].sm +
-              displacement * (source->dim[i].sm / source->elem_len - 1);
-        }
-    }
-
-  result->base_addr = (char *) source->base_addr + displacement;
-  return CFI_SUCCESS;
-}
diff --git a/src/iso-fortran-binding/ISO_Fortran_binding.h b/src/iso-fortran-binding/ISO_Fortran_binding.h
deleted file mode 100644
index 2cb2ab113..000000000
--- a/src/iso-fortran-binding/ISO_Fortran_binding.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-   OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-   OpenCoarrays -- ISO_Fortran_binding standard-compliant interoperability with C.
-   Copyright (c) 2018, Sourcery, Inc.
-   Copyright (c) 2018, Sourcery Institute
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-   3. Neither the names of the copyright holders nor the names of
-      their contributors may be used to endorse or promote products
-      derived from this software without specific prior written
-      permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HnnnOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-   OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ISO_FORTRAN_BINDING_H
-#define ISO_FORTRAN_BINDING_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>  /* Standard ptrdiff_t tand size_t. */
-#include <stdint.h>  /* Integer types. */
-
-/* Constants, defined as macros. */
-#define CFI_VERSION 1
-#define CFI_MAX_RANK 15
-
-/* Attributes. */
-#define CFI_attribute_pointer 0
-#define CFI_attribute_allocatable 1
-#define CFI_attribute_other 2
-
-/* Error codes. */
-#define CFI_SUCCESS 0
-#define CFI_ERROR_BASE_ADDR_NULL 1
-#define CFI_ERROR_BASE_ADDR_NOT_NULL 2
-#define CFI_INVALID_ELEM_LEN 3
-#define CFI_INVALID_RANK 4
-#define CFI_INVALID_TYPE 5
-#define CFI_INVALID_ATTRIBUTE 6
-#define CFI_INVALID_EXTENT 7
-#define CFI_INVALID_STRIDE 8
-#define CFI_INVALID_DESCRIPTOR 9
-#define CFI_ERROR_MEM_ALLOCATION 10
-#define CFI_ERROR_OUT_OF_BOUNDS 11
-
-/* CFI type definitions. */
-typedef ptrdiff_t CFI_index_t;
-typedef int8_t CFI_rank_t;
-typedef int8_t CFI_attribute_t;
-typedef int16_t CFI_type_t;
-
-/* CFI_dim_t. */
-typedef struct CFI_dim_t
-{
-        CFI_index_t lower_bound;
-        CFI_index_t extent;
-        CFI_index_t sm;
-}
-CFI_dim_t;
-
-/* CFI_cdesc_t, C descriptors are cast to this structure as follows:
-   CFI_CDESC_T(CFI_MAX_RANK) foo;
-   CFI_cdesc_t * bar = (CFI_cdesc_t *) &foo;
- */
-typedef struct CFI_cdesc_t
-{
-        void *base_addr;
-        size_t elem_len;
-        int version;
-        CFI_rank_t rank;
-        CFI_attribute_t attribute;
-        CFI_type_t type;
-        CFI_dim_t dim[];
-}
-CFI_cdesc_t;
-
-/* CFI_CDESC_T with an explicit type. */
-#define CFI_CDESC_TYPE_T(r, base_type) \
-        struct { \
-                base_type *base_addr; \
-                size_t elem_len; \
-                int version; \
-                CFI_rank_t rank; \
-                CFI_attribute_t attribute; \
-                CFI_type_t type; \
-                CFI_dim_t dim[r]; \
-        }
-#define CFI_CDESC_T(r) CFI_CDESC_TYPE_T (r, void)
-
-/* CFI function declarations. */
-void *CFI_address (const CFI_cdesc_t *, const CFI_index_t []);
-int CFI_allocate (CFI_cdesc_t *, const CFI_index_t [], const CFI_index_t [],
-                  size_t);
-int CFI_deallocate (CFI_cdesc_t *);
-int CFI_establish (CFI_cdesc_t *, void *, CFI_attribute_t, CFI_type_t, size_t,
-                   CFI_rank_t, const CFI_index_t []);
-int CFI_is_contiguous (const CFI_cdesc_t *);
-int CFI_section (CFI_cdesc_t *, const CFI_cdesc_t *, const CFI_index_t [],
-                 const CFI_index_t [], const CFI_index_t []);
-int CFI_select_part (CFI_cdesc_t *, const CFI_cdesc_t *, size_t, size_t);
-int CFI_setpointer (CFI_cdesc_t *, CFI_cdesc_t *, const CFI_index_t []);
-
-/* Types and kind numbers. Allows bitwise and to reveal the intrinsic type of a kind type. It also allows us to find the kind parameter by inverting the bit-shift equation.
-   CFI_type_kind_shift = 8
-   CFI_intrinsic_type  = 0 0 0 0 0 0 0 0 0 0 1 0
-   CFI_type_kind       = 0 0 0 0 0 0 0 0 1 0 0 0
-   CFI_type_example    = CFI_intrinsic_type + (CFI_type_kind << CFI_type_kind_shift)
-
-   Defining the CFI_type_example.
-   CFI_type_kind       = 0 0 0 0 0 0 0 0 1 0 0 0  << CFI_type_kind_shift
-                        -------------------------
-                         1 0 0 0 0 0 0 0 0 0 0 0  +
-   CFI_intrinsic_type  = 0 0 0 0 0 0 0 0 0 0 1 0
-                        -------------------------
-   CFI_type_example    = 1 0 0 0 0 0 0 0 0 0 1 0
-
-   Finding the intrinsic type with the logical mask.
-   CFI_type_example    = 1 0 0 0 0 0 0 0 0 0 1 0  &
-   CFI_type_mask       = 0 0 0 0 1 1 1 1 1 1 1 1
-                        -------------------------
-   CFI_intrinsic_type  = 0 0 0 0 0 0 0 0 0 0 1 0
-
-   Using the intrinsic type and kind shift to find the kind value of the type.
-   CFI_type_kind = (CFI_type_example - CFI_intrinsic_type) >> CFI_type_kind_shift
-   CFI_type_example   = 1 0 0 0 0 0 0 0 0 0 1 0  -
-   CFI_intrinsic_type = 0 0 0 0 0 0 0 0 0 0 1 0
-                       -------------------------
-                        1 0 0 0 0 0 0 0 0 0 0 0  >> CFI_type_kind_shift
-                       -------------------------
-   CFI_type_kind      = 0 0 0 0 0 0 0 0 1 0 0 0
- */
-#define CFI_type_mask 0xFF
-#define CFI_type_kind_shift 8
-
-/* Intrinsic types. Their kind number defines their storage size. */
-#define CFI_type_Integer 1
-#define CFI_type_Logical 2
-#define CFI_type_Real 3
-#define CFI_type_Complex 4
-#define CFI_type_Character 5
-
-/* Types with no kind. */
-#define CFI_type_struct 6
-#define CFI_type_cptr 7
-#define CFI_type_cfunptr 8
-#define CFI_type_other -1
-
-/* Types with kind parameter.
-   The kind parameter represents the type's byte size. The exception is kind = 10, which has byte size of 64 but 80 bit precision. Complex variables are double the byte size of their real counterparts. The ucs4_char matches wchar_t if sizeof (wchar_t) == 4.
- */
-#define CFI_type_char (CFI_type_Character + (1 << CFI_type_kind_shift))
-#define CFI_type_ucs4_char (CFI_type_Character + (4 << CFI_type_kind_shift))
-
-/* C-Fortran Interoperability types. */
-#define CFI_type_signed_char (CFI_type_Integer + (1 << CFI_type_kind_shift))
-#define CFI_type_short (CFI_type_Integer + (2 << CFI_type_kind_shift))
-#define CFI_type_int (CFI_type_Integer + (4 << CFI_type_kind_shift))
-#define CFI_type_long (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_long_long (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_size_t (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_int8_t (CFI_type_Integer + (1 << CFI_type_kind_shift))
-#define CFI_type_int16_t (CFI_type_Integer + (2 << CFI_type_kind_shift))
-#define CFI_type_int32_t (CFI_type_Integer + (4 << CFI_type_kind_shift))
-#define CFI_type_int64_t (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_int_least8_t (CFI_type_Integer + (1 << CFI_type_kind_shift))
-#define CFI_type_int_least16_t (CFI_type_Integer + (2 << CFI_type_kind_shift))
-#define CFI_type_int_least32_t (CFI_type_Integer + (4 << CFI_type_kind_shift))
-#define CFI_type_int_least64_t (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_int_fast8_t (CFI_type_Integer + (1 << CFI_type_kind_shift))
-#define CFI_type_int_fast16_t (CFI_type_Integer + (2 << CFI_type_kind_shift))
-#define CFI_type_int_fast32_t (CFI_type_Integer + (4 << CFI_type_kind_shift))
-#define CFI_type_int_fast64_t (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_intmax_t (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_intptr_t (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_ptrdiff_t (CFI_type_Integer + (8 << CFI_type_kind_shift))
-#define CFI_type_int128_t (CFI_type_Integer + (16 << CFI_type_kind_shift))
-#define CFI_type_int_least128_t (CFI_type_Integer + (16 << CFI_type_kind_shift))
-#define CFI_type_int_fast128_t (CFI_type_Integer + (16 << CFI_type_kind_shift))
-#define CFI_type_Bool (CFI_type_Logical + (1 << CFI_type_kind_shift))
-#define CFI_type_float (CFI_type_Real + (4 << CFI_type_kind_shift))
-#define CFI_type_double (CFI_type_Real + (8 << CFI_type_kind_shift))
-#define CFI_type_long_double (CFI_type_Real + (10 << CFI_type_kind_shift))
-#define CFI_type_float128 (CFI_type_Real + (16 << CFI_type_kind_shift))
-#define CFI_type_float_Complex (CFI_type_Complex + (4 << CFI_type_kind_shift))
-#define CFI_type_double_Complex (CFI_type_Complex + (8 << CFI_type_kind_shift))
-#define CFI_type_long_double_Complex (CFI_type_Complex + (10 << CFI_type_kind_shift))
-#define CFI_type_float128_Complex (CFI_type_Complex + (16 << CFI_type_kind_shift))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* ISO_FORTRAN_BINDING_H */
diff --git a/src/make.inc b/src/make.inc
deleted file mode 100644
index 2be003e6e..000000000
--- a/src/make.inc
+++ /dev/null
@@ -1,75 +0,0 @@
-# make.inc
-#
-# -- This make include file defines variables for use in the OpenCoarrays 
-#    static Makefile.  Please edit this file before using the Makefile.)
-#
-# OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-# Copyright (c) 2015-2016, Sourcery, Inc.
-# Copyright (c) 2015-2016, Sourcery Institute
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice, this
-#    list of conditions and the following disclaimer in the documentation and/or
-#    other materials provided with the distribution.
-# 3. Neither the names of the copyright holders nor the names of their contributors
-#    may be used to endorse or promote products derived from this software without
-#    specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-# Edit the following line to choose the compiler (Options: gnu, cray)
-compiler=gnu
-
-ifeq ($(compiler),gnu)
-  FC=gfortran
-  CC=mpicc
-  MPFC = mpifort
-  MPICC = mpicc
-  OSHCC = oshcc
-  FFLAGS_EXTRA = -fcoarray=lib
-  MPI_EXTRA_FLAGS = -Wall -Wextra -Wno-error=cpp -Wno-error=unused-parameter -DSTRIDED -DUSE_FAILED_IMAGES  #-DNONBLOCKING_PUT -DCAF_MPI_LOCK_UNLOCK
-  MPI_RUN = mpiexec -np 2
-else
-  ifeq ($(compiler),cray)
-    FC=ftn
-    CC=cc
-    MPFC=ftn
-    MPICC = cc
-  endif
-endif
-
-PREFIX_NAME=_gfortran_caf_
-
-FFLAGS = -O2 -g
-CFLAGS = -O2 -g
-
-CFLAGS_EXTRA = -DPREFIX_NAME=$(PREFIX_NAME) -DHAVE_INT128_T
-FFLAGS += $(FFLAGS_EXTRA)
-CFLAGS += $(CFLAGS_EXTRA)
-LDFLAGS +=
-
-SINGLE_CFLAGS += -Wall -Wextra
-
-MPI_EXTRA_FLAGS = -DSTRIDED # -DNONBLOCKING_PUT -DCAF_MPI_LOCK_UNLOCK
-MPI_CFLAGS += $(MPI_EXTRA_FLAGS)
-
-GASNET_CFLAGS += # -DSTRIDED
-GASNET_PATH =
-GASNET_MAK = $(GASNET_PATH)/GASNet-1.22.4/smp-conduit/smp-par.mak
-GASNET_LDFLAGS +=$(GASNET_LIBS)
-GASNET_RUN = mpiexec -np 2
diff --git a/src/make.inc.Cray-XE b/src/make.inc.Cray-XE
deleted file mode 100644
index efb4313c2..000000000
--- a/src/make.inc.Cray-XE
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Makefile for a Cray XE
-#
-# Before compiling the library, load the following modules:
-#   module swap PrgEnv-cray PrgEnv-gnu
-#   module load gcc/4.8.1  # für GASNet
-#   module load cray-ga  # für ARMCI
-#
-
-PREFIX_NAME=_gfortran_caf_
-FC=gfortran
-MPFC=mpifort
-
-FFLAGS += -O2 -g -fcoarray=lib
-CFLAGS += -DPREFIX_NAME=$(PREFIX_NAME) -g -O2 -DHAVE_INT128_T
-LDFLAGS +=
-
-SINGLE_CFLAGS += -Werror -Wall -Wextra
-
-ARMCI_DIR =
-ARMCI_CFLAGS += -Werror -Wall -Wextra
-ARMCI_LDFLAGS +=
-ARMCI_CC = cc
-ARMCI_RUN = aprun -n 2
-
-MPI_CFLAGS += -Werror -Wall -Wextra
-MPICC = cc
-MPI_RUN = aprun -n 2
-
-GASNET_CFLAGS += -I/opt/chapel/1.8.0/cray-xk/third-party/gasnet/install/cray-xk-cray-prgenv-gnu/seg-fast/nodbg/include/gemini-conduit/ \
-                 -I/opt/chapel/1.8.0/cray-xk/third-party/gasnet/install/cray-xk-cray-prgenv-gnu/seg-fast/nodbg/include/ \
-                 -Wno-all
-GASNET_MAK = /opt/chapel/1.8.0/cray-xk/third-party/gasnet/install/cray-xk-cray-prgenv-gnu/seg-fast/nodbg/include/gemini-conduit/gemini-par.mak
-GASNET_CC = cc
-GASNET_RUN = mpiexec -np 2
diff --git a/src/mpi/mpi_caf.c b/src/mpi-runtime/mpi_caf.c
similarity index 99%
rename from src/mpi/mpi_caf.c
rename to src/mpi-runtime/mpi_caf.c
index 76133f8f8..4ab7e1ef5 100644
--- a/src/mpi/mpi_caf.c
+++ b/src/mpi-runtime/mpi_caf.c
@@ -54,7 +54,7 @@
   #define WITH_FAILED_IMAGES 1
 #endif
 
-#include "libcaf.h"
+#include "../libcaf.h"
 
 /* Define GFC_CAF_CHECK to enable run-time checking. */
 /* #define GFC_CAF_CHECK  1 */
diff --git a/src/mpi/CMakeLists.txt b/src/mpi/CMakeLists.txt
deleted file mode 100644
index ddb150e90..000000000
--- a/src/mpi/CMakeLists.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-# Silence warnings about dereferencing unset variables
-if(NOT CMAKE_REQUIRED_FLAGS)
-  set(CMAKE_REQUIRED_FLAGS "")
-endif()
-if(NOT CMAKE_REQUIRED_LIBRARIES)
-  set(CMAKE_REQUIRED_LIBRARIES "")
-endif()
-if(NOT CMAKE_REQUIRED_INCLUDES)
-  set(CMAKE_REQUIRED_INCLUDES "")
-endif()
-
-if (NOT MPI_C_FOUND)
-  find_package(MPI REQUIRED)
-endif()
-
-#-----------------------------------------------------------
-# Add the actual library targets, then adjust them as needed
-#-----------------------------------------------------------
-add_library(opencoarrays_mod STATIC ../extensions/opencoarrays.F90)
-set_target_properties(opencoarrays_mod
-  PROPERTIES
-  Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}"
-  POSITION_INDEPENDENT_CODE TRUE)
-target_compile_options(opencoarrays_mod
-  PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${MPI_Fortran_COMPILE_OPTIONS}>)
-target_compile_definitions(opencoarrays_mod
-  PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${MPI_Fortran_COMPILE_DEFINITIONS}>)
-target_link_libraries(opencoarrays_mod
-  PUBLIC ${MPI_Fortran_LINK_FLAGS}
-  PUBLIC ${MPI_Fortran_LIBRARIES})
-target_link_libraries(opencoarrays_mod
-  PUBLIC caf_mpi_static)
-target_include_directories(opencoarrays_mod PUBLIC
-  $<$<COMPILE_LANGUAGE:Fortran>:${MPI_Fortran_INCLUDE_PATH}>
-  $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}>)
-
-add_library(caf_mpi SHARED mpi_caf.c ../common/caf_auxiliary.c)
-add_library(caf_mpi_static STATIC  mpi_caf.c ../common/caf_auxiliary.c)
-target_link_libraries(caf_mpi
-  PUBLIC ${MPI_C_LINK_FLAGS}
-  PUBLIC ${MPI_C_LIBRARIES})
-target_link_libraries(caf_mpi_static
-  PUBLIC ${MPI_C_LINK_FLAGS}
-  PUBLIC ${MPI_C_LIBRARIES})
-set_target_properties(caf_mpi_static
-  PROPERTIES
-  POSITION_INDEPENDENT_CODE TRUE)
-target_include_directories(caf_mpi PUBLIC
-  $<$<COMPILE_LANGUAGE:C>:${MPI_C_INCLUDE_PATH}>
-  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-target_include_directories(caf_mpi_static PUBLIC
-  $<$<COMPILE_LANGUAGE:C>:${MPI_C_INCLUDE_PATH}>
-  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-target_compile_options(caf_mpi
-  PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_COMPILE_OPTIONS}>)
-target_compile_definitions(caf_mpi
-  PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_COMPILE_DEFINITIONS}>)
-target_compile_options(caf_mpi_static
-  PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_COMPILE_OPTIONS}>)
-target_compile_definitions(caf_mpi_static
-  PUBLIC $<$<COMPILE_LANGUAGE:C>:${MPI_C_COMPILE_DEFINITIONS}>)
-
-set(CAF_SO_VERSION 0)
-if(gfortran_compiler)
-  if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0.0)
-    set(CAF_SO_VERSION 3)
-  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
-    set(CAF_SO_VERSION 2)
-  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0.0)
-    set(CAF_SO_VERSION 1)
-  endif()
-endif()
-
-set_target_properties ( caf_mpi
-  PROPERTIES
-  SOVERSION ${CAF_SO_VERSION}
-#  VERSION ${PROJECT_VERSION}
-)
-
-# Create a symlink in the include dir
-if(UNIX)
-  add_custom_command(TARGET caf_mpi
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "./${mod_dir_tail}/opencoarrays.mod" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/opencoarrays.mod"
-    COMMENT "Creating symlink ${CMAKE_INSTALL_INCLUDEDIR}/opencoarrays.mod --> ${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}/opencoarrays.mod")
-endif()
-
-install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-  FILES_MATCHING PATTERN "opencoarrays.mod")
-
-set_target_properties( caf_mpi_static
-  PROPERTIES
-  SOVERSION ${CAF_SO_VERSION}
-#  VERSION ${PROJECT_VERSION}
-)
-
-if (gfortran_compiler)
-  target_compile_options(caf_mpi INTERFACE $<$<COMPILE_LANGUAGE:Fortran>:-fcoarray=lib>)
-  target_compile_options(caf_mpi_static INTERFACE $<$<COMPILE_LANGUAGE:Fortran>:-fcoarray=lib>)
-endif()
-
-install(TARGETS opencoarrays_mod caf_mpi caf_mpi_static EXPORT OpenCoarraysTargets
-  DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-)
-
-#----------------------------------
-# Determine if we're using Open MPI
-#----------------------------------
-cmake_host_system_information(RESULT N_CPU QUERY NUMBER_OF_LOGICAL_CORES)
-set(N_CPU ${N_CPU} PARENT_SCOPE)
-cmake_host_system_information(RESULT HOST_NAME QUERY HOSTNAME)
-set(HOST_NAME ${HOST_NAME} PARENT_SCOPE)
-execute_process(COMMAND ${MPIEXEC} --version
-  OUTPUT_VARIABLE mpi_version_out)
-if (mpi_version_out MATCHES "[Oo]pen[ -][Mm][Pp][Ii]")
-  message( STATUS "OpenMPI detected")
-  set ( openmpi true PARENT_SCOPE)
-  # Write out a host file because OMPI's mpiexec is dumb
-  file(WRITE ${CMAKE_BINARY_DIR}/hostfile "${HOST_NAME} slots=${N_CPU}\n")
-  message( STATUS "hostfile written to: ${CMAKE_BINARY_DIR}/hostfile")
-  if(NOT DEFINED ENV{TRAVIS})
-    message( STATUS "Open-MPI back end detected, passing --allow-run-as-root to allow tests to pass when run with sudo or as root." )
-  endif()
-endif ()
-
-if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
-  set(gfortran_compiler true)
-elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
-  set(cray_compiler true)
-elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "PGI")
-  set(portland_group_compiler true)
-endif()
-
-if(gfortran_compiler AND (NOT opencoarrays_aware_compiler))
-  target_compile_definitions(opencoarrays_mod
-    PUBLIC -DCOMPILER_SUPPORTS_CAF_INTRINSICS)
-endif()
-
-option(CAF_EXPOSE_INIT_FINALIZE "Expose caf_init and caf_finalize in opencoarrays module" FALSE)
-if(CAF_EXPOSE_INIT_FINALIZE)
-  target_compile_definitions(opencoarrays_mod
-    PRIVATE -DEXPOSE_INIT_FINALIZE)
-endif()
-
-include(CheckIncludeFile)
-CHECK_INCLUDE_FILE("alloca.h" HAVE_ALLOCA)
-if(NOT HAVE_ALLOCA)
-  target_compile_definitions(caf_mpi
-    PRIVATE -DALLOCA_MISSING)
-  target_compile_definitions(caf_mpi_static
-    PRIVATE -DALLOCA_MISSING)
-  message(WARNING "Could not find <alloca.h>. Assuming functionality is provided elsewhere.")
-endif()
-
-#----------------------------------------------------------------------
-# Test if MPI implementation provides features needed for failed images
-#----------------------------------------------------------------------
-set(MPI_HAS_FAULT_TOL_EXT YES)
-
-CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H)
-if (NOT HAVE_SIGNAL_H)
-  set(MPI_HAS_FAULT_TOL_EXT NO)
-  message( FATAL_ERROR "Currently, OpenCoarrays cannot build without signal.h")
-endif()
-
-include(CheckSymbolExists)
-CHECK_SYMBOL_EXISTS(SIGKILL "signal.h" HAVE_SIGKILL)
-if(NOT HAVE_SIGKILL) # try -D_POSIX, needed for mingw-w64, maybe others, see #435
-                     # https://github.com/sourceryinstitute/OpenCoarrays/issues/435#issuecomment-323592433
-  list( APPEND CMAKE_REQUIRED_DEFINITIONS -D_POSIX)
-  CHECK_SYMBOL_EXISTS(SIGKILL "signal.h" HAVE_SIGKILL2)
-  if(HAVE_SIGKILL2)
-    set(HAVE_SIGKILL ${HAVE_SIGKILL2})
-    foreach(lib caf_mpi caf_mpi_static)
-      target_compile_definitions(${lib}
-    	PUBLIC -D_POSIX)
-    endforeach()
-  endif()
-endif()
-
-if (NOT HAVE_SIGKILL)
-  set(MPI_HAS_FAULT_TOL_EXT NO)
-  message (FATAL_ERROR "Currently, OpenCoarrays cannot build without SIGKILL from signal.h")
-endif()
-
-set(NEEDED_SYMBOLS MPIX_ERR_PROC_FAILED;MPIX_ERR_REVOKED;MPIX_Comm_failure_ack;MPIX_Comm_failure_get_acked;MPIX_Comm_shrink;MPIX_Comm_agree)
-
-set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
-if(CMAKE_REQUIRED_INCLUDES)
-  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${MPI_C_INCLUDE_PATH})
-else()
-  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
-endif()
-set(old_cmake_required_flags "${CMAKE_REQUIRED_FLAGS}")
-if(CMAKE_REQUIRED_FLAGS)
-  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${MPI_C_COMPILE_FLAGS} ${MPI_C_LINK_FLAGS})
-else()
-  set(CMAKE_REQUIRED_FLAGS ${MPI_C_COMPILE_FLAGS} ${MPI_C_LINK_FLAGS})
-endif()
-set(old_cmake_required_libraries "${CMAKE_REQUIRED_LIBRARIES}")
-if(CMAKE_REQUIRED_LIBRARIES)
-  set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${MPI_C_LIBRARIES})
-else()
-  set(CMAKE_REQUIRED_LIBRARIES ${MPI_C_LIBRARIES})
-endif()
-
-set(MPI_HEADERS mpi.h)
-include(CheckIncludeFiles)
-CHECK_INCLUDE_FILES("mpi.h;mpi-ext.h" HAVE_MPI_EXT)
-if(HAVE_MPI_EXT)
-    foreach(lib caf_mpi caf_mpi_static)
-      target_compile_definitions(${lib}
-    	PRIVATE -DHAVE_MPI_EXT_H)
-    endforeach()
-  set(MPI_HEADERS ${MPI_HEADERS};mpi-ext.h)
-endif()
-
-foreach(symbol ${NEEDED_SYMBOLS})
-  CHECK_SYMBOL_EXISTS(${symbol} "${MPI_HEADERS}" HAVE_${symbol})
-  if(NOT HAVE_${symbol})
-    message( STATUS "\${HAVE_${symbol}} = ${HAVE_${symbol}}")
-    message( STATUS
-      "Note: Failed Images not supported by the current MPI implementation! (Needs MPIX experimental features--as of MPI3)")
-    set(MPI_HAS_FAULT_TOL_EXT NO)
-    break() # no need to keep looking
-  endif()
-endforeach(symbol)
-set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
-set(CMAKE_REQUIRED_FLAGS ${old_cmake_required_flags})
-set(CMAKE_REQUIRED_LIBRARIES ${old_cmake_required_libraries})
-
-if(MPI_HAS_FAULT_TOL_EXT) # AND (NOT openmpi))
-  option(CAF_ENABLE_FAILED_IMAGES "Enable failed images support" FALSE)
-  message(STATUS "The MPI implementation appears to have the experimental features for ULFM
-that will allow you to build OpenCoarrays with failed images support. However,
-ULFM support did not make it into the MPI-4 standard, and it is known to
-trigger some bugs. Because of this we have disabled it by default. You may
-add the `-DCAF_ENABLE_FAILED_IMAGES:BOOL=ON` CMake flag or edit the value
-with ccmake or cmake-gui if you would like to experiment with failed images.")
-else()
-  set(CAF_ENABLE_FAILED_IMAGES FALSE
-    CACHE
-    BOOL
-    "Enable failed images support (no support in the selected MPI implementation)"
-    FORCE)
-endif()
-
-if(CAF_ENABLE_FAILED_IMAGES)
-  foreach(lib caf_mpi caf_mpi_static)
-    target_compile_definitions(${lib}
-      PUBLIC -DUSE_FAILED_IMAGES)
-  endforeach()
-endif()
-
-#---------------------------------------------------
-# Windows Intel MPI compatibility, see GH issue #435
-#---------------------------------------------------
-set(old_cmake_required_includes "${CMAKE_REQUIRED_INCLUDES}")
-if(CMAKE_REQUIRED_INCLUDES)
-  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${MPI_C_INCLUDE_PATH})
-else()
-  set(CMAKE_REQUIRED_INCLUDES ${MPI_C_INCLUDE_PATH})
-endif()
-CHECK_INCLUDE_FILES("mpi.h" HAVE_MPI_H)
-CHECK_SYMBOL_EXISTS(I_MPI_VERSION "mpi.h" HAVE_Intel_MPI)
-if(HAVE_Intel_MPI AND WIN32)
-  foreach(lib caf_mpi caf_mpi_static)
-    target_compile_definitions(${lib}
-      PUBLIC -DUSE_GCC)
-  endforeach()
-endif()
-set(CMAKE_REQUIRED_INCLUDES ${old_cmake_required_includes})
-
-##############################################
-# Configure `caf` and `cafrun` wrapper scripts
-##############################################
-# List of caf.in variables needing configuration:
-#
-# @CAF_VERSION@ @opencoarrays_aware_compiler@ @Fortran_COMPILER@ @CAF_MODDIR@
-# @CAF_MPI_Fortran_LINK_FLAGS@ @CAF_MPI_Fortran_COMPILE_FLAGS@
-# @CAF_LIBS@ @CAF_MPI_LIBS@
-#
-
-set(CAF_VERSION "${full_git_describe}")
-set(Fortran_COMPILER "${CMAKE_Fortran_COMPILER}")
-set(CAF_MODDIR "${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}")
-set(MOD_DIR_FLAG "${CMAKE_Fortran_MODDIR_FLAG}")
-set(CAF_MPI_LIBS "")
-foreach( lib IN LISTS MPI_Fortran_LIBRARIES)
-  set(CAF_MPI_LIBS "${CAF_MPI_LIBS} \"${lib}\"")
-endforeach()
-string(STRIP "${CAF_MPI_LIBS}" CAF_MPI_LIBS)
-set(CAF_MPI_Fortran_LINK_FLAGS "")
-foreach( lflag IN LISTS MPI_Fortran_LINK_FLAGS)
-  set(CAF_MPI_Fortran_LINK_FLAGS "${CAF_MPI_Fortran_LINK_FLAGS} ${lflag}" )
-endforeach()
-string(STRIP "${CAF_MPI_Fortran_LINK_FLAGS}" CAF_MPI_Fortran_LINK_FLAGS)
-set(CAF_MPI_Fortran_COMPILE_FLAGS "")
-foreach( fcflag IN LISTS MPI_Fortran_COMPILE_FLAGS)
-  set(CAF_MPI_Fortran_COMPILE_FLAGS "${CAF_MPI_Fortran_COMPILE_FLAGS} ${fcflag}" )
-endforeach()
-string(STRIP "${CAF_MPI_Fortran_COMPILE_FLAGS}" CAF_MPI_Fortran_COMPILE_FLAGS)
-set_target_properties(caf_mpi_static
-  PROPERTIES OUTPUT_NAME caf_mpi)
-get_target_property(libcaf_static caf_mpi_static OUTPUT_NAME)
-set(CAF_LIBS "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${libcaf_static}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-
-configure_file("${CMAKE_SOURCE_DIR}/src/extensions/caf.in" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf"
-  @ONLY)
-
-
-# List of cafrun.in variables needing configuration:
-#
-# @CAF_VERSION@ @MPIEXEC@ @MPIEXEC_NUMPROC_FLAG@ @MPIEXEC_PREFLAGS@ @MPIEXEC_POSTFLAGS@
-# @HAVE_FAILED_IMG@
-#
-
-if(CAF_ENABLE_FAILED_IMAGES)
-  set(HAVE_FAILED_IMG "true")
-else()
-  set(HAVE_FAILED_IMG "false")
-endif()
-
-configure_file("${CMAKE_SOURCE_DIR}/src/extensions/cafrun.in" "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun"
-  @ONLY)
-
-install(PROGRAMS "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun"
-  "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf"
-  DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
-
-lint_script("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" caf)
-check_script_style("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf")
-lint_script("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}" cafrun)
-check_script_style("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/cafrun")
diff --git a/src/mpi/Makefile b/src/mpi/Makefile
deleted file mode 100644
index d997295ce..000000000
--- a/src/mpi/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-include ../make.inc
-
-MPICC ?= mpicc
-
-libcaf_mpi.a: mpi_caf.o ../common/caf_auxiliary.o
-	ar rcv $@ mpi_caf.o ../common/caf_auxiliary.o
-	ranlib $@
-
-.c.o:
-	$(MPICC) $(CFLAGS) $(MPI_CFLAGS) -I.. -c $< -o $@
-
-mpi_caf.o: mpi_caf.c ../libcaf.h ../libcaf-gfortran-descriptor.h
-
-../common/caf_auxiliary.o:
-	$(MAKE) -C ../common
-
-clean:
-	rm -f mpi_caf.o
-
-distclean: clean
-	rm -f libcaf_mpi.a
diff --git a/src/openshmem/Makefile b/src/openshmem/Makefile
deleted file mode 100644
index 78dea0eb4..000000000
--- a/src/openshmem/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-include ../make.inc
-
-MPICC ?= oshcc
-
-libcaf_openshmem.a: openshmem_caf.o ../common/caf_auxiliary.o
-	ar rcv $@ openshmem_caf.o ../common/caf_auxiliary.o
-	ranlib $@
-
-.c.o:
-	$(MPICC) $(CFLAGS) $(MPI_CFLAGS) -I.. -c $< -o $@
-
-openshmem_caf.o: openshmem_caf.c ../libcaf.h ../libcaf-gfortran-descriptor.h
-
-../common/caf_auxiliary.o:
-	$(MAKE) -C ../common
-
-clean:
-	rm -f openshmem_caf.o
-
-distclean: clean
-	rm -f libcaf_openshmem.a
diff --git a/src/openshmem/openshmem_caf.c b/src/openshmem/openshmem_caf.c
deleted file mode 100644
index 597d0f2e3..000000000
--- a/src/openshmem/openshmem_caf.c
+++ /dev/null
@@ -1,3888 +0,0 @@
-/* One-sided MPI implementation of Libcaf
-
-Copyright (c) 2012-2016, Sourcery, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Sourcery, Inc., nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL SOURCERY, INC., BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
-
-/****l* mpi/mpi_caf.c
- * NAME
- *   mpi_caf
- * SYNOPSIS
- *   This program implements the LIBCAF_MPI transport layer.
-******
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>        /* For memcpy.  */
-#include <stdarg.h>        /* For variadic arguments.  */
-#include <alloca.h>
-#include <unistd.h>
-#include <mpi.h>
-#include <shmem.h>                    
-#include <pthread.h>
-
-#include "libcaf.h"
-
-/* Define GFC_CAF_CHECK to enable run-time checking.  */
-/* #define GFC_CAF_CHECK  1  */
-
-
-#ifdef GCC_GE_7
-/** The caf-token of the mpi-library.
-
-Objects of this data structure are owned by the library and are treated as a
-black box by the compiler.  In the coarray-program the tokens are opaque
-pointers, i.e. black boxes.
-
-For each coarray (allocatable|save|pointer) (scalar|array|event|lock) a token
-needs to be present.  For components of derived type coarrays a token is
-needed only when the component has the allocatable or pointer attribute.
-*/
-typedef struct mpi_caf_token_t
-{
-  /** The pointer to memory associated to this token's data on the local image.
-  The compiler uses the address for direct access to the memory of the object
-  this token is assocated to, i.e., the memory pointed to be local_memptr is
-  the scalar or array.
-  When the library is responsible for deleting the memory, then this is the one
-  to free.  */
-  void *local_memptr;
-  /** The MPI window to associated to the object's data.
-  The window is used to access the data on other images. In pre GCC_GE_7
-  installations this was the token.  */
-  MPI_Win memptr;
-  /** When the object this token is associated to is an array, than this
-  window gives access to the descriptor on remote images. When the object is
-  scalar, then this is NULL.  */
-  MPI_Win *desc;
-} mpi_caf_token_t;
-#define TOKEN(X) &(((mpi_caf_token_t *) (X))->memptr)
-#else
-typedef MPI_Win *mpi_caf_token_t;
-#define TOKEN(X) ((mpi_caf_token_t) (X))
-#endif
-
-static void error_stop (int error) __attribute__ ((noreturn));
-
-/* Global variables.  */
-static int caf_this_image;
-static int caf_num_images = 0;
-static int caf_is_finalized = 0;
-
-#if MPI_VERSION >= 3
-  MPI_Info mpi_info_same_size;
-#endif // MPI_VERSION
-
-/*Sync image part*/
-
-int *sync_images_var;
-
-static int *orders;
-static int *images_full;
-MPI_Request *sync_handles;
-static int *arrived;
-
-/* Pending puts */
-#if defined(NONBLOCKING_PUT) && !defined(CAF_MPI_LOCK_UNLOCK)
-typedef struct win_sync {
-  MPI_Win *win;
-  int img;
-  struct win_sync *next;
-} win_sync;
-
-static win_sync *last_elem = NULL;
-static win_sync *pending_puts = NULL;
-#endif
-
-caf_static_t *caf_static_list = NULL;
-caf_static_t *caf_tot = NULL;
-
-/* Image status variable */
-
-static int img_status = 0;
-static MPI_Win *stat_tok;
-
-/* Active messages variables */
-
-char **buff_am;
-MPI_Status *s_am;
-MPI_Request *req_am;
-MPI_Datatype *dts;
-char *msgbody;
-pthread_mutex_t lock_am;
-int done_am=0;
-
-char err_buffer[MPI_MAX_ERROR_STRING];
-
-/* All CAF runtime calls should use this comm instead of
-   MPI_COMM_WORLD for interoperability purposes. */
-MPI_Comm CAF_COMM_WORLD;
-
-/* For MPI interoperability, allow external initialization
-   (and thus finalization) of MPI. */
-bool caf_owns_mpi = false;
-
-/* Foo function pointers for coreduce.
-  The handles when arguments are passed by reference.  */
-int (*int32_t_by_reference)(void *, void *);
-float (*float_by_reference)(void *, void *);
-double (*double_by_reference)(void *, void *);
-/* Strings are always passed by reference.  */
-void (*char_by_reference)(void *, int, void *, void *, int, int);
-/* The handles when arguments are passed by value.  */
-int (*int32_t_by_value)(int32_t, int32_t);
-float (*float_by_value)(float, float);
-double (*double_by_value)(double, double);
-
-/* Define shortcuts for Win_lock and _unlock depending on whether the primitives
-   are available in the MPI implementation.  When they are not available the
-   shortcut is expanded to nothing by the preprocessor else to the API call.
-   This prevents having #ifdef #else #endif constructs strewn all over the code
-   reducing its readability.  */
-#ifdef CAF_MPI_LOCK_UNLOCK
-#define CAF_Win_lock(type, img, win) MPI_Win_lock (type, img, 0, win)
-#define CAF_Win_unlock(img, win) MPI_Win_unlock (img, win)
-#define CAF_Win_lock_all(win)
-#define CAF_Win_unlock_all(win)
-#else //CAF_MPI_LOCK_UNLOCK
-#define CAF_Win_lock(type, img, win)
-#define CAF_Win_unlock(img, win) MPI_Win_flush (img, win)
-#if MPI_VERSION >= 3
-#define CAF_Win_lock_all(win) MPI_Win_lock_all (MPI_MODE_NOCHECK, win)
-#else
-#define CAF_Win_lock_all(win)
-#endif
-#define CAF_Win_unlock_all(win) MPI_Win_unlock_all (win)
-#endif //CAF_MPI_LOCK_UNLOCK
-
-#define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
-
-#if defined(NONBLOCKING_PUT) && !defined(CAF_MPI_LOCK_UNLOCK)
-void explicit_flush()
-{
-  win_sync *w=pending_puts, *t;
-  MPI_Win *p;
-  while(w != NULL)
-    {
-      p = w->win;
-      MPI_Win_flush(w->img,*p);
-      t = w;
-      w = w->next;
-      free(t);
-    }
-  last_elem = NULL;
-  pending_puts = NULL;
-}
-#endif
-
-#ifdef HELPER
-void helperFunction()
-{
-  int i = 0, flag = 0, msgid = 0;
-  int ndim = 0, position = 0;
-
-  s_am = calloc(caf_num_images, sizeof(MPI_Status));
-  req_am = calloc(caf_num_images, sizeof(MPI_Request));
-  dts = calloc(caf_num_images, sizeof(MPI_Datatype));
-
-  for(i=0;i<caf_num_images;i++)
-    MPI_Irecv(buff_am[i], 1000, MPI_PACKED, i, 1, CAF_COMM_WORLD, &req_am[i]);
-
-  while(1)
-    {
-      pthread_mutex_lock(&lock_am);
-      for(i=0;i<caf_num_images;i++)
-        {
-          if(!caf_is_finalized)
-            {
-              MPI_Test(&req_am[i], &flag, &s_am[i]);
-              if(flag==1)
-                {
-                  position = 0;
-                  MPI_Unpack(buff_am[i], 1000, &position, &msgid, 1, MPI_INT, CAF_COMM_WORLD);
-                  /* msgid=2 was initially assigned to strided transfers, it can be reused */
-                  /* Strided transfers Msgid=2 */
-
-                  /* You can add you own function */
-
-                  if(msgid==2)
-                    {
-                      msgid=0; position=0;
-                    }
-                  MPI_Irecv(buff_am[i], 1000, MPI_PACKED, i, 1, CAF_COMM_WORLD, &req_am[i]);
-                  flag=0;
-                }
-            }
-          else
-            {
-              done_am=1;
-              pthread_mutex_unlock(&lock_am);
-              return;
-            }
-        }
-        pthread_mutex_unlock(&lock_am);
-    }
-}
-#endif
-/* Keep in sync with single.c.  */
-static void
-caf_runtime_error (const char *message, ...)
-{
-  va_list ap;
-  fprintf (stderr, "Fortran runtime error on image %d: ", caf_this_image);
-  va_start (ap, message);
-  vfprintf (stderr, message, ap);
-  va_end (ap);
-  fprintf (stderr, "\n");
-
-  /* FIXME: Shutdown the Fortran RTL to flush the buffer.  PR 43849.  */
-  /* FIXME: Do some more effort than just to abort.  */
-  //  MPI_Finalize();
-
-  /* Should be unreachable, but to make sure also call exit.  */
-  exit (EXIT_FAILURE);
-}
-
-/* FIXME: CMake chokes on the "inline" keyword below.  If we can detect that CMake is  */
-/*        being used, we could add something of the form "#ifdef _CMAKE" to remove the */
-/*        keyword only when building with CMake */
-/* inline */ void locking_atomic_op(MPI_Win win, int *value, int newval,
-			      int compare, int image_index, size_t index)
-{
-      CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image_index-1, win);
-      MPI_Compare_and_swap (&newval,&compare,value, MPI_INT,image_index-1,
-                            index*sizeof(int), win);
-      CAF_Win_unlock (image_index-1, win);
-}
-
-void mutex_lock(MPI_Win win, int image_index, size_t index, int *stat,
-		int *acquired_lock, char *errmsg, int errmsg_len)
-{
-  const char msg[] = "Already locked";
-#if MPI_VERSION >= 3
-  int value=1, compare = 0, newval = caf_this_image, i = 1;
-
-  if(stat != NULL)
-    *stat = 0;
-
-  locking_atomic_op(win, &value, newval, compare, image_index, index);
-
-  if(value == caf_this_image && image_index == caf_this_image)
-    goto stat_error;
-
-  if(acquired_lock != NULL)
-    {
-      if(value == 0)
-        *acquired_lock = 1;
-      else
-	*acquired_lock = 0;
-      return;
-    }
-
-  while(value != 0)
-    {
-      locking_atomic_op(win, &value, newval, compare, image_index, index);
-      usleep(caf_this_image*i);
-      i++;
-    }
-
-  return;
-
-stat_error:
-  if(errmsg != NULL)
-    {
-      memset(errmsg,' ',errmsg_len);
-      memcpy(errmsg, msg, MIN(errmsg_len,strlen(msg)));
-    }
-  if(stat != NULL)
-    *stat = 99;
-  else
-    error_stop(99);
-#else // MPI_VERSION
-#warning Locking for MPI-2 is not implemented
-  printf ("Locking for MPI-2 is not supported, please update your MPI implementation\n");
-#endif // MPI_VERSION
-}
-
-void mutex_unlock(MPI_Win win, int image_index, size_t index, int *stat,
-		  char* errmsg, int errmsg_len)
-{
-  const char msg[] = "Variable is not locked";
-  if(stat != NULL)
-    *stat = 0;
-#if MPI_VERSION >= 3
-  int value=1, compare = 1, newval = 0;
-
-  /* locking_atomic_op(win, &value, newval, compare, image_index, index); */
-
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image_index-1, win);
-  MPI_Fetch_and_op(&newval, &value, MPI_INT, image_index-1, index*sizeof(int), MPI_REPLACE, win);
-  CAF_Win_unlock (image_index-1, win);
-
-  if(value == 0)
-    goto stat_error;
-
-  return;
-
-stat_error:
-  if(errmsg != NULL)
-    {
-      memset(errmsg,' ',errmsg_len);
-      memcpy(errmsg, msg, MIN(errmsg_len,strlen(msg)));
-    }
-  if(stat != NULL)
-    *stat = 99;
-  else
-    error_stop(99);
-#else // MPI_VERSION
-#warning Locking for MPI-2 is not implemented
-  printf ("Locking for MPI-2 is not supported, please update your MPI implementation\n");
-#endif // MPI_VERSION
-}
-
-/* Initialize coarray program.  This routine assumes that no other
-   GASNet initialization happened before. */
-
-void
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-_gfortran_caf_init (int *argc, char ***argv)
-#else
-PREFIX (init) (int *argc, char ***argv)
-#endif
-{
-  if (caf_num_images == 0)
-    {
-      int ierr = 0, i = 0, j = 0;
-
-      int is_init = 0, prior_thread_level = MPI_THREAD_SINGLE;
-
-      
-      if (is_init) {
-	caf_owns_mpi = false;
-      } else {
-	shmem_init();
-	shmem_set_cache_inv ();
-	MPI_Init(argc, argv);
-	caf_owns_mpi = true;
-      }
-      
-      MPI_Comm_dup(MPI_COMM_WORLD, &CAF_COMM_WORLD);
-      caf_num_images = shmem_n_pes();
-      caf_this_image = shmem_my_pe();
-      caf_this_image++;
-    }
-
-  sync_images_var = (int*)shmem_malloc(sizeof(int)*caf_num_images);
-  memset(sync_images_var,0,sizeof(int)*caf_num_images);
-  
-  shmem_barrier_all();
-}
-
-/* Forward declaration of sync_images.  */
-
-void
-sync_images_internal (int count, int images[], int *stat, char *errmsg,
-                      int errmsg_len, bool internal);
-
-/* Finalize coarray program.   */
-
-void
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-_gfortran_caf_finalize (void)
-#else
-PREFIX (finalize) (void)
-#endif
-{
-  /* Add a conventional barrier to prevent images from quitting to early.  */
-  shmem_barrier_all();
-  while (caf_static_list != NULL)
-    {
-      caf_static_t *tmp = caf_static_list->prev;
-
-      free (caf_static_list);
-      caf_static_list = tmp;
-    }
-
-  caf_static_t *tmp_tot = caf_tot, *prev = caf_tot;
-  void *p;
-
-  while(tmp_tot)
-    {
-      prev = tmp_tot->prev;
-      p = TOKEN(tmp_tot->token);
-      /* CAF_Win_unlock_all (*p); */
-#ifdef GCC_GE_7
-      /* Unregister the window to the descriptors when freeing the token.  */
-      if (((mpi_caf_token_t *)tmp_tot->token)->desc)
-	{
-	  mpi_caf_token_t *mpi_token = (mpi_caf_token_t *)tmp_tot->token;
-	  CAF_Win_unlock_all(*(mpi_token->desc));
-	  MPI_Win_free (mpi_token->desc);
-	  free (mpi_token->desc);
-	}
-#endif // GCC_GE_7
-      /* MPI_Win_free(p); */
-      free(tmp_tot);
-      tmp_tot = prev;
-    }
-
-  /* CAF_Win_unlock_all (*stat_tok); */
-  /* MPI_Win_free (stat_tok); */
-  /* MPI_Comm_free(&CAF_COMM_WORLD); */
-
-  /* Only call Finalize if CAF runtime Initialized MPI. */
-  if (caf_owns_mpi) {
-    shmem_finalize();
-    MPI_Finalize();
-  }
-  caf_is_finalized = 1;
-}
-
-
-int
-PREFIX (this_image)(int distance __attribute__ ((unused)))
-{
-  return caf_this_image;
-}
-
-
-int
-PREFIX (num_images)(int distance __attribute__ ((unused)),
-                         int failed __attribute__ ((unused)))
-{
-  return caf_num_images;
-}
-
-
-#ifdef GCC_GE_7
-/** Register an object with the coarray library creating a token where
-    necessary/requested.
-
-    See the ABI-documentation of gfortran for the expected behavior.
-    Contrary to this expected behavior is this routine not registering memory
-    in the descriptor, that is already present.  I.e., when the compiler
-    expects the library to allocate the memory for an object in desc, then
-    its data_ptr is NULL. This is still missing here.  At the moment the
-    compiler also does not make use of it, but it is contrary to the
-    documentation.
-    */
-void
-PREFIX (register) (size_t size, caf_register_t type, caf_token_t *token,
-                   gfc_descriptor_t *desc, int *stat, char *errmsg,
-		   int errmsg_len)
-{
-  /* int ierr; */
-  void *mem;
-  size_t actual_size;
-  int l_var=0, *init_array=NULL;
-
-  if (unlikely (caf_is_finalized))
-    goto error;
-
-  /* Start GASNET if not already started.  */
-  if (caf_num_images == 0)
-    PREFIX (init) (NULL, NULL);
-
-  if(type == CAF_REGTYPE_LOCK_STATIC || type == CAF_REGTYPE_LOCK_ALLOC ||
-     type == CAF_REGTYPE_CRITICAL || type == CAF_REGTYPE_EVENT_STATIC ||
-     type == CAF_REGTYPE_EVENT_ALLOC)
-    {
-      actual_size = size * sizeof(int);
-      l_var = 1;
-    }
-  else
-    actual_size = size;
-
-  mpi_caf_token_t *mpi_token;
-  MPI_Win *p;
-  /* The token has to be present, when COARRAY_ALLOC_ALLOCATE_ONLY is
-     specified.  */
-  if (type != CAF_REGTYPE_COARRAY_ALLOC_ALLOCATE_ONLY)
-    *token = malloc (sizeof (mpi_caf_token_t));
-
-  mpi_token = (mpi_caf_token_t *) *token;
-  p = TOKEN(mpi_token);
-
-  if ((type == CAF_REGTYPE_COARRAY_ALLOC_ALLOCATE_ONLY
-       || type == CAF_REGTYPE_COARRAY_ALLOC
-       || type == CAF_REGTYPE_COARRAY_STATIC)
-      && GFC_DESCRIPTOR_RANK (desc) != 0)
-    {
-      /* Add a window for the descriptor when an array is registered.  */
-      int ierr;
-      size_t desc_size = sizeof (gfc_descriptor_t) + /*GFC_DESCRIPTOR_RANK (desc)*/
-	  GFC_MAX_DIMENSIONS * sizeof (descriptor_dimension);
-      mpi_token->desc = (MPI_Win *)malloc (sizeof (MPI_Win));
-      ierr = MPI_Win_create (desc, desc_size, 1, mpi_info_same_size,
-			     CAF_COMM_WORLD, mpi_token->desc);
-      CAF_Win_lock_all (*(mpi_token->desc));
-    }
-  else
-    mpi_token->desc = NULL;
-
-#if MPI_VERSION >= 3
-  if (type != CAF_REGTYPE_COARRAY_ALLOC_REGISTER_ONLY)
-    {
-      // Note, MPI_Win_allocate implicitly synchronizes.
-      MPI_Win_allocate (actual_size, 1, MPI_INFO_NULL, CAF_COMM_WORLD, &mem, p);
-      CAF_Win_lock_all (*p);
-    }
-  else
-    mem = NULL;
-#else // MPI_VERSION
-  MPI_Alloc_mem(actual_size, MPI_INFO_NULL, &mem);
-  MPI_Win_create(mem, actual_size, 1, MPI_INFO_NULL, CAF_COMM_WORLD, p);
-#endif // MPI_VERSION
-
-  if(l_var)
-    {
-      init_array = (int *)calloc(size, sizeof(int));
-      CAF_Win_lock (MPI_LOCK_EXCLUSIVE, caf_this_image - 1, *p);
-      MPI_Put (init_array, size, MPI_INT, caf_this_image-1,
-                      0, size, MPI_INT, *p);
-      CAF_Win_unlock (caf_this_image - 1, *p);
-      free(init_array);
-    }
-
-  if (type != CAF_REGTYPE_COARRAY_ALLOC_REGISTER_ONLY)
-    {
-      caf_static_t *tmp = malloc (sizeof (caf_static_t));
-      tmp->prev  = caf_tot;
-      tmp->token = *token;
-      caf_tot = tmp;
-    }
-
-  if (type == CAF_REGTYPE_COARRAY_STATIC)
-    {
-      caf_static_t *tmp = malloc (sizeof (caf_static_t));
-      tmp->prev  = caf_static_list;
-      tmp->token = *token;
-      caf_static_list = tmp;
-    }
-
-  if (stat)
-    *stat = 0;
-
-  /* The descriptor will be initialized only after the call to register.  */
-  mpi_token->local_memptr = mem;
-  desc->base_addr = mem;
-  return;
-
-error:
-  {
-    char *msg;
-
-    if (caf_is_finalized)
-      msg = "Failed to allocate coarray - there are stopped images";
-    else
-      msg = "Failed to allocate coarray";
-
-    if (stat)
-      {
-        *stat = caf_is_finalized ? STAT_STOPPED_IMAGE : 1;
-        if (errmsg_len > 0)
-          {
-            int len = ((int) strlen (msg) > errmsg_len) ? errmsg_len
-                                                        : (int) strlen (msg);
-            memcpy (errmsg, msg, len);
-            if (errmsg_len > len)
-              memset (&errmsg[len], ' ', errmsg_len-len);
-          }
-      }
-    else
-      caf_runtime_error (msg);
-  }
-}
-#else // GCC_GE_7
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-void *
-  _gfortran_caf_register (size_t size, caf_register_t type, caf_token_t *token,
-                          int *stat, char *errmsg, int errmsg_len)
-#else
-void *
-  PREFIX (register) (size_t size, caf_register_t type, caf_token_t *token,
-                     int *stat, char *errmsg, int errmsg_len)
-#endif
-{
-  /* int ierr; */
-  void *mem;
-  size_t actual_size;
-  int l_var=0, *init_array=NULL;
-
-  if (unlikely (caf_is_finalized))
-    goto error;
-
-  /* Start GASNET if not already started.  */
-  if (caf_num_images == 0)
-#ifdef COMPILER_SUPPORTS_CAF_INTRINSICS
-    _gfortran_caf_init (NULL, NULL);
-#else
-    PREFIX (init) (NULL, NULL);
-#endif
-
-  if(type == CAF_REGTYPE_LOCK_STATIC || type == CAF_REGTYPE_LOCK_ALLOC ||
-     type == CAF_REGTYPE_CRITICAL || type == CAF_REGTYPE_EVENT_STATIC ||
-     type == CAF_REGTYPE_EVENT_ALLOC)
-    {
-      actual_size = size*sizeof(int);
-      l_var = 1;
-    }
-  else
-    actual_size = size;
-
-  /* Token contains only a list of pointers.  */
-  mem = shmem_malloc(actual_size);
-  *token = mem;
-
-  PREFIX(sync_all) (NULL,NULL,0);
-
-  caf_static_t *tmp = malloc (sizeof (caf_static_t));
-  tmp->prev  = caf_tot;
-  tmp->token = *token;
-  caf_tot = tmp;
-
-  if (type == CAF_REGTYPE_COARRAY_STATIC)
-    {
-      caf_static_t *tmp = malloc (sizeof (caf_static_t));
-      tmp->prev  = caf_static_list;
-      tmp->token = *token;
-      caf_static_list = tmp;
-    }
-
-  if (stat)
-    *stat = 0;
-
-  return mem;
-
-error:
-  {
-    char *msg;
-
-    if (caf_is_finalized)
-      msg = "Failed to allocate coarray - there are stopped images";
-    else
-      msg = "Failed to allocate coarray";
-
-    if (stat)
-      {
-        *stat = caf_is_finalized ? STAT_STOPPED_IMAGE : 1;
-        if (errmsg_len > 0)
-          {
-            int len = ((int) strlen (msg) > errmsg_len) ? errmsg_len
-                                                        : (int) strlen (msg);
-            memcpy (errmsg, msg, len);
-            if (errmsg_len > len)
-              memset (&errmsg[len], ' ', errmsg_len-len);
-          }
-      }
-    else
-      caf_runtime_error (msg);
-  }
-  return NULL;
-}
-#endif
-
-
-#ifdef GCC_GE_7
-void
-PREFIX (deregister) (caf_token_t *token, int type, int *stat, char *errmsg,
-		     int errmsg_len)
-#else
-void
-PREFIX (deregister) (caf_token_t *token, int *stat, char *errmsg, int errmsg_len)
-#endif
-{
-  /* int ierr; */
-
-  if (unlikely (caf_is_finalized))
-    {
-      const char msg[] = "Failed to deallocate coarray - "
-                          "there are stopped images";
-      if (stat)
-        {
-          *stat = STAT_STOPPED_IMAGE;
-
-          if (errmsg_len > 0)
-            {
-              int len = ((int) sizeof (msg) - 1 > errmsg_len)
-                        ? errmsg_len : (int) sizeof (msg) - 1;
-              memcpy (errmsg, msg, len);
-              if (errmsg_len > len)
-                memset (&errmsg[len], ' ', errmsg_len-len);
-            }
-          return;
-        }
-      caf_runtime_error (msg);
-    }
-
-  PREFIX (sync_all) (NULL, NULL, 0);
-
-  caf_static_t *tmp = caf_tot, *prev = caf_tot, *next=caf_tot;
-  void *p;
-
-  while(tmp)
-    {
-      prev = tmp->prev;
-
-      if(tmp->token == *token)
-        {
-          p = TOKEN(*token);
-#ifdef GCC_GE_7
-	  mpi_caf_token_t *mpi_token = *(mpi_caf_token_t **)token;
-	  if (mpi_token->local_memptr)
-	    {
-	      MPI_Win_free(p);
-	      mpi_token->local_memptr = NULL;
-	    }
-	  if ((*(mpi_caf_token_t **)token)->desc
-	      && type != CAF_DEREGTYPE_COARRAY_DEALLOCATE_ONLY)
-	    {
-	      CAF_Win_unlock_all(*(mpi_token->desc));
-	      MPI_Win_free (mpi_token->desc);
-	      free (mpi_token->desc);
-	    }
-#else
-          /* MPI_Win_free(p); */
-	  shmem_free(p);
-#endif
-
-          if(prev)
-            next->prev = prev->prev;
-          else
-            next->prev = NULL;
-
-          if(tmp == caf_tot)
-            caf_tot = prev;
-
-          free(tmp);
-          break;
-        }
-
-      next = tmp;
-      tmp = prev;
-    }
-
-  if (stat)
-    *stat = 0;
-
-  /* if (unlikely (ierr = ARMCI_Free ((*token)[caf_this_image-1]))) */
-  /*   caf_runtime_error ("ARMCI memory freeing failed: Error code %d", ierr); */
-  //gasnet_exit(0);
-
-  /* free (*token); */
-}
-
-void
-PREFIX (sync_memory) (int *stat, char *errmsg, int errmsg_len)
-{
-#if defined(NONBLOCKING_PUT) && !defined(CAF_MPI_LOCK_UNLOCK)
-  explicit_flush();
-#endif
-}
-
-
-void
-PREFIX (sync_all) (int *stat, char *errmsg, int errmsg_len)
-{
-  int ierr=0;
-
-  if (unlikely (caf_is_finalized))
-    ierr = STAT_STOPPED_IMAGE;
-  else
-    {
-      shmem_barrier_all();
-      /* MPI_Barrier(CAF_COMM_WORLD); */
-      ierr = 0;
-    }
-
-  if (stat)
-    *stat = ierr;
-
-  if (ierr)
-    {
-      char *msg;
-      if (caf_is_finalized)
-        msg = "SYNC ALL failed - there are stopped images";
-      else
-        msg = "SYNC ALL failed";
-
-      if (errmsg_len > 0)
-        {
-          int len = ((int) strlen (msg) > errmsg_len) ? errmsg_len
-                                                      : (int) strlen (msg);
-          memcpy (errmsg, msg, len);
-          if (errmsg_len > len)
-            memset (&errmsg[len], ' ', errmsg_len-len);
-        }
-      else
-        caf_runtime_error (msg);
-    }
-}
-
-/* token: The token of the array to be written to. */
-/* offset: Difference between the coarray base address and the actual data, used for caf(3)[2] = 8 or caf[4]%a(4)%b = 7. */
-/* image_index: Index of the coarray (typically remote, though it can also be on this_image). */
-/* data: Pointer to the to-be-transferred data. */
-/* size: The number of bytes to be transferred. */
-/* asynchronous: Return before the data transfer has been complete  */
-
-void selectType(int size, MPI_Datatype *dt)
-{
-  int t_s;
-
-  MPI_Type_size(MPI_INT, &t_s);
-
-  if(t_s==size)
-    {
-      *dt=MPI_INT;
-      return;
-    }
-
-  MPI_Type_size(MPI_DOUBLE, &t_s);
-
-  if(t_s==size)
-    {
-      *dt=MPI_DOUBLE;
-      return;
-    }
-
-  MPI_Type_size(MPI_COMPLEX, &t_s);
-
-  if(t_s==size)
-    {
-      *dt=MPI_COMPLEX;
-      return;
-    }
-
-  MPI_Type_size(MPI_DOUBLE_COMPLEX, &t_s);
-
-  if(t_s==size)
-    {
-      *dt=MPI_DOUBLE_COMPLEX;
-      return;
-    }
-
-}
-
-void
-PREFIX (sendget) (caf_token_t token_s, size_t offset_s, int image_index_s,
-                  gfc_descriptor_t *dest,
-                  caf_vector_t *dst_vector __attribute__ ((unused)),
-                  caf_token_t token_g, size_t offset_g,
-                  int image_index_g, gfc_descriptor_t *src ,
-                  caf_vector_t *src_vector __attribute__ ((unused)),
-                  int src_kind, int dst_kind, bool mrt)
-{
-  int ierr = 0;
-  size_t i, size;
-  int j;
-  int rank = GFC_DESCRIPTOR_RANK (dest);
-  MPI_Win *p_s = TOKEN(token_s), *p_g = TOKEN(token_g);
-  ptrdiff_t dst_offset = 0;
-  ptrdiff_t src_offset = 0;
-  void *pad_str = NULL;
-  size_t src_size = GFC_DESCRIPTOR_SIZE (src);
-  size_t dst_size = GFC_DESCRIPTOR_SIZE (dest);
-  char *tmp;
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = dest->dim[j]._ubound - dest->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-        dimextent = 0;
-      size *= dimextent;
-    }
-
-  if (size == 0)
-    return;
-
-  if (rank == 0
-      || (GFC_DESCRIPTOR_TYPE (dest) == GFC_DESCRIPTOR_TYPE (src)
-          && dst_kind == src_kind && GFC_DESCRIPTOR_RANK (src) != 0
-          && (GFC_DESCRIPTOR_TYPE (dest) != BT_CHARACTER || dst_size == src_size)
-          && PREFIX (is_contiguous) (dest) && PREFIX (is_contiguous) (src)))
-    {
-      tmp = (char *) calloc (size, dst_size);
-
-      CAF_Win_lock (MPI_LOCK_SHARED, image_index_g - 1, *p_g);
-      ierr = MPI_Get (tmp, dst_size*size, MPI_BYTE,
-                      image_index_g-1, offset_g, dst_size*size, MPI_BYTE, *p_g);
-      if (pad_str)
-        memcpy ((char *) tmp + src_size, pad_str,
-                dst_size-src_size);
-      CAF_Win_unlock (image_index_g-1, *p_g);
-
-      CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image_index_s - 1, *p_s);
-      if (GFC_DESCRIPTOR_TYPE (dest) == GFC_DESCRIPTOR_TYPE (src)
-          && dst_kind == src_kind)
-        ierr = MPI_Put (tmp, dst_size*size, MPI_BYTE,
-                        image_index_s-1, offset_s,
-                        (dst_size > src_size ? src_size : dst_size) * size,
-                        MPI_BYTE, *p_s);
-      if (pad_str)
-        ierr = MPI_Put (pad_str, dst_size-src_size, MPI_BYTE, image_index_s-1,
-                        offset_s, dst_size - src_size, MPI_BYTE, *p_s);
-      CAF_Win_unlock (image_index_s - 1, *p_s);
-
-      if (ierr != 0)
-        error_stop (ierr);
-      return;
-
-      free(tmp);
-    }
-  else
-    {
-      tmp = calloc(1, dst_size);
-
-      for (i = 0; i < size; i++)
-        {
-          ptrdiff_t array_offset_dst = 0;
-          ptrdiff_t stride = 1;
-          ptrdiff_t extent = 1;
-	  ptrdiff_t tot_ext = 1;
-          for (j = 0; j < rank-1; j++)
-            {
-              array_offset_dst += ((i / tot_ext)
-                                   % (dest->dim[j]._ubound
-                                      - dest->dim[j].lower_bound + 1))
-                * dest->dim[j]._stride;
-              extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-              stride = dest->dim[j]._stride;
-	      tot_ext *= extent;
-            }
-
-	  array_offset_dst += (i / tot_ext) * dest->dim[rank-1]._stride;
-          dst_offset = offset_s + array_offset_dst*GFC_DESCRIPTOR_SIZE (dest);
-
-          ptrdiff_t array_offset_sr = 0;
-          if (GFC_DESCRIPTOR_RANK (src) != 0)
-            {
-              stride = 1;
-              extent = 1;
-	      tot_ext = 1;
-              for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-                {
-                  array_offset_sr += ((i / tot_ext)
-                                      % (src->dim[j]._ubound
-                                         - src->dim[j].lower_bound + 1))
-                    * src->dim[j]._stride;
-                  extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-                  stride = src->dim[j]._stride;
-		  tot_ext *= extent;
-                }
-
-              array_offset_sr += (i / tot_ext) * src->dim[rank-1]._stride;
-              array_offset_sr *= GFC_DESCRIPTOR_SIZE (src);
-            }
-          src_offset = offset_g + array_offset_sr;
-
-          CAF_Win_lock (MPI_LOCK_SHARED, image_index_g - 1, *p_g);
-          ierr = MPI_Get (tmp, dst_size, MPI_BYTE,
-                          image_index_g-1, src_offset, src_size, MPI_BYTE, *p_g);
-          CAF_Win_unlock (image_index_g - 1, *p_g);
-
-          CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image_index_s - 1, *p_s);
-          ierr = MPI_Put (tmp, GFC_DESCRIPTOR_SIZE (dest), MPI_BYTE, image_index_s-1,
-                          dst_offset, GFC_DESCRIPTOR_SIZE (dest), MPI_BYTE, *p_s);
-          if (pad_str)
-            ierr = MPI_Put (pad_str, dst_size - src_size, MPI_BYTE, image_index_s-1,
-                            dst_offset, dst_size - src_size, MPI_BYTE, *p_s);
-          CAF_Win_unlock (image_index_s - 1, *p_s);
-
-          if (ierr != 0)
-            {
-              error_stop (ierr);
-              return;
-            }
-        }
-      free(tmp);
-    }
-
-}
-
-/* Send array data from src to dest on a remote image.  */
-/* The last argument means may_require_temporary */
-
-void
-PREFIX (send) (caf_token_t token, size_t offset, int image_index,
-               gfc_descriptor_t *dest,
-               caf_vector_t *dst_vector __attribute__ ((unused)),
-               gfc_descriptor_t *src, int dst_kind, int src_kind,
-               bool mrt)
-{
-  /* FIXME: Implement vector subscripts, type conversion and check whether
-     string-kind conversions are permitted.
-     FIXME: Implement sendget as well.  */
-  int ierr = 0;
-  size_t i, size;
-  int j;
-  /* int position, msg = 0;  */
-  int rank = GFC_DESCRIPTOR_RANK (dest);
-  void *p = TOKEN(token);
-  ptrdiff_t dst_offset = 0;
-  void *pad_str = NULL;
-  void *t_buff = NULL;
-  bool *buff_map = NULL;
-  size_t src_size = GFC_DESCRIPTOR_SIZE (src);
-  size_t dst_size = GFC_DESCRIPTOR_SIZE (dest);
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = dest->dim[j]._ubound - dest->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-        dimextent = 0;
-      size *= dimextent;
-    }
-
-  if (size == 0)
-    return;
-
-  if (GFC_DESCRIPTOR_TYPE (dest) == BT_CHARACTER && dst_size > src_size)
-    {
-      pad_str = alloca (dst_size - src_size);
-      if (dst_kind == 1)
-        memset (pad_str, ' ', dst_size-src_size);
-      else /* dst_kind == 4.  */
-        for (i = 0; i < (dst_size-src_size)/4; i++)
-              ((int32_t*) pad_str)[i] = (int32_t) ' ';
-    }
-  if (rank == 0
-      || (GFC_DESCRIPTOR_TYPE (dest) == GFC_DESCRIPTOR_TYPE (src)
-          && dst_kind == src_kind && GFC_DESCRIPTOR_RANK (src) != 0
-          && (GFC_DESCRIPTOR_TYPE (dest) != BT_CHARACTER || dst_size == src_size)
-          && PREFIX (is_contiguous) (dest) && PREFIX (is_contiguous) (src)))
-    {
-      if(caf_this_image == image_index)
-        {
-          /* The address of source passed by the compiler points on the right
-           * memory location. No offset summation is needed.  */
-          void *dest_tmp = (void *) ((char *) dest->base_addr);// + offset);
-          memmove (dest_tmp,src->base_addr,size*dst_size);
-          return;
-        }
-      else
-        {
-          /* CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image_index - 1, *p); */
-          if (GFC_DESCRIPTOR_TYPE (dest) == GFC_DESCRIPTOR_TYPE (src)
-              && dst_kind == src_kind)
-	    shmem_putmem(p+offset,src->base_addr,(dst_size > src_size ? src_size : dst_size)*size,
-			 image_index-1);
-            /* ierr = MPI_Put (src->base_addr, (dst_size > src_size ? src_size : dst_size)*size, MPI_BYTE, */
-            /*                 image_index-1, offset, */
-            /*                 (dst_size > src_size ? src_size : dst_size) * size, */
-            /*                 MPI_BYTE, *p); */
-          if (pad_str)
-	    {
-	      size_t newoff = offset + (dst_size > src_size ? src_size : dst_size) * size;
-	      shmem_putmem(p+newoff,pad_str,dst_size-src_size,image_index-1);
-	      /* ierr = MPI_Put (pad_str, dst_size-src_size, MPI_BYTE, image_index-1, */
-	      /* 		      newoff, dst_size - src_size, MPI_BYTE, *p); */
-	    }
-#ifdef CAF_MPI_LOCK_UNLOCK
-          /* MPI_Win_unlock (image_index-1, *p); */
-#elif NONBLOCKING_PUT
-	  /* Pending puts init */
-	  if(pending_puts == NULL)
-	    {
-	      pending_puts = calloc(1,sizeof(win_sync));
-	      pending_puts->next=NULL;
-	      pending_puts->win = token;
-	      pending_puts->img = image_index-1;
-	      last_elem = pending_puts;
-	      last_elem->next = NULL;
-	    }
-	  else
-	    {
-	      last_elem->next = calloc(1,sizeof(win_sync));
-	      last_elem = last_elem->next;
-	      last_elem->win = token;
-	      last_elem->img = image_index-1;
-	      last_elem->next = NULL;
-	    }
-#else
-	  /* MPI_Win_flush (image_index-1, *p); */
-#endif // CAF_MPI_LOCK_UNLOCK
-        }
-
-      if (ierr != 0)
-        error_stop (ierr);
-      return;
-    }
-  else
-    {
-
-#ifdef STRIDED
-      MPI_Datatype dt_s, dt_d, base_type_src, base_type_dst;
-      int *arr_bl;
-      int *arr_dsp_s, *arr_dsp_d;
-
-      void *sr = src->base_addr;
-
-      /* selectType (GFC_DESCRIPTOR_SIZE (src), &base_type_src); */
-      /* selectType (GFC_DESCRIPTOR_SIZE (dest), &base_type_dst); */
-
-      if(GFC_DESCRIPTOR_SIZE (src) == sizeof(int))
-	{
-	  shmem_int_iput(p,sr,dest->dim[0]._stride,src->dim[0]._stride,
-			 size,image_index-1);
-	}
-      else if(GFC_DESCRIPTOR_SIZE (src) == sizeof(double))
-	{
-	  shmem_double_iput(p,sr,dest->dim[0]._stride,src->dim[0]._stride,
-			    size, image_index-1);
-	}
-#if 0
-      if(rank == 1)
-        {
-          MPI_Type_vector(size, 1, src->dim[0]._stride, base_type_src, &dt_s);
-          MPI_Type_vector(size, 1, dest->dim[0]._stride, base_type_dst, &dt_d);
-        }
-      /* else if(rank == 2) */
-      /*   { */
-      /*     MPI_Type_vector(size/src->dim[0]._ubound, src->dim[0]._ubound, src->dim[1]._stride, base_type_src, &dt_s); */
-      /*     MPI_Type_vector(size/dest->dim[0]._ubound, dest->dim[0]._ubound, dest->dim[1]._stride, base_type_dst, &dt_d); */
-      /*   } */
-      else
-        {
-          arr_bl = calloc (size, sizeof (int));
-          arr_dsp_s = calloc (size, sizeof (int));
-          arr_dsp_d = calloc (size, sizeof (int));
-
-          for (i = 0; i < size; i++)
-            arr_bl[i] = 1;
-
-          for (i = 0; i < size; i++)
-            {
-              ptrdiff_t array_offset_dst = 0;
-              ptrdiff_t stride = 1;
-              ptrdiff_t extent = 1;
-	      ptrdiff_t tot_ext = 1;
-              for (j = 0; j < rank-1; j++)
-                {
-                  array_offset_dst += ((i / tot_ext)
-                                       % (dest->dim[j]._ubound
-                                          - dest->dim[j].lower_bound + 1))
-                    * dest->dim[j]._stride;
-                  extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-                  stride = dest->dim[j]._stride;
-		  tot_ext *= extent;
-                }
-
-              array_offset_dst += (i / tot_ext) * dest->dim[rank-1]._stride;
-              arr_dsp_d[i] = array_offset_dst;
-
-              if (GFC_DESCRIPTOR_RANK (src) != 0)
-                {
-                  ptrdiff_t array_offset_sr = 0;
-                  stride = 1;
-                  extent = 1;
-		  tot_ext = 1;
-                  for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-                    {
-                      array_offset_sr += ((i / tot_ext)
-                                          % (src->dim[j]._ubound
-                                             - src->dim[j].lower_bound + 1))
-                        * src->dim[j]._stride;
-                      extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-                      stride = src->dim[j]._stride;
-		      tot_ext *= extent;
-                    }
-
-                  array_offset_sr += (i / tot_ext) * src->dim[rank-1]._stride;
-                  arr_dsp_s[i] = array_offset_sr;
-                }
-              else
-                arr_dsp_s[i] = 0;
-            }
-
-          MPI_Type_indexed(size, arr_bl, arr_dsp_s, base_type_src, &dt_s);
-          MPI_Type_indexed(size, arr_bl, arr_dsp_d, base_type_dst, &dt_d);
-
-          free (arr_bl);
-          free (arr_dsp_s);
-          free (arr_dsp_d);
-        }
-
-      MPI_Type_commit(&dt_s);
-      MPI_Type_commit(&dt_d);
-
-      dst_offset = offset;
-
-      CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image_index - 1, *p);
-      ierr = MPI_Put (sr, 1, dt_s, image_index-1, dst_offset, 1, dt_d, *p);
-      CAF_Win_unlock (image_index - 1, *p);
-
-      if (ierr != 0)
-        {
-          error_stop (ierr);
-          return;
-        }
-
-      MPI_Type_free (&dt_s);
-      MPI_Type_free (&dt_d);
-
-#endif
-
-#else
-      if(caf_this_image == image_index && mrt)
-        {
-          t_buff = calloc(size,GFC_DESCRIPTOR_SIZE (dest));
-          buff_map = calloc(size,sizeof(bool));
-        }
-
-      /* CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image_index - 1, *p); */
-      for (i = 0; i < size; i++)
-        {
-          ptrdiff_t array_offset_dst = 0;
-          ptrdiff_t stride = 1;
-          ptrdiff_t extent = 1;
-	  ptrdiff_t tot_ext = 1;
-          for (j = 0; j < rank-1; j++)
-            {
-              array_offset_dst += ((i / tot_ext)
-                                   % (dest->dim[j]._ubound
-                                      - dest->dim[j].lower_bound + 1))
-                * dest->dim[j]._stride;
-              extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-              stride = dest->dim[j]._stride;
-	      tot_ext *= extent;
-            }
-
-          array_offset_dst += (i / tot_ext) * dest->dim[rank-1]._stride;
-          dst_offset = offset + array_offset_dst*GFC_DESCRIPTOR_SIZE (dest);
-
-          void *sr;
-          if (GFC_DESCRIPTOR_RANK (src) != 0)
-            {
-              ptrdiff_t array_offset_sr = 0;
-              stride = 1;
-              extent = 1;
-	      tot_ext = 1;
-              for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-                {
-                  array_offset_sr += ((i / tot_ext)
-                                      % (src->dim[j]._ubound
-                                         - src->dim[j].lower_bound + 1))
-                    * src->dim[j]._stride;
-                  extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-                  stride = src->dim[j]._stride;
-		  tot_ext *= extent;
-                }
-
-              array_offset_sr += (i / tot_ext) * src->dim[rank-1]._stride;
-              sr = (void *)((char *) src->base_addr
-                            + array_offset_sr*GFC_DESCRIPTOR_SIZE (src));
-            }
-          else
-            sr = src->base_addr;
-
-          if(caf_this_image == image_index)
-            {
-              if(!mrt)
-                memmove(dest->base_addr+dst_offset,sr,GFC_DESCRIPTOR_SIZE (src));
-              else
-                {
-                  memmove(t_buff+i*GFC_DESCRIPTOR_SIZE (src),sr,GFC_DESCRIPTOR_SIZE (src));
-                  buff_map[i] = true;
-                }
-            }
-          else
-            {
-	      shmem_putmem(p+dst_offset,sr,GFC_DESCRIPTOR_SIZE (dest),
-			   image_index-1);
-              /* ierr = MPI_Put (sr, GFC_DESCRIPTOR_SIZE (dest), MPI_BYTE, image_index-1, */
-              /*                 dst_offset, GFC_DESCRIPTOR_SIZE (dest), MPI_BYTE, *p); */
-              if (pad_str)
-		shmem_putmem(p+dst_offset,pad_str,dst_size-src_size,image_index-1);
-                /* ierr = MPI_Put (pad_str, dst_size - src_size, MPI_BYTE, image_index-1, */
-                /*                 dst_offset, dst_size - src_size, MPI_BYTE, *p); */
-            }
-
-          if (ierr != 0)
-            {
-              error_stop (ierr);
-              return;
-            }
-        }
-
-      if(caf_this_image == image_index && mrt)
-        {
-          for(i=0;i<size;i++)
-            {
-              if(buff_map[i])
-                {
-                  ptrdiff_t array_offset_dst = 0;
-                  ptrdiff_t stride = 1;
-                  ptrdiff_t extent = 1;
-		  ptrdiff_t tot_ext = 1;
-                  for (j = 0; j < rank-1; j++)
-                    {
-                      array_offset_dst += ((i / tot_ext)
-                                           % (dest->dim[j]._ubound
-                                              - dest->dim[j].lower_bound + 1))
-                        * dest->dim[j]._stride;
-                      extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-                      stride = dest->dim[j]._stride;
-		      tot_ext *= extent;
-                    }
-
-		  //extent = (dest->dim[rank-1]._ubound - dest->dim[rank-1].lower_bound + 1);
-                  array_offset_dst += (i / tot_ext) * dest->dim[rank-1]._stride;
-                  dst_offset = offset + array_offset_dst*GFC_DESCRIPTOR_SIZE (dest);
-                  memmove(src->base_addr+dst_offset,t_buff+i*GFC_DESCRIPTOR_SIZE (src),GFC_DESCRIPTOR_SIZE (src));
-                }
-            }
-          free(t_buff);
-          free(buff_map);
-        }
-      /* CAF_Win_unlock (image_index - 1, *p); */
-#endif
-    }
-}
-
-
-/* Get array data from a remote src to a local dest.  */
-
-void
-PREFIX (get) (caf_token_t token, size_t offset,
-              int image_index,
-              gfc_descriptor_t *src ,
-              caf_vector_t *src_vector __attribute__ ((unused)),
-              gfc_descriptor_t *dest, int src_kind, int dst_kind,
-              bool mrt)
-{
-  size_t i, size;
-  int ierr = 0;
-  int j;
-  void *p = TOKEN(token);
-  int rank = GFC_DESCRIPTOR_RANK (src);
-  size_t src_size = GFC_DESCRIPTOR_SIZE (src);
-  size_t dst_size = GFC_DESCRIPTOR_SIZE (dest);
-  void *t_buff = NULL;
-  bool *buff_map = NULL;
-  void *pad_str = NULL;
-  /* size_t sr_off = 0;  */
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = dest->dim[j]._ubound - dest->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-        dimextent = 0;
-      size *= dimextent;
-    }
-
-  if (size == 0)
-    return;
-
-  if (GFC_DESCRIPTOR_TYPE (dest) == BT_CHARACTER && dst_size > src_size)
-    {
-      pad_str = alloca (dst_size - src_size);
-      if (dst_kind == 1)
-        memset (pad_str, ' ', dst_size-src_size);
-      else /* dst_kind == 4.  */
-        for (i = 0; i < (dst_size-src_size)/4; i++)
-              ((int32_t*) pad_str)[i] = (int32_t) ' ';
-    }
-
-  if (rank == 0
-      || (GFC_DESCRIPTOR_TYPE (dest) == GFC_DESCRIPTOR_TYPE (src)
-          && dst_kind == src_kind
-          && (GFC_DESCRIPTOR_TYPE (dest) != BT_CHARACTER || dst_size == src_size)
-          && PREFIX (is_contiguous) (dest) && PREFIX (is_contiguous) (src)))
-    {
-      /*  if (async == false) */
-      if(caf_this_image == image_index)
-        {
-          /* The address of source passed by the compiler points on the right
-           * memory location. No offset summation is needed.  */
-          void *src_tmp = (void *) ((char *) src->base_addr);// + offset);
-          memmove(dest->base_addr,src_tmp,size*src_size);
-          return;
-        }
-      else
-        {
-          /* CAF_Win_lock (MPI_LOCK_SHARED, image_index - 1, *p); */
-	  shmem_getmem(dest->base_addr,p+offset,size*dst_size,image_index-1);//this works only for integers 
-          /* ierr = MPI_Get (dest->base_addr, dst_size*size, MPI_BYTE, */
-          /*                 image_index-1, offset, dst_size*size, MPI_BYTE, *p); */
-          if (pad_str)
-            memcpy ((char *) dest->base_addr + src_size, pad_str,
-                    dst_size-src_size);
-          /* CAF_Win_unlock (image_index - 1, *p); */
-        }
-      if (ierr != 0)
-        error_stop (ierr);
-      return;
-    }
-#ifdef STRIDED
-
-  MPI_Datatype dt_s, dt_d, base_type_src, base_type_dst;
-  int *arr_bl;
-  int *arr_dsp_s, *arr_dsp_d;
-
-  void *dst = dest->base_addr;
-
-  /* selectType(GFC_DESCRIPTOR_SIZE (src), &base_type_src); */
-  /* selectType(GFC_DESCRIPTOR_SIZE (dest), &base_type_dst); */
-  if(GFC_DESCRIPTOR_SIZE (src) == sizeof(int))
-    {
-      shmem_int_iget(p,dst,dest->dim[0]._stride,src->dim[0]._stride,
-		     size,image_index-1);
-    }
-  else if(GFC_DESCRIPTOR_SIZE (src) == sizeof(double))
-    {
-      shmem_double_iget(p,dst,dest->dim[0]._stride,src->dim[0]._stride,
-			size, image_index-1);
-    }
-#if 0
-  if(rank == 1)
-    {
-      MPI_Type_vector(size, 1, src->dim[0]._stride, base_type_src, &dt_s);
-      MPI_Type_vector(size, 1, dest->dim[0]._stride, base_type_dst, &dt_d);
-    }
-  /* else if(rank == 2) */
-  /*   { */
-  /*     MPI_Type_vector(size/src->dim[0]._ubound, src->dim[0]._ubound, src->dim[1]._stride, base_type_src, &dt_s); */
-  /*     MPI_Type_vector(size/dest->dim[0]._ubound, dest->dim[0]._ubound, dest->dim[1]._stride, base_type_dst, &dt_d); */
-  /*   } */
-  else
-    {
-      arr_bl = calloc(size, sizeof(int));
-      arr_dsp_s = calloc(size, sizeof(int));
-      arr_dsp_d = calloc(size, sizeof(int));
-
-      for(i=0;i<size;i++)
-        arr_bl[i]=1;
-
-      for (i = 0; i < size; i++)
-        {
-          ptrdiff_t array_offset_dst = 0;
-          ptrdiff_t stride = 1;
-          ptrdiff_t extent = 1;
-	  ptrdiff_t tot_ext = 1;
-          for (j = 0; j < rank-1; j++)
-            {
-              array_offset_dst += ((i / tot_ext)
-                                   % (dest->dim[j]._ubound
-                                      - dest->dim[j].lower_bound + 1))
-                * dest->dim[j]._stride;
-              extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-              stride = dest->dim[j]._stride;
-	      tot_ext *= extent;
-            }
-
-	  //extent = (dest->dim[rank-1]._ubound - dest->dim[rank-1].lower_bound + 1);
-          array_offset_dst += (i / tot_ext) * dest->dim[rank-1]._stride;
-          arr_dsp_d[i] = array_offset_dst;
-
-          ptrdiff_t array_offset_sr = 0;
-          stride = 1;
-          extent = 1;
-	  tot_ext = 1;
-          for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-            {
-              array_offset_sr += ((i / tot_ext)
-                                  % (src->dim[j]._ubound
-                                     - src->dim[j].lower_bound + 1))
-                * src->dim[j]._stride;
-              extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-              stride = src->dim[j]._stride;
-	      tot_ext *= extent;
-            }
-
-	  //extent = (src->dim[rank-1]._ubound - src->dim[rank-1].lower_bound + 1);
-          array_offset_sr += (i / tot_ext) * src->dim[rank-1]._stride;
-          arr_dsp_s[i] = array_offset_sr;
-
-        }
-
-      MPI_Type_indexed(size, arr_bl, arr_dsp_s, base_type_src, &dt_s);
-      MPI_Type_indexed(size, arr_bl, arr_dsp_d, base_type_dst, &dt_d);
-
-      free(arr_bl);
-      free(arr_dsp_s);
-      free(arr_dsp_d);
-    }
-
-  MPI_Type_commit(&dt_s);
-  MPI_Type_commit(&dt_d);
-
-  //sr_off = offset;
-
-  CAF_Win_lock (MPI_LOCK_SHARED, image_index - 1, *p);
-  ierr = MPI_Get (dst, 1, dt_d, image_index-1, offset, 1, dt_s, *p);
-  CAF_Win_unlock (image_index - 1, *p);
-
-  if (ierr != 0)
-    error_stop (ierr);
-
-  MPI_Type_free(&dt_s);
-  MPI_Type_free(&dt_d);
-#endif
-
-#else
-  if(caf_this_image == image_index && mrt)
-    {
-      t_buff = calloc(size,GFC_DESCRIPTOR_SIZE (dest));
-      buff_map = calloc(size,sizeof(bool));
-    }
-
-  /* CAF_Win_lock (MPI_LOCK_SHARED, image_index - 1, *p); */
-  for (i = 0; i < size; i++)
-    {
-      ptrdiff_t array_offset_dst = 0;
-      ptrdiff_t stride = 1;
-      ptrdiff_t extent = 1;
-      ptrdiff_t tot_ext = 1;
-      for (j = 0; j < rank-1; j++)
-        {
-          array_offset_dst += ((i / tot_ext)
-                               % (dest->dim[j]._ubound
-                                  - dest->dim[j].lower_bound + 1))
-                              * dest->dim[j]._stride;
-          extent = (dest->dim[j]._ubound - dest->dim[j].lower_bound + 1);
-          stride = dest->dim[j]._stride;
-	  tot_ext *= extent;
-        }
-
-      array_offset_dst += (i / tot_ext) * dest->dim[rank-1]._stride;
-
-      ptrdiff_t array_offset_sr = 0;
-      stride = 1;
-      extent = 1;
-      tot_ext = 1;
-      for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-        {
-          array_offset_sr += ((i / tot_ext)
-                           % (src->dim[j]._ubound
-                              - src->dim[j].lower_bound + 1))
-                          * src->dim[j]._stride;
-          extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-          stride = src->dim[j]._stride;
-	  tot_ext *= extent;
-        }
-
-      array_offset_sr += (i / tot_ext) * src->dim[rank-1]._stride;
-
-      size_t sr_off = offset + array_offset_sr*GFC_DESCRIPTOR_SIZE (src);
-      void *dst = (void *) ((char *) dest->base_addr
-                            + array_offset_dst*GFC_DESCRIPTOR_SIZE (dest));
-      /* FIXME: Handle image_index == this_image().  */
-      /*  if (async == false) */
-      if(caf_this_image == image_index)
-        {
-          /* Is this needed? */
-          if(!mrt)
-            memmove(dst,src->base_addr+array_offset_sr*GFC_DESCRIPTOR_SIZE(src),GFC_DESCRIPTOR_SIZE (src));
-          else
-            {
-              memmove(t_buff+i*GFC_DESCRIPTOR_SIZE (dest),dst,GFC_DESCRIPTOR_SIZE (dest));
-              buff_map[i] = true;
-            }
-        }
-      else
-        {
-	  shmem_getmem(dst, p+sr_off, GFC_DESCRIPTOR_SIZE (dest), image_index-1);
-          /* ierr = MPI_Get (dst, GFC_DESCRIPTOR_SIZE (dest), */
-          /*                 MPI_BYTE, image_index-1, sr_off, */
-          /*                 GFC_DESCRIPTOR_SIZE (src), MPI_BYTE, *p); */
-          if (pad_str)
-            memcpy ((char *) dst + src_size, pad_str, dst_size-src_size);
-        }
-      if (ierr != 0)
-        error_stop (ierr);
-    }
-
-  if(caf_this_image == image_index && mrt)
-    {
-      for(i=0;i<size;i++)
-        {
-          if(buff_map[i])
-            {
-              ptrdiff_t array_offset_sr = 0;
-              ptrdiff_t stride = 1;
-              ptrdiff_t extent = 1;
-	      ptrdiff_t tot_ext = 1;
-              for (j = 0; j < GFC_DESCRIPTOR_RANK (src)-1; j++)
-                {
-                  array_offset_sr += ((i / tot_ext)
-                                      % (src->dim[j]._ubound
-                                         - src->dim[j].lower_bound + 1))
-                    * src->dim[j]._stride;
-                  extent = (src->dim[j]._ubound - src->dim[j].lower_bound + 1);
-                  stride = src->dim[j]._stride;
-		  tot_ext *= extent;
-                }
-
-	      //extent = (src->dim[rank-1]._ubound - src->dim[rank-1].lower_bound + 1);
-              array_offset_sr += (i / tot_ext) * src->dim[rank-1]._stride;
-
-              size_t sr_off = offset + array_offset_sr*GFC_DESCRIPTOR_SIZE (src);
-
-              memmove(dest->base_addr+sr_off,t_buff+i*GFC_DESCRIPTOR_SIZE (src),GFC_DESCRIPTOR_SIZE (src));
-            }
-        }
-      free(t_buff);
-      free(buff_map);
-    }
-  /* CAF_Win_unlock (image_index - 1, *p); */
-#endif
-}
-
-
-#ifdef GCC_GE_7
-/* Emitted when a theorectically unreachable part is reached.  */
-const char unreachable[] = "Fatal error: unreachable alternative found.\n";
-
-/** Convert kind 4 characters into kind 1 one.
-    Copied from the gcc:libgfortran/caf/single.c.
-*/
-static void
-assign_char4_from_char1 (size_t dst_size, size_t src_size, uint32_t *dst,
-			 unsigned char *src)
-{
-  size_t i, n;
-  n = dst_size/4 > src_size ? src_size : dst_size/4;
-  for (i = 0; i < n; ++i)
-    dst[i] = (int32_t) src[i];
-  for (; i < dst_size/4; ++i)
-    dst[i] = (int32_t) ' ';
-}
-
-
-/** Convert kind 1 characters into kind 4 one.
-    Copied from the gcc:libgfortran/caf/single.c.
-*/
-static void
-assign_char1_from_char4 (size_t dst_size, size_t src_size, unsigned char *dst,
-			 uint32_t *src)
-{
-  size_t i, n;
-  n = dst_size > src_size/4 ? src_size/4 : dst_size;
-  for (i = 0; i < n; ++i)
-    dst[i] = src[i] > UINT8_MAX ? (unsigned char) '?' : (unsigned char) src[i];
-  if (dst_size > n)
-    memset (&dst[n], ' ', dst_size - n);
-}
-
-
-/** Convert convertable types.
-    Copied from the gcc:libgfortran/caf/single.c. Can't say much about it.
-*/
-static void
-convert_type (void *dst, int dst_type, int dst_kind, void *src, int src_type,
-	      int src_kind, int *stat)
-{
-#ifdef HAVE_GFC_INTEGER_16
-  typedef __int128 int128t;
-#else
-  typedef int64_t int128t;
-#endif
-
-#if defined(GFC_REAL_16_IS_LONG_DOUBLE)
-  typedef long double real128t;
-  typedef _Complex long double complex128t;
-#elif defined(HAVE_GFC_REAL_16)
-  typedef _Complex float __attribute__((mode(TC))) __complex128;
-  typedef __float128 real128t;
-  typedef __complex128 complex128t;
-#elif defined(HAVE_GFC_REAL_10)
-  typedef long double real128t;
-  typedef long double complex128t;
-#else
-  typedef double real128t;
-  typedef _Complex double complex128t;
-#endif
-
-  int128t int_val = 0;
-  real128t real_val = 0;
-  complex128t cmpx_val = 0;
-
-  switch (src_type)
-    {
-    case BT_INTEGER:
-      if (src_kind == 1)
-	int_val = *(int8_t*) src;
-      else if (src_kind == 2)
-	int_val = *(int16_t*) src;
-      else if (src_kind == 4)
-	int_val = *(int32_t*) src;
-      else if (src_kind == 8)
-	int_val = *(int64_t*) src;
-#ifdef HAVE_GFC_INTEGER_16
-      else if (src_kind == 16)
-	int_val = *(int128t*) src;
-#endif
-      else
-	goto error;
-      break;
-    case BT_REAL:
-      if (src_kind == 4)
-	real_val = *(float*) src;
-      else if (src_kind == 8)
-	real_val = *(double*) src;
-#ifdef HAVE_GFC_REAL_10
-      else if (src_kind == 10)
-	real_val = *(long double*) src;
-#endif
-#ifdef HAVE_GFC_REAL_16
-      else if (src_kind == 16)
-	real_val = *(real128t*) src;
-#endif
-      else
-	goto error;
-      break;
-    case BT_COMPLEX:
-      if (src_kind == 4)
-	cmpx_val = *(_Complex float*) src;
-      else if (src_kind == 8)
-	cmpx_val = *(_Complex double*) src;
-#ifdef HAVE_GFC_REAL_10
-      else if (src_kind == 10)
-	cmpx_val = *(_Complex long double*) src;
-#endif
-#ifdef HAVE_GFC_REAL_16
-      else if (src_kind == 16)
-	cmpx_val = *(complex128t*) src;
-#endif
-      else
-	goto error;
-      break;
-    default:
-      goto error;
-    }
-
-  switch (dst_type)
-    {
-    case BT_INTEGER:
-      if (src_type == BT_INTEGER)
-	{
-	  if (dst_kind == 1)
-	    *(int8_t*) dst = (int8_t) int_val;
-	  else if (dst_kind == 2)
-	    *(int16_t*) dst = (int16_t) int_val;
-	  else if (dst_kind == 4)
-	    *(int32_t*) dst = (int32_t) int_val;
-	  else if (dst_kind == 8)
-	    *(int64_t*) dst = (int64_t) int_val;
-#ifdef HAVE_GFC_INTEGER_16
-	  else if (dst_kind == 16)
-	    *(int128t*) dst = (int128t) int_val;
-#endif
-	  else
-	    goto error;
-	}
-      else if (src_type == BT_REAL)
-	{
-	  if (dst_kind == 1)
-	    *(int8_t*) dst = (int8_t) real_val;
-	  else if (dst_kind == 2)
-	    *(int16_t*) dst = (int16_t) real_val;
-	  else if (dst_kind == 4)
-	    *(int32_t*) dst = (int32_t) real_val;
-	  else if (dst_kind == 8)
-	    *(int64_t*) dst = (int64_t) real_val;
-#ifdef HAVE_GFC_INTEGER_16
-	  else if (dst_kind == 16)
-	    *(int128t*) dst = (int128t) real_val;
-#endif
-	  else
-	    goto error;
-	}
-      else if (src_type == BT_COMPLEX)
-	{
-	  if (dst_kind == 1)
-	    *(int8_t*) dst = (int8_t) cmpx_val;
-	  else if (dst_kind == 2)
-	    *(int16_t*) dst = (int16_t) cmpx_val;
-	  else if (dst_kind == 4)
-	    *(int32_t*) dst = (int32_t) cmpx_val;
-	  else if (dst_kind == 8)
-	    *(int64_t*) dst = (int64_t) cmpx_val;
-#ifdef HAVE_GFC_INTEGER_16
-	  else if (dst_kind == 16)
-	    *(int128t*) dst = (int128t) cmpx_val;
-#endif
-	  else
-	    goto error;
-	}
-      else
-	goto error;
-      return;
-    case BT_REAL:
-      if (src_type == BT_INTEGER)
-	{
-	  if (dst_kind == 4)
-	    *(float*) dst = (float) int_val;
-	  else if (dst_kind == 8)
-	    *(double*) dst = (double) int_val;
-#ifdef HAVE_GFC_REAL_10
-	  else if (dst_kind == 10)
-	    *(long double*) dst = (long double) int_val;
-#endif
-#ifdef HAVE_GFC_REAL_16
-	  else if (dst_kind == 16)
-	    *(real128t*) dst = (real128t) int_val;
-#endif
-	  else
-	    goto error;
-	}
-      else if (src_type == BT_REAL)
-	{
-	  if (dst_kind == 4)
-	    *(float*) dst = (float) real_val;
-	  else if (dst_kind == 8)
-	    *(double*) dst = (double) real_val;
-#ifdef HAVE_GFC_REAL_10
-	  else if (dst_kind == 10)
-	    *(long double*) dst = (long double) real_val;
-#endif
-#ifdef HAVE_GFC_REAL_16
-	  else if (dst_kind == 16)
-	    *(real128t*) dst = (real128t) real_val;
-#endif
-	  else
-	    goto error;
-	}
-      else if (src_type == BT_COMPLEX)
-	{
-	  if (dst_kind == 4)
-	    *(float*) dst = (float) cmpx_val;
-	  else if (dst_kind == 8)
-	    *(double*) dst = (double) cmpx_val;
-#ifdef HAVE_GFC_REAL_10
-	  else if (dst_kind == 10)
-	    *(long double*) dst = (long double) cmpx_val;
-#endif
-#ifdef HAVE_GFC_REAL_16
-	  else if (dst_kind == 16)
-	    *(real128t*) dst = (real128t) cmpx_val;
-#endif
-	  else
-	    goto error;
-	}
-      return;
-    case BT_COMPLEX:
-      if (src_type == BT_INTEGER)
-	{
-	  if (dst_kind == 4)
-	    *(_Complex float*) dst = (_Complex float) int_val;
-	  else if (dst_kind == 8)
-	    *(_Complex double*) dst = (_Complex double) int_val;
-#ifdef HAVE_GFC_REAL_10
-	  else if (dst_kind == 10)
-	    *(_Complex long double*) dst = (_Complex long double) int_val;
-#endif
-#ifdef HAVE_GFC_REAL_16
-	  else if (dst_kind == 16)
-	    *(complex128t*) dst = (complex128t) int_val;
-#endif
-	  else
-	    goto error;
-	}
-      else if (src_type == BT_REAL)
-	{
-	  if (dst_kind == 4)
-	    *(_Complex float*) dst = (_Complex float) real_val;
-	  else if (dst_kind == 8)
-	    *(_Complex double*) dst = (_Complex double) real_val;
-#ifdef HAVE_GFC_REAL_10
-	  else if (dst_kind == 10)
-	    *(_Complex long double*) dst = (_Complex long double) real_val;
-#endif
-#ifdef HAVE_GFC_REAL_16
-	  else if (dst_kind == 16)
-	    *(complex128t*) dst = (complex128t) real_val;
-#endif
-	  else
-	    goto error;
-	}
-      else if (src_type == BT_COMPLEX)
-	{
-	  if (dst_kind == 4)
-	    *(_Complex float*) dst = (_Complex float) cmpx_val;
-	  else if (dst_kind == 8)
-	    *(_Complex double*) dst = (_Complex double) cmpx_val;
-#ifdef HAVE_GFC_REAL_10
-	  else if (dst_kind == 10)
-	    *(_Complex long double*) dst = (_Complex long double) cmpx_val;
-#endif
-#ifdef HAVE_GFC_REAL_16
-	  else if (dst_kind == 16)
-	    *(complex128t*) dst = (complex128t) cmpx_val;
-#endif
-	  else
-	    goto error;
-	}
-      else
-	goto error;
-      return;
-    default:
-      goto error;
-    }
-
-error:
-  fprintf (stderr, "libcaf_single RUNTIME ERROR: Cannot convert type %d kind "
-	   "%d to type %d kind %d\n", src_type, src_kind, dst_type, dst_kind);
-  if (stat)
-    *stat = 1;
-  else
-    abort ();
-}
-
-
-/** Copy a chunk of data from one image to the current one, with type
-    conversion.
-
-    Copied from the gcc:libgfortran/caf/single.c. Can't say much about it.
-*/
-static void
-copy_data (void *ds, mpi_caf_token_t *token, ptrdiff_t offset, int dst_type,
-	   int src_type, int dst_kind, int src_kind, size_t dst_size,
-	   size_t src_size, size_t num, int *stat, int image_index)
-{
-  size_t k;
-  if (dst_type == src_type && dst_kind == src_kind)
-    {
-      size_t sz = (dst_size > src_size ? src_size : dst_size) * num;
-      CAF_Win_lock (MPI_LOCK_SHARED, image_index, token->memptr);
-      MPI_Get (ds, sz, MPI_BYTE, image_index, offset, sz, MPI_BYTE,
-	       token->memptr);
-      CAF_Win_unlock (image_index, token->memptr);
-      if ((dst_type == BT_CHARACTER || src_type == BT_CHARACTER)
-	  && dst_size > src_size)
-	{
-	  if (dst_kind == 1)
-	    memset ((void*)(char*) ds + src_size, ' ', dst_size-src_size);
-	  else /* dst_kind == 4.  */
-	    for (k = src_size/4; k < dst_size/4; k++)
-	      ((int32_t*) ds)[k] = (int32_t) ' ';
-	}
-    }
-  else if (dst_type == BT_CHARACTER && dst_kind == 1)
-    {
-      /* Get the required amount of memory on the stack.  */
-      void *srh = alloca (src_size);
-      CAF_Win_lock (MPI_LOCK_SHARED, image_index, token->memptr);
-      MPI_Get (srh, src_size, MPI_BYTE, image_index, offset,
-	       src_size, MPI_BYTE, token->memptr);
-      CAF_Win_unlock (image_index, token->memptr);
-      assign_char1_from_char4 (dst_size, src_size, ds, srh);
-    }
-  else if (dst_type == BT_CHARACTER)
-    {
-      /* Get the required amount of memory on the stack.  */
-      void *srh = alloca (src_size);
-      CAF_Win_lock (MPI_LOCK_SHARED, image_index, token->memptr);
-      MPI_Get (srh, src_size, MPI_BYTE, image_index, offset,
-	       src_size, MPI_BYTE, token->memptr);
-      CAF_Win_unlock (image_index, token->memptr);
-      assign_char4_from_char1 (dst_size, src_size, ds, srh);
-    }
-  else
-    {
-      /* Get the required amount of memory on the stack.  */
-      void *srh = alloca (src_size * num);
-      CAF_Win_lock (MPI_LOCK_SHARED, image_index, token->memptr);
-      MPI_Get (srh, src_size * num, MPI_BYTE, image_index, offset,
-	       src_size * num, MPI_BYTE, token->memptr);
-      CAF_Win_unlock (image_index, token->memptr);
-      for (k = 0; k < num; ++k)
-	{
-	  convert_type (ds, dst_type, dst_kind, srh, src_type, src_kind, stat);
-	  ds += dst_size;
-	  srh += src_size;
-	}
-    }
-}
-
-
-/** Compute the number of items referenced.
-
-    Computes the number of items between lower bound (lb) and upper bound (ub)
-    with respect to the stride taking corner cases into account.  */
-#define COMPUTE_NUM_ITEMS(num, stride, lb, ub) \
-  do { \
-    ptrdiff_t abs_stride = (stride) > 0 ? (stride) : -(stride); \
-    num = (stride) > 0 ? (ub) + 1 - (lb) : (lb) + 1 - (ub); \
-    if (num <= 0 || abs_stride < 1) return; \
-    num = (abs_stride > 1) ? (1 + (num - 1) / abs_stride) : num; \
-  } while (0)
-
-
-/** Convenience macro to get the extent of a descriptor in a certain dimension.
-
-    Copied from gcc:libgfortran/libgfortran.h. */
-#define GFC_DESCRIPTOR_EXTENT(desc,i) ((desc)->dim[i]._ubound + 1 \
-				      - (desc)->dim[i].lower_bound)
-
-
-/** Get a copy of the remote descriptor.
-
-    The copy of the remote descriptor is placed into memory which has to be
-    provided in src_desc_data. The pointer to the descriptor is set in src.  */
-#define GET_REMOTE_DESC(mpi_token, src, src_desc_data, image_index) \
-  if (mpi_token->desc) \
-    { \
-      size_t desc_size = sizeof (gfc_descriptor_t) + GFC_MAX_DIMENSIONS /* rank */ \
-	* sizeof (descriptor_dimension); \
-      int err; \
-      CAF_Win_lock (MPI_LOCK_SHARED, image_index, *(mpi_token->desc)); \
-      MPI_Get (&src_desc_data, desc_size, MPI_BYTE, \
-	       image_index, 0, desc_size, MPI_BYTE, *(mpi_token->desc)); \
-      err = CAF_Win_unlock (image_index, *(mpi_token->desc)); \
-      src = (gfc_descriptor_t *)&src_desc_data; \
-    } \
-  else \
-    src = NULL
-
-
-/** Define the descriptor of max rank.
-
-    This typedef is made to allow storing a copy of a remote descriptor on the
-    stack without having to care about the rank.  */
-typedef struct gfc_max_dim_descriptor_t {
-  void *base_addr;
-  size_t offset;
-  ptrdiff_t dtype;
-  descriptor_dimension dim[GFC_MAX_DIMENSIONS];
-} gfc_max_dim_descriptor_t;
-
-static void
-get_for_ref (caf_reference_t *ref, size_t *i, size_t dst_index,
-	     mpi_caf_token_t *mpi_token, gfc_descriptor_t *dst,
-	     gfc_descriptor_t *src, void *ds, void *sr,
-	     ptrdiff_t sr_byte_offset,
-	     int dst_kind, int src_kind, size_t dst_dim, size_t src_dim,
-	     size_t num, int *stat, int image_index)
-/* !!! The image_index is zero-base here.  */
-{
-  ptrdiff_t extent_src = 1, array_offset_src = 0, stride_src;
-  size_t next_dst_dim;
-  gfc_max_dim_descriptor_t src_desc_data;
-
-  if (unlikely (ref == NULL))
-    /* May be we should issue an error here, because this case should not
-       occur.  */
-    return;
-
-  if (ref->next == NULL)
-    {
-      size_t dst_size = GFC_DESCRIPTOR_SIZE (dst);
-      size_t dst_rank = GFC_DESCRIPTOR_RANK (dst);
-      int src_type = -1;
-
-      switch (ref->type)
-	{
-	case CAF_REF_COMPONENT:
-	  /* Because the token is always registered after the component, its
-	     offset is always greater zeor.  */
-	  if (ref->u.c.caf_token_offset > 0)
-	    copy_data (ds, mpi_token, ref->u.c.offset,
-		       GFC_DESCRIPTOR_TYPE (dst), GFC_DESCRIPTOR_TYPE (dst),
-		       dst_kind, src_kind, dst_size, ref->item_size, 1, stat,
-		       image_index);
-	  else
-	    copy_data (ds, mpi_token, ref->u.c.offset,
-		       GFC_DESCRIPTOR_TYPE (dst), GFC_DESCRIPTOR_TYPE (src),
-		       dst_kind, src_kind, dst_size, ref->item_size, 1, stat,
-		       image_index);
-	  ++(*i);
-	  return;
-	case CAF_REF_STATIC_ARRAY:
-	  src_type = ref->u.a.static_array_type;
-	  /* Intentionally fall through.  */
-	case CAF_REF_ARRAY:
-	  if (ref->u.a.mode[src_dim] == CAF_ARR_REF_NONE)
-	    {
-	      copy_data (ds + dst_index * dst_size, mpi_token,
-			 sr_byte_offset, GFC_DESCRIPTOR_TYPE (dst),
-			 src_type == -1 ? GFC_DESCRIPTOR_TYPE (src) : src_type,
-			 dst_kind, src_kind, dst_size, ref->item_size, num,
-			 stat, image_index);
-	      *i += num;
-	      return;
-	    }
-	  break;
-	default:
-	  caf_runtime_error (unreachable);
-	}
-    }
-
-  switch (ref->type)
-    {
-    case CAF_REF_COMPONENT:
-      if (ref->u.c.caf_token_offset > 0)
-	{
-	  mpi_token = *(mpi_caf_token_t**)(sr + ref->u.c.caf_token_offset);
-	  GET_REMOTE_DESC (mpi_token, src, src_desc_data, image_index);
-	  get_for_ref (ref->next, i, dst_index, mpi_token, dst, src,
-		       ds, sr + ref->u.c.offset, ref->u.c.offset,
-		       dst_kind, src_kind, dst_dim, 0, 1, stat, image_index);
-	}
-      else
-	get_for_ref (ref->next, i, dst_index, mpi_token, dst,
-		     (gfc_descriptor_t *)(sr + ref->u.c.offset), ds,
-		     sr + ref->u.c.offset, ref->u.c.offset, dst_kind, src_kind,
-		     dst_dim, 0, 1, stat, image_index);
-      return;
-    case CAF_REF_ARRAY:
-      if (ref->u.a.mode[src_dim] == CAF_ARR_REF_NONE)
-	{
-	  get_for_ref (ref->next, i, dst_index, mpi_token, dst,
-		       src, ds, sr, sr_byte_offset, dst_kind,
-		       src_kind, dst_dim, 0, 1, stat, image_index);
-	  return;
-	}
-      /* Only when on the left most index switch the data pointer to
-	 the array's data pointer.  */
-      if (src_dim == 0)
-	{
-	  sr = src->base_addr;
-	  sr_byte_offset = 0;
-	}
-      switch (ref->u.a.mode[src_dim])
-	{
-	case CAF_ARR_REF_VECTOR:
-	  extent_src = GFC_DESCRIPTOR_EXTENT (src, src_dim);
-	  array_offset_src = 0;
-	  for (size_t idx = 0; idx < ref->u.a.dim[src_dim].v.nvec;
-	       ++idx)
-	    {
-#define KINDCASE(kind, type) case kind: \
-	      array_offset_src = (((ptrdiff_t) \
-		  ((type *)ref->u.a.dim[src_dim].v.vector)[idx]) \
-		  - src->dim[src_dim].lower_bound \
-		  * src->dim[src_dim]._stride); \
-	      break
-
-	      switch (ref->u.a.dim[src_dim].v.kind)
-		{
-		KINDCASE (1, int8_t);
-		KINDCASE (2, int16_t);
-		KINDCASE (4, int32_t);
-		KINDCASE (8, int64_t);
-#ifdef HAVE_GFC_INTEGER_16
-		KINDCASE (16, __int128);
-#endif
-		default:
-		  caf_runtime_error (unreachable);
-		  return;
-		}
-#undef KINDCASE
-
-	      get_for_ref (ref, i, dst_index, mpi_token, dst, src, ds,
-			   sr + array_offset_src * ref->item_size,
-			   sr_byte_offset + array_offset_src * ref->item_size,
-			   dst_kind, src_kind, dst_dim + 1, src_dim + 1,
-			   1, stat, image_index);
-	      dst_index += dst->dim[dst_dim]._stride;
-	    }
-	  return;
-	case CAF_ARR_REF_FULL:
-	  COMPUTE_NUM_ITEMS (extent_src,
-			     ref->u.a.dim[src_dim].s.stride,
-			     src->dim[src_dim].lower_bound,
-			     src->dim[src_dim]._ubound);
-	  stride_src = src->dim[src_dim]._stride
-	      * ref->u.a.dim[src_dim].s.stride;
-	  array_offset_src = 0;
-	  for (ptrdiff_t idx = 0; idx < extent_src;
-	       ++idx, array_offset_src += stride_src)
-	    {
-	      get_for_ref (ref, i, dst_index, mpi_token, dst, src, ds,
-			   sr + array_offset_src * ref->item_size,
-			   sr_byte_offset + array_offset_src * ref->item_size,
-			   dst_kind, src_kind, dst_dim + 1, src_dim + 1,
-			   1, stat, image_index);
-	      dst_index += dst->dim[dst_dim]._stride;
-	    }
-	  return;
-	case CAF_ARR_REF_RANGE:
-	  COMPUTE_NUM_ITEMS (extent_src,
-			     ref->u.a.dim[src_dim].s.stride,
-			     ref->u.a.dim[src_dim].s.start,
-			     ref->u.a.dim[src_dim].s.end);
-	  array_offset_src = (ref->u.a.dim[src_dim].s.start
-			      - src->dim[src_dim].lower_bound)
-	      * src->dim[src_dim]._stride;
-	  stride_src = src->dim[src_dim]._stride
-	      * ref->u.a.dim[src_dim].s.stride;
-	  /* Increase the dst_dim only, when the src_extent is greater one
-	     or src and dst extent are both one.  Don't increase when the scalar
-	     source is not present in the dst.  */
-	  next_dst_dim = extent_src > 1
-	      || (GFC_DESCRIPTOR_EXTENT (dst, dst_dim) == 1
-		  && extent_src == 1) ? (dst_dim + 1) : dst_dim;
-	  for (ptrdiff_t idx = 0; idx < extent_src; ++idx)
-	    {
-	      get_for_ref (ref, i, dst_index, mpi_token, dst, src, ds,
-			   sr + array_offset_src * ref->item_size,
-			   sr_byte_offset + array_offset_src * ref->item_size,
-			   dst_kind, src_kind, next_dst_dim, src_dim + 1,
-			   1, stat, image_index);
-	      dst_index += dst->dim[dst_dim]._stride;
-	      array_offset_src += stride_src;
-	    }
-	  return;
-	case CAF_ARR_REF_SINGLE:
-	  array_offset_src = (ref->u.a.dim[src_dim].s.start
-			      - src->dim[src_dim].lower_bound)
-	      * src->dim[src_dim]._stride;
-	  get_for_ref (ref, i, dst_index, mpi_token, dst, src, ds,
-		       sr + array_offset_src * ref->item_size,
-		       sr_byte_offset + array_offset_src * ref->item_size,
-		       dst_kind, src_kind, dst_dim, src_dim + 1, 1,
-		       stat, image_index);
-	  return;
-	case CAF_ARR_REF_OPEN_END:
-	  COMPUTE_NUM_ITEMS (extent_src,
-			     ref->u.a.dim[src_dim].s.stride,
-			     ref->u.a.dim[src_dim].s.start,
-			     src->dim[src_dim]._ubound);
-	  stride_src = src->dim[src_dim]._stride
-	      * ref->u.a.dim[src_dim].s.stride;
-	  array_offset_src = (ref->u.a.dim[src_dim].s.start
-			      - src->dim[src_dim].lower_bound)
-	      * src->dim[src_dim]._stride;
-	  for (ptrdiff_t idx = 0; idx < extent_src; ++idx)
-	    {
-	      get_for_ref (ref, i, dst_index, mpi_token, dst, src, ds,
-			   sr + array_offset_src * ref->item_size,
-			   sr_byte_offset + array_offset_src * ref->item_size,
-			   dst_kind, src_kind, dst_dim + 1, src_dim + 1,
-			   1, stat, image_index);
-	      dst_index += dst->dim[dst_dim]._stride;
-	      array_offset_src += stride_src;
-	    }
-	  return;
-	case CAF_ARR_REF_OPEN_START:
-	  COMPUTE_NUM_ITEMS (extent_src,
-			     ref->u.a.dim[src_dim].s.stride,
-			     src->dim[src_dim].lower_bound,
-			     ref->u.a.dim[src_dim].s.end);
-	  stride_src = src->dim[src_dim]._stride
-	      * ref->u.a.dim[src_dim].s.stride;
-	  array_offset_src = 0;
-	  for (ptrdiff_t idx = 0; idx < extent_src; ++idx)
-	    {
-	      get_for_ref (ref, i, dst_index, mpi_token, dst, src, ds,
-			   sr + array_offset_src * ref->item_size,
-			   sr_byte_offset + array_offset_src * ref->item_size,
-			   dst_kind, src_kind, dst_dim + 1, src_dim + 1,
-			   1, stat, image_index);
-	      dst_index += dst->dim[dst_dim]._stride;
-	      array_offset_src += stride_src;
-	    }
-	  return;
-	default:
-	  caf_runtime_error (unreachable);
-	}
-      return;
-    case CAF_REF_STATIC_ARRAY:
-      if (ref->u.a.mode[src_dim] == CAF_ARR_REF_NONE)
-	{
-	  get_for_ref (ref->next, i, dst_index, mpi_token, dst, NULL, ds, sr,
-		       sr_byte_offset, dst_kind, src_kind,
-		       dst_dim, 0, 1, stat, image_index);
-	  return;
-	}
-      switch (ref->u.a.mode[src_dim])
-	{
-	case CAF_ARR_REF_VECTOR:
-	  array_offset_src = 0;
-	  for (size_t idx = 0; idx < ref->u.a.dim[src_dim].v.nvec;
-	       ++idx)
-	    {
-#define KINDCASE(kind, type) case kind: \
-	     array_offset_src = ((type *)ref->u.a.dim[src_dim].v.vector)[idx]; \
-	      break
-
-	      switch (ref->u.a.dim[src_dim].v.kind)
-		{
-		KINDCASE (1, int8_t);
-		KINDCASE (2, int16_t);
-		KINDCASE (4, int32_t);
-		KINDCASE (8, int64_t);
-#ifdef HAVE_GFC_INTEGER_16
-		KINDCASE (16, __int128);
-#endif
-		default:
-		  caf_runtime_error (unreachable);
-		  return;
-		}
-#undef KINDCASE
-
-	      get_for_ref (ref, i, dst_index, mpi_token, dst, NULL, ds,
-			   sr + array_offset_src * ref->item_size,
-			   sr_byte_offset + array_offset_src * ref->item_size,
-			   dst_kind, src_kind, dst_dim + 1, src_dim + 1,
-			   1, stat, image_index);
-	      dst_index += dst->dim[dst_dim]._stride;
-	    }
-	  return;
-	case CAF_ARR_REF_FULL:
-	  for (array_offset_src = 0 ;
-	       array_offset_src <= ref->u.a.dim[src_dim].s.end;
-	       array_offset_src += ref->u.a.dim[src_dim].s.stride)
-	    {
-	      get_for_ref (ref, i, dst_index, mpi_token, dst, NULL, ds,
-			   sr + array_offset_src * ref->item_size,
-			   sr_byte_offset + array_offset_src * ref->item_size,
-			   dst_kind, src_kind, dst_dim + 1, src_dim + 1,
-			   1, stat, image_index);
-	      dst_index += dst->dim[dst_dim]._stride;
-	    }
-	  return;
-	case CAF_ARR_REF_RANGE:
-	  COMPUTE_NUM_ITEMS (extent_src,
-			     ref->u.a.dim[src_dim].s.stride,
-			     ref->u.a.dim[src_dim].s.start,
-			     ref->u.a.dim[src_dim].s.end);
-	  array_offset_src = ref->u.a.dim[src_dim].s.start;
-	  for (ptrdiff_t idx = 0; idx < extent_src; ++idx)
-	    {
-	      get_for_ref (ref, i, dst_index, mpi_token, dst, NULL, ds,
-			   sr + array_offset_src * ref->item_size,
-			   sr_byte_offset + array_offset_src * ref->item_size,
-			   dst_kind, src_kind, dst_dim + 1, src_dim + 1,
-			   1, stat, image_index);
-	      dst_index += dst->dim[dst_dim]._stride;
-	      array_offset_src += ref->u.a.dim[src_dim].s.stride;
-	    }
-	  return;
-	case CAF_ARR_REF_SINGLE:
-	  array_offset_src = ref->u.a.dim[src_dim].s.start;
-	  get_for_ref (ref, i, dst_index, mpi_token, dst, NULL, ds,
-		       sr + array_offset_src * ref->item_size,
-		       sr_byte_offset + array_offset_src * ref->item_size,
-		       dst_kind, src_kind, dst_dim, src_dim + 1, 1,
-		       stat, image_index);
-	  return;
-	/* The OPEN_* are mapped to a RANGE and therefore can not occur.  */
-	case CAF_ARR_REF_OPEN_END:
-	case CAF_ARR_REF_OPEN_START:
-	default:
-	  caf_runtime_error (unreachable);
-	}
-      return;
-    default:
-      caf_runtime_error (unreachable);
-    }
-}
-
-
-void
-_gfortran_caf_get_by_ref (caf_token_t token, int image_index,
-			  gfc_descriptor_t *dst, caf_reference_t *refs,
-			  int dst_kind, int src_kind,
-			  bool may_require_tmp __attribute__ ((unused)),
-			  bool dst_reallocatable, int *stat)
-{
-  const char vecrefunknownkind[] = "libcaf_single::caf_get_by_ref(): "
-				   "unknown kind in vector-ref.\n";
-  const char unknownreftype[] = "libcaf_single::caf_get_by_ref(): "
-				"unknown reference type.\n";
-  const char unknownarrreftype[] = "libcaf_single::caf_get_by_ref(): "
-				   "unknown array reference type.\n";
-  const char rankoutofrange[] = "libcaf_single::caf_get_by_ref(): "
-				"rank out of range.\n";
-  const char extentoutofrange[] = "libcaf_single::caf_get_by_ref(): "
-				  "extent out of range.\n";
-  const char cannotallocdst[] = "libcaf_single::caf_get_by_ref(): "
-				"can not allocate memory.\n";
-  const char nonallocextentmismatch[] = "libcaf_single::caf_get_by_ref(): "
-      "extent of non-allocatable arrays mismatch (%lu != %lu).\n";
-  const char doublearrayref[] = "libcaf_single::caf_get_by_ref(): "
-      "two or more array part references are not supported.\n";
-  size_t size, i;
-  size_t dst_index;
-  int dst_rank = GFC_DESCRIPTOR_RANK (dst);
-  int dst_cur_dim = 0;
-  size_t src_size;
-  mpi_caf_token_t *mpi_token = (mpi_caf_token_t *) token;
-  void *local_memptr = mpi_token->local_memptr;
-  gfc_descriptor_t *src;
-  gfc_max_dim_descriptor_t src_desc_data, primary_src_desc_data;
-  caf_reference_t *riter = refs;
-  long delta;
-  /* Reallocation of dst.data is needed (e.g., array to small).  */
-  bool realloc_needed;
-  /* Reallocation of dst.data is required, because data is not alloced at
-     all.  */
-  bool realloc_required;
-  bool extent_mismatch = false;
-  /* Set when the first non-scalar array reference is encountered.  */
-  bool in_array_ref = false;
-  bool array_extent_fixed = false;
-  realloc_needed = realloc_required = dst->base_addr == NULL;
-
-  if (stat)
-    *stat = 0;
-
-  GET_REMOTE_DESC (mpi_token, src, primary_src_desc_data, image_index - 1);
-  /* Compute the size of the result.  In the beginning size just counts the
-     number of elements.  */
-  size = 1;
-  while (riter)
-    {
-      switch (riter->type)
-	{
-	case CAF_REF_COMPONENT:
-	  if (riter->u.c.caf_token_offset)
-	    {
-	      mpi_token = *(mpi_caf_token_t**)
-				   (local_memptr + riter->u.c.caf_token_offset);
-	      local_memptr = mpi_token->local_memptr;
-	      GET_REMOTE_DESC (mpi_token, src, src_desc_data, image_index - 1);
-	    }
-	  else
-	    {
-	      local_memptr += riter->u.c.offset;
-	      src = (gfc_descriptor_t *)local_memptr;
-	    }
-	  break;
-	case CAF_REF_ARRAY:
-	  for (i = 0; riter->u.a.mode[i] != CAF_ARR_REF_NONE; ++i)
-	    {
-	      switch (riter->u.a.mode[i])
-		{
-		case CAF_ARR_REF_VECTOR:
-		  delta = riter->u.a.dim[i].v.nvec;
-#define KINDCASE(kind, type) case kind: \
-		    local_memptr += (((ptrdiff_t) \
-			((type *)riter->u.a.dim[i].v.vector)[0]) \
-			- src->dim[i].lower_bound) \
-			* src->dim[i]._stride \
-			* riter->item_size; \
-		    break
-
-		  switch (riter->u.a.dim[i].v.kind)
-		    {
-		    KINDCASE (1, int8_t);
-		    KINDCASE (2, int16_t);
-		    KINDCASE (4, int32_t);
-		    KINDCASE (8, int64_t);
-#if HAVE_GFC_INTEGER_16
-		    KINDCASE (16, __int128);
-#endif
-		    default:
-		      caf_runtime_error (vecrefunknownkind, stat, NULL, 0);
-		      return;
-		    }
-#undef KINDCASE
-		  break;
-		case CAF_ARR_REF_FULL:
-		  COMPUTE_NUM_ITEMS (delta,
-				     riter->u.a.dim[i].s.stride,
-				     src->dim[i].lower_bound,
-				     src->dim[i]._ubound);
-		  /* The memptr stays unchanged when ref'ing the first element
-		     in a dimension.  */
-		  break;
-		case CAF_ARR_REF_RANGE:
-		  COMPUTE_NUM_ITEMS (delta,
-				     riter->u.a.dim[i].s.stride,
-				     riter->u.a.dim[i].s.start,
-				     riter->u.a.dim[i].s.end);
-		  local_memptr += (riter->u.a.dim[i].s.start
-			     - src->dim[i].lower_bound)
-		      * src->dim[i]._stride
-		      * riter->item_size;
-		  break;
-		case CAF_ARR_REF_SINGLE:
-		  delta = 1;
-		  local_memptr += (riter->u.a.dim[i].s.start
-			     - src->dim[i].lower_bound)
-		      * src->dim[i]._stride
-		      * riter->item_size;
-		  break;
-		case CAF_ARR_REF_OPEN_END:
-		  COMPUTE_NUM_ITEMS (delta,
-				     riter->u.a.dim[i].s.stride,
-				     riter->u.a.dim[i].s.start,
-				     src->dim[i]._ubound);
-		  local_memptr += (riter->u.a.dim[i].s.start
-			     - src->dim[i].lower_bound)
-		      * src->dim[i]._stride
-		      * riter->item_size;
-		  break;
-		case CAF_ARR_REF_OPEN_START:
-		  COMPUTE_NUM_ITEMS (delta,
-				     riter->u.a.dim[i].s.stride,
-				     src->dim[i].lower_bound,
-				     riter->u.a.dim[i].s.end);
-		  /* The memptr stays unchanged when ref'ing the first element
-		     in a dimension.  */
-		  break;
-		default:
-		  caf_runtime_error (unknownarrreftype, stat, NULL, 0);
-		  return;
-		}
-	      if (delta <= 0)
-		return;
-	      /* Check the various properties of the destination array.
-		 Is an array expected and present?  */
-	      if (delta > 1 && dst_rank == 0)
-		{
-		  /* No, an array is required, but not provided.  */
-		  caf_runtime_error (extentoutofrange, stat, NULL, 0);
-		  return;
-		}
-	      /* When dst is an array.  */
-	      if (dst_rank > 0)
-		{
-		  /* Check that dst_cur_dim is valid for dst.  Can be
-		     superceeded only by scalar data.  */
-		  if (dst_cur_dim >= dst_rank && delta != 1)
-		    {
-		      caf_runtime_error (rankoutofrange, stat, NULL, 0);
-		      return;
-		    }
-		  /* Do further checks, when the source is not scalar.  */
-		  else if (delta != 1)
-		    {
-		      /* Check that the extent is not scalar and we are not in
-			 an array ref for the dst side.  */
-		      if (!in_array_ref)
-			{
-			  /* Check that this is the non-scalar extent.  */
-			  if (!array_extent_fixed)
-			    {
-			      /* In an array extent now.  */
-			      in_array_ref = true;
-			      /* Check that we haven't skipped any scalar
-				 dimensions yet and that the dst is
-				 compatible.  */
-			      if (i > 0
-				  && dst_rank == GFC_DESCRIPTOR_RANK (src))
-				{
-				  if (dst_reallocatable)
-				    {
-				      /* Dst is reallocatable, which means that
-					 the bounds are not set.  Set them.  */
-				      for (dst_cur_dim= 0; dst_cur_dim < (int)i;
-					   ++dst_cur_dim)
-					{
-					  dst->dim[dst_cur_dim].lower_bound = 1;
-					  dst->dim[dst_cur_dim]._ubound = 1;
-					  dst->dim[dst_cur_dim]._stride = 1;
-					}
-				    }
-				  else
-				    dst_cur_dim = i;
-				}
-			      /* Else press thumbs, that there are enough
-				 dimensional refs to come.  Checked below.  */
-			    }
-			  else
-			    {
-			      caf_runtime_error (doublearrayref, stat, NULL,
-						  0);
-			      return;
-			    }
-			}
-		      /* When the realloc is required, then no extent may have
-			 been set.  */
-		      extent_mismatch = realloc_required
-			  || GFC_DESCRIPTOR_EXTENT (dst, dst_cur_dim) != delta;
-		      /* When it already known, that a realloc is needed or
-			 the extent does not match the needed one.  */
-		      if (realloc_required || realloc_needed
-			  || extent_mismatch)
-			{
-			  /* Check whether dst is reallocatable.  */
-			  if (unlikely (!dst_reallocatable))
-			    {
-			      caf_runtime_error (nonallocextentmismatch, stat,
-						  NULL, 0, delta,
-						  GFC_DESCRIPTOR_EXTENT (dst,
-								  dst_cur_dim));
-			      return;
-			    }
-			  /* Only report an error, when the extent needs to be
-			     modified, which is not allowed.  */
-			  else if (!dst_reallocatable && extent_mismatch)
-			    {
-			      caf_runtime_error (extentoutofrange, stat, NULL,
-						  0);
-			      return;
-			    }
-			  realloc_needed = true;
-			}
-		      /* Only change the extent when it does not match.  This is
-			 to prevent resetting given array bounds.  */
-		      if (extent_mismatch)
-			{
-			  dst->dim[dst_cur_dim].lower_bound = 1;
-			  dst->dim[dst_cur_dim]._ubound = delta;
-			  dst->dim[dst_cur_dim]._stride = size;
-			}
-		    }
-
-		  /* Only increase the dim counter, when in an array ref.  */
-		  if (in_array_ref && dst_cur_dim < dst_rank)
-		    ++dst_cur_dim;
-		}
-	      size *= (ptrdiff_t)delta;
-	    }
-	  if (in_array_ref)
-	    {
-	      array_extent_fixed = true;
-	      in_array_ref = false;
-	    }
-	  break;
-	case CAF_REF_STATIC_ARRAY:
-	  for (i = 0; riter->u.a.mode[i] != CAF_ARR_REF_NONE; ++i)
-	    {
-	      switch (riter->u.a.mode[i])
-		{
-		case CAF_ARR_REF_VECTOR:
-		  delta = riter->u.a.dim[i].v.nvec;
-#define KINDCASE(kind, type) case kind: \
-		    local_memptr += ((type *)riter->u.a.dim[i].v.vector)[0] \
-			* riter->item_size; \
-		    break
-
-		  switch (riter->u.a.dim[i].v.kind)
-		    {
-		    KINDCASE (1, int8_t);
-		    KINDCASE (2, int16_t);
-		    KINDCASE (4, int32_t);
-		    KINDCASE (8, int64_t);
-#if HAVE_GFC_INTEGER_16
-		    KINDCASE (16, __int128);
-#endif
-		    default:
-		      caf_runtime_error (vecrefunknownkind, stat, NULL, 0);
-		      return;
-		    }
-#undef KINDCASE
-		  break;
-		case CAF_ARR_REF_FULL:
-		  delta = riter->u.a.dim[i].s.end / riter->u.a.dim[i].s.stride
-		      + 1;
-		  /* The memptr stays unchanged when ref'ing the first element
-		     in a dimension.  */
-		  break;
-		case CAF_ARR_REF_RANGE:
-		  COMPUTE_NUM_ITEMS (delta,
-				     riter->u.a.dim[i].s.stride,
-				     riter->u.a.dim[i].s.start,
-				     riter->u.a.dim[i].s.end);
-		  local_memptr += riter->u.a.dim[i].s.start
-		      * riter->u.a.dim[i].s.stride
-		      * riter->item_size;
-		  break;
-		case CAF_ARR_REF_SINGLE:
-		  delta = 1;
-		  local_memptr += riter->u.a.dim[i].s.start
-		      * riter->u.a.dim[i].s.stride
-		      * riter->item_size;
-		  break;
-		case CAF_ARR_REF_OPEN_END:
-		  /* This and OPEN_START are mapped to a RANGE and therefore
-		     can not occur here.  */
-		case CAF_ARR_REF_OPEN_START:
-		default:
-		  caf_runtime_error (unknownarrreftype, stat, NULL, 0);
-		  return;
-		}
-	      if (delta <= 0)
-		return;
-	      /* Check the various properties of the destination array.
-		 Is an array expected and present?  */
-	      if (delta > 1 && dst_rank == 0)
-		{
-		  /* No, an array is required, but not provided.  */
-		  caf_runtime_error (extentoutofrange, stat, NULL, 0);
-		  return;
-		}
-	      /* When dst is an array.  */
-	      if (dst_rank > 0)
-		{
-		  /* Check that dst_cur_dim is valid for dst.  Can be
-		     superceeded only by scalar data.  */
-		  if (dst_cur_dim >= dst_rank && delta != 1)
-		    {
-		      caf_runtime_error (rankoutofrange, stat, NULL, 0);
-		      return;
-		    }
-		  /* Do further checks, when the source is not scalar.  */
-		  else if (delta != 1)
-		    {
-		      /* Check that the extent is not scalar and we are not in
-			 an array ref for the dst side.  */
-		      if (!in_array_ref)
-			{
-			  /* Check that this is the non-scalar extent.  */
-			  if (!array_extent_fixed)
-			    {
-			      /* In an array extent now.  */
-			      in_array_ref = true;
-			      /* The dst is not reallocatable, so nothing more
-				 to do, then correct the dim counter.  */
-			      dst_cur_dim = i;
-			    }
-			  else
-			    {
-			      caf_runtime_error (doublearrayref, stat, NULL,
-						  0);
-			      return;
-			    }
-			}
-		      /* When the realloc is required, then no extent may have
-			 been set.  */
-		      extent_mismatch = realloc_required
-			  || GFC_DESCRIPTOR_EXTENT (dst, dst_cur_dim) != delta;
-		      /* When it is already known, that a realloc is needed or
-			 the extent does not match the needed one.  */
-		      if (realloc_required || realloc_needed
-			  || extent_mismatch)
-			{
-			  /* Check whether dst is reallocatable.  */
-			  if (unlikely (!dst_reallocatable))
-			    {
-			      caf_runtime_error (nonallocextentmismatch, stat,
-						  NULL, 0, delta,
-						  GFC_DESCRIPTOR_EXTENT (dst,
-								  dst_cur_dim));
-			      return;
-			    }
-			  /* Only report an error, when the extent needs to be
-			     modified, which is not allowed.  */
-			  else if (!dst_reallocatable && extent_mismatch)
-			    {
-			      caf_runtime_error (extentoutofrange, stat, NULL,
-						  0);
-			      return;
-			    }
-			  realloc_needed = true;
-			}
-		      /* Only change the extent when it does not match.  This is
-			 to prevent resetting given array bounds.  */
-		      if (extent_mismatch)
-			{
-			  dst->dim[dst_cur_dim].lower_bound = 1;
-			  dst->dim[dst_cur_dim]._ubound = delta;
-			  dst->dim[dst_cur_dim]._stride = size;
-			}
-		    }
-		  /* Only increase the dim counter, when in an array ref.  */
-		  if (in_array_ref && dst_cur_dim < dst_rank)
-		    ++dst_cur_dim;
-		}
-	      size *= (ptrdiff_t)delta;
-	    }
-	  if (in_array_ref)
-	    {
-	      array_extent_fixed = true;
-	      in_array_ref = false;
-	    }
-	  break;
-	default:
-	  caf_runtime_error (unknownreftype, stat, NULL, 0);
-	  return;
-	}
-      src_size = riter->item_size;
-      riter = riter->next;
-    }
-  if (size == 0 || src_size == 0)
-    return;
-  /* Postcondition:
-     - size contains the number of elements to store in the destination array,
-     - src_size gives the size in bytes of each item in the destination array.
-  */
-
-  if (realloc_needed)
-    {
-      if (!array_extent_fixed)
-	{
-	  /* This can happen only, when the result is scalar.  */
-	  for (dst_cur_dim = 0; dst_cur_dim < dst_rank; ++dst_cur_dim)
-	    {
-	      dst->dim[dst_cur_dim].lower_bound = 1;
-	      dst->dim[dst_cur_dim]._ubound = 1;
-	      dst->dim[dst_cur_dim]._stride = 1;
-	    }
-	}
-      dst->base_addr = malloc (size * GFC_DESCRIPTOR_SIZE (dst));
-      if (unlikely (dst->base_addr == NULL))
-	{
-	  caf_runtime_error (cannotallocdst, stat, NULL, 0);
-	  return;
-	}
-    }
-
-  /* Reset the token.  */
-  mpi_token = (mpi_caf_token_t *) token;
-  local_memptr = mpi_token->local_memptr;
-  src = (gfc_descriptor_t *)&primary_src_desc_data;
-  dst_index = 0;
-  i = 0;
-  get_for_ref (refs, &i, dst_index, mpi_token, dst, src,
-	       dst->base_addr, local_memptr, 0, dst_kind, src_kind, 0, 0,
-	       1, stat, image_index - 1);
-}
-
-
-void
-PREFIX(send_by_ref) (caf_token_t token, int image_index,
-                         gfc_descriptor_t *src, caf_reference_t *refs,
-                         int dst_kind, int src_kind, bool may_require_tmp,
-                         bool dst_reallocatable, int *stat)
-{
-  fprintf (stderr, "COARRAY ERROR: caf_send_by_ref() not implemented yet ");
-  error_stop (1);
-}
-
-
-void
-PREFIX(sendget_by_ref) (caf_token_t dst_token, int dst_image_index,
-                            caf_reference_t *dst_refs, caf_token_t src_token,
-                            int src_image_index, caf_reference_t *src_refs,
-                            int dst_kind, int src_kind,
-                            bool may_require_tmp, int *dst_stat, int *src_stat)
-{
-  fprintf (stderr, "COARRAY ERROR: caf_sendget_by_ref() not implemented yet ");
-  error_stop (1);
-}
-
-
-int
-PREFIX(is_present) (caf_token_t token, int image_index, caf_reference_t *refs)
-{
-  fprintf (stderr, "COARRAY ERROR: caf_is_present() not implemented yet ");
-  error_stop (1);
-}
-#endif
-
-
-/* SYNC IMAGES. Note: SYNC IMAGES(*) is passed as count == -1 while
-   SYNC IMAGES([]) has count == 0. Note further that SYNC IMAGES(*)
-   is not equivalent to SYNC ALL. */
-void
-PREFIX (sync_images) (int count, int images[], int *stat, char *errmsg,
-		      int errmsg_len)
-{
-  int newval = 1, zero = 0;
-  int sum = 0, i, tmp_count;
-  int *tmp_images;
-  
-  if(count == -1)
-    {
-      tmp_count = caf_num_images-1;
-      tmp_images = alloca(sizeof(int)*(caf_num_images-1));
-      for(i=0;i<caf_num_images-1;i++)
-	tmp_images[i] = i+2;
-    }
-  else
-    {
-      tmp_count = count;
-      tmp_images = images;
-    }
-
-  for(i=0;i<tmp_count;i++)
-    shmem_int_p(&sync_images_var[caf_this_image-1], 1, tmp_images[i]-1);
-
-  for(i=0;i<tmp_count;i++)
-    shmem_int_wait(&sync_images_var[tmp_images[i]-1], 0);
-
-}
-
-void
-sync_images_internal (int count, int images[], int *stat, char *errmsg,
-                      int errmsg_len, bool internal)
-{
-  int ierr = 0, i = 0, j = 0, int_zero = 0, done_count = 0;
-  MPI_Status s;
-
-  if (count == 0 || (count == 1 && images[0] == caf_this_image))
-    {
-      if (stat)
-        *stat = 0;
-      return;
-    }
-
-  /* halt execution if sync images contains duplicate image numbers */
-  for(i = 0; i < count; ++i)
-    for(j = 0; j < i; ++j)
-      if(images[i] == images[j])
-	{
-	  ierr = STAT_DUP_SYNC_IMAGES;
-	  if(stat)
-	    *stat = ierr;
-	  goto sync_images_err_chk;
-	}
-
-#ifdef GFC_CAF_CHECK
-  {
-    for (i = 0; i < count; ++i)
-      if (images[i] < 1 || images[i] > caf_num_images)
-        {
-          fprintf (stderr, "COARRAY ERROR: Invalid image index %d to SYNC "
-                   "IMAGES", images[i]);
-          error_stop (1);
-        }
-  }
-#endif
-
-  if (unlikely (caf_is_finalized))
-    ierr = STAT_STOPPED_IMAGE;
-  else
-    {
-       if(count == -1)
-        {
-          for (i = 0; i < caf_num_images - 1; ++i)
-            ++orders[images_full[i] - 1];
-          count = caf_num_images - 1;
-          images = images_full;
-        }
-      else
-        {
-          for (i = 0; i < count; ++i)
-            ++orders[images[i] - 1];
-        }
-
-#if defined(NONBLOCKING_PUT) && !defined(CAF_MPI_LOCK_UNLOCK)
-      explicit_flush();
-#endif
-
-      /* A rather simple way to synchronice:
-	 - expect all images to sync with receiving an int,
-	 - on the other side, send all processes to sync with an int,
-	 - when the int received is STAT_STOPPED_IMAGE the return immediately,
-	   else wait until all images in the current set of images have send
-	   some data, i.e., synced.
-
-	 This approach as best as possible implements the syncing of different
-	 sets of images and figuring that an image has stopped.  MPI does not
-	 provide any direct means of syncing non-coherent sets of images.
-	 The groups/communicators of MPI always need to be consistent, i.e.,
-	 have the same members on all images participating.  This is
-	 contradictiory to the sync images statement, where syncing, e.g., in a
-	 ring pattern is possible.
-
-	 This implementation guarantees, that as long as no image is stopped
-	 an image only is allowed to continue, when all its images to sync to
-	 also have reached a sync images statement.  This implementation makes
-	 no assumption when the image continues or in which order synced
-	 images continue.  */
-      for(i = 0; i < count; ++i)
-	/* Need to have the request handlers contigously in the handlers
-	   array or waitany below will trip about the handler as illegal.  */
-	ierr = MPI_Irecv (&arrived[images[i] - 1], 1, MPI_INT, images[i] - 1, 0,
-			  CAF_COMM_WORLD, &sync_handles[i]);
-      for(i = 0; i < count; ++i)
-	MPI_Send (&int_zero, 1, MPI_INT, images[i] - 1, 0, CAF_COMM_WORLD);
-      done_count = 0;
-      while (done_count < count)
-	{
-	  ierr = MPI_Waitany (count, sync_handles, &i, &s);
-	  if (i != MPI_UNDEFINED)
-	    {
-	      ++done_count;
-	      if (ierr == MPI_SUCCESS && arrived[s.MPI_SOURCE] == STAT_STOPPED_IMAGE)
-		{
-		  /* Possible future extension: Abort pending receives.  At the
-		     moment the receives are discarded by the program
-		     termination.  For the tested mpi-implementation this is ok.
-		   */
-		  ierr = STAT_STOPPED_IMAGE;
-		  break;
-		}
-	    }
-	  else if (ierr != MPI_SUCCESS)
-	    /* Abort receives here, too, when implemented above.  */
-	    break;
-	}
-    }
-
-sync_images_err_chk:
-  if (stat)
-    *stat = ierr;
-
-  if (ierr && stat == NULL)
-    {
-      char *msg;
-      if (caf_is_finalized)
-	msg = "SYNC IMAGES failed - there are stopped images";
-      else
-        msg = "SYNC IMAGES failed";
-
-      if (errmsg_len > 0)
-        {
-          int len = ((int) strlen (msg) > errmsg_len) ? errmsg_len
-                                                      : (int) strlen (msg);
-          memcpy (errmsg, msg, len);
-          if (errmsg_len > len)
-            memset (&errmsg[len], ' ', errmsg_len-len);
-        }
-      else if (!internal)
-        caf_runtime_error (msg);
-    }
-}
-
-
-#define GEN_REDUCTION(name, datatype, operator) \
-static void \
-name (datatype *invec, datatype *inoutvec, int *len, \
-               MPI_Datatype *datatype __attribute__ ((unused))) \
-{ \
-  int i; \
-  for (i = 0; i < len; i++) \
-    operator; \
-}
-
-#define REFERENCE_FUNC(TYPE) TYPE ## _by_reference
-#define VALUE_FUNC(TYPE) TYPE ## _by_value
-
-#define GEN_COREDUCE(name, dt)			\
-static void \
-name##_by_reference_adapter (void *invec, void *inoutvec, int *len, \
-      MPI_Datatype *datatype)		     \
-{ \
-  int i;	     \
-  for(i=0;i<*len;i++)				\
-    {								\
-      *((dt*)inoutvec) = (dt)(REFERENCE_FUNC(dt)((dt *)invec, (dt *)inoutvec));	\
-     invec+=sizeof(dt); inoutvec+=sizeof(dt);	\
-   } \
-} \
-static void \
-name##_by_value_adapter (void *invec, void *inoutvec, int *len, \
-      MPI_Datatype *datatype)		     \
-{ \
-  int i;	     \
-  for(i=0;i<*len;i++)				\
-    {								\
-      *((dt*)inoutvec) = (dt)(VALUE_FUNC(dt)(*(dt *)invec, *(dt *)inoutvec));	\
-     invec+=sizeof(dt); inoutvec+=sizeof(dt);	\
-   } \
-}
-
-GEN_COREDUCE (redux_int32, int32_t)
-GEN_COREDUCE (redux_real32, float)
-GEN_COREDUCE (redux_real64, double)
-
-static void \
-redux_char_by_reference_adapter (void *invec, void *inoutvec, int *len,
-      MPI_Datatype *datatype)
-{
-  long int lb, string_len; // this should be MPI_Aint
-  MPI_Type_extent(*datatype, &lb, &string_len);
-  for(int i = 0; i < *len; i++)
-    {
-      /* The length of the result is fixed, i.e., no deferred string length is
-       * allowed there.  */
-      REFERENCE_FUNC(char)((char *)inoutvec, string_len, (char *)invec, (char *)inoutvec, string_len, string_len);
-      invec += sizeof(char) * string_len;
-      inoutvec += sizeof(char) * string_len;
-    }
-}
-
-#ifndef MPI_INTEGER1
-GEN_REDUCTION (do_sum_int1, int8_t, inoutvec[i] += invec[i])
-GEN_REDUCTION (do_min_int1, int8_t,
-               inoutvec[i] = invec[i] >= inoutvec[i] ? inoutvec[i] : invec[i])
-GEN_REDUCTION (do_max_int1, int8_t,
-               inoutvec[i] = invec[i] <= inoutvec[i] ? inoutvec[i] : invec[i])
-#endif
-
-#if defined(MPI_INTEGER16) && defined(GFC_INTEGER_16)
-GEN_REDUCTION (do_sum_int1, GFC_INTEGER_16, inoutvec[i] += invec[i])
-GEN_REDUCTION (do_min_int1, GFC_INTEGER_16,
-               inoutvec[i] = invec[i] >= inoutvec[i] ? inoutvec[i] : invec[i])
-GEN_REDUCTION (do_max_int1, GFC_INTEGER_16,
-               inoutvec[i] = invec[i] <= inoutvec[i] ? inoutvec[i] : invec[i])
-#endif
-
-#if defined(GFC_DTYPE_REAL_10) \
-    || (!defined(GFC_DTYPE_REAL_10)  && defined(GFC_DTYPE_REAL_16))
-GEN_REDUCTION (do_sum_real10, long double, inoutvec[i] += invec[i])
-GEN_REDUCTION (do_min_real10, long double,
-               inoutvec[i] = invec[i] >= inoutvec[i] ? inoutvec[i] : invec[i])
-GEN_REDUCTION (do_max_real10, long double,
-               inoutvec[i] = invec[i] <= inoutvec[i] ? inoutvec[i] : invec[i])
-GEN_REDUCTION (do_sum_complex10, _Complex long double, inoutvec[i] += invec[i])
-GEN_REDUCTION (do_min_complex10, _Complex long double,
-               inoutvec[i] = invec[i] >= inoutvec[i] ? inoutvec[i] : invec[i])
-GEN_REDUCTION (do_max_complex10, _Complex long double,
-               inoutvec[i] = invec[i] <= inoutvec[i] ? inoutvec[i] : invec[i])
-#endif
-
-#if defined(GFC_DTYPE_REAL_10) && defined(GFC_DTYPE_REAL_16)
-GEN_REDUCTION (do_sum_real10, __float128, inoutvec[i] += invec[i])
-GEN_REDUCTION (do_min_real10, __float128,
-               inoutvec[i] = invec[i] >= inoutvec[i] ? inoutvec[i] : invec[i])
-GEN_REDUCTION (do_max_real10, __float128,
-               inoutvec[i] = invec[i] <= inoutvec[i] ? inoutvec[i] : invec[i])
-GEN_REDUCTION (do_sum_complex10, _Complex __float128, inoutvec[i] += invec[i])
-GEN_REDUCTION (do_mincomplexl10, _Complex __float128,
-               inoutvec[i] = invec[i] >= inoutvec[i] ? inoutvec[i] : invec[i])
-GEN_REDUCTION (do_max_complex10, _Complex __float128,
-               inoutvec[i] = invec[i] <= inoutvec[i] ? inoutvec[i] : invec[i])
-#endif
-#undef GEN_REDUCTION
-
-
-static MPI_Datatype
-get_MPI_datatype (gfc_descriptor_t *desc, int char_len)
-{
-  /* FIXME: Better check whether the sizes are okay and supported;
-     MPI3 adds more types, e.g. MPI_INTEGER1.  */
-  switch (GFC_DTYPE_TYPE_SIZE (desc))
-    {
-#ifdef MPI_INTEGER1
-    case GFC_DTYPE_INTEGER_1:
-      return MPI_INTEGER1;
-#endif
-#ifdef MPI_INTEGER2
-    case GFC_DTYPE_INTEGER_2:
-      return MPI_INTEGER2;
-#endif
-    case GFC_DTYPE_INTEGER_4:
-#ifdef MPI_INTEGER4
-      return MPI_INTEGER4;
-#else
-      return MPI_INTEGER;
-#endif
-#ifdef MPI_INTEGER8
-    case GFC_DTYPE_INTEGER_8:
-      return MPI_INTEGER8;
-#endif
-#if defined(MPI_INTEGER16) && defined(GFC_DTYPE_INTEGER_16)
-    case GFC_DTYPE_INTEGER_16:
-      return MPI_INTEGER16;
-#endif
-
-    case GFC_DTYPE_LOGICAL_4:
-      return MPI_INT;
-
-    case GFC_DTYPE_REAL_4:
-#ifdef MPI_REAL4
-      return MPI_REAL4;
-#else
-      return MPI_REAL;
-#endif
-    case GFC_DTYPE_REAL_8:
-#ifdef MPI_REAL8
-      return MPI_REAL8;
-#else
-      return MPI_DOUBLE_PRECISION;
-#endif
-
-/* Note that we cannot use REAL_16 as we do not know whether it matches REAL(10)
-   or REAL(16), which have both the same bitsize and only make use of less
-   bits.  */
-    case GFC_DTYPE_COMPLEX_4:
-      return MPI_COMPLEX;
-    case GFC_DTYPE_COMPLEX_8:
-      return MPI_DOUBLE_COMPLEX;
-    }
-/* gfortran passes character string arguments with a
-   GFC_DTYPE_TYPE_SIZE == GFC_TYPE_CHARACTER + 64*strlen
-*/
-  if ( (GFC_DTYPE_TYPE_SIZE(desc)-GFC_DTYPE_CHARACTER)%64==0 )
-    {
-      MPI_Datatype string;
-      if (char_len == 0)
-	char_len = GFC_DESCRIPTOR_SIZE (desc);
-      MPI_Type_contiguous(char_len, MPI_CHARACTER, &string);
-      MPI_Type_commit(&string);
-      return string;
-    }
-
-  caf_runtime_error ("Unsupported data type in collective: %ld\n",GFC_DTYPE_TYPE_SIZE (desc));
-  return 0;
-}
-
-
-static void
-internal_co_reduce (MPI_Op op, gfc_descriptor_t *source, int result_image, int *stat,
-	     char *errmsg, int src_len, int errmsg_len)
-{
-  size_t i, size;
-  int j, ierr;
-  int rank = GFC_DESCRIPTOR_RANK (source);
-
-  MPI_Datatype datatype = get_MPI_datatype (source, src_len);
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = source->dim[j]._ubound
-                            - source->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-        dimextent = 0;
-      size *= dimextent;
-    }
-
-  if (rank == 0 || PREFIX (is_contiguous) (source))
-    {
-      if (result_image == 0)
-	ierr = MPI_Allreduce (MPI_IN_PLACE, source->base_addr, size, datatype,
-                              op, CAF_COMM_WORLD);
-      else if (result_image == caf_this_image)
-	ierr = MPI_Reduce (MPI_IN_PLACE, source->base_addr, size, datatype, op,
-                           result_image-1, CAF_COMM_WORLD);
-      else
-	ierr = MPI_Reduce (source->base_addr, NULL, size, datatype, op,
-                           result_image-1, CAF_COMM_WORLD);
-      if (ierr)
-        goto error;
-      goto co_reduce_cleanup;
-    }
-
-  for (i = 0; i < size; i++)
-    {
-      ptrdiff_t array_offset_sr = 0;
-      ptrdiff_t stride = 1;
-      ptrdiff_t extent = 1;
-      for (j = 0; j < GFC_DESCRIPTOR_RANK (source)-1; j++)
-        {
-          array_offset_sr += ((i / (extent*stride))
-                           % (source->dim[j]._ubound
-                              - source->dim[j].lower_bound + 1))
-                          * source->dim[j]._stride;
-          extent = (source->dim[j]._ubound - source->dim[j].lower_bound + 1);
-          stride = source->dim[j]._stride;
-        }
-      array_offset_sr += (i / extent) * source->dim[rank-1]._stride;
-      void *sr = (void *)((char *) source->base_addr
-                          + array_offset_sr*GFC_DESCRIPTOR_SIZE (source));
-      if (result_image == 0)
-	ierr = MPI_Allreduce (MPI_IN_PLACE, sr, 1, datatype, op,
-                              CAF_COMM_WORLD);
-      else if (result_image == caf_this_image)
-	ierr = MPI_Reduce (MPI_IN_PLACE, sr, 1, datatype, op,
-                           result_image-1, CAF_COMM_WORLD);
-      else
-	ierr = MPI_Reduce (sr, NULL, 1, datatype, op, result_image-1,
-                           CAF_COMM_WORLD);
-      if (ierr)
-        goto error;
-    }
-
-co_reduce_cleanup:
-  if (GFC_DESCRIPTOR_TYPE (source) == BT_CHARACTER)
-    MPI_Type_free (&datatype);
-  if (stat)
-    *stat = 0;
-  return;
-error:
-  /* FIXME: Put this in an extra function and use it elsewhere.  */
-  if (stat)
-    {
-      *stat = ierr;
-      if (!errmsg)
-        return;
-    }
-
-  int len = sizeof (err_buffer);
-  MPI_Error_string (ierr, err_buffer, &len);
-  if (!stat)
-    {
-      err_buffer[len == sizeof (err_buffer) ? len-1 : len] = '\0';
-      caf_runtime_error ("CO_SUM failed with %s\n", err_buffer);
-    }
-  memcpy (errmsg, err_buffer, errmsg_len > len ? len : errmsg_len);
-  if (errmsg_len > len)
-    memset (&errmsg[len], '\0', errmsg_len - len);
-}
-
-void
-PREFIX (co_broadcast) (gfc_descriptor_t *a, int source_image, int *stat, char *errmsg,
-                       int errmsg_len)
-{
-  size_t i, size;
-  int j, ierr;
-  int rank = GFC_DESCRIPTOR_RANK (a);
-
-  MPI_Datatype datatype = get_MPI_datatype (a, 0);
-
-  size = 1;
-  for (j = 0; j < rank; j++)
-    {
-      ptrdiff_t dimextent = a->dim[j]._ubound
-                            - a->dim[j].lower_bound + 1;
-      if (dimextent < 0)
-        dimextent = 0;
-      size *= dimextent;
-    }
-
-  if (rank == 0)
-    {
-      if (datatype != MPI_CHARACTER)
-	ierr = MPI_Bcast(a->base_addr, size, datatype, source_image-1, CAF_COMM_WORLD);
-      else
-      {
-        int a_length;
-        if (caf_this_image==source_image)
-          a_length=strlen(a->base_addr);
-        /* Broadcast the string lenth */
-        ierr = MPI_Bcast(&a_length, 1, MPI_INT, source_image-1, CAF_COMM_WORLD);
-        if (ierr)
-          goto error;
-        /* Broadcast the string itself */
-	ierr = MPI_Bcast(a->base_addr, a_length, datatype, source_image-1, CAF_COMM_WORLD);
-      }
-
-      if (ierr)
-        goto error;
-      goto co_broadcast_exit;
-    }
-    else if (datatype == MPI_CHARACTER) /* rank !=0  */
-    {
-        caf_runtime_error ("Co_broadcast of character arrays not yet supported\n");
-    }
-
-  for (i = 0; i < size; i++)
-    {
-      ptrdiff_t array_offset_sr = 0;
-      ptrdiff_t stride = 1;
-      ptrdiff_t extent = 1;
-      for (j = 0; j < GFC_DESCRIPTOR_RANK (a)-1; j++)
-        {
-          array_offset_sr += ((i / (extent*stride))
-                           % (a->dim[j]._ubound
-                              - a->dim[j].lower_bound + 1))
-                          * a->dim[j]._stride;
-          extent = (a->dim[j]._ubound - a->dim[j].lower_bound + 1);
-          stride = a->dim[j]._stride;
-        }
-      array_offset_sr += (i / extent) * a->dim[rank-1]._stride;
-      void *sr = (void *)((char *) a->base_addr
-                          + array_offset_sr*GFC_DESCRIPTOR_SIZE (a));
-
-      ierr = MPI_Bcast(sr, 1, datatype, source_image-1, CAF_COMM_WORLD);
-
-      if (ierr)
-        goto error;
-    }
-
-co_broadcast_exit:
-  if (stat)
-    *stat = 0;
-  if (GFC_DESCRIPTOR_TYPE(a) == BT_CHARACTER)
-    MPI_Type_free(&datatype);
-  return;
-
-error:
-  /* FIXME: Put this in an extra function and use it elsewhere.  */
-  if (stat)
-    {
-      *stat = ierr;
-      if (!errmsg)
-        return;
-    }
-
-  int len = sizeof (err_buffer);
-  MPI_Error_string (ierr, err_buffer, &len);
-  if (!stat)
-    {
-      err_buffer[len == sizeof (err_buffer) ? len-1 : len] = '\0';
-      caf_runtime_error ("CO_SUM failed with %s\n", err_buffer);
-    }
-  memcpy (errmsg, err_buffer, errmsg_len > len ? len : errmsg_len);
-  if (errmsg_len > len)
-    memset (&errmsg[len], '\0', errmsg_len - len);
-}
-
-/** The front-end function for co_reduce functionality.  It sets up the MPI_Op
- * for use in MPI_*Reduce functions. */
-void
-PREFIX (co_reduce) (gfc_descriptor_t *a, void *(*opr) (void *, void *), int opr_flags,
-		    int result_image, int *stat, char *errmsg, int a_len, int errmsg_len)
-{
-  MPI_Op op;
-  /* Integers and logicals can be treated the same. */
-  if(GFC_DESCRIPTOR_TYPE(a) == BT_INTEGER
-     || GFC_DESCRIPTOR_TYPE(a) == BT_LOGICAL)
-    {
-      /* When the ARG_VALUE opr_flag is set, then the user-function expects its
-       * arguments to be passed by value. */
-      if ((opr_flags & GFC_CAF_ARG_VALUE) > 0)
-	{
-	  int32_t_by_value = (typeof (VALUE_FUNC(int32_t)))opr;
-	  MPI_Op_create(redux_int32_by_value_adapter, 1, &op);
-	}
-      else
-	{
-	  int32_t_by_reference = (typeof (REFERENCE_FUNC(int32_t)))opr;
-	  MPI_Op_create(redux_int32_by_reference_adapter, 1, &op);
-	}
-    }
-  /* Treat reals/doubles. */
-  else if(GFC_DESCRIPTOR_TYPE(a) == BT_REAL)
-    {
-      /* When the ARG_VALUE opr_flag is set, then the user-function expects its
-       * arguments to be passed by value. */
-      if(GFC_DESCRIPTOR_SIZE(a) == sizeof(float))
-  	{
-	  if ((opr_flags & GFC_CAF_ARG_VALUE) > 0)
-	    {
-	      float_by_value = (typeof (VALUE_FUNC(float)))opr;
-	      MPI_Op_create(redux_real32_by_value_adapter, 1, &op);
-	    }
-	  else
-	    {
-	      float_by_reference = (typeof (REFERENCE_FUNC(float)))opr;
-	      MPI_Op_create(redux_real32_by_reference_adapter, 1, &op);
-	    }
-  	}
-      else
-	{
-	  /* When the ARG_VALUE opr_flag is set, then the user-function expects its
-	   * arguments to be passed by value. */
-	  if ((opr_flags & GFC_CAF_ARG_VALUE) > 0)
-	    {
-	      double_by_value = (typeof (VALUE_FUNC(double)))opr;
-	      MPI_Op_create(redux_real64_by_value_adapter, 1, &op);
-	    }
-	  else
-	    {
-	      double_by_reference = (typeof (REFERENCE_FUNC(double)))opr;
-	      MPI_Op_create(redux_real64_by_reference_adapter, 1, &op);
-	    }
-  	}
-    }
-  else if (GFC_DESCRIPTOR_TYPE(a) == BT_CHARACTER)
-    {
-      /* Char array functions always pass by reference. */
-      char_by_reference = (typeof (REFERENCE_FUNC(char)))opr;
-      MPI_Op_create(redux_char_by_reference_adapter, 1, &op);
-    }
-  else
-    {
-      caf_runtime_error ("Data type not yet supported for co_reduce\n");
-    }
-
-  internal_co_reduce (op, a, result_image, stat, errmsg, a_len, errmsg_len);
-}
-
-void
-PREFIX (co_sum) (gfc_descriptor_t *a, int result_image, int *stat, char *errmsg,
-                 int errmsg_len)
-{
-  internal_co_reduce (MPI_SUM, a, result_image, stat, errmsg, 0, errmsg_len);
-}
-
-
-void
-PREFIX (co_min) (gfc_descriptor_t *a, int result_image, int *stat, char *errmsg,
-                 int src_len, int errmsg_len)
-{
-  internal_co_reduce (MPI_MIN, a, result_image, stat, errmsg, src_len, errmsg_len);
-}
-
-
-void
-PREFIX (co_max) (gfc_descriptor_t *a, int result_image, int *stat,
-                 char *errmsg, int src_len, int errmsg_len)
-{
-  internal_co_reduce (MPI_MAX, a, result_image, stat, errmsg, src_len, errmsg_len);
-}
-
-
-/* Locking functions */
-
-void
-PREFIX (lock) (caf_token_t token, size_t index, int image_index,
-               int *acquired_lock, int *stat, char *errmsg,
-               int errmsg_len)
-{
-  int dest_img;
-  MPI_Win *p = TOKEN(token);
-
-  if(image_index == 0)
-    dest_img = caf_this_image;
-  else
-    dest_img = image_index;
-
-  mutex_lock(*p, dest_img, index, stat, acquired_lock, errmsg, errmsg_len);
-}
-
-
-void
-PREFIX (unlock) (caf_token_t token, size_t index, int image_index,
-                 int *stat, char *errmsg, int errmsg_len)
-{
-  int dest_img;
-  MPI_Win *p = TOKEN(token);
-
-  if(image_index == 0)
-    dest_img = caf_this_image;
-  else
-    dest_img = image_index;
-
-  mutex_unlock(*p, dest_img, index, stat, errmsg, errmsg_len);
-}
-
-/* Atomics operations */
-
-void
-PREFIX (atomic_define) (caf_token_t token, size_t offset,
-                        int image_index, void *value, int *stat,
-                        int type __attribute__ ((unused)), int kind)
-{
-  MPI_Win *p = TOKEN(token);
-  MPI_Datatype dt;
-  int ierr = 0;
-  int image;
-
-  if(image_index != 0)
-    image = image_index-1;
-  else
-    image = caf_this_image-1;
-
-  selectType(kind, &dt);
-
-#if MPI_VERSION >= 3
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  ierr = MPI_Accumulate (value, 1, dt, image, offset, 1, dt, MPI_REPLACE, *p);
-  CAF_Win_unlock (image, *p);
-#else // MPI_VERSION
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  ierr = MPI_Put (value, 1, dt, image, offset, 1, dt, *p);
-  CAF_Win_unlock (image, *p);
-#endif // MPI_VERSION
-
-  if (stat)
-    *stat = ierr;
-  else if (ierr != 0)
-    error_stop (ierr);
-
-  return;
-}
-
-void
-PREFIX(atomic_ref) (caf_token_t token, size_t offset,
-                    int image_index,
-                    void *value, int *stat,
-                    int type __attribute__ ((unused)), int kind)
-{
-  MPI_Win *p = TOKEN(token);
-  MPI_Datatype dt;
-  int ierr = 0;
-  int image;
-
-  if(image_index != 0)
-    image = image_index-1;
-  else
-    image = caf_this_image-1;
-
-  selectType(kind, &dt);
-
-#if MPI_VERSION >= 3
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  ierr = MPI_Fetch_and_op(NULL, value, dt, image, offset, MPI_NO_OP, *p);
-  CAF_Win_unlock (image, *p);
-#else // MPI_VERSION
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  ierr = MPI_Get (value, 1, dt, image, offset, 1, dt, *p);
-  CAF_Win_unlock (image, *p);
-#endif // MPI_VERSION
-
-  if (stat)
-    *stat = ierr;
-  else if (ierr != 0)
-    error_stop (ierr);
-
-  return;
-}
-
-
-void
-PREFIX(atomic_cas) (caf_token_t token, size_t offset,
-                    int image_index, void *old, void *compare,
-                    void *new_val, int *stat,
-                    int type __attribute__ ((unused)), int kind)
-{
-  MPI_Win *p = TOKEN(token);
-  MPI_Datatype dt;
-  int ierr = 0;
-  int image;
-
-  if(image_index != 0)
-    image = image_index-1;
-  else
-    image = caf_this_image-1;
-
-  selectType (kind, &dt);
-
-#if MPI_VERSION >= 3
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  ierr = MPI_Compare_and_swap (new_val, compare, old, dt, image,
-                               offset, *p);
-  CAF_Win_unlock (image, *p);
-#else // MPI_VERSION
-#warning atomic_cas for MPI-2 is not yet implemented
-  printf ("We apologize but atomic_cas for MPI-2 is not yet implemented\n");
-  ierr = 1;
-#endif // MPI_VERSION
-
-  if (stat)
-    *stat = ierr;
-  else if (ierr != 0)
-    error_stop (ierr);
-
-  return;
-}
-
-void
-PREFIX (atomic_op) (int op, caf_token_t token ,
-                    size_t offset, int image_index,
-                    void *value, void *old, int *stat,
-                    int type __attribute__ ((unused)),
-                    int kind)
-{
-  int ierr = 0;
-  MPI_Datatype dt;
-  MPI_Win *p = TOKEN(token);
-  int image;
-
-#if MPI_VERSION >= 3
-  old = malloc(kind);
-
-  if(image_index != 0)
-    image = image_index-1;
-  else
-    image = caf_this_image-1;
-
-  selectType (kind, &dt);
-
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  /* Atomic_add */
-  switch(op) {
-    case 1:
-      ierr = MPI_Fetch_and_op(value, old, dt, image, offset, MPI_SUM, *p);
-      break;
-    case 2:
-      ierr = MPI_Fetch_and_op(value, old, dt, image, offset, MPI_BAND, *p);
-      break;
-    case 4:
-      ierr = MPI_Fetch_and_op(value, old, dt, image, offset, MPI_BOR, *p);
-      break;
-    case 5:
-      ierr = MPI_Fetch_and_op(value, old, dt, image, offset, MPI_BXOR, *p);
-      break;
-    default:
-      printf ("We apologize but the atomic operation requested for MPI < 3 is not yet implemented\n");
-      break;
-    }
-  CAF_Win_unlock (image, *p);
-
-  free(old);
-#else // MPI_VERSION
-  #warning atomic_op for MPI is not yet implemented
-  printf ("We apologize but atomic_op for MPI < 3 is not yet implemented\n");
-#endif // MPI_VERSION
-  if (stat)
-    *stat = ierr;
-  else if (ierr != 0)
-    error_stop (ierr);
-
-  return;
-}
-
-/* Events */
-
-void
-PREFIX (event_post) (caf_token_t token, size_t index,
-		     int image_index, int *stat,
-		     char *errmsg, int errmsg_len)
-{
-  int image, value=1, ierr=0;
-  MPI_Win *p = TOKEN(token);
-  const char msg[] = "Error on event post";
-
-  if(image_index == 0)
-    image = caf_this_image-1;
-  else
-    image = image_index-1;
-
-  if(stat != NULL)
-    *stat = 0;
-
-#if MPI_VERSION >= 3
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  ierr = MPI_Accumulate (&value, 1, MPI_INT, image, index*sizeof(int), 1, MPI_INT, MPI_SUM, *p);
-  CAF_Win_unlock (image, *p);
-#else // MPI_VERSION
-  #warning Events for MPI-2 are not implemented
-  printf ("Events for MPI-2 are not supported, please update your MPI implementation\n");
-#endif // MPI_VERSION
-  if(ierr != MPI_SUCCESS)
-    {
-      if(stat != NULL)
-	*stat = ierr;
-      if(errmsg != NULL)
-	{
-	  memset(errmsg,' ',errmsg_len);
-	  memcpy(errmsg, msg, MIN(errmsg_len,strlen(msg)));
-	}
-    }
-}
-
-void
-PREFIX (event_wait) (caf_token_t token, size_t index,
-		     int until_count, int *stat,
-		     char *errmsg, int errmsg_len)
-{
-  int ierr=0,count=0,i,image=caf_this_image-1;
-  int *var=NULL,flag,old=0;
-  int newval=0;
-  const int spin_loop_max = 20000;
-  MPI_Win *p = TOKEN(token);
-  const char msg[] = "Error on event wait";
-
-  if(stat != NULL)
-    *stat = 0;
-
-  MPI_Win_get_attr(*p,MPI_WIN_BASE,&var,&flag);
-
-  for(i = 0; i < spin_loop_max; ++i)
-    {
-      MPI_Win_sync(*p);
-      count = var[index];
-      if(count >= until_count)
-	break;
-    }
-
-  i=1;
-  while(count < until_count)
-    /* for(i = 0; i < spin_loop_max; ++i) */
-      {
-	MPI_Win_sync(*p);
-	count = var[index];
-	/* if(count >= until_count) */
-	/*   break; */
-	usleep(5*i);
-	i++;
-      }
-
-  newval = -until_count;
-
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  ierr = MPI_Fetch_and_op(&newval, &old, MPI_INT, image, index*sizeof(int), MPI_SUM, *p);
-  CAF_Win_unlock (image, *p);
-  if(ierr != MPI_SUCCESS)
-    {
-      if(stat != NULL)
-	*stat = ierr;
-      if(errmsg != NULL)
-	{
-	  memset(errmsg,' ',errmsg_len);
-	  memcpy(errmsg, msg, MIN(errmsg_len,strlen(msg)));
-	}
-    }
-}
-
-void
-PREFIX (event_query) (caf_token_t token, size_t index,
-		      int image_index, int *count, int *stat)
-{
-  int image,ierr=0;
-  MPI_Win *p = TOKEN(token);
-
-  if(image_index == 0)
-    image = caf_this_image-1;
-  else
-    image = image_index-1;
-
-  if(stat != NULL)
-    *stat = 0;
-
-#if MPI_VERSION >= 3
-  CAF_Win_lock (MPI_LOCK_EXCLUSIVE, image, *p);
-  ierr = MPI_Fetch_and_op(NULL, count, MPI_INT, image, index*sizeof(int), MPI_NO_OP, *p);
-  CAF_Win_unlock (image, *p);
-#else // MPI_VERSION
-#warning Events for MPI-2 are not implemented
-  printf ("Events for MPI-2 are not supported, please update your MPI implementation\n");
-#endif // MPI_VERSION
-  if(ierr != MPI_SUCCESS && stat != NULL)
-    *stat = ierr;
-}
-
-/* ERROR STOP the other images.  */
-
-static void
-error_stop (int error)
-{
-  /* FIXME: Shutdown the Fortran RTL to flush the buffer.  PR 43849.  */
-  /* FIXME: Do some more effort than just gasnet_exit().  */
-  MPI_Abort(CAF_COMM_WORLD, error);
-
-  /* Should be unreachable, but to make sure also call exit.  */
-  exit (error);
-}
-
-/* STOP function for integer arguments.  */
-void
-PREFIX (stop_numeric) (int32_t stop_code)
-{
-  fprintf (stderr, "STOP %d\n", stop_code);
-  PREFIX (finalize) ();
-}
-
-/* STOP function for string arguments.  */
-void
-PREFIX (stop_str) (const char *string, int32_t len)
-{
-  fputs ("STOP ", stderr);
-  while (len--)
-    fputc (*(string++), stderr);
-  fputs ("\n", stderr);
-
-  PREFIX (finalize) ();
-}
-
-/* ERROR STOP function for string arguments.  */
-
-void
-PREFIX (error_stop_str) (const char *string, int32_t len)
-{
-  fputs ("ERROR STOP ", stderr);
-  while (len--)
-    fputc (*(string++), stderr);
-  fputs ("\n", stderr);
-
-  error_stop (1);
-}
-
-
-/* ERROR STOP function for numerical arguments.  */
-
-void
-PREFIX (error_stop) (int32_t error)
-{
-  fprintf (stderr, "ERROR STOP %d\n", error);
-  error_stop (error);
-}
diff --git a/src/extensions/caf.in b/src/script-templates/caf.in
similarity index 74%
rename from src/extensions/caf.in
rename to src/script-templates/caf.in
index fbe4204bc..fd53c2261 100755
--- a/src/extensions/caf.in
+++ b/src/script-templates/caf.in
@@ -7,8 +7,8 @@
 # Invokes the chosen Fortran compiler with the received command-line
 # arguments.
 #
-# Copyright (c) 2015-2020, Sourcery Institute
-# Copyright (c) 2015-2020, Sourcery, Inc.
+# Copyright (c) 2015-2022, Sourcery Institute
+# Copyright (c) 2015-2022, Sourcery, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -50,28 +50,25 @@ set -o pipefail
 #---------------------------
 # List of variables needing configuration:
 #
-# CAF_VERSION, opencoarrays_aware_compiler, Fortran_COMPILER, CAF_MODDIR,
-# CAF_MPI_Fortran_LINK_FLAGS, CAF_MPI_Fortran_COMPILE_FLAGS,
-# CAF_LIBS, CAF_MPI_LIBS
-#
+#   CAF_VERSION
+#   Fortran_COMPILER
+#   CAF_MPI_Fortran_LINK_FLAGS
+#   CAF_MPI_Fortran_COMPILE_FLAGS
+#   CAF_LIBS, CAF_MPI_LIBS
 
 caf_version='@CAF_VERSION@' # fetched from `git describe` and/or
 # `.VERSION` file
-oca_compiler="@opencoarrays_aware_compiler@" # True for GFortran > 5.0.0
 
 # Compiler used to build OpenCoarrays; runtime must match compiler used during build
 cafc="@Fortran_COMPILER@"
 if [[ "${cafc}" == @*@ ]]; then
   cafc=gfortran
 fi
-caf_mod_dir="@CAF_MODDIR@"    # location of extensions module, needed for non-OCA compilers
-mod_dir_flag="-I"
-
 
-# Ideally these should be absolute paths. Since they are array
-# variables multiple libs (absolute or not) can be specified provided
-# proper quoting is used, when @var@ is expanded. (i.e., expands with
-# double quotes around each library w/path to ensure proper word
+# Ideally these should be absolute paths. Because they are array
+# variables, multiple libs (absolute or not) can be specified provided
+# that proper quoting is used, when @var@ is expanded. (i.e., expands 
+# with double quotes around each library w/path to ensure proper word
 # splittling for paths with spaces) Handling of paths is complex
 # between CMake and pkg-config: pkg-config (new enough versions) will
 # theoretically expand paths with spaces escaped or the path
@@ -176,7 +173,7 @@ __only_compiling () {
 substitute_lib () {
   # Try to substitute a shared or static library if requested library is missing
   # Some package managers only install dynamic or static libs
-  if ! [[ -f "${1}" ]] ; then
+  if ! [[ -f "${1}" && "${1}" = *.* ]] ; then
       case "${1##*.}" in
           a|lib)
               for suff in so dylib dll ; do
@@ -206,16 +203,8 @@ substitute_lib () {
   fi
 }
 
-# Always make extensions module available, user can choose whether to `use` it or not
-caf_pre_flags=("${mod_dir_flag}${prefix%/}/${caf_mod_dir}")
+caf_pre_flags=('-fcoarray=lib')
 
-if [[ "${oca_compiler}" == true ]]; then
-  if [[ -z "${caf_pre_flags[*]:-}" ]]; then
-    caf_pre_flags=('-fcoarray=lib')
-  else
-    caf_pre_flags+=('-fcoarray=lib')
-  fi
-fi
 if [[ -n "${mpi_compile_flags[*]:-}" ]]; then
   for compileflag in "${mpi_compile_flags[@]:-}"; do
       caf_pre_flags+=("${compileflag}")
@@ -260,34 +249,10 @@ usage() {
   echo "   ${cmd} --help"
   echo "   ${cmd} -s"
   echo ""
-  echo "OpenCoarrays ${caf_version} ${cmd} supports three categories of compilers"
-  echo "with the following restrictions for each use case:"
-  echo ""
-  echo " 1. With an OpenCoarrays-Aware (OCA) compiler (GNU 5.1.0 or later),"
-  echo "   a. If any of the options listed above appear, any remaining arguments are ignored."
-  echo "   b. If present, any Fortran <source-file(s)> must have a name of the form:"
-  echo "      *.f90, *.F90, *.f, or *.F. "
-  echo ""
-  echo " 2. With non-OCA CAF compilers (Intel or Cray),"
-  echo "   a. Observe restrictions 1a-d above."
-  echo "   b. Access OpenCoarrays collective subroutines via use association with an only clause,"
-  echo "      e.g., 'use opencoarrays, only : co_sum,co_broadcast' "
-  echo ""
-  echo " 3. With non-CAF compilers (all compilers not named above),"
-  echo "   a. Observe restrictions 1a-d above."
-  echo "   b. Access OpenCoarrays capabilities via use association ('use opencoarrays')."
-  echo "   c. The only CAF statements or expressions allowed are the following:"
-  echo "      * 'num_images()' "
-  echo "      * 'this_image()' with or without arguments"
-  echo "      * 'sync all' with or without arguments."
-  echo "      * 'sync images' with or without arguments."
-  echo "      * 'error stop' without arguments."
-  echo "      * 'co_sum', 'co_broadcast', 'co_max', 'co_min', or 'co_reduce'"
-  echo ""
-  echo " The caf wrapper will append -L..., -l..., and other required flags as necessary"
-  echo " to link against OpenCoarrays, using values that get set during the OpenCoarrays"
-  echo " build and installation."
-  echo ""
+  echo "OpenCoarrays ${caf_version} ${cmd} provides a runtime library for parallel features of Fortran 2018."
+  echo "An OpenCoarrays installation includes the opencoarrays library, the caf compiler wrapper, and the cafrun."
+  echo "program launcher.  The caf wrapper invokes the compiler with the flags required to link against"
+  echo "OpenCoarrays, using values that get set during the OpenCoarrays build and installation."
 }
 
 # Print useage information if caf is invoked without arguments
@@ -299,8 +264,8 @@ fi
 if [[ ${1} == -[vV] || ${1} == '--version' ]]; then
   echo ""
   echo "OpenCoarrays Coarray Fortran Compiler Wrapper (caf version ${caf_version})"
-  echo "Copyright (C) 2015-2020 Sourcery Institute"
-  echo "Copyright (C) 2015-2020 Sourcery, Inc."
+  echo "Copyright (C) 2015-2022 Sourcery Institute"
+  echo "Copyright (C) 2015-2022 Archaeologic Inc."
   echo ""
   echo "OpenCoarrays comes with NO WARRANTY, to the extent permitted by law."
   echo "You may redistribute copies of OpenCoarrays under the terms of the"
@@ -334,21 +299,6 @@ elif [[ ${1} == '-h' || ${1} == '--help' ]]; then
   # Print usage information
   usage | ${PAGER:-less -i -F -X -M -J}
   exit 0
-elif [[ "${oca_compiler:-}" != "true" ]]; then
-  # Transform file(s) with the .f90, .F90, .f, or .F extension, if present:
-  # Loop over all arguments and perform simple search & replace source transformation on any Fortran sources
-  i=0
-  for arg in "${@}"; do
-    src_extension="${arg##*.}"
-    ((i+=1)) # Increment i to keep track of which arg we're processing
-    if [[ "${src_extension}" == [fF]90 || "${src_extension}" == [fF] ]]; then
-      # Edit & copy the source to replace CAF syntax with calls to public procedures in opencoarrays.f90:
-      sed -e 's/sync all/call sync_all/g' -e 's/error stop/call error_stop/g' \
-        -e 's/sync images/call sync_images/g' "${arg}" >"caf-${arg}"
-      # Replace the file name in command-line argment $i with the new name before invoking the compiler:
-      set -- "${@:1:$((i - 1))}" "caf-${arg}" "${@:$((i + 1)):$((${#} - i))}"
-    fi
-  done
 fi
 
 # Invoke the compiler along with all command-line arguments:
diff --git a/src/extensions/cafrun.in b/src/script-templates/cafrun.in
similarity index 100%
rename from src/extensions/cafrun.in
rename to src/script-templates/cafrun.in
diff --git a/src/script-templates/install.rsp-template b/src/script-templates/install.rsp-template
new file mode 100755
index 000000000..85f84b59a
--- /dev/null
+++ b/src/script-templates/install.rsp-template
@@ -0,0 +1,5 @@
+options install
+options --compiler @MPIFC@ 
+options --c-compiler @MPICC@ 
+options --c-flag "-DPREFIX_NAME=_gfortran_caf_ -DGCC_GE_7 -DGCC_GE_8"
+options --flag "-fcoarray=lib"
diff --git a/src/script-templates/test.rsp-template b/src/script-templates/test.rsp-template
new file mode 100755
index 000000000..75b7e3ae3
--- /dev/null
+++ b/src/script-templates/test.rsp-template
@@ -0,0 +1,5 @@
+options test
+options --compiler @CAF@
+options --c-compiler @MPICC@ 
+options --c-flag "-DPREFIX_NAME=_gfortran_caf_ -DGCC_GE_7 -DGCC_GE_8"
+options --runner "cafrun -n 4"
diff --git a/test/co_broadcast_test.f90 b/test/co_broadcast_test.f90
new file mode 100644
index 000000000..fcfbf9ec8
--- /dev/null
+++ b/test/co_broadcast_test.f90
@@ -0,0 +1,69 @@
+module co_broadcast_test
+  use garden, only : result_t, test_item_t, describe, it, assert_equals, assert_that
+
+  implicit none
+  private
+  public :: test_co_broadcast
+
+  type object_t
+    integer i
+    logical fallacy
+    character(len=len("fooey")) actor
+    complex issues
+  end type
+
+  interface operator(==)
+    module procedure equals
+  end interface
+
+contains
+
+  function test_co_broadcast() result(tests)
+    type(test_item_t) tests
+  
+    tests = describe( &
+      "The co_broadcast subroutine", &
+      [ it("broadcasts a default integer scalar with no optional arguments present", broadcast_default_integer_scalar) &
+       ,it("broadcasts a derived type scalar with no allocatable components", broadcast_derived_type) &
+    ])
+  end function
+
+  logical pure function equals(lhs, rhs) 
+    type(object_t), intent(in) :: lhs, rhs 
+    equals = all([ &
+      lhs%i == rhs%i &
+     ,lhs%fallacy .eqv. rhs%fallacy &
+     ,lhs%actor == rhs%actor &
+     ,lhs%issues == rhs%issues &
+    ])
+  end function
+
+  function broadcast_default_integer_scalar() result(result_)
+    type(result_t) result_
+    integer iPhone
+    integer, parameter :: source_value = 7779311, junk = -99
+
+    iPhone = merge(source_value, junk, this_image()==1)
+    call co_broadcast(iPhone, source_image=1)
+    result_ = assert_equals(source_value, iPhone)
+  end function
+
+  function broadcast_derived_type() result(result_)
+    type(result_t) result_
+    type(object_t) object
+
+
+    associate(me => this_image(), ni => num_images())
+
+     object = object_t(me, .false., "gooey", me*(1.,0.))
+
+      call co_broadcast(object, source_image=ni)
+
+      associate(expected_object => object_t(ni, .false., "gooey", ni*(1.,0.)))
+        result_ = assert_that(expected_object == object, "co_broadcast derived type")
+      end associate
+    end associate
+
+  end function
+
+end module co_broadcast_test
diff --git a/test/co_max_test.f90 b/test/co_max_test.f90
new file mode 100644
index 000000000..e1bcf93e1
--- /dev/null
+++ b/test/co_max_test.f90
@@ -0,0 +1,144 @@
+module co_max_test
+    use garden, only: result_t, test_item_t, assert_equals, describe, it, assert_that, assert_equals
+
+    implicit none
+    private
+    public :: test_co_max
+
+contains
+    function test_co_max() result(tests)
+        type(test_item_t) tests
+    
+        tests = describe( &
+          "The co_max subroutine computes the maximum", &
+          [ it("default integer scalar with stat argument present", max_default_integer_scalars) &
+           ,it("integer(c_int64_t) scalar with no optional arguments present", max_c_int64_scalars) &
+           ,it("default integer 1D array elements with no optional arguments present", max_default_integer_1D_array) &
+           ,it("default integer 7D array elements with stat argument present", max_default_integer_7D_array) &
+           ,it("default real scalars with stat argument present", max_default_real_scalars) &
+           ,it("double precision 2D array elements with no optional arguments present", max_double_precision_2D_array) &
+           ! _______ Character type not yet supported _________
+           !,it("reverse-alphabetizes length-5 default character scalars with no optional arguments", &
+           !    reverse_alphabetize_default_character_scalars) &
+           !,it("elements across images with 3D arrays of strings", max_elements_in_3D_string_arrays) &
+        ])
+    end function
+
+    function max_default_integer_scalars() result(result_)
+        type(result_t) result_
+        integer i, status_
+ 
+        status_ = -1
+        i = -this_image()
+        call co_max(i, stat=status_)
+        result_ = assert_equals(-1, i) .and. assert_equals(0, status_)
+    end function
+
+    function max_c_int64_scalars() result(result_)
+        use iso_c_binding, only : c_int64_t 
+        type(result_t) result_
+        integer(c_int64_t) i
+ 
+        i = this_image()
+        call co_max(i)
+        result_ = assert_equals(num_images(), int(i))
+    end function
+
+    function max_default_integer_1D_array() result(result_)
+        type(result_t) result_
+        integer i
+        integer, allocatable :: array(:)
+ 
+        associate(sequence_ => this_image()*[(i, i=1, num_images())])
+          array = sequence_
+          call co_max(array)
+          associate(max_sequence => num_images()*[(i, i=1, num_images())])
+            result_ = assert_that(all(max_sequence == array))
+          end associate
+        end associate
+    end function
+
+    function max_default_integer_7D_array() result(result_)
+        type(result_t) result_
+        integer array(2,1,1, 1,1,1, 2), status_
+ 
+        status_ = -1
+        array = 3 + this_image()
+        call co_max(array, stat=status_)
+        result_ = assert_that(all(array == 3+num_images())) .and. assert_equals(0, status_)
+    end function
+
+    function max_default_real_scalars() result(result_)
+        type(result_t) result_
+        real scalar
+        real, parameter :: pi = 3.141592654
+        integer status_
+
+        status_ = -1
+        scalar = -pi*this_image()
+        call co_max(scalar, stat=status_)
+        result_ = assert_equals(-dble(pi), dble(scalar) ) .and. assert_equals(0, status_)
+    end function
+
+    function max_double_precision_2D_array() result(result_)
+        type(result_t) result_
+        double precision, allocatable :: array(:,:)
+        double precision, parameter :: tent(*,*) = dble(reshape(-[0,1,2,3,2,1], [3,2]))
+ 
+        array = tent*dble(this_image())
+        call co_max(array)
+        result_ = assert_that(all(array==tent))
+    end function
+
+    function max_elements_in_3D_string_arrays() result(result_)
+      type(result_t) result_
+      character(len=*), parameter :: script(*) = ["To be ","or not","to    ","be.   "]
+      character(len=len(script)), dimension(2,1,2) :: scramlet, co_max_scramlet
+      integer i, cyclic_permutation(size(script))
+    
+      associate(me => this_image())
+        associate(cyclic_permutation => [(1 + mod(i-1,size(script)), i=me, me+size(script) )]) 
+          scramlet = reshape(script(cyclic_permutation), shape(scramlet))
+        end associate
+      end associate
+
+      co_max_scramlet = scramlet
+      call co_max(co_max_scramlet, result_image=1)
+
+      block 
+        integer j, delta_j
+        character(len=len(script)) expected_script(size(script)), expected_scramlet(size(scramlet,1),size(scramlet,2))
+
+        do j=1, size(script)
+          expected_script(j) = script(j)
+          do delta_j = 1, max(num_images()-1, size(script))
+            associate(periodic_index => 1 + mod(j+delta_j-1, size(script)))
+              expected_script(j) = max(expected_script(j), script(periodic_index))
+            end associate
+          end do
+        end do
+        expected_scramlet = reshape(expected_script, shape(expected_scramlet))
+
+        result_ =  assert_that(all(scramlet == co_max_scramlet),"all(scramlet == co_max_scramlet)")
+      end block
+    
+    end function
+
+    function reverse_alphabetize_default_character_scalars() result(result_)
+      type(result_t) result_
+      character(len=*), parameter :: words(*) = [character(len=len("loddy")):: "loddy","doddy","we","like","to","party"]
+      character(len=:), allocatable :: my_word
+
+      associate(me => this_image())
+        associate(periodic_index => 1 + mod(me-1,size(words)))
+          my_word = words(periodic_index)
+          call co_max(my_word)
+        end associate
+      end associate
+
+      associate(expected_word => maxval(words(1:min(num_images(), size(words)))))
+        result_ = assert_equals(expected_word, my_word)
+      end associate
+    end function
+
+end module co_max_test
diff --git a/test/co_min_test.f90 b/test/co_min_test.f90
new file mode 100644
index 000000000..4d43b8934
--- /dev/null
+++ b/test/co_min_test.f90
@@ -0,0 +1,145 @@
+module co_min_test
+    use garden, only: result_t, test_item_t, assert_equals, describe, it, assert_that, assert_equals
+
+    implicit none
+    private
+    public :: test_co_min
+
+contains
+    function test_co_min() result(tests)
+        type(test_item_t) tests
+    
+        tests = describe( &
+          "The co_min subroutine computes the minimum", &
+          [ it("default integer scalar with stat argument present", min_default_integer_scalars) &
+           ,it("integer(c_int64_t) scalar with no optional arguments present", min_c_int64_scalars) &
+           ,it("default integer 1D array elements with no optional arguments present", min_default_integer_1D_array) &
+           ,it("default integer 7D array elements with stat argument present", min_default_integer_7D_array) &
+           ,it("default real scalars with stat argument present", min_default_real_scalars) &
+           ,it("double precision 2D array elements with no optional arguments present", min_double_precision_2D_array) &
+           ! _______ Character type not yet supported _________
+           !,it("length-5 string with no optional arguments", &
+           !alphabetically_1st_scalar_string) &
+           !,it("elements across images with 2D arrays of strings", min_elements_in_2D_string_arrays) &
+        ])
+    end function
+
+    function min_default_integer_scalars() result(result_)
+        type(result_t) result_
+        integer i, status_
+ 
+        status_ = -1
+        i = -this_image()
+        call co_min(i, stat=status_)
+        result_ = assert_equals(-num_images(), i) .and. assert_equals(0, status_)
+    end function
+
+    function min_c_int64_scalars() result(result_)
+        use iso_c_binding, only : c_int64_t 
+        type(result_t) result_
+        integer(c_int64_t) i
+ 
+        i = this_image()
+        call co_min(i)
+        result_ = assert_equals(1, int(i))
+    end function
+
+    function min_default_integer_1D_array() result(result_)
+        type(result_t) result_
+        integer i
+        integer, allocatable :: array(:)
+ 
+        associate(sequence_ => this_image()*[(i, i=1, num_images())])
+          array = sequence_
+          call co_min(array)
+          associate(min_sequence => [(i, i=1, num_images())])
+            result_ = assert_that(all(min_sequence == array))
+          end associate
+        end associate
+    end function
+
+    function min_default_integer_7D_array() result(result_)
+        type(result_t) result_
+        integer array(2,1,1, 1,1,1, 2), status_
+ 
+        status_ = -1
+        array = 3 - this_image()
+        call co_min(array, stat=status_)
+        result_ = assert_that(all(array == 3 - num_images())) .and. assert_equals(0, status_)
+    end function
+
+    function min_default_real_scalars() result(result_)
+        type(result_t) result_
+        real scalar
+        real, parameter :: pi = 3.141592654
+        integer status_
+
+        status_ = -1
+        scalar = -pi*this_image()
+        call co_min(scalar, stat=status_)
+        result_ = assert_equals(-dble(pi*num_images()), dble(scalar) ) .and. assert_equals(0, status_)
+    end function
+
+    function min_double_precision_2D_array() result(result_)
+        type(result_t) result_
+        double precision, allocatable :: array(:,:)
+        double precision, parameter :: tent(*,*) = dble(reshape(-[0,1,2,3,2,1], [3,2]))
+ 
+        array = tent*dble(this_image())
+        call co_min(array)
+        result_ = assert_that(all(array==tent*num_images()))
+    end function
+
+    function min_elements_in_2D_string_arrays() result(result_)
+      type(result_t) result_
+      character(len=*), parameter :: script(*) = &
+        [character(len=len("the question.")) :: "To be ","or not"," to ","be.","  That is ","the question."]
+      character(len=len(script)), dimension(3,2) :: scramlet, co_min_scramlet
+      integer i, cyclic_permutation(size(script))
+      
+      associate(me => this_image())
+        associate(cyclic_permutation => [(1 + mod(i-1,size(script)), i=me, me+size(script) )])
+          scramlet = reshape(script(cyclic_permutation), shape(scramlet))
+        end associate
+      end associate
+
+      co_min_scramlet = scramlet
+      call co_min(co_min_scramlet, result_image=1)
+
+      block 
+        integer j, delta_j
+        character(len=len(script)) expected_script(size(script)), expected_scramlet(size(scramlet,1),size(scramlet,2))
+
+        do j=1, size(script)
+          expected_script(j) = script(j)
+          do delta_j = 1, min(num_images()-1, size(script))
+            associate(periodic_index => 1 + mod(j+delta_j-1, size(script)))
+              expected_script(j) = min(expected_script(j), script(periodic_index))
+            end associate
+          end do
+        end do
+        expected_scramlet = reshape(expected_script, shape(scramlet))
+
+        result_ =  assert_that(all(scramlet == co_min_scramlet),"all(scramlet == co_min_scramlet)")
+      end block
+      
+    end function
+
+    function alphabetically_1st_scalar_string() result(result_)
+      type(result_t) result_
+      character(len=*), parameter :: words(*) = [character(len=len("to party!")):: "Loddy","doddy","we","like","to party!"]
+      character(len=:), allocatable :: my_word
+
+      associate(me => this_image())
+        associate(periodic_index => 1 + mod(me-1,size(words)))
+          my_word = words(periodic_index)
+          call co_min(my_word)
+        end associate
+      end associate
+
+      associate(expected_word => minval(words(1:min(num_images(), size(words)))))
+        result_ = assert_equals(expected_word, my_word)
+      end associate
+    end function
+
+end module co_min_test
diff --git a/test/co_reduce_test.f90 b/test/co_reduce_test.f90
new file mode 100644
index 000000000..39c532497
--- /dev/null
+++ b/test/co_reduce_test.f90
@@ -0,0 +1,235 @@
+module co_reduce_test
+  use garden, only : result_t, test_item_t, assert_equals, describe, it, assert_that, assert_equals
+  use assert_m, only : assert
+  use iso_c_binding, only : c_bool, c_char, c_double, c_int64_t
+
+  implicit none
+  private
+  public :: test_co_reduce
+
+contains
+
+  function test_co_reduce() result(tests)
+    type(test_item_t) tests
+  
+    tests = describe( &
+      "The co_reduce subroutine", &
+      [ it("sums default integer scalars with no optional arguments present", sum_default_integer_scalars) & 
+       ,it("sums integer(c_int64_t) scalars with no optional arguments present", sum_c_int64_t_scalars) &
+       ,it("multiplies default real scalars with all optional arguments present", multiply_default_real_scalars) &
+       ,it("multiplies real(c_double) scalars with all optional arguments present", multiply_c_double_scalars) &
+       ,it("performs a collective .and. operation across logical scalars", reports_on_consensus) &
+       ,it("sums default integer elements of a 2D array across images", sum_integer_array_elements) &
+      ! _______ Complex type not yet supported _________
+      !,it("sums default complex scalars with a stat-variable present", sum_default_complex_scalars) &
+      !,it("sums complex(c_double) scalars with a stat-variable present", sum_complex_c_double_scalars) &
+      ! _______ Character type not yet supported _________
+      !,it("finds the alphabetically first length-5 string with result_image present", alphabetically_1st_size1_string_array) & 
+    ])
+  end function
+
+  function alphabetically_1st_size1_string_array() result(result_)
+    type(result_t) result_
+    character(len=*, kind=c_char), parameter :: names(*) = ["larry","harry","carey","betty","tommy","billy"]
+    character(len=:, kind=c_char), allocatable :: my_name(:)
+
+    associate(me => this_image())
+      associate(periodic_index => 1 + mod(me-1,size(names)))
+        my_name = [names(periodic_index)]
+        call co_reduce(my_name, alphabetize)
+      end associate
+    end associate
+
+    associate(expected_name => minval(names(1:min(num_images(), size(names)))))
+      result_ = assert_that(all(expected_name == my_name))
+    end associate
+
+  contains
+
+    pure function alphabetize(lhs, rhs) result(first_alphabetically)
+      character(len=*), intent(in) :: lhs, rhs
+      character(len=len(lhs)) first_alphabetically
+      call assert(len(lhs)==len(rhs), "co_reduce_s alphabetize: LHS/RHS length match", lhs//" , "//rhs)
+      first_alphabetically = min(lhs,rhs)
+    end function
+
+  end function
+
+  function sum_integer_array_elements() result(result_)
+    type(result_t) result_
+    integer status_
+    integer, parameter :: input_array(*,*) = reshape([1, 2, 3, 4], [2, 2])
+    integer array(2,2)
+
+    array = input_array
+    call co_reduce(array, add)
+    result_ = assert_that(all(num_images()*input_array==array))
+
+  contains
+
+    pure function add(lhs, rhs) result(total)
+      integer, intent(in) :: lhs, rhs
+      integer total
+      total = lhs + rhs 
+    end function
+
+  end function
+
+  function sum_complex_c_double_scalars() result(result_)
+    type(result_t) result_
+    integer status_
+    complex(c_double) z
+    complex(c_double), parameter :: z_input=(1._c_double, 1._c_double)
+
+    z = z_input
+    call co_reduce(z, add_complex, stat=status_)
+    result_ = assert_equals(real(num_images()*z_input, c_double), real(z, c_double)) .and. assert_equals(0, status_)
+
+  contains
+
+    pure function add_complex(lhs, rhs) result(total)
+      complex(c_double), intent(in) :: lhs, rhs
+      complex(c_double) total
+      total = lhs + rhs 
+    end function
+
+  end function
+
+  function sum_default_complex_scalars() result(result_)
+    type(result_t) result_
+    integer status_
+    complex z
+    complex, parameter :: z_input=(1.,1.)
+
+    z = z_input
+    call co_reduce(z, add_complex, stat=status_)
+    result_ = assert_equals(dble(num_images()*z_input), dble(z)) .and. assert_equals(0, status_)
+
+  contains
+
+    pure function add_complex(lhs, rhs) result(total)
+      complex, intent(in) :: lhs, rhs
+      complex total
+      total = lhs + rhs 
+    end function
+
+  end function
+
+  function sum_default_integer_scalars() result(result_)
+    type(result_t) result_
+    integer i
+
+    i = 1
+    call co_reduce(i, add)
+    result_ = assert_equals(num_images(), i)
+
+  contains
+
+    pure function add(lhs, rhs) result(total)
+      integer, intent(in) :: lhs, rhs
+      integer total
+      total = lhs + rhs 
+    end function
+
+  end function
+
+  function sum_c_int64_t_scalars() result(result_)
+    type(result_t) result_
+    integer(c_int64_t) i
+
+    i = 1_c_int64_t
+    call co_reduce(i, add_integers)
+    result_ = assert_that(int(num_images(), c_int64_t)==i)
+
+  contains
+
+    pure function add_integers(lhs, rhs) result(total)
+      integer(c_int64_t), intent(in) :: lhs, rhs
+      integer(c_int64_t) total
+      total = lhs + rhs 
+    end function
+
+  end function
+
+  function reports_on_consensus() result(result_)
+    type(result_t) result_
+    logical(c_bool) one_false, one_true, all_true
+
+    one_false = merge(.false., .true., this_image()==1)
+    call co_reduce(one_false, and)
+
+    one_true = merge(.true., .false., this_image()==1)
+    call co_reduce(one_true, and)
+ 
+    all_true = .true.
+    call co_reduce(all_true, and)
+
+    result_ = assert_that(one_false .eqv. .false.) .and. &
+              assert_that(one_true .eqv. merge(.true.,.false.,num_images()==1)) .and. &
+              assert_that(all_true .eqv. .true.)
+  contains
+
+    pure function and(lhs, rhs) result(lhs_and_rhs)
+      logical(c_bool), intent(in) :: lhs, rhs
+      logical(c_bool) lhs_and_rhs
+      lhs_and_rhs = lhs .and. rhs 
+    end function
+
+  end function
+
+  function multiply_c_double_scalars() result(result_)
+    type(result_t) result_
+    real(c_double) p
+    integer j, status_
+    character(len=:), allocatable :: error_message
+
+    error_message = "unused"
+    associate(me => this_image())
+      p = real(me,c_double)
+      call co_reduce(p, multiply_doubles, result_image=1, stat=status_, errmsg=error_message)
+      associate(expected_result => merge( product([(real(j,c_double), j = 1, num_images())]), real(me,c_double), me==1 ))
+        result_ = &
+          assert_equals(expected_result, real(p,c_double)) .and. &
+          assert_equals(0, status_) .and. &
+          assert_equals("unused", error_message)
+      end associate
+    end associate
+
+  contains
+
+    pure function multiply_doubles(lhs, rhs) result(product_)
+      real(c_double), intent(in) :: lhs, rhs
+      real(c_double) product_
+      product_ = lhs * rhs 
+    end function
+
+  end function
+
+  function multiply_default_real_scalars() result(result_)
+    type(result_t) result_
+    real p
+    integer j, status_
+    character(len=:), allocatable :: error_message
+
+    error_message = "unused"
+    associate(me => this_image())
+      p = real(me)
+      call co_reduce(p, multiply, result_image=1, stat=status_, errmsg=error_message)
+      associate(expected_result => merge( product([(dble(j), j = 1, num_images())]), dble(me), me==1 ))
+        result_ = &
+          assert_equals(expected_result, dble(p)) .and. &
+          assert_equals(0, status_) .and. &
+          assert_equals("unused", error_message)
+      end associate
+    end associate
+
+  contains
+
+    pure function multiply(lhs, rhs) result(product_)
+      real, intent(in) :: lhs, rhs
+      real product_
+      product_ = lhs * rhs 
+    end function
+
+  end function
+end module co_reduce_test
diff --git a/test/co_sum_test.f90 b/test/co_sum_test.f90
new file mode 100644
index 000000000..fad16dff9
--- /dev/null
+++ b/test/co_sum_test.f90
@@ -0,0 +1,138 @@
+module co_sum_test
+    use garden, only: result_t, test_item_t, assert_equals, describe, it, assert_that, assert_equals
+
+    implicit none
+    private
+    public :: test_co_sum
+
+contains
+    function test_co_sum() result(tests)
+        type(test_item_t) tests
+    
+        tests = describe( &
+          "The co_sum subroutine", &
+          [ it("sums default integer scalars with no optional arguments present", sum_default_integer_scalars) &
+           ,it("sums default integer scalars with all arguments present", sum_integers_all_arguments) &
+           ,it("sums integer(c_int64_t) scalars with stat argument present", sum_c_int64_scalars) &
+           ,it("sums default integer 1D arrays with no optional arguments present", sum_default_integer_1D_array) &
+           ,it("sums default integer 15D arrays with stat argument present", sum_default_integer_15D_array) &
+           ,it("sums default real scalars with result_image argument present", sum_default_real_scalars) &
+           ,it("sums double precision 2D arrays with no optional arguments present", sum_double_precision_2D_array) &
+           ,it("sums default complex scalars with stat argument present", sum_default_complex_scalars) &
+           ,it("sums double precision 1D complex arrays with no optional arguments present", sum_dble_complex_1D_arrays) &
+        ])
+    end function
+
+    function sum_default_integer_scalars() result(result_)
+        type(result_t) result_
+        integer i
+ 
+        i = 1
+        call co_sum(i)
+        result_ = assert_equals(num_images(), i)
+    end function
+
+    function sum_integers_all_arguments() result(result_)
+        type(result_t) result_
+        integer i, status_, result_image_
+        character(len=*), parameter :: whitespace = repeat(" ", ncopies=29)
+        character(len=:), allocatable :: error_message
+
+        i = 1
+        result_image_ = 1
+        status_ = -1
+        error_message = whitespace
+
+        associate(expected_i => merge(num_images()*i, i, this_image()==result_image_))
+          call co_sum(i, result_image_, status_, error_message)
+          result_ = assert_equals(expected_i, i) .and. assert_equals(0, status_) .and. assert_equals(whitespace, error_message)
+        end associate
+    end function
+
+    function sum_c_int64_scalars() result(result_)
+        use iso_c_binding, only : c_int64_t 
+        type(result_t) result_
+        integer(c_int64_t) i
+        integer i_default_kind, status_
+
+        status_ = -1
+        i = 2_c_int64_t
+        call co_sum(i, stat=status_)
+        i_default_kind = i
+        result_ = assert_equals(2*num_images(), int(i)) .and. assert_equals(0, status_)
+    end function
+
+    function sum_default_integer_1D_array() result(result_)
+        type(result_t) result_
+        integer i
+        integer, allocatable :: array(:)
+ 
+        associate(images => num_images())
+          associate(sequence_ => [(i,i=1,images)])
+            array = sequence_
+            call co_sum(array)
+            result_ = assert_that(all(array==images*sequence_))
+          end associate
+        end associate
+    end function
+
+    function sum_default_integer_15D_array() result(result_)
+        type(result_t) result_
+        integer array(2,1,1, 1,1,1, 1,1,1, 1,1,1, 1,2,1)
+        integer status_
+ 
+        status_ = -1
+        array = 3
+        call co_sum(array, stat=status_)
+        result_ = assert_that(all(3*num_images() == array)) .and.  assert_equals(0, status_)
+    end function
+
+    function sum_default_real_scalars() result(result_)
+        type(result_t) result_
+        real scalar
+        real, parameter :: e = 2.7182818459045
+        integer result_image_
+
+        result_image_ = 1
+        scalar = e
+        call co_sum(scalar, result_image=result_image_)
+        associate(expected_result => merge(num_images()*e, e, this_image()==result_image_))
+          result_ = assert_equals(dble(expected_result), dble(scalar))
+        end associate
+    end function
+
+    function sum_double_precision_2D_array() result(result_)
+        type(result_t) result_
+        double precision, allocatable :: array(:,:)
+        double precision, parameter :: input(*,*) = reshape(-[6,5,4,3,2,1], [3,2])
+ 
+        array = input
+        call co_sum(array)
+        result_ = assert_equals(product(num_images()*input), product(array))
+    end function
+
+    function sum_default_complex_scalars() result(result_)
+        type(result_t) result_
+        real scalar
+        complex z
+        complex, parameter :: i=(0.,1.)
+        integer status_
+
+        status_ = -1
+        z = i
+        call co_sum(z, stat=status_)
+        result_ = assert_equals(dble(abs(i*num_images())), dble(abs(z)) ) .and. assert_equals(0, status_)
+    end function
+             
+    function sum_dble_complex_1D_arrays() result(result_)
+        type(result_t) result_
+        integer, parameter :: dp = kind(1.D0)
+        complex(dp), allocatable :: array(:)
+        complex(dp), parameter :: input(*) = [(1.D0,1.0D0)]
+ 
+        array = [(1.D0,1.D0)]
+        call co_sum(array)
+        result_ = assert_that(all([input*num_images()] == array))
+    end function
+
+end module co_sum_test
diff --git a/test/error_stop_test.f90 b/test/error_stop_test.f90
new file mode 100644
index 000000000..595948793
--- /dev/null
+++ b/test/error_stop_test.f90
@@ -0,0 +1,45 @@
+module error_stop_test
+    use garden, only: test_item_t, describe, result_t, it, assert_that
+
+    implicit none
+    private
+    public :: test_this_image
+
+contains
+    function test_this_image() result(tests)
+        type(test_item_t) :: tests
+
+        tests = describe( &
+                "A program that executes the error_stop function", &
+                [ it("exits with a non-zero exitstat when stop code is an integer", check_integer_stop_code) &
+                 ,it("exits with a non-zero exitstat when stop code is an character", check_character_stop_code) &
+                ])
+    end function
+
+    function check_integer_stop_code() result(result_)
+        type(result_t) :: result_
+        integer exit_status
+
+        call execute_command_line( &
+          command = "fpm run --example error_stop_integer_code --compiler caf --runner 'cafrun -n 2' > /dev/null 2>&1", &
+          wait = .true., &
+          exitstat = exit_status &
+        )   
+        result_ = assert_that(exit_status /= 0)
+
+    end function
+
+    function check_character_stop_code() result(result_)
+        type(result_t) :: result_
+        integer exit_status
+
+        call execute_command_line( &
+          command = "fpm run --example error_stop_character_code --compiler caf --runner 'cafrun -n 2' > /dev/null 2>&1", &
+          wait = .true., &
+          exitstat = exit_status &
+        )   
+        result_ = assert_that(exit_status /= 0)
+
+    end function
+
+end module error_stop_test
diff --git a/test/main.f90 b/test/main.f90
new file mode 100644
index 000000000..cb8c71938
--- /dev/null
+++ b/test/main.f90
@@ -0,0 +1,55 @@
+! Generated by cart. DO NOT EDIT
+program main
+    implicit none
+
+    if (.not.run()) stop 1
+contains
+    function run() result(passed)
+        use co_broadcast_test, only: &
+                co_broadcast_co_broadcast => &
+                    test_co_broadcast
+        use co_max_test, only: &
+                co_max_co_max => &
+                    test_co_max
+        use co_min_test, only: &
+                co_min_co_min => &
+                    test_co_min
+        use co_reduce_test, only: &
+                co_reduce_co_reduce => &
+                    test_co_reduce
+        use co_sum_test, only: &
+                co_sum_co_sum => &
+                    test_co_sum
+        use error_stop_test, only: &
+                error_stop_this_image => &
+                    test_this_image
+        use num_images_test, only: &
+                num_images_num_images => &
+                    test_num_images
+        use this_image_test, only: &
+                this_image_this_image => &
+                    test_this_image
+        use garden , only: test_item_t, test_that, run_tests
+
+
+
+        logical :: passed
+
+        type(test_item_t) :: tests
+        type(test_item_t) :: individual_tests(8)
+
+        individual_tests(1) = co_broadcast_co_broadcast()
+        individual_tests(2) = co_max_co_max()
+        individual_tests(3) = co_min_co_min()
+        individual_tests(4) = co_reduce_co_reduce()
+        individual_tests(5) = co_sum_co_sum()
+        individual_tests(6) = error_stop_this_image()
+        individual_tests(7) = num_images_num_images()
+        individual_tests(8) = this_image_this_image()
+        tests = test_that(individual_tests)
+
+
+        passed = run_tests(tests)
+
+    end function
+end program
diff --git a/test/num_images_test.f90 b/test/num_images_test.f90
new file mode 100644
index 000000000..23e16ac64
--- /dev/null
+++ b/test/num_images_test.f90
@@ -0,0 +1,24 @@
+module num_images_test
+  use garden, only: result_t, test_item_t, assert_that, describe, it
+
+  implicit none
+  private
+  public :: test_num_images
+
+contains
+  function test_num_images() result(tests)
+    type(test_item_t) :: tests
+
+    tests = &
+      describe( &
+        "The num_images function result", &
+        [ it("is a valid number of images when invoked with no arguments", check_num_images_valid) &
+      ])
+  end function
+
+  function check_num_images_valid() result(result_)
+    type(result_t) :: result_
+    result_ = assert_that(num_images()>0, "positive number of images")
+  end function
+
+end module num_images_test
diff --git a/test/this_image_test.f90 b/test/this_image_test.f90
new file mode 100644
index 000000000..4a70c24de
--- /dev/null
+++ b/test/this_image_test.f90
@@ -0,0 +1,32 @@
+module this_image_test
+    use garden, only: result_t, test_item_t, assert_that, describe, it
+
+    implicit none
+    private
+    public :: test_this_image
+
+contains
+    function test_this_image() result(tests)
+        type(test_item_t) :: tests
+    
+        integer, parameter :: initiation_success = 0
+
+        tests = describe( &
+          "The this_image function result", &
+          [ it("is the proper member of the set {1,2,...,num_images()} when invoked as this_image()", check_this_image_set) &
+        ])
+    end function
+
+    function check_this_image_set() result(result_)
+        type(result_t) :: result_
+        integer, allocatable :: image_numbers(:)
+        integer i
+ 
+        associate(me => this_image(), ni => num_images())
+          image_numbers = [(merge(0, me, me/=i), i = 1, ni)]
+          call co_sum(image_numbers)
+          result_ = assert_that(all(image_numbers == [(i, i = 1, ni)]) .and. size(image_numbers)>0, "correct image set")
+        end associate
+    end function
+
+end module this_image_test
diff --git a/src/tests/CMakeLists.txt b/tests/CMakeLists.txt
similarity index 100%
rename from src/tests/CMakeLists.txt
rename to tests/CMakeLists.txt
diff --git a/src/tests/UH_CAF_perf_validation_suite_v1.0.1.txt b/tests/UH_CAF_perf_validation_suite_v1.0.1.txt
similarity index 100%
rename from src/tests/UH_CAF_perf_validation_suite_v1.0.1.txt
rename to tests/UH_CAF_perf_validation_suite_v1.0.1.txt
diff --git a/src/tests/installation/CMakeLists.txt b/tests/installation/CMakeLists.txt
similarity index 100%
rename from src/tests/installation/CMakeLists.txt
rename to tests/installation/CMakeLists.txt
diff --git a/src/tests/installation/installation-scripts.sh b/tests/installation/installation-scripts.sh
similarity index 100%
rename from src/tests/installation/installation-scripts.sh
rename to tests/installation/installation-scripts.sh
diff --git a/src/tests/installation/installation-scripts.sh-usage b/tests/installation/installation-scripts.sh-usage
similarity index 100%
rename from src/tests/installation/installation-scripts.sh-usage
rename to tests/installation/installation-scripts.sh-usage
diff --git a/src/tests/installation/test-stack.sh b/tests/installation/test-stack.sh
similarity index 100%
rename from src/tests/installation/test-stack.sh
rename to tests/installation/test-stack.sh
diff --git a/src/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/CMakeLists.txt
rename to tests/integration/CMakeLists.txt
diff --git a/src/tests/integration/coarrayHelloWorld/CMakeLists.txt b/tests/integration/coarrayHelloWorld/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/coarrayHelloWorld/CMakeLists.txt
rename to tests/integration/coarrayHelloWorld/CMakeLists.txt
diff --git a/src/tests/integration/coarrayHelloWorld/Makefile b/tests/integration/coarrayHelloWorld/Makefile
similarity index 100%
rename from src/tests/integration/coarrayHelloWorld/Makefile
rename to tests/integration/coarrayHelloWorld/Makefile
diff --git a/src/tests/integration/coarrayHelloWorld/hello_multiverse.F90 b/tests/integration/coarrayHelloWorld/hello_multiverse.F90
similarity index 100%
rename from src/tests/integration/coarrayHelloWorld/hello_multiverse.F90
rename to tests/integration/coarrayHelloWorld/hello_multiverse.F90
diff --git a/src/tests/integration/dist_transpose/CMakeLists.txt b/tests/integration/dist_transpose/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/dist_transpose/CMakeLists.txt
rename to tests/integration/dist_transpose/CMakeLists.txt
diff --git a/src/tests/integration/dist_transpose/Makefile_NS_GASNET b/tests/integration/dist_transpose/Makefile_NS_GASNET
similarity index 100%
rename from src/tests/integration/dist_transpose/Makefile_NS_GASNET
rename to tests/integration/dist_transpose/Makefile_NS_GASNET
diff --git a/src/tests/integration/dist_transpose/coarray_distributed_transpose.F90 b/tests/integration/dist_transpose/coarray_distributed_transpose.F90
similarity index 100%
rename from src/tests/integration/dist_transpose/coarray_distributed_transpose.F90
rename to tests/integration/dist_transpose/coarray_distributed_transpose.F90
diff --git a/src/tests/integration/dist_transpose/walltime.o b/tests/integration/dist_transpose/walltime.o
similarity index 100%
rename from src/tests/integration/dist_transpose/walltime.o
rename to tests/integration/dist_transpose/walltime.o
diff --git a/src/tests/integration/dist_transpose/walltime.x64 b/tests/integration/dist_transpose/walltime.x64
similarity index 100%
rename from src/tests/integration/dist_transpose/walltime.x64
rename to tests/integration/dist_transpose/walltime.x64
diff --git a/src/tests/integration/events/CMakeLists.txt b/tests/integration/events/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/events/CMakeLists.txt
rename to tests/integration/events/CMakeLists.txt
diff --git a/src/tests/integration/events/async-hello.F90 b/tests/integration/events/async-hello.F90
similarity index 100%
rename from src/tests/integration/events/async-hello.F90
rename to tests/integration/events/async-hello.F90
diff --git a/src/tests/integration/pde_solvers/CMakeLists.txt b/tests/integration/pde_solvers/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/CMakeLists.txt
rename to tests/integration/pde_solvers/CMakeLists.txt
diff --git a/src/tests/integration/pde_solvers/README.md b/tests/integration/pde_solvers/README.md
similarity index 100%
rename from src/tests/integration/pde_solvers/README.md
rename to tests/integration/pde_solvers/README.md
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/CMakeLists.txt b/tests/integration/pde_solvers/coarrayBurgers/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/CMakeLists.txt
rename to tests/integration/pde_solvers/coarrayBurgers/CMakeLists.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/Makefile b/tests/integration/pde_solvers/coarrayBurgers/Makefile
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/Makefile
rename to tests/integration/pde_solvers/coarrayBurgers/Makefile
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/Makefile.inst b/tests/integration/pde_solvers/coarrayBurgers/Makefile.inst
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/Makefile.inst
rename to tests/integration/pde_solvers/coarrayBurgers/Makefile.inst
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/global_field.F90 b/tests/integration/pde_solvers/coarrayBurgers/global_field.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/global_field.F90
rename to tests/integration/pde_solvers/coarrayBurgers/global_field.F90
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/cray_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/cray_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/cray_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/cray_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/gfortran4.8_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/gfortran4.8_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/gfortran4.8_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/gfortran4.8_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/gfortran_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/gfortran_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/gfortran_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/gfortran_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/ibm_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/ibm_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/ibm_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/ibm_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/intel_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/intel_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/intel_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/intel_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/nag_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/nag_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/nag_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/nag_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/portlandgroup_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/portlandgroup_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/portlandgroup_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/portlandgroup_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/tau_cray_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/tau_cray_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/tau_cray_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/tau_cray_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/include-files/tau_intel_capabilities.txt b/tests/integration/pde_solvers/coarrayBurgers/include-files/tau_intel_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/include-files/tau_intel_capabilities.txt
rename to tests/integration/pde_solvers/coarrayBurgers/include-files/tau_intel_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/library/ForTrilinos_assertion_utility.F90 b/tests/integration/pde_solvers/coarrayBurgers/library/ForTrilinos_assertion_utility.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/library/ForTrilinos_assertion_utility.F90
rename to tests/integration/pde_solvers/coarrayBurgers/library/ForTrilinos_assertion_utility.F90
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/library/ForTrilinos_error.F90 b/tests/integration/pde_solvers/coarrayBurgers/library/ForTrilinos_error.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/library/ForTrilinos_error.F90
rename to tests/integration/pde_solvers/coarrayBurgers/library/ForTrilinos_error.F90
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/library/co_object_interface.F90 b/tests/integration/pde_solvers/coarrayBurgers/library/co_object_interface.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/library/co_object_interface.F90
rename to tests/integration/pde_solvers/coarrayBurgers/library/co_object_interface.F90
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/library/object_interface.F90 b/tests/integration/pde_solvers/coarrayBurgers/library/object_interface.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/library/object_interface.F90
rename to tests/integration/pde_solvers/coarrayBurgers/library/object_interface.F90
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/local_field.F90 b/tests/integration/pde_solvers/coarrayBurgers/local_field.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/local_field.F90
rename to tests/integration/pde_solvers/coarrayBurgers/local_field.F90
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/main.F90 b/tests/integration/pde_solvers/coarrayBurgers/main.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/main.F90
rename to tests/integration/pde_solvers/coarrayBurgers/main.F90
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/run.sh b/tests/integration/pde_solvers/coarrayBurgers/run.sh
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/run.sh
rename to tests/integration/pde_solvers/coarrayBurgers/run.sh
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce.pbs b/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce.pbs
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce.pbs
rename to tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce.pbs
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce_multiple.pbs b/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce_multiple.pbs
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce_multiple.pbs
rename to tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce_multiple.pbs
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce_tau.pbs b/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce_tau.pbs
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce_tau.pbs
rename to tests/integration/pde_solvers/coarrayBurgers/scripts/coarrayBurgers_cce_tau.pbs
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh b/tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh
rename to tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh.with_modules b/tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh.with_modules
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh.with_modules
rename to tests/integration/pde_solvers/coarrayBurgers/scripts/run.sh.with_modules
diff --git a/src/tests/integration/pde_solvers/coarrayBurgers/scripts/run_troubleshooting.sh b/tests/integration/pde_solvers/coarrayBurgers/scripts/run_troubleshooting.sh
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayBurgers/scripts/run_troubleshooting.sh
rename to tests/integration/pde_solvers/coarrayBurgers/scripts/run_troubleshooting.sh
diff --git a/src/tests/integration/pde_solvers/coarrayHeatSimplified/CMakeLists.txt b/tests/integration/pde_solvers/coarrayHeatSimplified/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayHeatSimplified/CMakeLists.txt
rename to tests/integration/pde_solvers/coarrayHeatSimplified/CMakeLists.txt
diff --git a/src/tests/integration/pde_solvers/coarrayHeatSimplified/Makefile b/tests/integration/pde_solvers/coarrayHeatSimplified/Makefile
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayHeatSimplified/Makefile
rename to tests/integration/pde_solvers/coarrayHeatSimplified/Makefile
diff --git a/src/tests/integration/pde_solvers/coarrayHeatSimplified/global_field.f90 b/tests/integration/pde_solvers/coarrayHeatSimplified/global_field.f90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayHeatSimplified/global_field.f90
rename to tests/integration/pde_solvers/coarrayHeatSimplified/global_field.f90
diff --git a/src/tests/integration/pde_solvers/coarrayHeatSimplified/local_field.f90 b/tests/integration/pde_solvers/coarrayHeatSimplified/local_field.f90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayHeatSimplified/local_field.f90
rename to tests/integration/pde_solvers/coarrayHeatSimplified/local_field.f90
diff --git a/src/tests/integration/pde_solvers/coarrayHeatSimplified/main.f90 b/tests/integration/pde_solvers/coarrayHeatSimplified/main.f90
similarity index 100%
rename from src/tests/integration/pde_solvers/coarrayHeatSimplified/main.f90
rename to tests/integration/pde_solvers/coarrayHeatSimplified/main.f90
diff --git a/src/tests/integration/pde_solvers/include-files/cray_capabilities.txt b/tests/integration/pde_solvers/include-files/cray_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/include-files/cray_capabilities.txt
rename to tests/integration/pde_solvers/include-files/cray_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/include-files/gfortran_capabilities.txt b/tests/integration/pde_solvers/include-files/gfortran_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/include-files/gfortran_capabilities.txt
rename to tests/integration/pde_solvers/include-files/gfortran_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/include-files/ibm_capabilities.txt b/tests/integration/pde_solvers/include-files/ibm_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/include-files/ibm_capabilities.txt
rename to tests/integration/pde_solvers/include-files/ibm_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/include-files/intel_capabilities.txt b/tests/integration/pde_solvers/include-files/intel_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/include-files/intel_capabilities.txt
rename to tests/integration/pde_solvers/include-files/intel_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/include-files/nag_capabilities.txt b/tests/integration/pde_solvers/include-files/nag_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/include-files/nag_capabilities.txt
rename to tests/integration/pde_solvers/include-files/nag_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/include-files/portlandgroup_capabilities.txt b/tests/integration/pde_solvers/include-files/portlandgroup_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/include-files/portlandgroup_capabilities.txt
rename to tests/integration/pde_solvers/include-files/portlandgroup_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/include-files/tau_cray_capabilities.txt b/tests/integration/pde_solvers/include-files/tau_cray_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/include-files/tau_cray_capabilities.txt
rename to tests/integration/pde_solvers/include-files/tau_cray_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/include-files/tau_intel_capabilities.txt b/tests/integration/pde_solvers/include-files/tau_intel_capabilities.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/include-files/tau_intel_capabilities.txt
rename to tests/integration/pde_solvers/include-files/tau_intel_capabilities.txt
diff --git a/src/tests/integration/pde_solvers/library/CMakeLists.txt b/tests/integration/pde_solvers/library/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/library/CMakeLists.txt
rename to tests/integration/pde_solvers/library/CMakeLists.txt
diff --git a/src/tests/integration/pde_solvers/library/ForTrilinos_assertion_utility.F90 b/tests/integration/pde_solvers/library/ForTrilinos_assertion_utility.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/library/ForTrilinos_assertion_utility.F90
rename to tests/integration/pde_solvers/library/ForTrilinos_assertion_utility.F90
diff --git a/src/tests/integration/pde_solvers/library/ForTrilinos_error.F90 b/tests/integration/pde_solvers/library/ForTrilinos_error.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/library/ForTrilinos_error.F90
rename to tests/integration/pde_solvers/library/ForTrilinos_error.F90
diff --git a/src/tests/integration/pde_solvers/library/co_object_interface.F90 b/tests/integration/pde_solvers/library/co_object_interface.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/library/co_object_interface.F90
rename to tests/integration/pde_solvers/library/co_object_interface.F90
diff --git a/src/tests/integration/pde_solvers/library/object_interface.F90 b/tests/integration/pde_solvers/library/object_interface.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/library/object_interface.F90
rename to tests/integration/pde_solvers/library/object_interface.F90
diff --git a/src/tests/integration/pde_solvers/library/parse_command_line.f90 b/tests/integration/pde_solvers/library/parse_command_line.f90
similarity index 100%
rename from src/tests/integration/pde_solvers/library/parse_command_line.f90
rename to tests/integration/pde_solvers/library/parse_command_line.f90
diff --git a/src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt b/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
rename to tests/integration/pde_solvers/navier-stokes/CMakeLists.txt
diff --git a/src/tests/integration/pde_solvers/navier-stokes/Makefile b/tests/integration/pde_solvers/navier-stokes/Makefile
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/Makefile
rename to tests/integration/pde_solvers/navier-stokes/Makefile
diff --git a/src/tests/integration/pde_solvers/navier-stokes/Makefile_NS_GASNET b/tests/integration/pde_solvers/navier-stokes/Makefile_NS_GASNET
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/Makefile_NS_GASNET
rename to tests/integration/pde_solvers/navier-stokes/Makefile_NS_GASNET
diff --git a/src/tests/integration/pde_solvers/navier-stokes/coarray-shear.f90 b/tests/integration/pde_solvers/navier-stokes/coarray-shear.f90
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/coarray-shear.f90
rename to tests/integration/pde_solvers/navier-stokes/coarray-shear.f90
diff --git a/src/tests/integration/pde_solvers/navier-stokes/coarray-shear_coll.F90 b/tests/integration/pde_solvers/navier-stokes/coarray-shear_coll.F90
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/coarray-shear_coll.F90
rename to tests/integration/pde_solvers/navier-stokes/coarray-shear_coll.F90
diff --git a/src/tests/integration/pde_solvers/navier-stokes/coarray-shear_coll_lock.f90 b/tests/integration/pde_solvers/navier-stokes/coarray-shear_coll_lock.f90
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/coarray-shear_coll_lock.f90
rename to tests/integration/pde_solvers/navier-stokes/coarray-shear_coll_lock.f90
diff --git a/src/tests/integration/pde_solvers/navier-stokes/libfft_avx.a b/tests/integration/pde_solvers/navier-stokes/libfft_avx.a
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/libfft_avx.a
rename to tests/integration/pde_solvers/navier-stokes/libfft_avx.a
diff --git a/src/tests/integration/pde_solvers/navier-stokes/libfft_sse.a b/tests/integration/pde_solvers/navier-stokes/libfft_sse.a
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/libfft_sse.a
rename to tests/integration/pde_solvers/navier-stokes/libfft_sse.a
diff --git a/src/tests/integration/pde_solvers/navier-stokes/mpi-shear.f90 b/tests/integration/pde_solvers/navier-stokes/mpi-shear.f90
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/mpi-shear.f90
rename to tests/integration/pde_solvers/navier-stokes/mpi-shear.f90
diff --git a/src/tests/integration/pde_solvers/navier-stokes/walltime.o b/tests/integration/pde_solvers/navier-stokes/walltime.o
similarity index 100%
rename from src/tests/integration/pde_solvers/navier-stokes/walltime.o
rename to tests/integration/pde_solvers/navier-stokes/walltime.o
diff --git a/src/tests/performance/BurgersMPI/CMakeLists.txt b/tests/performance/BurgersMPI/CMakeLists.txt
similarity index 100%
rename from src/tests/performance/BurgersMPI/CMakeLists.txt
rename to tests/performance/BurgersMPI/CMakeLists.txt
diff --git a/src/tests/performance/BurgersMPI/Makefile b/tests/performance/BurgersMPI/Makefile
similarity index 100%
rename from src/tests/performance/BurgersMPI/Makefile
rename to tests/performance/BurgersMPI/Makefile
diff --git a/src/tests/performance/BurgersMPI/input_file.F90 b/tests/performance/BurgersMPI/input_file.F90
similarity index 100%
rename from src/tests/performance/BurgersMPI/input_file.F90
rename to tests/performance/BurgersMPI/input_file.F90
diff --git a/src/tests/performance/BurgersMPI/kind_parameters.F90 b/tests/performance/BurgersMPI/kind_parameters.F90
similarity index 100%
rename from src/tests/performance/BurgersMPI/kind_parameters.F90
rename to tests/performance/BurgersMPI/kind_parameters.F90
diff --git a/src/tests/performance/BurgersMPI/main.F90 b/tests/performance/BurgersMPI/main.F90
similarity index 100%
rename from src/tests/performance/BurgersMPI/main.F90
rename to tests/performance/BurgersMPI/main.F90
diff --git a/src/tests/performance/BurgersMPI/mpi_module.F90 b/tests/performance/BurgersMPI/mpi_module.F90
similarity index 100%
rename from src/tests/performance/BurgersMPI/mpi_module.F90
rename to tests/performance/BurgersMPI/mpi_module.F90
diff --git a/src/tests/performance/BurgersMPI/mpi_share.F90 b/tests/performance/BurgersMPI/mpi_share.F90
similarity index 100%
rename from src/tests/performance/BurgersMPI/mpi_share.F90
rename to tests/performance/BurgersMPI/mpi_share.F90
diff --git a/src/tests/performance/BurgersMPI/periodic_2nd_order.F90 b/tests/performance/BurgersMPI/periodic_2nd_order.F90
similarity index 100%
rename from src/tests/performance/BurgersMPI/periodic_2nd_order.F90
rename to tests/performance/BurgersMPI/periodic_2nd_order.F90
diff --git a/src/tests/performance/BurgersMPI/shared.F90 b/tests/performance/BurgersMPI/shared.F90
similarity index 100%
rename from src/tests/performance/BurgersMPI/shared.F90
rename to tests/performance/BurgersMPI/shared.F90
diff --git a/src/tests/performance/CMakeLists.txt b/tests/performance/CMakeLists.txt
similarity index 100%
rename from src/tests/performance/CMakeLists.txt
rename to tests/performance/CMakeLists.txt
diff --git a/src/tests/performance/mpi_dist_transpose/CMakeLists.txt b/tests/performance/mpi_dist_transpose/CMakeLists.txt
similarity index 100%
rename from src/tests/performance/mpi_dist_transpose/CMakeLists.txt
rename to tests/performance/mpi_dist_transpose/CMakeLists.txt
diff --git a/src/tests/performance/mpi_dist_transpose/mpi_distributed_transpose.F90 b/tests/performance/mpi_dist_transpose/mpi_distributed_transpose.F90
similarity index 100%
rename from src/tests/performance/mpi_dist_transpose/mpi_distributed_transpose.F90
rename to tests/performance/mpi_dist_transpose/mpi_distributed_transpose.F90
diff --git a/src/tests/performance/mpi_dist_transpose/walltime.o b/tests/performance/mpi_dist_transpose/walltime.o
similarity index 100%
rename from src/tests/performance/mpi_dist_transpose/walltime.o
rename to tests/performance/mpi_dist_transpose/walltime.o
diff --git a/src/tests/performance/mpi_dist_transpose/walltime.x64 b/tests/performance/mpi_dist_transpose/walltime.x64
similarity index 100%
rename from src/tests/performance/mpi_dist_transpose/walltime.x64
rename to tests/performance/mpi_dist_transpose/walltime.x64
diff --git a/src/tests/performance/psnap/CMakeLists.txt b/tests/performance/psnap/CMakeLists.txt
similarity index 100%
rename from src/tests/performance/psnap/CMakeLists.txt
rename to tests/performance/psnap/CMakeLists.txt
diff --git a/src/tests/performance/psnap/cafpsnap.f90 b/tests/performance/psnap/cafpsnap.f90
similarity index 100%
rename from src/tests/performance/psnap/cafpsnap.f90
rename to tests/performance/psnap/cafpsnap.f90
diff --git a/src/tests/performance/psnap/timemeasure.c b/tests/performance/psnap/timemeasure.c
similarity index 100%
rename from src/tests/performance/psnap/timemeasure.c
rename to tests/performance/psnap/timemeasure.c
diff --git a/src/tests/regression/CMakeLists.txt b/tests/regression/CMakeLists.txt
similarity index 100%
rename from src/tests/regression/CMakeLists.txt
rename to tests/regression/CMakeLists.txt
diff --git a/src/tests/regression/reported/CMakeLists.txt b/tests/regression/reported/CMakeLists.txt
similarity index 100%
rename from src/tests/regression/reported/CMakeLists.txt
rename to tests/regression/reported/CMakeLists.txt
diff --git a/src/tests/regression/reported/issue-172-wrong-co_reduce-int64.F90 b/tests/regression/reported/issue-172-wrong-co_reduce-int64.F90
similarity index 100%
rename from src/tests/regression/reported/issue-172-wrong-co_reduce-int64.F90
rename to tests/regression/reported/issue-172-wrong-co_reduce-int64.F90
diff --git a/src/tests/regression/reported/issue-172-wrong-co_reduce-int8.F90 b/tests/regression/reported/issue-172-wrong-co_reduce-int8.F90
similarity index 100%
rename from src/tests/regression/reported/issue-172-wrong-co_reduce-int8.F90
rename to tests/regression/reported/issue-172-wrong-co_reduce-int8.F90
diff --git a/src/tests/regression/reported/issue-172-wrong-co_reduce.F90 b/tests/regression/reported/issue-172-wrong-co_reduce.F90
similarity index 100%
rename from src/tests/regression/reported/issue-172-wrong-co_reduce.F90
rename to tests/regression/reported/issue-172-wrong-co_reduce.F90
diff --git a/src/tests/regression/reported/issue-243-source-allocation-no-sync.f90 b/tests/regression/reported/issue-243-source-allocation-no-sync.f90
similarity index 100%
rename from src/tests/regression/reported/issue-243-source-allocation-no-sync.f90
rename to tests/regression/reported/issue-243-source-allocation-no-sync.f90
diff --git a/src/tests/regression/reported/issue-292-convert-type-before-put.f90 b/tests/regression/reported/issue-292-convert-type-before-put.f90
similarity index 100%
rename from src/tests/regression/reported/issue-292-convert-type-before-put.f90
rename to tests/regression/reported/issue-292-convert-type-before-put.f90
diff --git a/src/tests/regression/reported/issue-322-non-coarray-vector-idx-lhs.f90 b/tests/regression/reported/issue-322-non-coarray-vector-idx-lhs.f90
similarity index 100%
rename from src/tests/regression/reported/issue-322-non-coarray-vector-idx-lhs.f90
rename to tests/regression/reported/issue-322-non-coarray-vector-idx-lhs.f90
diff --git a/src/tests/regression/reported/issue-422-send-get.F90 b/tests/regression/reported/issue-422-send-get.F90
similarity index 100%
rename from src/tests/regression/reported/issue-422-send-get.F90
rename to tests/regression/reported/issue-422-send-get.F90
diff --git a/src/tests/regression/reported/issue-422-send.F90 b/tests/regression/reported/issue-422-send.F90
similarity index 100%
rename from src/tests/regression/reported/issue-422-send.F90
rename to tests/regression/reported/issue-422-send.F90
diff --git a/src/tests/regression/reported/issue-488-multi-dim-cobounds.f90 b/tests/regression/reported/issue-488-multi-dim-cobounds.f90
similarity index 100%
rename from src/tests/regression/reported/issue-488-multi-dim-cobounds.f90
rename to tests/regression/reported/issue-488-multi-dim-cobounds.f90
diff --git a/src/tests/regression/reported/issue-493-coindex-slice.f90 b/tests/regression/reported/issue-493-coindex-slice.f90
similarity index 100%
rename from src/tests/regression/reported/issue-493-coindex-slice.f90
rename to tests/regression/reported/issue-493-coindex-slice.f90
diff --git a/src/tests/regression/reported/issue-503-multidim-array-broadcast.f90 b/tests/regression/reported/issue-503-multidim-array-broadcast.f90
similarity index 100%
rename from src/tests/regression/reported/issue-503-multidim-array-broadcast.f90
rename to tests/regression/reported/issue-503-multidim-array-broadcast.f90
diff --git a/src/tests/regression/reported/issue-503-non-contig-red-ndarray.f90 b/tests/regression/reported/issue-503-non-contig-red-ndarray.f90
similarity index 100%
rename from src/tests/regression/reported/issue-503-non-contig-red-ndarray.f90
rename to tests/regression/reported/issue-503-non-contig-red-ndarray.f90
diff --git a/src/tests/regression/reported/issue-511-incorrect-shape.f90 b/tests/regression/reported/issue-511-incorrect-shape.f90
similarity index 100%
rename from src/tests/regression/reported/issue-511-incorrect-shape.f90
rename to tests/regression/reported/issue-511-incorrect-shape.f90
diff --git a/src/tests/regression/reported/issue-515-mimic-mpi-gatherv.f90 b/tests/regression/reported/issue-515-mimic-mpi-gatherv.f90
similarity index 100%
rename from src/tests/regression/reported/issue-515-mimic-mpi-gatherv.f90
rename to tests/regression/reported/issue-515-mimic-mpi-gatherv.f90
diff --git a/src/tests/regression/reported/issue-552-send_by_ref-singleton.f90 b/tests/regression/reported/issue-552-send_by_ref-singleton.f90
similarity index 100%
rename from src/tests/regression/reported/issue-552-send_by_ref-singleton.f90
rename to tests/regression/reported/issue-552-send_by_ref-singleton.f90
diff --git a/src/tests/regression/reported/issue-700-allow-multiple-scalar-dim-array-gets.f90 b/tests/regression/reported/issue-700-allow-multiple-scalar-dim-array-gets.f90
similarity index 100%
rename from src/tests/regression/reported/issue-700-allow-multiple-scalar-dim-array-gets.f90
rename to tests/regression/reported/issue-700-allow-multiple-scalar-dim-array-gets.f90
diff --git a/src/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/CMakeLists.txt
rename to tests/unit/CMakeLists.txt
diff --git a/src/tests/unit/collectives/CMakeLists.txt b/tests/unit/collectives/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/collectives/CMakeLists.txt
rename to tests/unit/collectives/CMakeLists.txt
diff --git a/src/tests/unit/collectives/co_broadcast.F90 b/tests/unit/collectives/co_broadcast.F90
similarity index 100%
rename from src/tests/unit/collectives/co_broadcast.F90
rename to tests/unit/collectives/co_broadcast.F90
diff --git a/src/tests/unit/collectives/co_broadcast_alloc_mixed.f90 b/tests/unit/collectives/co_broadcast_alloc_mixed.f90
similarity index 100%
rename from src/tests/unit/collectives/co_broadcast_alloc_mixed.f90
rename to tests/unit/collectives/co_broadcast_alloc_mixed.f90
diff --git a/src/tests/unit/collectives/co_broadcast_allocatable_components.f90 b/tests/unit/collectives/co_broadcast_allocatable_components.f90
similarity index 100%
rename from src/tests/unit/collectives/co_broadcast_allocatable_components.f90
rename to tests/unit/collectives/co_broadcast_allocatable_components.f90
diff --git a/src/tests/unit/collectives/co_broadcast_derived_type.f90 b/tests/unit/collectives/co_broadcast_derived_type.f90
similarity index 100%
rename from src/tests/unit/collectives/co_broadcast_derived_type.f90
rename to tests/unit/collectives/co_broadcast_derived_type.f90
diff --git a/src/tests/unit/collectives/co_max.F90 b/tests/unit/collectives/co_max.F90
similarity index 100%
rename from src/tests/unit/collectives/co_max.F90
rename to tests/unit/collectives/co_max.F90
diff --git a/src/tests/unit/collectives/co_min.F90 b/tests/unit/collectives/co_min.F90
similarity index 100%
rename from src/tests/unit/collectives/co_min.F90
rename to tests/unit/collectives/co_min.F90
diff --git a/src/tests/unit/collectives/co_reduce.F90 b/tests/unit/collectives/co_reduce.F90
similarity index 100%
rename from src/tests/unit/collectives/co_reduce.F90
rename to tests/unit/collectives/co_reduce.F90
diff --git a/src/tests/unit/collectives/co_reduce_res_im.F90 b/tests/unit/collectives/co_reduce_res_im.F90
similarity index 100%
rename from src/tests/unit/collectives/co_reduce_res_im.F90
rename to tests/unit/collectives/co_reduce_res_im.F90
diff --git a/src/tests/unit/collectives/co_reduce_string.f90 b/tests/unit/collectives/co_reduce_string.f90
similarity index 100%
rename from src/tests/unit/collectives/co_reduce_string.f90
rename to tests/unit/collectives/co_reduce_string.f90
diff --git a/src/tests/unit/collectives/co_sum.F90 b/tests/unit/collectives/co_sum.F90
similarity index 100%
rename from src/tests/unit/collectives/co_sum.F90
rename to tests/unit/collectives/co_sum.F90
diff --git a/src/tests/unit/events/CMakeLists.txt b/tests/unit/events/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/events/CMakeLists.txt
rename to tests/unit/events/CMakeLists.txt
diff --git a/src/tests/unit/events/allocatable_p2p_event_post.f90 b/tests/unit/events/allocatable_p2p_event_post.f90
similarity index 100%
rename from src/tests/unit/events/allocatable_p2p_event_post.f90
rename to tests/unit/events/allocatable_p2p_event_post.f90
diff --git a/src/tests/unit/events/static_event_post_issue_293.f90 b/tests/unit/events/static_event_post_issue_293.f90
similarity index 100%
rename from src/tests/unit/events/static_event_post_issue_293.f90
rename to tests/unit/events/static_event_post_issue_293.f90
diff --git a/src/tests/unit/extensions/CMakeLists.txt b/tests/unit/extensions/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/extensions/CMakeLists.txt
rename to tests/unit/extensions/CMakeLists.txt
diff --git a/src/tests/unit/fail_images/CMakeLists.txt b/tests/unit/fail_images/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/fail_images/CMakeLists.txt
rename to tests/unit/fail_images/CMakeLists.txt
diff --git a/src/tests/unit/fail_images/image_fail_and_failed_images_test_1.f90 b/tests/unit/fail_images/image_fail_and_failed_images_test_1.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_fail_and_failed_images_test_1.f90
rename to tests/unit/fail_images/image_fail_and_failed_images_test_1.f90
diff --git a/src/tests/unit/fail_images/image_fail_and_get_test_1.f90 b/tests/unit/fail_images/image_fail_and_get_test_1.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_fail_and_get_test_1.f90
rename to tests/unit/fail_images/image_fail_and_get_test_1.f90
diff --git a/src/tests/unit/fail_images/image_fail_and_status_test_1.f90 b/tests/unit/fail_images/image_fail_and_status_test_1.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_fail_and_status_test_1.f90
rename to tests/unit/fail_images/image_fail_and_status_test_1.f90
diff --git a/src/tests/unit/fail_images/image_fail_and_stopped_images_test_1.f90 b/tests/unit/fail_images/image_fail_and_stopped_images_test_1.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_fail_and_stopped_images_test_1.f90
rename to tests/unit/fail_images/image_fail_and_stopped_images_test_1.f90
diff --git a/src/tests/unit/fail_images/image_fail_and_sync_test_1.f90 b/tests/unit/fail_images/image_fail_and_sync_test_1.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_fail_and_sync_test_1.f90
rename to tests/unit/fail_images/image_fail_and_sync_test_1.f90
diff --git a/src/tests/unit/fail_images/image_fail_and_sync_test_2.f90 b/tests/unit/fail_images/image_fail_and_sync_test_2.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_fail_and_sync_test_2.f90
rename to tests/unit/fail_images/image_fail_and_sync_test_2.f90
diff --git a/src/tests/unit/fail_images/image_fail_and_sync_test_3.f90 b/tests/unit/fail_images/image_fail_and_sync_test_3.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_fail_and_sync_test_3.f90
rename to tests/unit/fail_images/image_fail_and_sync_test_3.f90
diff --git a/src/tests/unit/fail_images/image_fail_test_1.f90 b/tests/unit/fail_images/image_fail_test_1.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_fail_test_1.f90
rename to tests/unit/fail_images/image_fail_test_1.f90
diff --git a/src/tests/unit/fail_images/image_status_test_1.f90 b/tests/unit/fail_images/image_status_test_1.f90
similarity index 100%
rename from src/tests/unit/fail_images/image_status_test_1.f90
rename to tests/unit/fail_images/image_status_test_1.f90
diff --git a/src/tests/unit/init_register/CMakeLists.txt b/tests/unit/init_register/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/init_register/CMakeLists.txt
rename to tests/unit/init_register/CMakeLists.txt
diff --git a/src/tests/unit/init_register/allocate_as_barrier.f90 b/tests/unit/init_register/allocate_as_barrier.f90
similarity index 100%
rename from src/tests/unit/init_register/allocate_as_barrier.f90
rename to tests/unit/init_register/allocate_as_barrier.f90
diff --git a/src/tests/unit/init_register/allocate_as_barrier_proc.f90 b/tests/unit/init_register/allocate_as_barrier_proc.f90
similarity index 100%
rename from src/tests/unit/init_register/allocate_as_barrier_proc.f90
rename to tests/unit/init_register/allocate_as_barrier_proc.f90
diff --git a/src/tests/unit/init_register/async_comp_alloc.f90 b/tests/unit/init_register/async_comp_alloc.f90
similarity index 100%
rename from src/tests/unit/init_register/async_comp_alloc.f90
rename to tests/unit/init_register/async_comp_alloc.f90
diff --git a/src/tests/unit/init_register/async_comp_alloc_2.f90 b/tests/unit/init_register/async_comp_alloc_2.f90
similarity index 100%
rename from src/tests/unit/init_register/async_comp_alloc_2.f90
rename to tests/unit/init_register/async_comp_alloc_2.f90
diff --git a/src/tests/unit/init_register/comp_allocated_1.f90 b/tests/unit/init_register/comp_allocated_1.f90
similarity index 100%
rename from src/tests/unit/init_register/comp_allocated_1.f90
rename to tests/unit/init_register/comp_allocated_1.f90
diff --git a/src/tests/unit/init_register/comp_allocated_2.f90 b/tests/unit/init_register/comp_allocated_2.f90
similarity index 100%
rename from src/tests/unit/init_register/comp_allocated_2.f90
rename to tests/unit/init_register/comp_allocated_2.f90
diff --git a/src/tests/unit/init_register/initialize_mpi.F90 b/tests/unit/init_register/initialize_mpi.F90
similarity index 100%
rename from src/tests/unit/init_register/initialize_mpi.F90
rename to tests/unit/init_register/initialize_mpi.F90
diff --git a/src/tests/unit/init_register/register.f90 b/tests/unit/init_register/register.f90
similarity index 100%
rename from src/tests/unit/init_register/register.f90
rename to tests/unit/init_register/register.f90
diff --git a/src/tests/unit/init_register/register_alloc_comp_1.f90 b/tests/unit/init_register/register_alloc_comp_1.f90
similarity index 100%
rename from src/tests/unit/init_register/register_alloc_comp_1.f90
rename to tests/unit/init_register/register_alloc_comp_1.f90
diff --git a/src/tests/unit/init_register/register_alloc_comp_2.f90 b/tests/unit/init_register/register_alloc_comp_2.f90
similarity index 100%
rename from src/tests/unit/init_register/register_alloc_comp_2.f90
rename to tests/unit/init_register/register_alloc_comp_2.f90
diff --git a/src/tests/unit/init_register/register_alloc_comp_3.f90 b/tests/unit/init_register/register_alloc_comp_3.f90
similarity index 100%
rename from src/tests/unit/init_register/register_alloc_comp_3.f90
rename to tests/unit/init_register/register_alloc_comp_3.f90
diff --git a/src/tests/unit/init_register/register_alloc_vector.f90 b/tests/unit/init_register/register_alloc_vector.f90
similarity index 100%
rename from src/tests/unit/init_register/register_alloc_vector.f90
rename to tests/unit/init_register/register_alloc_vector.f90
diff --git a/src/tests/unit/init_register/register_vector.f90 b/tests/unit/init_register/register_vector.f90
similarity index 100%
rename from src/tests/unit/init_register/register_vector.f90
rename to tests/unit/init_register/register_vector.f90
diff --git a/src/tests/unit/iso-fortran-binding/CMakeLists.txt b/tests/unit/iso-fortran-binding/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/iso-fortran-binding/CMakeLists.txt
rename to tests/unit/iso-fortran-binding/CMakeLists.txt
diff --git a/src/tests/unit/iso-fortran-binding/ISO_Fortran_binding_tests.c b/tests/unit/iso-fortran-binding/ISO_Fortran_binding_tests.c
similarity index 100%
rename from src/tests/unit/iso-fortran-binding/ISO_Fortran_binding_tests.c
rename to tests/unit/iso-fortran-binding/ISO_Fortran_binding_tests.c
diff --git a/src/tests/unit/send-get/CMakeLists.txt b/tests/unit/send-get/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/send-get/CMakeLists.txt
rename to tests/unit/send-get/CMakeLists.txt
diff --git a/src/tests/unit/send-get/alloc_comp_get_convert_nums.f90 b/tests/unit/send-get/alloc_comp_get_convert_nums.f90
similarity index 100%
rename from src/tests/unit/send-get/alloc_comp_get_convert_nums.f90
rename to tests/unit/send-get/alloc_comp_get_convert_nums.f90
diff --git a/src/tests/unit/send-get/alloc_comp_multidim_shape.F90 b/tests/unit/send-get/alloc_comp_multidim_shape.F90
similarity index 100%
rename from src/tests/unit/send-get/alloc_comp_multidim_shape.F90
rename to tests/unit/send-get/alloc_comp_multidim_shape.F90
diff --git a/src/tests/unit/send-get/alloc_comp_send_convert_nums.f90 b/tests/unit/send-get/alloc_comp_send_convert_nums.f90
similarity index 100%
rename from src/tests/unit/send-get/alloc_comp_send_convert_nums.f90
rename to tests/unit/send-get/alloc_comp_send_convert_nums.f90
diff --git a/src/tests/unit/send-get/get_array_test.f90 b/tests/unit/send-get/get_array_test.f90
similarity index 100%
rename from src/tests/unit/send-get/get_array_test.f90
rename to tests/unit/send-get/get_array_test.f90
diff --git a/src/tests/unit/send-get/get_convert_char_array.f90 b/tests/unit/send-get/get_convert_char_array.f90
similarity index 100%
rename from src/tests/unit/send-get/get_convert_char_array.f90
rename to tests/unit/send-get/get_convert_char_array.f90
diff --git a/src/tests/unit/send-get/get_convert_nums.f90 b/tests/unit/send-get/get_convert_nums.f90
similarity index 100%
rename from src/tests/unit/send-get/get_convert_nums.f90
rename to tests/unit/send-get/get_convert_nums.f90
diff --git a/src/tests/unit/send-get/get_static_array.f90 b/tests/unit/send-get/get_static_array.f90
similarity index 100%
rename from src/tests/unit/send-get/get_static_array.f90
rename to tests/unit/send-get/get_static_array.f90
diff --git a/src/tests/unit/send-get/get_with_offset_1d.f90 b/tests/unit/send-get/get_with_offset_1d.f90
similarity index 100%
rename from src/tests/unit/send-get/get_with_offset_1d.f90
rename to tests/unit/send-get/get_with_offset_1d.f90
diff --git a/src/tests/unit/send-get/get_with_vector_index.f90 b/tests/unit/send-get/get_with_vector_index.f90
similarity index 100%
rename from src/tests/unit/send-get/get_with_vector_index.f90
rename to tests/unit/send-get/get_with_vector_index.f90
diff --git a/src/tests/unit/send-get/old_get_array_test.f90 b/tests/unit/send-get/old_get_array_test.f90
similarity index 100%
rename from src/tests/unit/send-get/old_get_array_test.f90
rename to tests/unit/send-get/old_get_array_test.f90
diff --git a/src/tests/unit/send-get/sameloc.f90 b/tests/unit/send-get/sameloc.f90
similarity index 100%
rename from src/tests/unit/send-get/sameloc.f90
rename to tests/unit/send-get/sameloc.f90
diff --git a/src/tests/unit/send-get/send-strided-self.f90 b/tests/unit/send-get/send-strided-self.f90
similarity index 100%
rename from src/tests/unit/send-get/send-strided-self.f90
rename to tests/unit/send-get/send-strided-self.f90
diff --git a/src/tests/unit/send-get/send_array_test.f90 b/tests/unit/send-get/send_array_test.f90
similarity index 100%
rename from src/tests/unit/send-get/send_array_test.f90
rename to tests/unit/send-get/send_array_test.f90
diff --git a/src/tests/unit/send-get/send_convert_char_array.f90 b/tests/unit/send-get/send_convert_char_array.f90
similarity index 100%
rename from src/tests/unit/send-get/send_convert_char_array.f90
rename to tests/unit/send-get/send_convert_char_array.f90
diff --git a/src/tests/unit/send-get/send_convert_nums.f90 b/tests/unit/send-get/send_convert_nums.f90
similarity index 100%
rename from src/tests/unit/send-get/send_convert_nums.f90
rename to tests/unit/send-get/send_convert_nums.f90
diff --git a/src/tests/unit/send-get/send_with_vector_index.f90 b/tests/unit/send-get/send_with_vector_index.f90
similarity index 100%
rename from src/tests/unit/send-get/send_with_vector_index.f90
rename to tests/unit/send-get/send_with_vector_index.f90
diff --git a/src/tests/unit/send-get/sendget_convert_char_array.f90 b/tests/unit/send-get/sendget_convert_char_array.f90
similarity index 100%
rename from src/tests/unit/send-get/sendget_convert_char_array.f90
rename to tests/unit/send-get/sendget_convert_char_array.f90
diff --git a/src/tests/unit/send-get/sendget_convert_nums.f90 b/tests/unit/send-get/sendget_convert_nums.f90
similarity index 100%
rename from src/tests/unit/send-get/sendget_convert_nums.f90
rename to tests/unit/send-get/sendget_convert_nums.f90
diff --git a/src/tests/unit/send-get/strided_get.f90 b/tests/unit/send-get/strided_get.f90
similarity index 100%
rename from src/tests/unit/send-get/strided_get.f90
rename to tests/unit/send-get/strided_get.f90
diff --git a/src/tests/unit/send-get/strided_sendget.f90 b/tests/unit/send-get/strided_sendget.f90
similarity index 100%
rename from src/tests/unit/send-get/strided_sendget.f90
rename to tests/unit/send-get/strided_sendget.f90
diff --git a/src/tests/unit/send-get/whole_get_array.f90 b/tests/unit/send-get/whole_get_array.f90
similarity index 100%
rename from src/tests/unit/send-get/whole_get_array.f90
rename to tests/unit/send-get/whole_get_array.f90
diff --git a/src/tests/unit/simple/CMakeLists.txt b/tests/unit/simple/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/simple/CMakeLists.txt
rename to tests/unit/simple/CMakeLists.txt
diff --git a/src/tests/unit/simple/Makefile b/tests/unit/simple/Makefile
similarity index 100%
rename from src/tests/unit/simple/Makefile
rename to tests/unit/simple/Makefile
diff --git a/src/tests/unit/simple/increment_neighbor.f90 b/tests/unit/simple/increment_neighbor.f90
similarity index 100%
rename from src/tests/unit/simple/increment_neighbor.f90
rename to tests/unit/simple/increment_neighbor.f90
diff --git a/src/tests/unit/simple/random_init.f90 b/tests/unit/simple/random_init.f90
similarity index 100%
rename from src/tests/unit/simple/random_init.f90
rename to tests/unit/simple/random_init.f90
diff --git a/src/tests/unit/simple/syncimages2.c b/tests/unit/simple/syncimages2.c
similarity index 100%
rename from src/tests/unit/simple/syncimages2.c
rename to tests/unit/simple/syncimages2.c
diff --git a/src/tests/unit/simple/testAtomics.f90 b/tests/unit/simple/testAtomics.f90
similarity index 100%
rename from src/tests/unit/simple/testAtomics.f90
rename to tests/unit/simple/testAtomics.f90
diff --git a/src/tests/unit/sync/CMakeLists.txt b/tests/unit/sync/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/sync/CMakeLists.txt
rename to tests/unit/sync/CMakeLists.txt
diff --git a/src/tests/unit/sync/duplicate_syncimages.f90 b/tests/unit/sync/duplicate_syncimages.f90
similarity index 100%
rename from src/tests/unit/sync/duplicate_syncimages.f90
rename to tests/unit/sync/duplicate_syncimages.f90
diff --git a/src/tests/unit/sync/sync_image_ring_abort_on_stopped_image.f90 b/tests/unit/sync/sync_image_ring_abort_on_stopped_image.f90
similarity index 100%
rename from src/tests/unit/sync/sync_image_ring_abort_on_stopped_image.f90
rename to tests/unit/sync/sync_image_ring_abort_on_stopped_image.f90
diff --git a/src/tests/unit/sync/syncall.f90 b/tests/unit/sync/syncall.f90
similarity index 100%
rename from src/tests/unit/sync/syncall.f90
rename to tests/unit/sync/syncall.f90
diff --git a/src/tests/unit/sync/syncimages.f90 b/tests/unit/sync/syncimages.f90
similarity index 100%
rename from src/tests/unit/sync/syncimages.f90
rename to tests/unit/sync/syncimages.f90
diff --git a/src/tests/unit/sync/syncimages2.f90 b/tests/unit/sync/syncimages2.f90
similarity index 100%
rename from src/tests/unit/sync/syncimages2.f90
rename to tests/unit/sync/syncimages2.f90
diff --git a/src/tests/unit/sync/syncimages_status.f90 b/tests/unit/sync/syncimages_status.f90
similarity index 100%
rename from src/tests/unit/sync/syncimages_status.f90
rename to tests/unit/sync/syncimages_status.f90
diff --git a/src/tests/unit/teams/CMakeLists.txt b/tests/unit/teams/CMakeLists.txt
similarity index 100%
rename from src/tests/unit/teams/CMakeLists.txt
rename to tests/unit/teams/CMakeLists.txt
diff --git a/src/tests/unit/teams/get-communicator.F90 b/tests/unit/teams/get-communicator.F90
similarity index 100%
rename from src/tests/unit/teams/get-communicator.F90
rename to tests/unit/teams/get-communicator.F90
diff --git a/src/tests/unit/teams/sync-team.f90 b/tests/unit/teams/sync-team.f90
similarity index 100%
rename from src/tests/unit/teams/sync-team.f90
rename to tests/unit/teams/sync-team.f90
diff --git a/src/tests/unit/teams/team-number.f90 b/tests/unit/teams/team-number.f90
similarity index 100%
rename from src/tests/unit/teams/team-number.f90
rename to tests/unit/teams/team-number.f90
diff --git a/src/tests/unit/teams/teams_coarray_get.f90 b/tests/unit/teams/teams_coarray_get.f90
similarity index 100%
rename from src/tests/unit/teams/teams_coarray_get.f90
rename to tests/unit/teams/teams_coarray_get.f90
diff --git a/src/tests/unit/teams/teams_coarray_get_by_ref.f90 b/tests/unit/teams/teams_coarray_get_by_ref.f90
similarity index 100%
rename from src/tests/unit/teams/teams_coarray_get_by_ref.f90
rename to tests/unit/teams/teams_coarray_get_by_ref.f90
diff --git a/src/tests/unit/teams/teams_coarray_send.f90 b/tests/unit/teams/teams_coarray_send.f90
similarity index 100%
rename from src/tests/unit/teams/teams_coarray_send.f90
rename to tests/unit/teams/teams_coarray_send.f90
diff --git a/src/tests/unit/teams/teams_coarray_send_by_ref.f90 b/tests/unit/teams/teams_coarray_send_by_ref.f90
similarity index 100%
rename from src/tests/unit/teams/teams_coarray_send_by_ref.f90
rename to tests/unit/teams/teams_coarray_send_by_ref.f90
diff --git a/src/tests/unit/teams/teams_coarray_sendget.f90 b/tests/unit/teams/teams_coarray_sendget.f90
similarity index 100%
rename from src/tests/unit/teams/teams_coarray_sendget.f90
rename to tests/unit/teams/teams_coarray_sendget.f90
diff --git a/src/tests/unit/teams/teams_send.f90 b/tests/unit/teams/teams_send.f90
similarity index 100%
rename from src/tests/unit/teams/teams_send.f90
rename to tests/unit/teams/teams_send.f90
diff --git a/src/tests/unit/teams/teams_subset.f90 b/tests/unit/teams/teams_subset.f90
similarity index 100%
rename from src/tests/unit/teams/teams_subset.f90
rename to tests/unit/teams/teams_subset.f90
diff --git a/src/tests/utilities/CMakeLists.txt b/tests/utilities/CMakeLists.txt
similarity index 100%
rename from src/tests/utilities/CMakeLists.txt
rename to tests/utilities/CMakeLists.txt
diff --git a/src/tests/utilities/oc_assertions_implementation.F90 b/tests/utilities/oc_assertions_implementation.F90
similarity index 100%
rename from src/tests/utilities/oc_assertions_implementation.F90
rename to tests/utilities/oc_assertions_implementation.F90
diff --git a/src/tests/utilities/oc_assertions_interface.F90 b/tests/utilities/oc_assertions_interface.F90
similarity index 100%
rename from src/tests/utilities/oc_assertions_interface.F90
rename to tests/utilities/oc_assertions_interface.F90
diff --git a/src/tests/utilities/opencoarrays_object_interface.f90 b/tests/utilities/opencoarrays_object_interface.f90
similarity index 100%
rename from src/tests/utilities/opencoarrays_object_interface.f90
rename to tests/utilities/opencoarrays_object_interface.f90