From c792faa005699df01810a04828bd57d620579f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= <zulian@eit.uni-kl.de>
Date: Tue, 9 Aug 2016 13:59:22 +0200
Subject: [PATCH] IceWrapper is now part of 3d-ice. Project files updated.

Since version 2.2.6 3d-ice contains the IceWapper code.

Readme file updated.

Example stack file "stack.stk" udpated to fit the current version of 3d-ice.
---
 DRAMSys/dram.vp.system.pro                        |  5 -----
 .../resources/configs/thermalsim/stack.stk        | 15 ++++++++-------
 DRAMSys/simulator/simulator.pro                   |  6 +-----
 README.md                                         |  5 ++---
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/DRAMSys/dram.vp.system.pro b/DRAMSys/dram.vp.system.pro
index bdd85a46..9fa840ef 100644
--- a/DRAMSys/dram.vp.system.pro
+++ b/DRAMSys/dram.vp.system.pro
@@ -7,11 +7,6 @@ isEmpty(thermalsim) {
 
 $$eval(thermalsim) {
     message(Thermal Simulation Feature Enabled)
-
-    # build the project sequentially as listed in SUBDIRS
-    CONFIG += ordered
-
-    SUBDIRS += simulator/src/common/third_party/icewrapper/3D-ICE-SystemC-Client.pro
 } else {
     message(Thermal Simulation Feature Disabled)
 }
diff --git a/DRAMSys/simulator/resources/configs/thermalsim/stack.stk b/DRAMSys/simulator/resources/configs/thermalsim/stack.stk
index 41593b1d..ec74f020 100755
--- a/DRAMSys/simulator/resources/configs/thermalsim/stack.stk
+++ b/DRAMSys/simulator/resources/configs/thermalsim/stack.stk
@@ -10,11 +10,15 @@ material COPPER :
     thermal conductivity 4.01e-04 ;
     volumetric heat capacity 3.37e-12 ;
 
-heat sink :
-    sink height 1e03, area 100e06, material COPPER ;
-    spreader height 0.5e03, area 70e06, material SILICON ;
+top heat sink :
+    //sink height 1e03, area 100e06, material COPPER ;
+    //spreader height 0.5e03, area 70e06, material SILICON ;
     heat transfer coefficient 1.3e-09 ;
-    ambient temperature 318.15 ;
+    temperature 318.15 ;
+dimensions :
+   chip length 6100, width 10600 ;
+   cell length  100, width   100 ;
+
 
 layer PCB :
     height 10 ;
@@ -26,9 +30,6 @@ die DRAM :
     layer 1.5 BEOL ;
     layer 58.5 SILICON ;
 
-dimensions :
-   chip length 6100, width 10600 ;
-   cell length 100, width  100 ;
 
 stack:
     die DRAM_DIE DRAM floorplan "./mem.flp" ;
diff --git a/DRAMSys/simulator/simulator.pro b/DRAMSys/simulator/simulator.pro
index 92f4698b..84dd1070 100644
--- a/DRAMSys/simulator/simulator.pro
+++ b/DRAMSys/simulator/simulator.pro
@@ -190,7 +190,7 @@ $$eval(thermalsim) {
     }
     message(LIBSUPERLU_HOME path is $${libthreed_ice_home})
 
-    LIBS += -L$${libthreed_ice_home}/lib -lthreed-ice-2.2.5
+    LIBS += -L$${libthreed_ice_home}/lib -lthreed-ice-2.2.4
     LIBS += -L$${libsuperlu_home}/lib -lsuperlu_4.3
     LIBS += -lblas
     message(Libraries: $${LIBS})
@@ -198,12 +198,8 @@ $$eval(thermalsim) {
     INCLUDEPATH += $${libthreed_ice_home}/include
     INCLUDEPATH += $${libsuperlu_home}/SRC
     INCLUDEPATH += $${systemc_home}/include
-    INCLUDEPATH += src/common/third_party/icewrapper
     message(Include paths: $${INCLUDEPATH})
 
-    OBJECTS += $$(PWD)/src/common/third_party/icewrapper/IceWrapper.o
-    message(Objects: $${OBJECTS})
-
     QMAKE_CXXFLAGS += -DTHERMALSIM
     message(Compiler flags: $${QMAKE_CXXFLAGS})
 
diff --git a/README.md b/README.md
index c9031a72..2d898ed8 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,8 @@ $ git clone --recursive https://<user>@git.rhrk.uni-kl.de/EIT-Wehn/dram.vp.syste
 ```
 
 The *--recursive* flag tells git to initialize all submodules within the
-repository. **DRAMPower** [2], **tinyxml** and **icewrapper** are examples
-third party repositories that were embedded within the source tree as
-submodules.
+repository. **DRAMPower** [2] and **tinyxml** are examples third party
+repositories that were embedded within the source tree as submodules.
 
 It is possible to work with a **fork** of the official codebase. In that case,
 after pushing changes into your fork you should create a **pull request** in