-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add positiveMax definition to Base Modelica (#12429)
- Loading branch information
Showing
7 changed files
with
179 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
testsuite/openmodelica/basemodelica/InStreamNominalThreshold.mo
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // name: InStreamNominalThreshold | ||
| // keywords: | ||
| // status: correct | ||
| // cflags: -d=newInst -f | ||
| // | ||
| // | ||
|
|
||
| connector S | ||
| Real r; | ||
| flow Real f; | ||
| stream Real s; | ||
| end S; | ||
|
|
||
| model A | ||
| S s1(f(nominal = 1e-3)); | ||
| S s2(f(nominal = 2000)); | ||
| S s3; | ||
| Real instream_s1; | ||
| Real instream_s2; | ||
| Real instream_s3; | ||
| equation | ||
| connect(s1, s2); | ||
| connect(s2, s3); | ||
| instream_s1 = inStream(s1.s); | ||
| instream_s2 = inStream(s2.s); | ||
| end A; | ||
|
|
||
| model InStreamNominalThreshold | ||
| A a; | ||
| Real instream_a_s1; | ||
| Real instream_a_s2; | ||
| equation | ||
| instream_a_s1 = inStream(a.s1.s); | ||
| instream_a_s2 = inStream(a.s2.s); | ||
| end InStreamNominalThreshold; | ||
|
|
||
| // Result: | ||
| // package 'InStreamNominalThreshold' | ||
| // function '$OMC$PositiveMax' | ||
| // input Real 'flowValue'; | ||
| // input Real 'eps'; | ||
| // output Real 'positiveMax'; | ||
| // algorithm | ||
| // 'positiveMax' := max('flowValue', 'eps'); | ||
| // end '$OMC$PositiveMax'; | ||
| // | ||
| // model 'InStreamNominalThreshold' | ||
| // Real 'a.s1.r'; | ||
| // Real 'a.s1.f'(nominal = 0.001); | ||
| // Real 'a.s1.s'; | ||
| // Real 'a.s2.r'; | ||
| // Real 'a.s2.f'(nominal = 2000.0); | ||
| // Real 'a.s2.s'; | ||
| // Real 'a.s3.r'; | ||
| // Real 'a.s3.f'; | ||
| // Real 'a.s3.s'; | ||
| // Real 'a.instream_s1'; | ||
| // Real 'a.instream_s2'; | ||
| // Real 'a.instream_s3'; | ||
| // Real 'instream_a_s1'; | ||
| // Real 'instream_a_s2'; | ||
| // equation | ||
| // 'a.s2.r' = 'a.s3.r'; | ||
| // 'a.s2.r' = 'a.s1.r'; | ||
| // -('a.s2.f' + 'a.s3.f' + 'a.s1.f') = 0.0; | ||
| // 'a.s1.s' = ('$OMC$PositiveMax'('a.s3.f', 1e-7) * 'a.s3.s' + '$OMC$PositiveMax'('a.s2.f', 1.9999999999999998e-4) * 'a.s2.s') / ('$OMC$PositiveMax'('a.s3.f', 1e-7) + '$OMC$PositiveMax'('a.s2.f', 1.9999999999999998e-4)); | ||
| // 'a.s3.s' = ('$OMC$PositiveMax'('a.s1.f', 1e-10) * 'a.s1.s' + '$OMC$PositiveMax'('a.s2.f', 1.9999999999999998e-4) * 'a.s2.s') / ('$OMC$PositiveMax'('a.s1.f', 1e-10) + '$OMC$PositiveMax'('a.s2.f', 1.9999999999999998e-4)); | ||
| // 'a.s2.s' = ('$OMC$PositiveMax'('a.s1.f', 1e-10) * 'a.s1.s' + '$OMC$PositiveMax'('a.s3.f', 1e-7) * 'a.s3.s') / ('$OMC$PositiveMax'('a.s1.f', 1e-10) + '$OMC$PositiveMax'('a.s3.f', 1e-7)); | ||
| // 'a.s1.f' = 0.0; | ||
| // 'a.s2.f' = 0.0; | ||
| // 'a.s3.f' = 0.0; | ||
| // 'a.instream_s1' = 'a.s1.s'; | ||
| // 'a.instream_s2' = 'a.s2.s'; | ||
| // 'instream_a_s1' = 'a.s1.s'; | ||
| // 'instream_a_s2' = 'a.s2.s'; | ||
| // end 'InStreamNominalThreshold'; | ||
| // end 'InStreamNominalThreshold'; | ||
| // endResult |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters