From 9ee6103f00510433910e58cc01447d51d57f76ac Mon Sep 17 00:00:00 2001 From: Thomas Beutlich Date: Wed, 22 Jan 2025 19:47:24 +0100 Subject: [PATCH] Add function declarations to outer scope --- ExternData/package.mo | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/ExternData/package.mo b/ExternData/package.mo index 4d94be3..e77a166 100644 --- a/ExternData/package.mo +++ b/ExternData/package.mo @@ -1452,11 +1452,46 @@ package ExternData "Library for data I/O of CSV, INI, JSON, MATLAB MAT, SSV, TIR extends Modelica.Icons.InterfacesPackage; model DataSource "Place holder for file based data source" - extends Modelica.Icons.Record; + + partial function getRealArray2D "Get 2D Real values from data source" + extends Modelica.Icons.Function; + annotation(Documentation(info="")); + end getRealArray2D; + + partial function getArrayRows2D "Get first dimension of 2D array in data source" + extends Modelica.Icons.Function; + annotation(Documentation(info="")); + end getArrayRows2D; + + partial function getArrayColumns2D "Get second dimension of 2D array in data source" + extends Modelica.Icons.Function; + annotation(Documentation(info="")); + end getArrayColumns2D; + + partial function getReal "Get scalar Real value from data source" + extends Modelica.Icons.Function; + annotation(Documentation(info="")); + end getReal; + + partial function getInteger "Get scalar Integer value from data source" + extends Modelica.Icons.Function; + annotation(Documentation(info="")); + end getInteger; + + partial function getBoolean "Get scalar Boolean value from data source" + extends Modelica.Icons.Function; + annotation(Documentation(info="")); + end getBoolean; + + partial function getString "Get scalar String value from data source" + extends Modelica.Icons.Function; + annotation(Documentation(info="")); + end getString; + annotation( - Documentation(info="

Place holder record that can be used as generic outer parameter instance in component models to reference an implemented inner parameter instance of CSVFile, INIFile, JSONFile, MATFile, SSVFile, XLSFile, XLSXFile, XMLFile, XML2File, or TIRFile.

See Examples.XMLTest2.Component for an example.

"), + Documentation(info="

Place holder model that can be used as generic outer instance in component models to reference an implemented inner instance of CSVFile, INIFile, JSONFile, MATFile, SSVFile, XLSFile, XLSXFile, XMLFile, XML2File, or TIRFile.

See Examples.XMLTestInnerOuter.Component for an example.

"), defaultComponentName="dataSource", - defaultComponentPrefixes="outer parameter", + defaultComponentPrefixes="outer", missingInnerMessage="No \"dataSource\" component is defined, please drag ExternData.CSVFile, ExternData.INIFile, ExternData.JSONFile, ExternData.MATFile, ExternData.SSVFile, ExternData.XLSFile, ExternData.XLSXFile, ExternData.XMLFile, ExternData.XML2File, or ExternData.TIRFile to the model top level"); end DataSource;