AMR: Update CMakeLists.txt of OPAL to work with latest AMReX version

modified: CMakeLists.txt deleted: CMakeModules/CCSEOptions.cmake deleted: CMakeModules/FindCCSE.cmake modified: cmake/OPALConfig.cmake.in modified: ippl/CMakeLists.txt modified: ippl/test/AMR/amrex-only/CMakeLists.txt modified: ippl/test/AMR/boxlib-amr/CMakeLists.txt modified: ippl/test/AMR/ippl-amr/CMakeLists.txt modified: ippl/test/AMR/ippl-bunch/CMakeLists.txt modified: src/CMakeLists.txt modified: tests/CMakeLists.txt

AMR: Update CMakeLists.txt of OPAL to work with latest AMReX version
modified: CMakeLists.txt deleted: CMakeModules/CCSEOptions.cmake deleted: CMakeModules/FindCCSE.cmake modified: cmake/OPALConfig.cmake.in modified: ippl/CMakeLists.txt modified: ippl/test/AMR/amrex-only/CMakeLists.txt modified: ippl/test/AMR/boxlib-amr/CMakeLists.txt modified: ippl/test/AMR/ippl-amr/CMakeLists.txt modified: ippl/test/AMR/ippl-bunch/CMakeLists.txt modified: src/CMakeLists.txt modified: tests/CMakeLists.txt
224a1e98 · frey_m · c81a8641 · 224a1e98 · c81a8641 · c81a8641
Commit 224a1e98 authored 7 years ago by frey_m
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,35 +124,21 @@ ENDIF (USE_H5HUT2)
 IF (ENABLE_AMR)
    MESSAGE (STATUS "Enable AMR_SOLVER    " ${ENABLE_AMR})
    ENABLE_LANGUAGE (Fortran)
-    SET (BL_SPACEDIM 3 CACHE INT "Dimension of AMReX build")
-    SET (ENABLE_MPI 1 CACHE INT "Enable build with MPI")
-    SET (ENABLE_OpenMP 0 CACHE INT "Enable build with OpenMP")
-    SET (BL_PRECISION "DOUBLE" CACHE INT "Precision of AMReX build")
-    SET (BL_USE_PARTICLES 1 CACHE INT "Include Particles classes in AMReX build")
-    SET (BL_DEBUG 0 CACHE INT "Include debugging information in AMReX build")
-    SET (ENABLE_PROFILING 0 CACHE INT "Include profiling information in AMReX build")
-    SET (ENABLE_BACKTRACE 0 CACHE INT "Include backtrace information in AMReX build")
-    SET ( CCSE_DIR $ENV{AMREX_PREFIX} )
+    find_package (AMReX CONFIG REQUIRED HINTS $ENV{AMREX_HOME}/cmake $ENV{AMREX_DIR}/cmake $ENV{AMREX_PREFIX}/cmake)
-    SET ( CCSE_LIBRARY_DIR $ENV{AMREX_LIBRARY_DIR} )
-    FIND_PACKAGE (CCSE REQUIRED)
-    MESSAGE (STATUS "Found AMReX include dir: ${CCSE_INCLUDE_DIR}")
-    MESSAGE (STATUS "Found AMReX library dir: ${CCSE_LIBRARY_DIR}")
-    # FIXME disable due to AMReX
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable -Wno-unused-variable -Wno-maybe-uninitialized")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBL_PRECISION=${BL_PRECISION}")
+    MESSAGE (STATUS "Found AMReX include dir: ${AMREX_INCLUDE_DIR}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_MPI=${ENABLE_MPI}")
+    MESSAGE (STATUS "Found AMReX library dir: ${AMREX_LIBRARY_DIR}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_OpenMP=${ENABLE_OpenMP}")
+    MESSAGE (STATUS "Found AMReX libraries: ${AMREX_LIBRARIES}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_PARTICLES=${BL_USE_PARTICLES}")
+    MESSAGE (STATUS "AMReX built with: ${AMREX_DEFINES}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBL_DEBUG=${BL_DEBUG}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_BACKTRACE=${ENABLE_BACKTRACE}")
+    # We need to replace the quotes of the AMREX_GIT_VERSION flag in AMREX_DEFINES
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_PROFILING=${ENABLE_PROFILING}")
+    # otherwise IpplVersions.h complains
-    SET (CMAKE_CXX_FLAGS "-DENABLE_AMR ${CMAKE_CXX_FLAGS}")
+    STRING(REPLACE "\"" "'" AMREX_DEFINES ${AMREX_DEFINES})
+    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_AMR ${AMREX_DEFINES}")
+    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable -Wno-unused-but-set-variable -Wno-maybe-uninitialized")
 ENDIF (ENABLE_AMR)
 # remove digits from hostname: edison03 -> edison

