From 8e64eee64d87aa514e66f40a7021a9c803ca6b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Tue, 20 Oct 2015 08:59:13 +0200
Subject: [PATCH] Get power values from DRAMPower if powerAnalysis and dynamic
 temperature simulation are activated

---
 DRAMSys/simulator/src/error/errormodel.cpp | 3 ++-
 DRAMSys/simulator/src/error/errormodel.h   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/DRAMSys/simulator/src/error/errormodel.cpp b/DRAMSys/simulator/src/error/errormodel.cpp
index 0d1a42b4..dc8be31b 100644
--- a/DRAMSys/simulator/src/error/errormodel.cpp
+++ b/DRAMSys/simulator/src/error/errormodel.cpp
@@ -44,6 +44,7 @@
 void errorModel::init()
 {
     powerAnalysis = Configuration::getInstance().PowerAnalysis;
+    dynTemperatureSim = Configuration::getInstance().DynamicTemperatureSimulation;
     // Get Configuration parameters:
     busWidth = Configuration::getInstance().Buswidth;
     burstLenght = Configuration::getInstance().memSpec.BurstLength;
@@ -512,7 +513,7 @@ double errorModel::getTemperature()
     double temperature = 89;
 
     if (this->myChannel != -1) {
-        if (powerAnalysis == true) {
+        if (dynTemperatureSim == true && powerAnalysis == true) {
             // TODO
             // check if this is best way to request information to DRAMPower.
             DRAMPower->updateCounters(true);
diff --git a/DRAMSys/simulator/src/error/errormodel.h b/DRAMSys/simulator/src/error/errormodel.h
index 2d5dfacf..5beff44c 100644
--- a/DRAMSys/simulator/src/error/errormodel.h
+++ b/DRAMSys/simulator/src/error/errormodel.h
@@ -60,6 +60,7 @@ class errorModel
     void init(void);
     bool powerAnalysis;
     libDRAMPower *DRAMPower;
+    bool dynTemperatureSim;
     // Configuration Parameters:
     unsigned int busWidth;
     unsigned int burstLenght;