[NF] Improve ModelicaIO support.

- Rename Streams_readMatrixSize => ModelicaIO_readMatrixSizes,
  since that's the actual name of the external function.
- Implemented evaluation of ModelicaIO_readRealMatrix.

Belonging to [master]:
  - #2975

Author: perost

Compiler/NFFrontEnd/NFEvalFunction.mo

@@ -980,10 +980,14 @@ algorithm
 
     case ("ModelicaIO_readMatrixSizes", {Expression.STRING(s1), Expression.STRING(s2)})
       algorithm
-        dims := ModelicaExternalC.Streams_readMatrixSize(s1, s2);
+        dims := ModelicaExternalC.ModelicaIO_readMatrixSizes(s1, s2);
       then
         Expression.ARRAY(Type.INTEGER(), {Expression.INTEGER(dims[1]), Expression.INTEGER(dims[2])}, true);
 
+    case ("ModelicaIO_readRealMatrix",
+        {Expression.STRING(s1), Expression.STRING(s2), Expression.INTEGER(i), Expression.INTEGER(i2), Expression.BOOLEAN(b)})
+      then evaluateModelicaIO_readRealMatrix(s1, s2, i, i2, b);
+
     else
       algorithm
         Error.assertion(false, getInstanceName() + ": failed to evaluate " + name, sourceInfo());
@@ -1025,6 +1029,33 @@ algorithm
   end match;
 end evaluateOpenModelicaRegex;
 
+function evaluateModelicaIO_readRealMatrix
+  input String fileName;
+  input String matrixName;
+  input Integer nrow;
+  input Integer ncol;
+  input Boolean verboseRead;
+  output Expression result;
+protected
+  Real[nrow, ncol] matrix;
+  list<Expression> row, rows = {};
+  Type ty;
+algorithm
+  matrix := ModelicaExternalC.ModelicaIO_readRealMatrix(fileName, matrixName, nrow, ncol, verboseRead);
+  ty := Type.ARRAY(Type.REAL(), {Dimension.fromInteger(ncol)});
+
+  for r in 1:nrow loop
+    row := {};
+    for c in 1:ncol loop
+      row := Expression.REAL(matrix[r, c]) :: row;
+    end for;
+    rows := Expression.ARRAY(ty, row, literal = true) :: rows;
+  end for;
+
+  ty := Type.liftArrayLeft(ty, Dimension.fromInteger(nrow));
+  result := Expression.ARRAY(ty, rows, literal = true);
+end evaluateModelicaIO_readRealMatrix;
+
 function evaluateExternal2
   input String name;
   input Function fn;

Compiler/Util/ModelicaExternalC.mo

@@ -103,13 +103,25 @@ function Strings_advanced_skipWhiteSpace
   external "C" nextIndex = ModelicaStrings_skipWhiteSpace(string,startIndex) annotation(Library = "ModelicaExternalC");
 end Strings_advanced_skipWhiteSpace;
 
-function Streams_readMatrixSize
+function ModelicaIO_readMatrixSizes
   input String fileName;
   input String matrixName;
   output Integer[2] dim;
 
   external "C" ModelicaIO_readMatrixSizes(fileName, matrixName, dim) annotation(Library = {"ModelicaIO", "ModelicaMatIO", "zlib"});
-end Streams_readMatrixSize;
+end ModelicaIO_readMatrixSizes;
+
+function ModelicaIO_readRealMatrix
+  input String fileName;
+  input String matrixName;
+  input Integer nrow;
+  input Integer ncol;
+  input Boolean verboseRead = true;
+  output Real[nrow, ncol] matrix;
+
+  external "C" ModelicaIO_readRealMatrix(fileName, matrixName, matrix, nrow, ncol, verboseRead)
+  annotation(Library = {"ModelicaIO", "ModelicaMatIO", "zlib"});
+end ModelicaIO_readRealMatrix;
 
 annotation(__OpenModelica_Interface="util");
 end ModelicaExternalC;