Index: DCWoRMS/branches/coolemall/example/review/DCWORMS_PLMXML_PSNCLittleServerRoom_1.xml
===================================================================
--- DCWoRMS/branches/coolemall/example/review/DCWORMS_PLMXML_PSNCLittleServerRoom_1.xml	(revision 1261)
+++ DCWoRMS/branches/coolemall/example/review/DCWORMS_PLMXML_PSNCLittleServerRoom_1.xml	(revision 1307)
@@ -440,5 +440,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -499,5 +499,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -558,5 +558,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -617,5 +617,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -676,5 +676,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -735,5 +735,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -794,5 +794,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -853,5 +853,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -912,5 +912,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -971,5 +971,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -1030,5 +1030,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -1089,5 +1089,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -1148,5 +1148,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -1207,5 +1207,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -1266,5 +1266,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -1325,5 +1325,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -1384,5 +1384,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -1443,5 +1443,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -10571,5 +10571,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -10630,5 +10630,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -10689,5 +10689,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -10748,5 +10748,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -10807,5 +10807,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -10866,5 +10866,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -10925,5 +10925,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -10984,5 +10984,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11043,5 +11043,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11102,5 +11102,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11161,5 +11161,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11220,5 +11220,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11279,5 +11279,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11338,5 +11338,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11397,5 +11397,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11456,5 +11456,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11515,5 +11515,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -11574,5 +11574,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -16650,5 +16650,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -16709,5 +16709,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -16768,5 +16768,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -16827,5 +16827,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -16886,5 +16886,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -16945,5 +16945,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17004,5 +17004,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17063,5 +17063,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17122,5 +17122,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17181,5 +17181,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17240,5 +17240,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17299,5 +17299,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17358,5 +17358,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17417,5 +17417,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17476,5 +17476,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17535,5 +17535,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17594,5 +17594,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -17653,5 +17653,5 @@
                            <airThroughputState>
                               <name>2</name>
-                              <value>0.004670000</value>
+                              <value>0.0112</value>
                               <powerUsage>6.600000000</powerUsage>
                            </airThroughputState>
@@ -20581,5 +20581,5 @@
       <scheduler class="Cluster" name="cluster">
          <schedulingPlugin>
-            <name>example.localplugin.coolemall.computebox1.CB1_FCFS_Random_SP</name>
+            <name>example.localplugin.coolemall.computebox1.CB1_FCFS_ConsolidationHighPerf_SP</name>
          </schedulingPlugin>
          <managedComputingResources include="false">
Index: DCWoRMS/branches/coolemall/example/review/review.properties
===================================================================
--- DCWoRMS/branches/coolemall/example/review/review.properties	(revision 1237)
+++ DCWoRMS/branches/coolemall/example/review/review.properties	(revision 1307)
@@ -16,5 +16,5 @@
 
 # Gantt chart
-creatediagrams.gantt=true
+#creatediagrams.gantt=true
 
 # Shows the execution times of tasks
@@ -28,5 +28,5 @@
 #creatediagrams.resairflow=Inlet;Outlet
 # Resource utilization chart - only for processors
-#creatediagrams.resutilization=ComputeBox1
+creatediagrams.resutilization=NodeGroup
 
 
@@ -37,5 +37,5 @@
 ambientairtemperature=17
 airflowvolume=0.304
-alpha=0.02
+alpha=0.2
 
 
Index: DCWoRMS/branches/coolemall/example/review/workload/fft.xml
===================================================================
--- DCWoRMS/branches/coolemall/example/review/workload/fft.xml	(revision 1224)
+++ DCWoRMS/branches/coolemall/example/review/workload/fft.xml	(revision 1307)
@@ -4,5 +4,5 @@
     <task id="common/scripts/fftScript">
         <execution>
-            <resourceConsumptionProfile type="i7-3615QE">
+            <resourceConsumptionProfile type="Core i7 - 3615QE">
                 <properties name="usefulWork">8000000</properties>
                 <properties name="usefulWorkUnit">cell</properties>
@@ -68,5 +68,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>
-        	<resourceConsumptionProfile type="i7-2715QE">
+        	<resourceConsumptionProfile type="Core i7 - 2715QE">
                 <properties name="usefulWork">8000000</properties>
                 <properties name="usefulWorkUnit">cell</properties>
@@ -132,5 +132,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>            
-            <resourceConsumptionProfile type="amdf">
+            <resourceConsumptionProfile type="Fusion G - T40N">
                 <properties name="usefulWork">8000000</properties>
                 <properties name="usefulWorkUnit">cell</properties>
@@ -256,5 +256,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>
-            <resourceConsumptionProfile type="atom64">
+            <resourceConsumptionProfile type="Atom - N2600">
                 <properties name="usefulWork">8000000</properties>
                 <properties name="usefulWorkUnit">cell</properties>
@@ -335,4 +335,83 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>
+            <resourceConsumptionProfile type="Atom - D510">
+                <properties name="usefulWork">8000000</properties>
+                <properties name="usefulWorkUnit">cell</properties>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT31S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.128093</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.242072</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                               
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT15S</duration>
+                    <behaviour name="PM_Power">
+                        <value>7.550038</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.224059</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                               
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT76S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.387756</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.249712</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                               
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT40S</duration>
+                    <behaviour name="PM_Power">
+                        <value>9.177039</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.273789</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                               
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT143S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.346174</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.248469</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                               
+                </resourceConsumption>
+            </resourceConsumptionProfile>            
         </execution>
     </task>
Index: DCWoRMS/branches/coolemall/example/review/workload/cray2.xml
===================================================================
--- DCWoRMS/branches/coolemall/example/review/workload/cray2.xml	(revision 1224)
+++ DCWoRMS/branches/coolemall/example/review/workload/cray2.xml	(revision 1307)
@@ -4,5 +4,5 @@
     <task id="common/scripts/cray2Script">
         <execution>
-            <resourceConsumptionProfile type="i7-3615QE">
+            <resourceConsumptionProfile type="Core i7 - 3615QE">
                 <properties name="usefulWork">144000000</properties>
                 <properties name="usefulWorkUnit">pixels</properties>
@@ -53,5 +53,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>
- 			<resourceConsumptionProfile type="i7-2715QE">
+ 			<resourceConsumptionProfile type="Core i7 - 2715QE">
                 <properties name="usefulWork">144000000</properties>
                 <properties name="usefulWorkUnit">pixels</properties>
@@ -87,5 +87,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>     
-            <resourceConsumptionProfile type="amdf">
+            <resourceConsumptionProfile type="Fusion G - T40N">
                 <properties name="usefulWork">144000000</properties>
                 <properties name="usefulWorkUnit">pixels</properties>
@@ -871,5 +871,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>
-           	<resourceConsumptionProfile type="atom64">
+           	<resourceConsumptionProfile type="Atom - N2600">
                 <properties name="usefulWork">144000000</properties>
                 <properties name="usefulWorkUnit">pixels</properties>
@@ -1204,5 +1204,339 @@
   					</behaviour>                   
                 </resourceConsumption>
