[ViewVC] Diff of: OpenMD/branches/development/src/utils/ProgressBar.cpp

Comparing branches/development/src/utils/ProgressBar.cpp (file contents):
Revision 1794 by gezelter, Thu Sep 6 19:44:06 2012 UTC vs.
Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

#	Line 35 \| Line 35
35		*
36		* [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37		* [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	<	* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).
38	>	* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).
39		* [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010).
40		* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
#	Line 52 \| Line 52
52		#else
53		#include <cstdio>
54		#include <sys/ioctl.h>
55	+	#include <unistd.h>
56		#endif
57
58		#ifdef IS_MPI
#	Line 86 \| Line 87 \| namespace OpenMD {
87
88		void ProgressBar::update() {
89
89	–	int width;
90	–
90		#ifdef IS_MPI
91		if (MPI::COMM_WORLD.Get_rank() == 0) {
92		#endif
#	Line 96 \| Line 95 \| namespace OpenMD {
95		if (isatty(fileno(stdout)) && (getenv("SGE_TASK_ID")==NULL)) {
96		// get the window width:
97
98	+	int width = 0;
99		#ifdef _MSC_VER
100		CONSOLE_SCREEN_BUFFER_INFO csbi;
101	<	int ret = GetConsoleScreenBufferInfo(GetStdHandle( STD_OUTPUT_HANDLE ),
102	<	&csbi);
101	>	HANDLE hConsole = GetStdHandle( STD_OUTPUT_HANDLE );
102	>	int ret = GetConsoleScreenBufferInfo(hConsole, &csbi);
103		if(ret) {
104	<	width = csbi.dwSize.X;
105	<	}
104	>	width = csbi.dwSize.X - 1;
105	>	}
106		#else
107		struct winsize w;
108		ioctl(fileno(stdout), TIOCGWINSZ, &w);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines