Merge branch release-2020 into master

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

diff --git a/src/gromacs/mdlib/mdoutf.h b/src/gromacs/mdlib/mdoutf.h
index 4add522f7971f3d3d572589cb2d9bc9d6ffbafb9..a6f9371ce6eee68897c41e6fee0786434adee6f7 100644 (file)
--- a/src/gromacs/mdlib/mdoutf.h
+++ b/src/gromacs/mdlib/mdoutf.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013,2014,2015,2016,2017 by the GROMACS development team.
+ * Copyright (c) 2013,2014,2015,2016,2017 The GROMACS development team.
  * Copyright (c) 2018,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
@@ -46,6 +46,7 @@
 
 class energyhistory_t;
 struct gmx_mtop_t;
+struct gmx_multisim_t;
 struct gmx_output_env_t;
 struct ObservablesHistory;
 struct t_commrec;
@@ -78,7 +79,9 @@ gmx_mdoutf_t init_mdoutf(FILE*                         fplog,
                          gmx_mtop_t*                   mtop,
                          const gmx_output_env_t*       oenv,
                          gmx_wallcycle_t               wcycle,
-                         gmx::StartingBehavior         startingBehavior);
+                         gmx::StartingBehavior         startingBehavior,
+                         bool                          simulationsShareState,
+                         const gmx_multisim_t*         ms);
 
 /*! \brief Getter for file pointer */
 ener_file_t mdoutf_get_fp_ene(gmx_mdoutf_t of);