output more resource estimates in jobutils

sawenzel · sawenzel · commit 3462a1d95875 · 2022-08-31T14:52:57.000+02:00
diff --git a/Utilities/Tools/jobutils2.sh b/Utilities/Tools/jobutils2.sh
@@ -206,9 +206,9 @@ taskwrapper() {
   fi
 
   # with or without memory monitoring ?
-  finalcommand="TIME=\"#walltime %e\\n#systime %S\\n#usertime %U\" ${TIMECOMMAND} ./${SCRIPTNAME}"
+  finalcommand="TIME=\"#walltime %e\\n#systime %S\\n#usertime %U\\n#maxmem %M\\n#CPU %P\" ${TIMECOMMAND} ./${SCRIPTNAME}"
   if [[ "$(uname)" != "Darwin" && "${JOBUTILS_MONITORMEM}" ]]; then
-    finalcommand="TIME=\"#walltime %e\\n#systime %S\\n#usertime %U\" ${O2_ROOT}/share/scripts/monitor-mem.sh ${TIMECOMMAND} './${SCRIPTNAME}'"
+    finalcommand="TIME=\"#walltime %e\\n#systime %S\\n#usertime %U\\n#maxmem %M\\n#CPU %P\" ${O2_ROOT}/share/scripts/monitor-mem.sh ${TIMECOMMAND} './${SCRIPTNAME}'"
   fi
   echo "Running: ${finalcommand}" > ${logfile}
 
