Skip to content

Tolerate floating-point rounding in friction pressure-drop assert #3

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
MatthiasBSchaefer wants to merge 4 commits into
base: master
Choose a base branch
from
+6 −5
Open

Tolerate floating-point rounding in friction pressure-drop assert #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4859031
Tolerate floating-point rounding in friction pressure-drop assert
MatthiasBSchaefer Jul 13, 2026
ea178d7
Fix spacing in pressureDrop calculations
MatthiasBSchaefer Jul 22, 2026
8bad774
Remove irrelevant remark from ModelicaMatIO.c
MatthiasBSchaefer Jul 22, 2026
de19205
Update remark in ModelicaMatIO.c
MatthiasBSchaefer Jul 23, 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
1 change: 1 addition & 0 deletions Modelica/Resources/C-Sources/ModelicaMatIO.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
IMPORTANT REMARK: PLEASE IGNORE THIS STUPID REMARK
*/

/* This file was created by concatenation of the following C source files of the
Expand Down
10 changes: 5 additions & 5 deletions Modelica/Thermal/FluidHeatFlow/BaseClasses/SimpleFriction.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ protected
initial algorithm
assert(V_flowNominal>V_flowLaminar,
"SimpleFriction: V_flowNominal has to be > V_flowLaminar!");
assert(dpNominal>=dpNomMin,
"SimpleFriction: dpNominal has to be > dpLaminar/V_flowLaminar*V_flowNominal!");
assert(dpNominal>=dpNomMin*(1 - 100*Modelica.Constants.eps),
"SimpleFriction: dpNominal has to be >= dpLaminar/V_flowLaminar*V_flowNominal!");
k:=(dpNominal - dpNomMin)/(V_flowNominal - V_flowLaminar)^2;
equation
if volumeFlow > +V_flowLaminar then
pressureDrop = +dpLaminar/V_flowLaminar*volumeFlow + k*(volumeFlow - V_flowLaminar)^2;
pressureDrop = +dpLaminar/V_flowLaminar * volumeFlow + k*(volumeFlow - V_flowLaminar)^2;
elseif volumeFlow < -V_flowLaminar then
pressureDrop = +dpLaminar/V_flowLaminar*volumeFlow - k*(volumeFlow + V_flowLaminar)^2;
pressureDrop = +dpLaminar/V_flowLaminar * volumeFlow - k*(volumeFlow + V_flowLaminar)^2;
else
pressureDrop = dpLaminar/V_flowLaminar*volumeFlow;
pressureDrop = dpLaminar/V_flowLaminar * volumeFlow;
end if;
Q_friction = frictionLoss*volumeFlow*pressureDrop;
annotation (Documentation(info="<html>
Expand Down