Skip to content

Fix conversion script #2019 #2027

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
mwetter merged 1 commit into from
Jun 11, 2025
Merged

Fix conversion script #2019 #2027

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
77 changes: 36 additions & 41 deletions IBPSA/Resources/Scripts/Conversion/ConvertIBPSA_from_3.0_to_4.0.mos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,42 @@ convertModifiers("IBPSA.Fluid.SolarCollectors.EN12975",
{"nPanelsSer"}, fill("",0), true);

// Conversion for https://github.com/ibpsa/modelica-ibpsa/issues/1926
convertModifiers("IBPSA.Fluid.Movers.FlowControlled_dp",
{"use_inputFilter"}, {"use_riseTime"}, true);
convertModifiers("IBPSA.Fluid.Movers.FlowControlled_m_flow",
{"use_inputFilter"}, {"use_riseTime"}, true);
convertModifiers("IBPSA.Fluid.Movers.SpeedControlled_y",
{"use_inputFilter"}, {"use_riseTime"}, true);
convertModifiers("IBPSA.Fluid.Movers.Preconfigured.FlowControlled_dp",
{"use_inputFilter"}, {"use_riseTime"}, true);
convertModifiers("IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow",
{"use_inputFilter"}, {"use_riseTime"}, true);
convertModifiers("IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y",
{"use_inputFilter"}, {"use_riseTime"}, true);

convertModifiers("IBPSA.Fluid.Actuators.Dampers.Exponential",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Dampers.MixingBox",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Dampers.MixingBoxMinimumFlow",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Dampers.PressureIndependent",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayLinear",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.ThreeWayTable",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayButterfly",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayEqualPercentage",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayLinear",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayPolynomial",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayPressureIndependent",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayQuickOpening",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertModifiers("IBPSA.Fluid.Actuators.Valves.TwoWayTable",
{"use_inputFilter", "riseTime"}, {"use_strokeTime", "strokeTime"}, true);
convertElement("IBPSA.Fluid.Movers.FlowControlled_dp", "use_inputFilter", "use_riseTime");
convertElement("IBPSA.Fluid.Movers.FlowControlled_m_flow", "use_inputFilter", "use_riseTime");
convertElement("IBPSA.Fluid.Movers.SpeedControlled_y", "use_inputFilter", "use_riseTime");
convertElement("IBPSA.Fluid.Movers.Preconfigured.FlowControlled_dp", "use_inputFilter", "use_riseTime");
convertElement("IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow", "use_inputFilter", "use_riseTime");
convertElement("IBPSA.Fluid.Movers.Preconfigured.SpeedControlled_y", "use_inputFilter", "use_riseTime");

convertElement("IBPSA.Fluid.Actuators.Dampers.Exponential", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Dampers.MixingBox", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Dampers.MixingBoxMinimumFlow", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Dampers.PressureIndependent", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.ThreeWayLinear", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.ThreeWayTable", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayButterfly", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayEqualPercentage", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayLinear", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayPolynomial", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayPressureIndependent", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayQuickOpening", "riseTime", "strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayTable", "riseTime", "strokeTime");

convertElement("IBPSA.Fluid.Actuators.Dampers.Exponential", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Dampers.MixingBox", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Dampers.MixingBoxMinimumFlow", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Dampers.PressureIndependent", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.ThreeWayLinear", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.ThreeWayTable", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayButterfly", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayEqualPercentage", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayLinear", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayPolynomial", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayPressureIndependent", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayQuickOpening", "use_inputFilter", "use_strokeTime");
convertElement("IBPSA.Fluid.Actuators.Valves.TwoWayTable", "use_inputFilter", "use_strokeTime");


// Conversion for https://github.com/ibpsa/modelica-ibpsa/issues/1885
Expand Down