energy/rapl documenation updates

1) updated man pages to better explain how the acct_gather_energy plugins give accurate results only in case of exclusive job allocations

2) remove unnecessary defines

doc/man/man1/sacct.1

@@ -441,6 +441,8 @@ specialized \f3sjobexitmod\fP command.
 .TP
 \f3ConsumedEnergy\fP
 Total energy consumed by all tasks in job, in joules.
+Note: Only in case of exclusive job allocation this value 
+reflects the jobs' real energy consumption.
 
 .TP
 \f3cputime\fP

doc/man/man1/sstat.1

@@ -131,6 +131,8 @@ Average Virtual Memory size of all tasks in job.
 .TP
 \f3ConsumedEnergy\fP
 Total energy consumed by all tasks in job, in joules.
+Note: Only in case of exclusive job allocation this value 
+reflects the jobs' real energy consumption. 
 
 .TP
 \f3JobID\fP

doc/man/man5/slurm.conf.5

@@ -160,7 +160,12 @@ determined by the value of \fBJobAcctGatherFrequency\fR.
 \fBAcctGatherEnergyType\fR
 Identifies the plugin to be used for energy consumption accounting.
 The jobacct_gather plugin and slurmd daemon call this plugin to collect
-energy consumption data for jobs and nodes.
+energy consumption data for jobs and nodes. The collection of energy 
+consumption data takes place on node level, hence only in case of exclusive 
+job allocation the energy consumption measurements will reflect the jobs 
+real consumption. In case of node sharing between jobs the reported consumed 
+energy per job (through sstat or sacct) will not reflect the real energy 
+consumed by the jobs. 
 
 Configurable values at present are:
 .RS

src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.h

@@ -41,17 +41,6 @@
 #ifndef _ENERGY_GATHER_RAPL_H_
 #define _ENERGY_GATHER_RAPL_H_
 
-#define EC_PACKAGE_ENERGY	1
-#define EC_DRAM_ENERGY 		2
-#define EC_TOTAL_ENERGY 	3
-#define EC_PACKAGE_POWER 	4
-#define EC_DRAM_POWER		5
-#define EC_TOTAL_POWER		6
-#define EC_ENERGY_UNITS		7
-
-#define EC_ALL_PACKAGES	        -2
-#define EC_CURRENT_CPU	        -1
-
 #define MAX_PKGS        256
 
 #define MSR_RAPL_POWER_UNIT             0x606