-            </resourceConsumptionProfile>                               
+            </resourceConsumptionProfile>      
+          	<resourceConsumptionProfile type="Atom - D510">
+                <properties name="usefulWork">144000000</properties>
+                <properties name="usefulWorkUnit">pixels</properties>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT5S</duration>
+                    <behaviour name="PM_Power">
+                        <value>23.154377</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.693756</value>                          
+                    </behaviour>
+                   	<behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT8S</duration>
+                    <behaviour name="PM_Power">
+                        <value>32.706639</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.982694</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.089231</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.933105</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.150119</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.934448</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.426417</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.942774</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.360743</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.940570</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.235024</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.937683</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT11S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.050777</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.930788</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.245951</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.938567</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT9S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.695414</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.952508</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT11S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.029183</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.931397</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT9S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.666696</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.951130</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.254710</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.938522</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.402531</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.942831</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.141355</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.935290</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT11S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.049914</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.930828</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT9S</duration>
+                    <behaviour name="PM_Power">
+                        <value>31.649148</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.950380</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT10S</duration>
+                    <behaviour name="PM_Power">
+                        <value>30.582736</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.917275</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT8S</duration>
+                    <behaviour name="PM_Power">
+                        <value>30.735705</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.922991</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT22S</duration>
+                    <behaviour name="PM_Power">
+                        <value>24.558177</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.736014</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT27S</duration>
+                    <behaviour name="PM_Power">
+                        <value>16.764997</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.499230</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT44S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.617722</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.252168</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>4</value>
+  					</behaviour>                   
+                </resourceConsumption>
+            </resourceConsumptionProfile>                                           
         </execution>
     </task>
Index: DCWoRMS/branches/coolemall/example/review/workload/opensslSpeed.xml
===================================================================
--- DCWoRMS/branches/coolemall/example/review/workload/opensslSpeed.xml	(revision 1224)
+++ DCWoRMS/branches/coolemall/example/review/workload/opensslSpeed.xml	(revision 1307)
@@ -4,5 +4,5 @@
 	<task id="common/scripts/opensslScript">
 		<execution>
-			<resourceConsumptionProfile  type="amdf">
+			<resourceConsumptionProfile  type="Fusion G - T40N">
 				<properties name="usefulWork">333740.2</properties>
 				<properties name="usefulWorkUnit">rsa1024sign</properties>
@@ -36,5 +36,5 @@
 				</resourceConsumption>
 			</resourceConsumptionProfile>
-			 <resourceConsumptionProfile type="atom64">
+			 <resourceConsumptionProfile type="Atom - N2600">
                 <properties name="usefulWork">172858.2</properties>
                 <properties name="usefulWorkUnit">rsa1024sign</properties>
@@ -68,5 +68,37 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>
-            <resourceConsumptionProfile type="i7-3615QE">
+            <resourceConsumptionProfile type="Atom - D510">
+                <properties name="usefulWork">172858.2</properties>
+                <properties name="usefulWorkUnit">rsa1024sign</properties>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="node">atom64_0_01</reference>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT513S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.426284</value>
+                    </behaviour>
+                    <behaviour name="PM_Disk_IO">
+                        <value>0.000000</value>
+                    </behaviour>
+                    <behaviour name="PM_Memory_RSS">
+                        <value>555.037037</value>
+                    </behaviour>
+                    <behaviour name="PM_Memory_Usage">
+                        <value>0.001095</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.250743</value>
+                    </behaviour>
+                    <behaviour name="PM_Download">
+                        <value>0.000000</value>
+                    </behaviour>
+                    <behaviour name="PM_Upload">
+                        <value>0.000000</value>
+                    </behaviour>
+                </resourceConsumption>
+            </resourceConsumptionProfile>
+            <resourceConsumptionProfile type="Core i7 - 3615QE">
                 <properties name="usefulWork">1946004</properties>
                 <properties name="usefulWorkUnit">rsa1024sign</properties>
@@ -100,5 +132,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>
-            <resourceConsumptionProfile type="i7-2715QE">
+            <resourceConsumptionProfile type="Core i7 - 2715QE">
                 <properties name="usefulWork">1581269.6</properties>
                 <properties name="usefulWorkUnit">rsa1024sign</properties>
Index: DCWoRMS/branches/coolemall/example/review/workload/tar.xml
===================================================================
--- DCWoRMS/branches/coolemall/example/review/workload/tar.xml	(revision 1224)
+++ DCWoRMS/branches/coolemall/example/review/workload/tar.xml	(revision 1307)
@@ -4,5 +4,5 @@
     <task id="common/scripts/tarScript">
         <execution>
