Skip to content

Simplify ComplexRampPhasor #4239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christiankral merged 1 commit into from
Dec 13, 2023
Merged

Simplify ComplexRampPhasor #4239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Modelica/ComplexBlocks/Sources/ComplexRampPhasor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ equation
magnitude = if not useLogRamp then
magnitude1 + (if time < startTime then
0 else
if time < (startTime + max(duration,eps)) then
(time - startTime)*(magnitude2-magnitude1)/max(duration,eps)
if time < (startTime + duration) then
(time - startTime)*(magnitude2-magnitude1)/duration
else
magnitude2-magnitude1)
else
if time < startTime then magnitude1 else
if time < (startTime + max(duration,eps)) then
10^(log10(magnitude1) + (log10(magnitude2) - log10(magnitude1))*min(1, (time-startTime)/max(duration,eps)))
if time < (startTime + duration) then
10^(log10(magnitude1) + (log10(magnitude2) - log10(magnitude1))*min(1, (time-startTime)/duration))
else
magnitude2;

Expand Down