new version of muscle 3.8.31

[jabaws.git] / binaries / src / muscle / progress.cpp

diff --git a/binaries/src/muscle/progress.cpp b/binaries/src/muscle/progress.cpp
index 104f306..a7fa01f 100644 (file)
--- a/binaries/src/muscle/progress.cpp
+++ b/binaries/src/muscle/progress.cpp
@@ -15,20 +15,6 @@ static bool g_bWipeDesc = false;
 static int g_nPrevDescLength;\r
 static unsigned g_uTotalSteps;\r
 \r
-double GetCheckMemUseMB()\r
-       {\r
-       unsigned MB = (unsigned) GetMemUseMB();\r
-       if (0 == g_uMaxMB || MB <= g_uMaxMB)\r
-               return MB;\r
-       fprintf(stderr, "\n\n*** MAX MEMORY %u MB EXCEEDED***\n", g_uMaxMB);\r
-       fprintf(stderr, "Memory allocated so far %u MB, physical RAM %u MB\n",\r
-         MB, (unsigned) GetRAMSizeMB());\r
-       fprintf(stderr, "Use -maxmb <n> option to increase limit, where <n> is in MB.\n");\r
-       SaveCurrentAlignment();\r
-       exit(EXIT_FatalError);\r
-       return MB;\r
-       }\r
-\r
 const char *ElapsedTimeAsStr()\r
        {\r
        time_t Now = time(0);\r
@@ -41,7 +27,7 @@ const char *MemToStr(double MB)
        if (MB < 0)\r
                return "";\r
 \r
-       static char Str[9];\r
+       static char Str[16];\r
        static double MaxMB = 0;\r
        static double RAMMB = 0;\r
 \r
@@ -118,7 +104,7 @@ void Progress(const char *szFormat, ...)
        if (g_bQuiet)\r
                return;\r
 \r
-       double MB = GetCheckMemUseMB();\r
+       double MB = GetMemUseMB();\r
 \r
        char szStr[4096];\r
        va_list ArgList;\r
@@ -142,7 +128,7 @@ void Progress(unsigned uStep, unsigned uTotalSteps)
                return;\r
 \r
        double dPct = ((uStep + 1)*100.0)/uTotalSteps;\r
-       double MB = GetCheckMemUseMB();\r
+       double MB = GetMemUseMB();\r
        fprintf(g_fProgress, "%8.8s  %12s  Iter %3u  %6.2f%%  %s",\r
          ElapsedTimeAsStr(),\r
          MemToStr(MB),\r
@@ -168,7 +154,7 @@ void ProgressStepsDone()
 \r
        if (g_bVerbose)\r
                {\r
-               double MB = GetCheckMemUseMB();\r
+               double MB = GetMemUseMB();\r
                Log("Elapsed time %8.8s  Peak memory use %12s  Iteration %3u %s\n",\r
                 ElapsedTimeAsStr(),\r
                 MemToStr(MB),\r