-             <resourceConsumptionProfile type="i7-3615QE">
+             <resourceConsumptionProfile type="Core i7 - 3615QE">
                 <properties name="usefulWork">537414105</properties>
                 <properties name="usefulWorkUnit">bytes</properties>
@@ -353,5 +353,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>
-  			<resourceConsumptionProfile type="i7-2715QE">
+  			<resourceConsumptionProfile type="Core i7 - 2715QE">
                 <properties name="usefulWork">537414105</properties>
                 <properties name="usefulWorkUnit">bytes</properties>
@@ -702,5 +702,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>     
-    		<resourceConsumptionProfile type="amdf">
+    		<resourceConsumptionProfile type="Fusion G - T40N">
                 <properties name="usefulWork">537414105</properties>
                 <properties name="usefulWorkUnit">bytes</properties>
@@ -1366,5 +1366,5 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>       
-            <resourceConsumptionProfile type="atom64">
+            <resourceConsumptionProfile type="Atom - N2600">
                 <properties name="usefulWork">537414105</properties>
                 <properties name="usefulWorkUnit">bytes</properties>
@@ -1685,4 +1685,323 @@
                 </resourceConsumption>
             </resourceConsumptionProfile>            
+            <resourceConsumptionProfile type="Atom - D510">
+                <properties name="usefulWork">537414105</properties>
+                <properties name="usefulWorkUnit">bytes</properties>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT210S</duration>
+                    <behaviour name="PM_Power">
+                        <value>7.983178</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.228733</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT60S</duration>
+                    <behaviour name="PM_Power">
+                        <value>7.805880</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.223382</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT59S</duration>
+                    <behaviour name="PM_Power">
+                        <value>7.643049</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.218484</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT218S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.098488</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.232159</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT78S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.155339</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.233824</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT4S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.492255</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.243919</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT9S</duration>
+                    <behaviour name="PM_Power">
+                        <value>4.927203</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.136037</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT14S</duration>
+                    <behaviour name="PM_Power">
+                        <value>5.534836</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.154369</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT12S</duration>
+                    <behaviour name="PM_Power">
+                        <value>5.267625</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.146522</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT19S</duration>
+                    <behaviour name="PM_Power">
+                        <value>5.727246</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.160342</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT20S</duration>
+                    <behaviour name="PM_Power">
+                        <value>5.155989</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.143068</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT39S</duration>
+                    <behaviour name="PM_Power">
+                        <value>7.839485</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.224555</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT5S</duration>
+                    <behaviour name="PM_Power">
+                        <value>1.223972</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.024289</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT328S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.358664</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.240060</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT263S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.320158</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.238852</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT4S</duration>
+                    <behaviour name="PM_Power">
+                        <value>2.665282</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.067946</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT25S</duration>
+                    <behaviour name="PM_Power">
+                        <value>6.967650</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.198171</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>    
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT16S</duration>
+                    <behaviour name="PM_Power">
+                        <value>4.858818</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.133836</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT15S</duration>
+                    <behaviour name="PM_Power">
+                        <value>8.418094</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.242439</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT7S</duration>
+                    <behaviour name="PM_Power">
+                        <value>7.723747</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.220364</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+                <resourceConsumption>
+                    <referenceHardware>
+                        <reference name="cpu_maxfreq">1600</reference>
+                    </referenceHardware>
+                    <duration>PT2S</duration>
+                    <behaviour name="PM_Power">
+                        <value>0.072369</value>
+                    </behaviour>
+                    <behaviour name="PM_CPU_Usage">
+                        <value>0.000000</value>
+                    </behaviour>
+                    <behaviour name="PM_Threads">
+  						<value>1</value>
+  					</behaviour>                        
+                </resourceConsumption>
+            </resourceConsumptionProfile>                        
         </execution>
     </task>
