- removed circlar dependency between hpcomsimcode and simcode

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21608 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jul 24, 2014 · 621c5ca · 621c5ca
1 parent 03f640e
commit 621c5ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Compiler/BackEnd/HpcOmMemory.mo b/Compiler/BackEnd/HpcOmMemory.mo
@@ -195,7 +195,7 @@ encapsulated package HpcOmMemory
           notOptimizedVars = listAppend(notOptimizedVars, algVars);
           notOptimizedVars = listAppend(notOptimizedVars, paramVars);
 
-          tmpMemoryMap = HpcOmSimCode.MEMORYMAP_ARRAY(memoryPositionMapping,0,hashTable,notOptimizedVars);
+          tmpMemoryMap = HpcOmSimCode.MEMORYMAP_ARRAY(memoryPositionMapping,0,hashTable,{});
         then SOME(tmpMemoryMap);
       else
         equation
@@ -616,7 +616,7 @@ encapsulated package HpcOmMemory
           positionMappingArray = arrayCreate(intMax(0, highestIdx),(-1,-1));
           List.map1_0(positionMappingList, convertCacheMapToMemoryMap3, positionMappingArray);
           floatArraySize = listLength(cacheLinesFloat)*8;
-          tmpMemoryMap = HpcOmSimCode.MEMORYMAP_ARRAY(positionMappingArray, floatArraySize, iScVarNameIdxMapping, iNotOptimizedVars);
+          tmpMemoryMap = HpcOmSimCode.MEMORYMAP_ARRAY(positionMappingArray, floatArraySize, iScVarNameIdxMapping, {});
         then tmpMemoryMap;
       else
         equation

diff --git a/Compiler/BackEnd/HpcOmSimCode.mo b/Compiler/BackEnd/HpcOmSimCode.mo
@@ -32,14 +32,13 @@
 encapsulated package HpcOmSimCode
 
   public import HashTableCrILst;
-  public import SimCode;
 
   public uniontype MemoryMap //stores information to organize the memory for the parallel code in an efficient way
     record MEMORYMAP_ARRAY
       array<tuple<Integer,Integer>> positionMapping; //map each simCodeVar to a memory (array) position and to arrayIdx
       Integer floatArraySize; //arrayIdx: 1
       HashTableCrILst.HashTable scVarNameIdxMapping; //maps each var-name to the scVar-idx
-      list<SimCode.SimVar> otherVars; //a list of not optimized variables
+      list<Integer> otherVars; //a list of not optimized variables
     end MEMORYMAP_ARRAY;
   end MemoryMap;