Merge branch 'azamat/mem-usage/swap-highwater' (PR #1639)

Correct parsing of mem highwater values from cpl.log. Previously, memory resident set size was getting parsed while checking for memleaks. [BFB] Fixes #1636
E3SM-Project · Aug 3, 2017 · f6426d0 · f6426d0
2 parents 0c7ff31 + 1072805
commit f6426d0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/main/cesm_comp_mod.F90 b/main/cesm_comp_mod.F90
@@ -3831,7 +3831,7 @@ subroutine cesm_run()
             call shr_mem_getusage(msize,mrss,.true.)
 
             write(logunit,105) ' memory_write: model date = ',ymd,tod, &
-                 ' memory = ',mrss,' MB (usage)    ',msize,' MB (highwater)', &
+                 ' memory = ',msize,' MB (highwater)    ',mrss,' MB (usage)', &
                  '  (pe=',iam_GLOID,' comps=',trim(complist)//')'
          endif
       endif