Merge commit d30f2cb6 from release-2020 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / energyoutput.h

diff --git a/src/gromacs/mdlib/energyoutput.h b/src/gromacs/mdlib/energyoutput.h
index f8cc196d5ec7ede2d19ea16f883c4c410c082668..898093092af71d56660432b150d836a4bbd447f8 100644 (file)
--- a/src/gromacs/mdlib/energyoutput.h
+++ b/src/gromacs/mdlib/energyoutput.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2019, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -72,6 +72,7 @@ namespace gmx
 class Awh;
 class Constraints;
 struct MdModulesNotifier;
+enum class StartingBehavior;
 } // namespace gmx
 
 //! \brief Printed names for intergroup energies
@@ -117,6 +118,7 @@ public:
      * \param[in] pull_work  Pulling simulations data
      * \param[in] fp_dhdl    FEP file.
      * \param[in] isRerun    Is this is a rerun instead of the simulations.
+     * \param[in] startingBehavior  Run starting behavior.
      * \param[in] mdModulesNotifier Notifications to MD modules.
      */
     EnergyOutput(ener_file*               fp_ene,
@@ -125,6 +127,7 @@ public:
                  const pull_t*            pull_work,
                  FILE*                    fp_dhdl,
                  bool                     isRerun,
+                 StartingBehavior         startingBehavior,
                  const MdModulesNotifier& mdModulesNotifier);
 
     ~EnergyOutput();