Merge branch release-2018

Trivial clash in post-submit matrix, where a TODO resolved in 2018
release collided with a new TODO in master branch.

Change-Id: I07366ecb232c7341c8cf17674be3112f44fc9cdd

diff --cc admin/builds/gromacs.py
Simple merge

diff --cc admin/builds/post-submit-matrix.txt
index d7b36ecb6045094ef2b86d749fd063bc142daf2e,00de439f9a3b508e1237eb77d781bf13f4d63ab7..89ec64b31b41f05325251d18cfca4a15295940ef
--- 1/admin/builds/post-submit-matrix.txt
--- 2/admin/builds/post-submit-matrix.txt
+++ b/admin/builds/post-submit-matrix.txt
@@@ -23,12 -23,14 +23,13 @@@ gcc-5 simd=ARM_NEON_ASIMD release-with-
  gcc-7 mpi no-openmp fftpack mdrun-only
  
  # Test MPMD PME with thread-MPI
 -# Test newest icc at time of release
 -# Test icc without SIMD in double precision in release mode
 -# TODO enable simd=avx_256 in this config, and change the above description once #2335 is resolved
 -icc-18 npme=1 nranks=2 no-openmp  double fftpack release simd=none
 +# Test oldest supported icc
 +# Test icc with AVX256 in double precision in release mode
 +icc-17 simd=avx_256 npme=1 nranks=2 no-openmp  double fftpack release
  
  # Test CUDA build on a slave with no CUDA devices
- gcc-4.9 gpu cuda-7.0 openmp release-with-assert
+ # Test without TNG support
+ gcc-4.9 gpu cuda-7.0 openmp no-tng release-with-assert
  
  # Test non-default GMX_PREFER_STATIC_LIBS behavior
  # TODO enable this

diff --cc src/gromacs/fileio/tngio.cpp
index d9d67fa0a5f23a1f4fa3d6f01254cd9743123224,b8ac1aee26909e23832a2b95e9de108ca34dcd76..eb62e4c7563a8acf309309cf6bf9a3193301c2a3
--- 1/src/gromacs/fileio/tngio.cpp
--- 2/src/gromacs/fileio/tngio.cpp
+++ b/src/gromacs/fileio/tngio.cpp
@@@ -82,16 -86,15 +86,17 @@@ using tng_trajectory_t = void *
   */
  struct gmx_tng_trajectory
  {
 -    tng_trajectory_t tng;                 //!< Actual TNG handle (pointer)
 -    bool             lastStepDataIsValid; //!< True if lastStep has been set
 -    std::int64_t     lastStep;            //!< Index/step used for last frame
 -    bool             lastTimeDataIsValid; //!< True if lastTime has been set
 -    double           lastTime;            //!< Time of last frame (TNG unit is seconds)
 -    bool             timePerFrameIsSet;   //!< True if we have set the time per frame
 +    tng_trajectory_t tng;                  //!< Actual TNG handle (pointer)
 +    bool             lastStepDataIsValid;  //!< True if lastStep has been set
 +    std::int64_t     lastStep;             //!< Index/step used for last frame
 +    bool             lastTimeDataIsValid;  //!< True if lastTime has been set
 +    double           lastTime;             //!< Time of last frame (TNG unit is seconds)
 +    bool             timePerFrameIsSet;    //!< True if we have set the time per frame
 +    int              boxOutputInterval;    //!< Number of steps between the output of box size
 +    int              lambdaOutputInterval; //!< Number of steps between the output of lambdas
  };
  
+ #if GMX_USE_TNG
  static const char *modeToVerb(char mode)
  {
      const char *p;

diff --cc src/gromacs/tools/dump.cpp
index 421b5da38a6b60f84bb4b2b1672008b5d4e761fa,82cd78a7834bb11a6d33e4617e5a5191a5b3ac52..8f92475880fb57d9b3ca14cdf2975d277af7c2b3
--- 1/src/gromacs/tools/dump.cpp
--- 2/src/gromacs/tools/dump.cpp
+++ b/src/gromacs/tools/dump.cpp
@@@ -348,12 -349,14 +350,14 @@@ static void list_tng_inner(const char *
      pr_reals_of_dim(stdout, indent, block_name, values, n_atoms, n_values_per_frame);
  }
  
+ #endif
+ 
  static void list_tng(const char gmx_unused *fn)
  {
- #ifdef GMX_USE_TNG
+ #if GMX_USE_TNG
      gmx_tng_trajectory_t tng;
 -    gmx_int64_t          nframe = 0;
 -    gmx_int64_t          i, *block_ids = nullptr, step, ndatablocks;
 +    int64_t              nframe = 0;
 +    int64_t              i, *block_ids = nullptr, step, ndatablocks;
      gmx_bool             bOK;
      real                *values = nullptr;
  

diff --cc src/gromacs/utility/binaryinformation.cpp
Simple merge