--- a/CMakeModules/CCSEOptions.cmake
+++ b/CMakeModules/CCSEOptions.cmake
-# -*- mode: cmake -*-
-#
-# Set up defines necessary to build BoxLib-based code
-if(__CCSE_OPTIONS_INCLUDED)
-  return()
-endif()
-set(__CCSE_OPTIONS_INCLUDED)
-enable_language(C)
-enable_language(CXX)
-enable_language(Fortran)
-if (ENABLE_POSITION_INDEPENDENT_CODE)
-  set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-endif ()
-# No idea why we need this.
-# I think it was required for Franklin build. -- lpritch
-if(PREFER_STATIC_LIBRARIES)
-  # Prefer static libraries, but don't require that everything must be static. 
-  # This appears to be necessary on Franklin at NERSC right now.  --RTM
-  set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib)
-endif(PREFER_STATIC_LIBRARIES)
-if(BUILD_STATIC_EXECUTABLES)
-    set(CMAKE_EXE_LINKER_FLAGS -static)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-    set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)       # remove -Wl,-Bdynamic
-    set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
-    set(CMAKE_SHARED_LIBRARY_C_FLAGS)         # remove -fPIC
-    set(CMAKE_SHARED_LIBRARY_CXX_FLAGS)
-    set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)    # remove -rdynamic
-    set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
-endif(BUILD_STATIC_EXECUTABLES)
-# Testing
-include(CMakeDependentOption)
-cmake_dependent_option(ENABLE_TESTS "Enable unit testing" ON
-                       "ENABLE_UnitTest" ON)
-if (ENABLE_TESTS)
-    set(BUILD_TESTS 1)
-endif()    
-include(FortranCInterface)
-include(${FortranCInterface_BINARY_DIR}/Output.cmake)
-message(STATUS "AMReX-specific compile settings:")
-if(FortranCInterface_GLOBAL_SUFFIX STREQUAL ""  AND FortranCInterface_GLOBAL_CASE STREQUAL "UPPER")
-    message(STATUS "   Fortran name mangling scheme to UPPERCASE (upper case, no append underscore)")
-    set(BL_FORTLINK UPPERCASE)
-elseif(FortranCInterface_GLOBAL_SUFFIX STREQUAL ""  AND FortranCInterface_GLOBAL_CASE STREQUAL "LOWER")
-    message(STATUS "   Fortran name mangling scheme to LOWERCASE (lower case, no append underscore)")
-    set(BL_FORTLINK LOWERCASE)
-elseif(FortranCInterface_GLOBAL_SUFFIX STREQUAL "_" AND FortranCInterface_GLOBAL_CASE STREQUAL "LOWER")
-    message(STATUS "   Fortran name mangling scheme to UNDERSCORE (lower case, append underscore)")
-    set(BL_FORTLINK "UNDERSCORE")
-else()
-    message(AUTHOR_WARNING "Fortran to C mangling not backward compatible with older style BoxLib code") 
-endif()
-set(BL_MACHINE ${CMAKE_SYSTEM_NAME})
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-  set(BL_DEBUG 0)
-else()
-  set(BL_DEBUG 1)
-endif()
-if (BL_DEBUG)
-  list(APPEND BL_DEFINES BL_USE_MPI)
-endif()
-# Here is a list of BL_ defines floating around in the code that probably should be 
-# explicitly set by the user for the build.  They are left here as TODO, in case some
-# systematic approach is discovered for doing this.  For the moment, the only ones
-# treated are ones that are known to give problems if not set
-#
-# BL_USE_ARRAYVIEW
-# BL_USE_NEWPLOTPER
-# BL_FIX_GATHERV_ERROR
-# BL_SYNC_RANTABLES
-# BL_COALESCE_FABS
-# BL_NO_FORT
-# BL_SETBUF_SIGNED_CHAR
-# BL_USE_FORT_STAR_PRECISION
-# BL_FIXHEADERDENORMS
-# BL_VISMF_MSGCHECK
-# BL_ALWAYS_FIX_DENORMALS
-# BL_NOLINEVALUES
-# BL_PROF_NOT_REG
-# BL_CWD_SIZE
-# _BL_ANSI_TIME
-# The following variables really should be set explicitly prior to including this file so
-# that the behavior is predictable
-if (NOT DEFINED ENABLE_MPI OR "${ENABLE_MPI}" STREQUAL "")
-  message(FATAL_ERROR "Must set ENABLE_MPI prior to including CCSEOptions.cmake")
-else()
-  if (ENABLE_MPI EQUAL 1 OR ENABLE_MPI EQUAL 0)
-  else()
-    message(FATAL_ERROR "ENABLE_MPI must be set to 0 or 1 prior to including CCSEOptions.cmake")
-  endif (ENABLE_MPI EQUAL 1 OR ENABLE_MPI EQUAL 0)
-endif (NOT DEFINED ENABLE_MPI OR "${ENABLE_MPI}" STREQUAL "")
-if (NOT DEFINED ENABLE_OpenMP OR "${ENABLE_OpenMP}" STREQUAL "")
-  message(FATAL_ERROR "Must set ENABLE_OpenMP prior to including CCSEOptions.cmake")
-else()
-  if (ENABLE_OpenMP EQUAL 1 OR ENABLE_OpenMP EQUAL 0)
-  else()
-    message(FATAL_ERROR "ENABLE_OpenMP must be set to 0 or 1 prior to including CCSEOptions.cmake")
-  endif (ENABLE_OpenMP EQUAL 1 OR ENABLE_OpenMP EQUAL 0)
-endif (NOT DEFINED ENABLE_OpenMP OR "${ENABLE_OpenMP}" STREQUAL "")
-message(STATUS "   BL_SPACEDIM = ${BL_SPACEDIM} (INT: 1,2,3)")
-message(STATUS "   BL_MACHINE = ${BL_MACHINE} (STRING: <ARCH>)")
-message(STATUS "   BL_PRECISION = ${BL_PRECISION} (STRING: \"FLOAT\", \"DOUBLE\")")
-message(STATUS "   ENABLE_MPI = ${ENABLE_MPI} (INT: 0,1)")
-message(STATUS "   ENABLE_OpenMP = ${ENABLE_OpenMP} (INT: 0,1)")
-message(STATUS "   BL_DEBUG = ${BL_DEBUG} (INT: 0,1)")
-message(STATUS "   BL_USE_PARTICLES = ${BL_USE_PARTICLES} (INT: 0,1)")
-message(STATUS "   ENABLE_BACKTRACE = ${ENABLE_BACKTRACE} (INT: 0,1)")
-message(STATUS "   ENABLE_PROFILING = ${ENABLE_PROFILING} (INT: 0,1)")
-message(STATUS "   CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX} (STRING: <install location prefix>)")
-set(BL_DEFINES "BL_NOLINEVALUES;BL_PARALLEL_IO;BL_SPACEDIM=${BL_SPACEDIM};BL_FORT_USE_${BL_FORTLINK};BL_${BL_MACHINE};BL_USE_${BL_PRECISION}")
-if (BL_USE_PARTICLES)
-  list(APPEND BL_DEFINES USE_PARTICLES)
-endif (BL_USE_PARTICLES)
-if (ENABLE_PROFILING)
-  list(APPEND BL_DEFINES BL_PROFILING)
-endif (ENABLE_PROFILING)
-if (ENABLE_COMM_PROFILING)
-  list(APPEND BL_DEFINES BL_COMM_PROFILING)
-endif (ENABLE_COMM_PROFILING)
-set(AMREX_EXTRA_LIBRARIES)
-set(AMREX_EXTRA_LIBRARY_PATH)
-set(AMREX_EXTRA_C_INCLUDE_PATH)
-set(AMREX_EXTRA_CXX_INCLUDE_PATH)
-set(AMREX_EXTRA_Fortran_INCLUDE_PATH)
-if (ENABLE_MPI)
-  list(APPEND BL_DEFINES BL_USE_MPI)
-  find_package(MPI REQUIRED)
-  list(APPEND AMREX_EXTRA_Fortran_INCLUDE_PATH "${MPI_Fortran_INCLUDE_PATH}")
-  list(APPEND AMREX_EXTRA_C_INCLUDE_PATH "${MPI_CXX_INCLUDE_PATH}")
-  list(APPEND AMREX_EXTRA_CXX_INCLUDE_PATH "${MPI_CXX_INCLUDE_PATH}")
-  set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} ${MPI_C_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MPI_CXX_FLAGS}")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${MPI_Fortran_FLAGS}")
-endif()
-if (ENABLE_OpenMP)
-  set(ENABLE_OMP TRUE)
-  list(APPEND BL_DEFINES BL_USE_OMP)
-  find_package(OpenMP REQUIRED)
-  set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} ${OpenMP_C_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-if (NOT BL_DEBUG)
-  list(APPEND BL_DEFINES NDEBUG)
-endif()
-if (DEFINED EXTRA_DEFS_FOR_CCSE)
-  list(APPEND BL_DEFINES "${EXTRA_DEFS_FOR_CCSE}")
-endif (DEFINED EXTRA_DEFS_FOR_CCSE)
-set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "${BL_DEFINES}")
-if (ENABLE_FORTRAN_MPI AND ENABLE_MPI)
-   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBL_USE_FORTRAN_MPI=1")
-endif (ENABLE_FORTRAN_MPI AND ENABLE_MPI)
-if (ENABLE_MG_FBOXLIB)
-   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMG_USE_FBOXIB=1")
-endif (ENABLE_MG_FBOXLIB)
-if (ENABLE_FBASELIB)
-   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBL_USE_F_BASELIB=1")
-endif (ENABLE_FBASELIB)
-if (ENABLE_CXX11)
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-endif (ENABLE_CXX11)
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-512 -Wno-deprecated")
-endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
--- a/CMakeModules/FindCCSE.cmake
+++ b/CMakeModules/FindCCSE.cmake
-# -*- mode: cmake -*-
-#
-# Amanzi CCSE Find Module
-#
-# Usage:
-#    Control the search through CCSE_DIR or setting environment variable
-#    CCSE_ROOT to the ccse installation prefix.
-#
-#    This module does not search default paths! 
-#
-#    Following variables are set:
-#    CCSE_FOUND            (BOOL)       Flag indicating if CCSE was found
-#    CCSE_INCLUDE_DIR      (PATH)       Path to the CCSE include file
-#    CCSE_INCLUDE_DIRS     (LIST)       List of all required include files
-#    CCSE_LIBRARY_DIR      (PATH)       Path to the CCSE library
-#    CCSE_LIBRARIES        (LIST)       List of all required CCSE libraries
-#    CCSE_PERL_DIR         (PATH)       Path to CCSE Perl scripts
-#    CCSE_EXT_LIBRARIES    (LIST)
-#    CCSE_EXT_LIBRARY_DIRS (LIST)
-#
-# #############################################################################
-# Standard CMake modules see CMAKE_ROOT/Modules
-include(FindPackageHandleStandardArgs)
-include(CCSEOptions)
-if ( CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
-    # Do nothing. Variables are set. No need to search again
-else(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)
-    # Cache variables
-    if(CCSE_DIR)
-        set(CCSE_DIR "${CCSE_DIR}" CACHE PATH "Path to search for CCSE include and library files")
-    endif()
-    if(CCSE_INCLUDE_DIR)
-        set(CCSE_INCLUDE_DIR "${CCSE_INCLUDE_DIR}" CACHE PATH "Path to search for CCSE include files")
-    endif()
-    if(CCSE_LIBRARY_DIR)
-        set(CCSE_LIBRARY_DIR "${CCSE_LIBRARY_DIR}" CACHE PATH "Path to search for CCSE library files")
-    endif()
-    if(CCSE_PERL_DIR)
-        set(CCSE_PERL_DIR "${CCSE_PERL_DIR}" CACHE PATH "Path to search for CCSE perl scripts")
-    endif()
-    # Search for include files
-    # Search order preference:
-    #  (1) CCSE_INCLUDE_DIR - check existence of path AND if the include files exist
-    #  (2) CCSE_DIR/include
-    #  (3) Default CMake paths See cmake --html-help=out.html file for more information.
-    #
-    set(ccse_inc_names "AMReX.H")
-    if (CCSE_INCLUDE_DIR)
-        if (EXISTS "${CCSE_INCLUDE_DIR}")
-            find_path(ccse_test_include_path
-                      NAMES ${ccse_inc_names}
-                      HINTS ${CCSE_INCLUDE_DIR}
-                      NO_DEFAULT_PATH)
-            if(NOT ccse_test_include_path)
-                message(SEND_ERROR "Cannot locate ${ccse_inc_names} in ${CCSE_INCLUDE_DIR}")
-            endif()
-            set(CCSE_INCLUDE_DIR ${ccse_test_include_path} )
-        else()
-            message(SEND_ERROR "CCSE_INCLUDE_DIR=${CCSE_INCLUDE_DIR} does not exist")
-            set(CCSE_INCLUDE_DIR "CCSE_INCLUDE_DIR-NOTFOUND")
-        endif()
-    else() 
-        set(ccse_inc_suffixes "include")
-        if(CCSE_DIR)
-            if (EXISTS "${CCSE_DIR}" )
-                find_path(CCSE_INCLUDE_DIR
-                          NAMES ${ccse_inc_names}
-                          HINTS ${CCSE_DIR}
-                          PATH_SUFFIXES ${ccse_inc_suffixes}
-                          NO_DEFAULT_PATH)
-            else()
-                 message(SEND_ERROR "CCSE_DIR=${CCSE_DIR} does not exist")
-                 set(CCSE_INCLUDE_DIR "CCSE_INCLUDE_DIR-NOTFOUND")
-            endif()    
-        else()
-            find_path(CCSE_INCLUDE_DIR
-                      NAMES ${ccse_inc_names}
-                      PATH_SUFFIXES ${ccse_inc_suffixes})
-        endif()
-    endif()
-    if ( NOT CCSE_INCLUDE_DIR )
-        message(SEND_ERROR "Cannot locate CCSE include directory")
-    else()
-        set(CCSE_INCLUDE_DIRS ${CCSE_INCLUDE_DIR})
-    endif()
-    # Search for libraries 
-    # Search order preference:
-    #  (1) CCSE_LIBRARY_DIR - check existence of path AND if the include files exist
-    #  (2) CCSE_DIR/<lib,Lib>
-    #  (3) Default CMake paths See cmake --html-help=out.html file for more information.
-    #
-    set(ccse_lib_name cboxlib)
-    if (CCSE_LIBRARY_DIR)
-        if (EXISTS "${CCSE_LIBRARY_DIR}")
-            find_library(CCSE_LIBRARY
-                         NAMES ${ccse_lib_name}
-                         HINTS ${CCSE_LIBRARY_DIR}
-                         NO_DEFAULT_PATH)
-        else()
-            message(SEND_ERROR "CCSE_LIBRARY_DIR=${CCSE_LIBRARY_DIR} does not exist")
-            set(CCSE_LIBRARY "CCSE_LIBRARY-NOTFOUND")
-        endif()
-    else() 
-        if(CCSE_DIR)
-            if (EXISTS "${CCSE_DIR}" )
-                find_library(CCSE_LIBRARY
-                             NAMES ${ccse_lib_name}
-                             HINTS ${CCSE_DIR}
-                             PATH_SUFFIXES "lib"
-                             NO_DEFAULT_PATH)
-                get_filename_component(CCSE_LIBRARY_DIR "${CCSE_LIBRARY}" PATH)
-            else()
-                 message(SEND_ERROR "CCSE libs not found in CCSE_DIR/lib${CCSE_LIBDIR_MPI_SUFFIX}${CCSE_LIBDIR_OMP_SUFFIX}, (CCSE_DIR=${CCSE_DIR})")
-                 set(CCSE_LIBRARY "CCSE_LIBRARY-NOTFOUND")
-            endif()    
-        else()
-            find_library(CCSE_LIBRARY
-                         NAMES ${ccse_lib_name})
-            get_filename_component(CCSE_LIBRARY_DIR "${CCSE_LIBRARY}" PATH)
-        endif()
-    endif()
-    # Now, make sure the rest are in the same place
-    # fboxlib is repeated twice to take care of circulr dependency
-    # when ENABALE_MPI=1
-    set(CCSE_LIBRARIES fboxlib;cboxlib;fboxlib;cfboxlib;box_camrdata)
-    foreach (L ${CCSE_LIBRARIES})
-            find_library(CCSE_LIBRARY
-                         NAMES ${L}
-                         HINTS ${CCSE_LIBRARY_DIR}
-                         NO_DEFAULT_PATH)
-            if ( NOT CCSE_LIBRARY )
-                message(SEND_ERROR "Cannot locate CCSE library: ${L}")
-            endif()
-    endforeach()
-    set(CCSE_LIBRARY_DIRS ${CCSE_LIBRARY_DIR})
-    # Add this to fix circular dependency
-    #if (ENABLE_MPI)
-     # set(CCSE_LIBRARIES fboxlib;cboxlib;fboxlib;cfboxlib;box_camrdata)
-    #endif (ENABLE_MPI)
-    # Search for perl scripts
-    # Search order preference:
-    #  (1) CCSE_PERL_DIR - check existence of path AND if the perl script exist
-    #  (2) CCSE_DIR/perl
-    #  (3) Default CMake paths See cmake --html-help=out.html file for more information.
-    #
- #    set(ccse_perl_name strip72)
-#     if (CCSE_PERL_DIR)
-#         if (EXISTS "${CCSE_PERL_DIR}")
-#             find_path(CCSE_PERL
-#                       NAMES ${ccse_perl_name}
-#                       HINTS ${CCSE_PERL_DIR}
-#                       NO_DEFAULT_PATH)
-#         else()
-#             message(SEND_ERROR "CCSE_PERL_DIR=${CCSE_PERL_DIR} does not exist")
-#             set(CCSE_PERL "CCSE_PERL-NOTFOUND")
-#         endif()
-#     else() 
-#         if(CCSE_DIR)
-#             if (EXISTS "${CCSE_DIR}" )
-#                 find_path(CCSE_PERL
-#                           NAMES ${ccse_perl_name}
-#                           HINTS "${CCSE_DIR}/perl"
-#                           NO_DEFAULT_PATH)
-#                 if ( NOT CCSE_PERL )
-# #                    message(SEND_ERROR "CCSE Perl scripts not in CCSE_DIR/perl=${CCSE_DIR}/perl")
-#                 else()
-#                     set(CCSE_PERL_DIR ${CCSE_PERL})
-#                 endif()    
-#             else()
-#                 message(SEND_ERROR "CCSE_DIR/perl=${CCSE_DIR}/perl does not exist")
-#             endif()
-#         endif()
-#     endif()
-# 
-endif(CCSE_LIBRARIES AND CCSE_INCLUDE_DIRS AND CCSE_PERL_DIR)    
-# Send useful message if everything is found
-find_package_handle_standard_args(CCSE DEFAULT_MSG
-                                  CCSE_LIBRARIES
-                                  CCSE_LIBRARY_DIRS 
-                                  CCSE_INCLUDE_DIRS )
-mark_as_advanced(
-  CCSE_INCLUDE_DIR
-  CCSE_INCLUDE_DIRS
-  CCSE_LIBRARIES
-  CCSE_LIBRARY_DIR
-  CCSE_LIBRARY_DIRS
-)
--- a/cmake/OPALConfig.cmake.in
+++ b/cmake/OPALConfig.cmake.in
@@ -13,7 +13,7 @@ SET(${PROJECT_NAME}_LIBRARIES
    ${Boost_LIBRARIES}
    ${Trilinos_LIBRARIES}
    ${Trilinos_TPL_LIBRARIES}
-    ${CCSE_LIBRARIES}
+    ${AMREX_LIBRARIES}
    ${CBOXLIB}
    ${OTHER_CMAKE_EXE_LINKER_FLAGS}
    ${CMAKE_DL_LIBS}
@@ -29,6 +29,6 @@ SET(${PROJECT_NAME}_INCLUDE_DIRS
    ${Trilinos_INCLUDE_DIRS}
    ${Trilinos_TPL_INCLUDE_DIRS}
    ${IPPL_SOURCE_DIRS}
-    ${CCSE_INCLUDE_DIRS}
+    ${AMREX_INCLUDE_DIRS}
    ${GTEST_INCLUDE_DIR}
 )
--- a/ippl/CMakeLists.txt
+++ b/ippl/CMakeLists.txt
@@ -95,50 +95,17 @@ OPTION (BUILD_LIBOPAL "Enable building the OPAL library" OFF)
 OPTION (NO_FIELD_ASSIGN_OPTIMIZATION "Disable compiler optimization of IPPL field assignment" OFF)
 IF (ENABLE_AMR)
-    # set specific parameters for BoxLib used in OPAL
+    MESSAGE (STATUS "Enable AMR_SOLVER    " ${ENABLE_AMR})
    ENABLE_LANGUAGE (Fortran)
-    SET ( CCSE_DIR $ENV{BOXLIB_PREFIX} )
+    find_package (AMReX CONFIG REQUIRED HINTS $ENV{AMREX_HOME}/cmake $ENV{AMREX_DIR}/cmake $ENV{AMREX_PREFIX}/cmake)
-    SET ( CCSE_LIBRARY_DIR $ENV{BOXLIB_LIBRARY_DIR} )
+    MESSAGE (STATUS "Found AMReX include dir: ${AMREX_INCLUDE_DIR}")
-    FIND_PACKAGE (CCSE REQUIRED)
+    MESSAGE (STATUS "Found AMReX library dir: ${AMREX_LIBRARY_DIR}")
+    MESSAGE (STATUS "Found AMReX libraries: ${AMREX_LIBRARIES}")
-    IF (CCSE_FOUND)
-        MESSAGE (STATUS "Found BoxLib include dir: ${CCSE_INCLUDE_DIR}")
+    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_AMR")
-        MESSAGE (STATUS "Found BoxLib library dir: ${CCSE_LIBRARY_DIR}")
-        MESSAGE (STATUS "Found BoxLib perl dir: ${CCSE_PERL_DIR}")
-        INCLUDE_DIRECTORIES (${CCSE_INCLUDE_DIR})
-    ENDIF (CCSE_FOUND)
-    SET (BL_SPACEDIM 3 CACHE INT "Dimension of BoxLib build")
-    SET (ENABLE_MPI 1 CACHE INT "Enable build with MPI")
-    SET (ENABLE_OpenMP 0 CACHE INT "Enable build with OpenMP")
-    SET (BL_PRECISION "DOUBLE" CACHE INT "Precision of BoxLib build")
-    SET (BL_USE_PARTICLES 1 CACHE INT "Include Particles classes in BoxLib build")
-    SET (ENABLE_PROFILING 0 CACHE INT "Include profiling information in BoxLib build")
-    SET (ENABLE_BACKTRACE 0 CACHE INT "Include backtrace information in BoxLib build")
-    # disable due to BoxLib
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBL_PRECISION=${BL_PRECISION}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_MPI=${ENABLE_MPI}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_OpenMP=${ENABLE_OpenMP}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_PARTICLES=${BL_USE_PARTICLES}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBL_DEBUG=${BL_DEBUG}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_BACKTRACE=${ENABLE_BACKTRACE}")
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_PROFILING=${ENABLE_PROFILING}")
-    MESSAGE (STATUS "Use following BoxLib settings:")
-    MESSAGE (STATUS "  BL_SPACEDIM = ${BL_SPACEDIM} (INT: 1, 2, 3)")
-    MESSAGE (STATUS "  BL_MACHINE = ${BL_MACHINE} (STRING: <ARCH>)")
-    MESSAGE (STATUS "  BL_PRECISION = ${BL_PRECISION} (STRING: \"FLOAT\", \"DOUBLE\")")
-    MESSAGE (STATUS "  ENABLE_MPI = ${ENABLE_MPI} (INT: 0, 1)")
-    MESSAGE (STATUS "  ENABLE_OpenMP = ${ENABLE_OpenMP} (INT: 0, 1)")
-    MESSAGE (STATUS "  BL_DEBUG = ${BL_DEBUG} (INT: 0, 1)")
-    MESSAGE (STATUS "  BL_USE_PARTICLES = ${BL_USE_PARTICLES} (INT: 0, 1)")
-    MESSAGE (STATUS "  ENABLE_BACKTRACE = ${ENABLE_BACKTRACE} (INT: 0, 1)")
-    MESSAGE (STATUS "  ENABLE_PROFILING = ${ENABLE_PROFILING} (INT: 0, 1)")
 ENDIF (ENABLE_AMR)
 if (ENABLE_SAAMG_SOLVER)

--- a/ippl/test/AMR/amrex-only/CMakeLists.txt
+++ b/ippl/test/AMR/amrex-only/CMakeLists.txt
@@ -9,22 +9,22 @@ message (STATUS "The MPI C++ compiler is: ${MPI_CXX_COMPILER}")
 #     message (STATUS "The underlying C++ compiler is: ${CMAKE_CXX_COMPILER}")
 set (CMAKE_CXX_FLAGS
-    "-O3 ${CMAKE_CXX_FLAGS} -DBL_USE_FORTRAN_MPI"
+    "-O3 ${CMAKE_CXX_FLAGS}"
    )
 set (CMAKE_CXX_FLAGS
-    "${IPPL_CMAKE_CXX_FLAGS} -std=c++11"
+    "${IPPL_CMAKE_CXX_FLAGS} -std=c++11 ${AMREX_DEFINES}"
 )
 include_directories (
-    ${CCSE_INCLUDE_DIR}
+    ${AMREX_INCLUDE_DIR}
 )
 link_directories (
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${IPPL_LIBRARY_DIR}
-    ${CCSE_LIBRARY_DIR}
+    ${AMREX_LIBRARY_DIR}
    ${HYPRE_LIBRARY_DIR}
 )
@@ -73,22 +73,22 @@ if ( ${BL_SPACEDIM} EQUAL 3 )
                       COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/inputs $<TARGET_FILE_DIR:testDeposition>)
    target_link_libraries (testDeposition ${LIBS}
-                           -lgfortran ${CCSE_LIBRARIES}
+                           -lgfortran ${AMREX_LIBRARIES}
                           -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
    target_link_libraries (AssignMultiLevelDensity ${LIBS}
-                           -lgfortran ${CCSE_LIBRARIES}
+                           -lgfortran ${AMREX_LIBRARIES}
                           -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
    target_link_libraries (testGeometry ${LIBS}
-                           -lgfortran ${CCSE_LIBRARIES}
+                           -lgfortran ${AMREX_LIBRARIES}
                           -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
    target_link_libraries (testDepositionFail ${LIBS}
-                           -lgfortran ${CCSE_LIBRARIES}
+                           -lgfortran ${AMREX_LIBRARIES}
                           -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
    target_link_libraries (testSolverFail ${LIBS}
-                           -lgfortran ${CCSE_LIBRARIES}
+                           -lgfortran ${AMREX_LIBRARIES}
                           -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 endif()
--- a/ippl/test/AMR/boxlib-amr/CMakeLists.txt
+++ b/ippl/test/AMR/boxlib-amr/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories (
    ${IPPL_INCLUDE_DIR}
    ${H5Hut_INCLUDE_DIR}
    ${HDF5_INCLUDE_DIR}
-    ${CCSE_INCLUDE_DIR}
+    ${AMREX_INCLUDE_DIR}
    ${HYPRE_INCLUDE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
@@ -30,7 +30,7 @@ link_directories (
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${IPPL_LIBRARY_DIR}
-    ${CCSE_LIBRARY_DIR}
+    ${AMREX_LIBRARY_DIR}
    ${HYPRE_LIBRARY_DIR}
 )
@@ -158,66 +158,66 @@ add_executable (testOldPerformance
                ../Solver.cpp)
    # Boxlib has a circular dependency between -lcboxlib and -lfboxlib --> resolve by: -lcboxlib -lfboxlib -lcboxlib
-#     target_link_libraries (testAmrPartBunch ${LIBS} -lgfortran ${CCSE_LIBRARIES} -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
+#     target_link_libraries (testAmrPartBunch ${LIBS} -lgfortran ${AMREX_LIBRARIES} -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
-#     target_link_libraries (testSolver ${LIBS} -lgfortran ${CCSE_LIBRARIES} -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
+#     target_link_libraries (testSolver ${LIBS} -lgfortran ${AMREX_LIBRARIES} -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
-#     target_link_libraries (testError ${LIBS} -lgfortran ${CCSE_LIBRARIES} -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
+#     target_link_libraries (testError ${LIBS} -lgfortran ${AMREX_LIBRARIES} -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (iterative)
 target_link_libraries (testH5Read ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testHdf5 ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testGaussian ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testUniform ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testUnifSphere ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testGridSolve ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testUnifSphereGrid ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testReal ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testMultiBunch ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (toFile ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testTracker ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testOldPlasma ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS}
                        -lboost_system -lboost_filesystem)
 target_link_libraries (testPerfectLoadBalancing ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testOldPerformance ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
--- a/ippl/test/AMR/ippl-amr/CMakeLists.txt
+++ b/ippl/test/AMR/ippl-amr/CMakeLists.txt
@@ -9,11 +9,11 @@ message (STATUS "The MPI C++ compiler is: ${MPI_CXX_COMPILER}")
 #     message (STATUS "The underlying C++ compiler is: ${CMAKE_CXX_COMPILER}")
 set (CMAKE_CXX_FLAGS
-    "-O3 ${CMAKE_CXX_FLAGS} -DBL_USE_FORTRAN_MPI -DUNIQUE_PTR"
+    "-O3 ${CMAKE_CXX_FLAGS} -DUNIQUE_PTR"
    )
 set (CMAKE_CXX_FLAGS
-    "${IPPL_CMAKE_CXX_FLAGS} -std=c++11 -DUSEH5FEDV2 -DPARALLEL_IO -DIPPL_AMR ${CMAKE_CXX_FLAGS}"
+    "${IPPL_CMAKE_CXX_FLAGS} -std=c++11 -DUSEH5FEDV2 -DPARALLEL_IO -DIPPL_AMR ${AMREX_DEFINES} ${CMAKE_CXX_FLAGS}"
 )
 set (BOOSTROOT $ENV{BOOST_DIR})
@@ -37,7 +37,7 @@ include_directories (
    ${IPPL_INCLUDE_DIR}
    ${H5Hut_INCLUDE_DIR}
    ${HDF5_INCLUDE_DIR}
-    ${CCSE_INCLUDE_DIR}
+    ${AMREX_INCLUDE_DIR}
    ${HYPRE_INCLUDE_DIR}
    ${BOOST_INCLUDE_DIR}
 )
@@ -46,7 +46,7 @@ link_directories (
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${IPPL_LIBRARY_DIR}
-    ${CCSE_LIBRARY_DIR}
+    ${AMREX_LIBRARY_DIR}
    ${HYPRE_LIBRARY_DIR}
    ${BOOST_LIBRARY_DIR}
 )
@@ -193,50 +193,50 @@ add_custom_command(TARGET testScatterAMReX POST_BUILD
 target_link_libraries (testAmrPartBase ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testNewTracker ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testPerformance ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testPlasma ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS}
                        -lboost_system -lboost_filesystem)
 target_link_libraries (testTagging ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 # target_link_libraries (testInitGuessSolver ${LIBS}
-#                         -lgfortran ${CCSE_LIBRARIES}
+#                         -lgfortran ${AMREX_LIBRARIES}
 #                         -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testInitialBox ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testScatterAMReX ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testDomainTransformSolve ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testGaussian ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testUnifSphere ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testLayout ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
--- a/ippl/test/AMR/ippl-bunch/CMakeLists.txt
+++ b/ippl/test/AMR/ippl-bunch/CMakeLists.txt
@@ -9,11 +9,11 @@ message (STATUS "The MPI C++ compiler is: ${MPI_CXX_COMPILER}")
 #     message (STATUS "The underlying C++ compiler is: ${CMAKE_CXX_COMPILER}")
 set (CMAKE_CXX_FLAGS
-    "-O3 ${CMAKE_CXX_FLAGS} -DBL_USE_FORTRAN_MPI"
+    "-O3 ${CMAKE_CXX_FLAGS}"
    )
 set (CMAKE_CXX_FLAGS
-    "${IPPL_CMAKE_CXX_FLAGS} -std=c++11 -DUSEH5FEDV2 -DPARALLEL_IO -DIPPL_AMR ${CMAKE_CXX_FLAGS}"
+    "${IPPL_CMAKE_CXX_FLAGS} -std=c++11 -DUSEH5FEDV2 -DPARALLEL_IO -DIPPL_AMR ${AMREX_DEFINES} ${CMAKE_CXX_FLAGS}"
 )
 include_directories (
@@ -24,7 +24,7 @@ include_directories (
    ${IPPL_INCLUDE_DIR}
    ${H5Hut_INCLUDE_DIR}
    ${HDF5_INCLUDE_DIR}
-    ${CCSE_INCLUDE_DIR}
+    ${AMREX_INCLUDE_DIR}
    ${HYPRE_INCLUDE_DIR}
 )
@@ -32,7 +32,7 @@ link_directories (
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${IPPL_LIBRARY_DIR}
-    ${CCSE_LIBRARY_DIR}
+    ${AMREX_LIBRARY_DIR}
    ${HYPRE_LIBRARY_DIR}
 )
@@ -71,9 +71,9 @@ add_executable( testAdapterPattern
               )
 # target_link_libraries (testCRTP ${LIBS}
-#                         -lgfortran ${CCSE_LIBRARIES}
+#                         -lgfortran ${AMREX_LIBRARIES}
 #                         -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 target_link_libraries (testAdapterPattern ${LIBS}
-                        -lgfortran ${CCSE_LIBRARIES}
+                        -lgfortran ${AMREX_LIBRARIES}
                        -lcboxlib ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,12 +12,8 @@ IF(ENABLE_SAAMG_SOLVER)
 ENDIF(ENABLE_SAAMG_SOLVER)
 IF(ENABLE_AMR)
-    # FIXME Find a better solution!
-    # We get otherwise a "undefined reference" to "getLevelBld()" and "probinit_"
-    set (CBOXLIB -lcboxlib)
    IF(NOT ${HOSTNAME_BASE} MATCHES "edison" AND NOT ${HOSTNAME_BASE} MATCHES "cori" AND NOT ${HOSTNAME_BASE} MATCHES "daint")
-        set (CBOXLIB "-lmpi -lmpi_mpifh ${CBOXLIB}")
+        set (F_MPI "-lmpi" "-lmpi_mpifh")
    ENDIF(NOT ${HOSTNAME_BASE} MATCHES "edison" AND NOT ${HOSTNAME_BASE} MATCHES "cori" AND NOT ${HOSTNAME_BASE} MATCHES "daint")
 ENDIF(ENABLE_AMR)
@@ -99,7 +95,7 @@ include_directories ( BEFORE
    ${Trilinos_INCLUDE_DIRS}
    ${Trilinos_TPL_INCLUDE_DIRS}
    ${IPPL_SOURCE_DIRS}
-    ${CCSE_INCLUDE_DIRS}
+    ${AMREX_INCLUDE_DIR}
    ${GTEST_INCLUDE_DIR}
    ${OPTP_INCLUDE_DIR}
 )
@@ -109,7 +105,7 @@ link_directories (
    ${OPTP_LIBRARY_DIR}
    ${Trilinos_LIBRARY_DIRS}
    ${Trilinos_TPL_LIBRARY_DIRS}
-    ${CCSE_LIBRARY_DIR}
+    ${AMREX_LIBRARY_DIR}
 )
 IF (ENABLE_DKS)
@@ -154,10 +150,10 @@ ENDIF (ENABLE_DKS)
 add_library( OPALib ${OPAL_SRCS} )
 set_target_properties( OPALib PROPERTIES OUTPUT_NAME OPAL )
-target_link_libraries( OPALib ${OPAL_LIBS} ${Trilinos_LIBRARIES} ${CCSE_LIBRARIES} ${OTHER_CMAKE_EXE_LINKER_FLAGS} )
+target_link_libraries( OPALib ${OPAL_LIBS} ${Trilinos_LIBRARIES} ${AMREX_LIBRARIES} ${OTHER_CMAKE_EXE_LINKER_FLAGS} )
 add_executable( opal Main.cpp )
-target_link_libraries( opal ${OPAL_LIBS} OPALib ${Trilinos_LIBRARIES} ${Trilinos_TPL_LIBRARIES} -lgfortran ${CCSE_LIBRARIES} ${CBOXLIB} ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
+target_link_libraries( opal ${OPAL_LIBS} OPALib ${Trilinos_LIBRARIES} ${Trilinos_TPL_LIBRARIES} -lgfortran ${AMREX_LIBRARIES} ${F_MPI} ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${CMAKE_DL_LIBS})
 install (TARGETS ${TEST_EXE} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 install (TARGETS opal RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")

--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -37,7 +37,7 @@ LINK_DIRECTORIES( ${GTEST_LIB_DIR}
    ${OPAL_SOURCE_DIR}/src
    ${Trilinos_LIBRARY_DIRS}
    ${Trilinos_TPL_LIBRARY_DIRS}
-    ${CCSE_LIBRARY_DIR}
+    ${AMREX_LIBRARY_DIR}
    ${Boost_LIBRARIES}
 )
@@ -52,7 +52,7 @@ INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIR}
    ${Trilinos_INCLUDE_DIRS}
    ${Trilinos_TPL_INCLUDE_DIRS}
    ${IPPL_SOURCE_DIRS}
-    ${CCSE_INCLUDE_DIRS}
+    ${AMREX_INCLUDE_DIRS}
    ${GTEST_INCLUDE_DIR}
 )
@@ -62,4 +62,4 @@ INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIR}
 # Build the test exe. We don't do an install on the unit test exe as it is
 # assumed that this is internal to opal
 ADD_EXECUTABLE(${TEST_EXE} ${TEST_SRCS}) # the opal and classic sources are not needed again if we link agains libOPAL and libCLASSIC!
-TARGET_LINK_LIBRARIES(${TEST_EXE} OPALib ${OPAL_LIBS} ${Trilinos_LIBRARIES} ${Trilinos_TPL_LIBRARIES} ${CCSE_LIBRARIES} -lgfortran ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${GTEST_BOTH_LIBRARIES} -lpthread)
+TARGET_LINK_LIBRARIES(${TEST_EXE} OPALib ${OPAL_LIBS} ${Trilinos_LIBRARIES} ${Trilinos_TPL_LIBRARIES} ${AMREX_LIBRARIES} -lgfortran ${OTHER_CMAKE_EXE_LINKER_FLAGS} ${GTEST_BOTH_LIBRARIES} -lpthread)