Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / analysisdata / analysisdata.cpp

diff --git a/src/gromacs/analysisdata/analysisdata.cpp b/src/gromacs/analysisdata/analysisdata.cpp
index 105a7b59fe1cb23b992e72388145447bc8ba0bd5..300b2bd56f6fbf94c989bec8c6338c2386f6df53 100644 (file)
--- a/src/gromacs/analysisdata/analysisdata.cpp
+++ b/src/gromacs/analysisdata/analysisdata.cpp
@@ -1,10 +1,10 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012,2013, by the GROMACS development team, led by
- * David van der Spoel, Berk Hess, Erik Lindahl, and including many
- * others, as listed in the AUTHORS file in the top-level source
- * directory and at http://www.gromacs.org.
+ * Copyright (c) 2010,2011,2012,2013,2014, 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.
  *
  * GROMACS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -39,7 +39,9 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_analysisdata
  */
-#include "gromacs/analysisdata/analysisdata.h"
+#include "gmxpre.h"
+
+#include "analysisdata.h"
 
 #include "gromacs/analysisdata/dataframe.h"
 #include "gromacs/analysisdata/datastorage.h"
@@ -151,6 +153,13 @@ AnalysisData::setMultipoint(bool bMultipoint)
 }
 
 
+int
+AnalysisData::frameCount() const
+{
+    return impl_->storage_.frameCount();
+}
+
+
 AnalysisDataHandle
 AnalysisData::startData(const AnalysisDataParallelOptions &opt)
 {
@@ -158,9 +167,7 @@ AnalysisData::startData(const AnalysisDataParallelOptions &opt)
                        "Too many calls to startData() compared to provided options");
     if (impl_->handles_.empty())
     {
-        notifyDataStart();
-        impl_->storage_.setParallelOptions(opt);
-        impl_->storage_.startDataStorage(this);
+        impl_->storage_.startParallelDataStorage(this, &moduleManager(), opt);
     }
 
     Impl::HandlePointer handle(new internal::AnalysisDataHandleImpl(this));
@@ -188,7 +195,7 @@ AnalysisData::finishData(AnalysisDataHandle handle)
 
     if (impl_->handles_.empty())
     {
-        notifyDataFinish();
+        impl_->storage_.finishDataStorage();
     }
 }