Commit 456916dd authored by Dorchies David's avatar Dorchies David
Browse files

feat(MacroRugo): Limit fFr = 1 if Fr > 1

Refs #295
parent 071bf9e2
......@@ -310,7 +310,7 @@ export class MacroRugo extends FishPass {
*/
private get Cx(): number {
if (this._cache.Cx === undefined) {
this._cache.Cx = this.prms.Cd0.v * 1.4917 -0.3914;
this._cache.Cx = this.prms.Cd0.v //* 1.4917 -0.3914;
}
return this._cache.Cx;
}
......@@ -479,10 +479,10 @@ export class MacroRugo extends FishPass {
(1 - Math.sqrt(MacroRugo.fracAxAy * this.prms.C.v)) /
Math.sqrt(MacroRugo.g * this.prms.Y.v);
if (Fr < 1.3) {
if (Fr < 1) {
return Math.pow(Math.min(rQ / (1 - Math.pow(Fr, 2) / 4), Math.pow(Fr, -2 / 3)), 2);
} else {
return Math.pow(Fr, -4 / 3);
return 1;
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment