GitLab

- compile option 'template-depth' removed
- break drown long lines

review of master CMakeList.txt and CMakeList.txt of OPAL and IPPL plus required changes in the source code

- more conflicts resolved

- formatting changes
- type in Intel compile options fixed

update required cmake version to 3.1 after change in 0e771d47; cleanup: cmake version only required at top level

modified:   ../CMakeLists.txt
modified:   Amr/AmrBoxLib.cpp
deleted:    Amr/AmrPythonWriter.cpp
deleted:    Amr/AmrPythonWriter.h
deleted:    Amr/AmrSliceWriter.cpp
deleted:    Amr/AmrSliceWriter.h
modified:   Amr/CMakeLists.txt
modified:   BasicActions/Option.cpp
modified:   Classic/Utilities/Options.cpp
modified:   Classic/Utilities/Options.h

This reverts commit 69985bb1.

- reformat with indent equal 4, split lines to make code better readable
- reviewed

Latest AMReX commit
-------------------

commit 207c75da3ad51deb2da1ba20bf8ce0a86264332a
Date:   Thu Nov 2 12:55:13 2017 -0600

    Use amrex_constants_module in amrex_filcc_2d

Affected files
--------------

modified:   ../../../../CMakeLists.txt
modified:   ../AmrOpal.cpp
modified:   ../AmrOpal.h
modified:   ../Distribution.cpp
modified:   ../Distribution.h
modified:   ../MGTSolver.cpp
modified:   ../MGTSolver.h
modified:   ../Solver.cpp
modified:   ../Solver.h
modified:   ../amrex-only/AssignMultiLevelDensity.cpp
modified:   ../amrex-only/CMakeLists.txt
modified:   ../amrex-only/Solver.cpp
modified:   ../amrex-only/testDeposition.cpp
modified:   ../amrex-only/testDepositionFail.cpp
modified:   ../amrex-only/testGeometry.cpp
modified:   ../amrex-only/testSolverFail.cpp
modified:   ../helper_functions.h
modified:   AmrParticleBase.h
modified:   AmrParticleBase.hpp
modified:   CMakeLists.txt
modified:   PartBunchAmr.h
modified:   ParticleAmrLayout.h
modified:   ParticleAmrLayout.hpp
modified:   testAmrPartBase.cpp
modified:   testCRTP.cpp
modified:   testDomainTransformSolve.cpp
modified:   testGaussian.cpp
modified:   testInitGuessSolver.cpp
modified:   testInitialBox.cpp
modified:   testLayout.cpp
modified:   testNewTracker.cpp
modified:   testPerformance.cpp
modified:   testPlasma.cpp
modified:   testReal.cpp
modified:   testScatterAMReX.cpp
modified:   testTagging.cpp
modified:   testUnifSphere.cpp
modified:   ../ippl-bunch/CMakeLists.txt
modified:   ../ippl-bunch/PartBunchBase.h
modified:   ../ippl-bunch/testAdapterPattern.cpp
modified:   ../trilinos/AmrBoundary.h
modified:   ../trilinos/AmrDirichletBoundary.h
modified:   ../trilinos/AmrLagrangeInterpolater.h
modified:   ../trilinos/AmrLagrangeInterpolater.hpp
modified:   ../trilinos/AmrMultiGridCore.h
modified:   ../trilinos/AmrMultiGridLevel.h
modified:   ../trilinos/AmrMultiGridLevel.hpp
modified:   ../trilinos/AmrOpenBoundary.h
modified:   ../trilinos/AmrTrilinearInterpolater.hpp
modified:   ../trilinos/AmrTrilinos.cpp
modified:   ../trilinos/AmrTrilinos.h
modified:   ../trilinos/CMakeLists.txt
modified:   ../trilinos/IrregularDomain.h
modified:   ../trilinos/build.h
modified:   ../trilinos/testAmrMultigrid.cpp
modified:   ../trilinos/testBoundaryMatrix.cpp
modified:   ../trilinos/testBoundaryVector.cpp
modified:   ../trilinos/testCopy.cpp
modified:   ../trilinos/testInterpolationMatrix.cpp
modified:   ../trilinos/testLagrange.cpp
modified:   ../trilinos/testNoFine.cpp
modified:   ../trilinos/testPoissonMatrix.cpp
modified:   ../trilinos/testRestrictionMatrix.cpp
modified:   ../trilinos/testSmootherMatrix.cpp
modified:   ../trilinos/testSolverComparison.cpp
modified:   ../trilinos/testSpecialPoissonMatrix.cpp
modified:   ../trilinos/testTrilinosGeometry.cpp
modified:   ../trilinos/testTrilinosSolver.cpp
modified:   ../trilinos/testWithFine.cpp
modified:   ../trilinos/tools.h
modified:   ../writePlotFile.H
modified:   ../../../../src/Amr/AmrBoxLib.cpp
modified:   ../../../../src/Amr/AmrPythonWriter.cpp
modified:   ../../../../src/Amr/AmrYtWriter.cpp
modified:   ../../../../src/Amr/BoxLibLayout.hpp
modified:   ../../../../src/Solvers/BoxLibSolvers/FMGPoissonSolver.cpp
modified:   ../../../../src/Solvers/BoxLibSolvers/FMGPoissonSolver.h