[NSimCode] have own index for external objects (#11890)

OpenModelica · Jan 26, 2024 · a2a5435 · a2a5435
1 parent be5a25d
commit a2a5435
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/OMCompiler/Compiler/NSimCode/NSimCode.mo b/OMCompiler/Compiler/NSimCode/NSimCode.mo
@@ -116,6 +116,7 @@ public
       Integer residualIndex;
       Integer implicitIndex; // this can be removed i think -> moved to solve
       Integer genericCallIndex;
+      Integer extObjIndex;
 
       UnorderedMap<AliasInfo, Integer> alias_map;
       UnorderedMap<Identifier, Integer> generic_call_map;
@@ -152,7 +153,7 @@ public
       0,0,0,0,
       0,0,0,0,
       1,0,0,
-      0,0,0,0,
+      0,0,0,0,0,
       UnorderedMap.new<Integer>(AliasInfo.hash, AliasInfo.isEqual),
       UnorderedMap.new<Integer>(Identifier.hash, Identifier.isEqual)
     );

diff --git a/OMCompiler/Compiler/NSimCode/NSimVar.mo b/OMCompiler/Compiler/NSimCode/NSimVar.mo
@@ -215,25 +215,31 @@ public
         case VarType.SIMULATION algorithm
           Pointer.update(acc, create(var, simCodeIndices.uniqueIndex, simCodeIndices.realVarIndex) :: Pointer.access(acc));
           simCodeIndices.uniqueIndex := simCodeIndices.uniqueIndex + 1;
-          simCodeIndices.realVarIndex := simCodeIndices.realVarIndex +1;
+          simCodeIndices.realVarIndex := simCodeIndices.realVarIndex + 1;
         then ();
 
         case VarType.PARAMETER algorithm
           Pointer.update(acc, create(var, simCodeIndices.uniqueIndex, simCodeIndices.realParamIndex) :: Pointer.access(acc));
           simCodeIndices.uniqueIndex := simCodeIndices.uniqueIndex + 1;
-          simCodeIndices.realParamIndex := simCodeIndices.realParamIndex +1;
+          simCodeIndices.realParamIndex := simCodeIndices.realParamIndex + 1;
         then ();
 
         case VarType.ALIAS algorithm
           Pointer.update(acc, create(var, simCodeIndices.uniqueIndex, simCodeIndices.realAliasIndex, Alias.fromBinding(var.binding)) :: Pointer.access(acc));
           simCodeIndices.uniqueIndex := simCodeIndices.uniqueIndex + 1;
-          simCodeIndices.realAliasIndex := simCodeIndices.realAliasIndex +1;
+          simCodeIndices.realAliasIndex := simCodeIndices.realAliasIndex + 1;
         then ();
 
         case VarType.RESIDUAL algorithm
           Pointer.update(acc, create(var, simCodeIndices.uniqueIndex, simCodeIndices.residualIndex) :: Pointer.access(acc));
           simCodeIndices.uniqueIndex := simCodeIndices.uniqueIndex + 1;
-          simCodeIndices.residualIndex := simCodeIndices.residualIndex +1;
+          simCodeIndices.residualIndex := simCodeIndices.residualIndex + 1;
+        then ();
+
+        case VarType.EXTERNAL_OBJECT algorithm
+          Pointer.update(acc, create(var, simCodeIndices.uniqueIndex, simCodeIndices.extObjIndex) :: Pointer.access(acc));
+          simCodeIndices.uniqueIndex := simCodeIndices.uniqueIndex + 1;
+          simCodeIndices.extObjIndex := simCodeIndices.extObjIndex + 1;
         then ();
 
         else algorithm
@@ -1089,7 +1095,7 @@ public
    {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {});
 
   type SplitType  = enumeration(NONE, TYPE);
-  type VarType    = enumeration(SIMULATION, PARAMETER, ALIAS, RESIDUAL); // ToDo: PRE, OLD, RELATIONS...
+  type VarType    = enumeration(SIMULATION, PARAMETER, ALIAS, RESIDUAL, EXTERNAL_OBJECT); // ToDo: PRE, OLD, RELATIONS...
 
   uniontype VarInfo
     record VAR_INFO
@@ -1236,7 +1242,7 @@ public
     protected
       Pointer<SimCodeIndices> indices_ptr = Pointer.create(simCodeIndices);
       Pointer<list<SimVar>> acc = Pointer.create({});
-      VarType varType = VarType.SIMULATION;
+      VarType varType = VarType.EXTERNAL_OBJECT;
     algorithm
       VariablePointers.map(external_objects, function SimVar.traverseCreate(acc = acc, indices_ptr = indices_ptr, varType = varType));
       simCodeIndices := Pointer.access(indices_ptr);