Skip to content

improved ill-posed integer rounding #2089

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

Open
JayHuLBL wants to merge 10 commits into
base: master
Choose a base branch
from
Open

improved ill-posed integer rounding #2089

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7bb463b
improved ill-posed integer rounding
JayHuLBL Feb 18, 2026
6a41c20
corrected implementation
JayHuLBL Feb 19, 2026
61b4f70
corrected implementation
JayHuLBL Feb 20, 2026
8462d07
improved implementation
JayHuLBL Feb 23, 2026
10f3e56
improved implementation
JayHuLBL Feb 24, 2026
b04274c
moved comment
JayHuLBL Feb 25, 2026
864091c
simplified implementation
JayHuLBL Feb 27, 2026
b53b1b9
corrected implementation
JayHuLBL Feb 27, 2026
4b45e33
corrected implementation
JayHuLBL Feb 27, 2026
ecffbe9
improved implementation
JayHuLBL Mar 6, 2026
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
25 changes: 19 additions & 6 deletions IBPSA/BoundaryConditions/WeatherData/BaseClasses/PartialConvertTime.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,24 @@ protected
parameter Boolean canRepeatWeatherFile = abs(mod(lenWea, 365*24*3600)) < 1E-2
"=true, if the weather file can be repeated, since it has the length of a year or a multiple of it";

discrete Modelica.Units.SI.Time tNext(start=0, fixed=true)
discrete Modelica.Units.SI.Time tNext
"Start time of next period";

Integer k "Period index";

initial equation
k = integer(modTimAux/lenWea)+1;
tNext = if canRepeatWeatherFile then k * lenWea else time;

equation
when {initial(), canRepeatWeatherFile and modTimAux > pre(tNext)} then
// simulation time stamp went over the end time of the weather file
//(last time stamp of the weather file + average increment)
tNext = if canRepeatWeatherFile then integer(modTimAux/lenWea)*lenWea + lenWea else time;
// simulation time stamp went over the end time of the weather file
// (last time stamp of the weather file + average increment)
when (canRepeatWeatherFile and modTimAux > pre(tNext)) then
k = pre(k) + 1;
tNext = k * lenWea;
end when;
calTimAux = if canRepeatWeatherFile then modTimAux - tNext + lenWea else modTimAux;

calTimAux = if canRepeatWeatherFile then modTimAux - tNext + lenWea else modTimAux;

annotation (
defaultComponentName="conTim",
Expand All @@ -38,6 +45,12 @@ or a multiple of it, if this is the length of the weather file.
</html>", revisions="<html>
<ul>
<li>
February 18, 2026, by Jianjun Hu:<br/>
Improved ill-posed integer rounding.<br/>
This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4480\">Buildings #4480</a>
and <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2088\">IBPSA #2088</a>.
</li>
<li>
March 27, 2023, by Ettore Zanetti:<br/>
Added partial class for conversion from simulation time to calendar time, to be
used by solar models that require calendar time for calculations.<br/>
Expand Down