개정판 96a2fc6f
issue #1058 : Pump HHP 계산 오류 수정
Change-Id: Ib26d2c8523b3e9d1ce11f04e8dc9b7cb75f828fa
| HYTOS/HYTOS/Commands/HydroCalculationCommand.py | ||
|---|---|---|
| 405 | 405 |
|
| 406 | 406 |
npsha = self.npsha_cal_hy(suct_p, vapr_p, density) |
| 407 | 407 |
head = self.pump_head_cal(diff_p, density) |
| 408 |
hhp = self.pump_hydp_hy(flowrate_mass, density, head)
|
|
| 408 |
hhp = self.pump_hydp_hy(flowrate_mass, density, diff_p)
|
|
| 409 | 409 |
|
| 410 | 410 |
attribute = {}
|
| 411 | 411 |
|
| ... | ... | |
| 548 | 548 |
|
| 549 | 549 |
return npsha |
| 550 | 550 |
|
| 551 |
def pump_hydp_hy(self, flowrate_mass, density, head):
|
|
| 551 |
def pump_hydp_hy(self, flowrate_mass, density, diff_p):
|
|
| 552 | 552 |
hydp_den = density |
| 553 | 553 |
|
| 554 | 554 |
# 질량유량은 모두 kg/min으로 맞춰야 함 |
| ... | ... | |
| 570 | 570 |
sg = hydp_den * 16.0185 / 1000 |
| 571 | 571 |
q = mass_4_hydp / hydp_den * 2.20462 / 3.28 ** 3 |
| 572 | 572 |
|
| 573 |
pressure_unit = self.units['Pressure'] |
|
| 574 |
if pressure_unit == 'kg/cm2': |
|
| 575 |
head = diff_p |
|
| 576 |
elif pressure_unit == 'psi': |
|
| 577 |
head = diff_p / 14.7 * 1.033 |
|
| 578 |
elif pressure_unit == 'bar': |
|
| 579 |
head = diff_p / 1.013 * 1.033 |
|
| 580 |
elif pressure_unit == 'mmHg': |
|
| 581 |
head = diff_p / 760 * 1.033 |
|
| 582 |
elif pressure_unit == 'kPa': |
|
| 583 |
head = diff_p / 101.325 * 1.033 |
|
| 584 |
elif pressure_unit == 'MPa': |
|
| 585 |
head = diff_p / 0.101325 * 1.033 |
|
| 586 |
|
|
| 587 |
# 현재 head는 kg/cm2으로 통일되어있음 |
|
| 588 |
head = head * 10 / sg |
|
| 589 |
|
|
| 573 | 590 |
# 현재 hydp는 kW 임 |
| 574 | 591 |
hydp = 0.163 * sg * q * head |
| 575 | 592 |
|
| readme.html | ||
|---|---|---|
| 37 | 37 |
<td style="padding-left: 5px; font-weight: bold;" colspan="2"><font color="white" size="3">CHANGES</font></td> |
| 38 | 38 |
</tr> |
| 39 | 39 |
|
| 40 |
<tr><td style="tr-title" colspan="2" bgcolor=lightgray><B>3.1.3.0 [2020.10.20]</B></td></tr> |
|
| 41 |
<tr><td class="filesChanged">1.</td><td>Pump HHP 오류 수정</td></tr> |
|
| 42 |
|
|
| 40 | 43 |
<tr><td style="tr-title" colspan="2" bgcolor=lightgray><B>3.1.2.0 [2020.10.19]</B></td></tr> |
| 41 | 44 |
<tr><td class="filesChanged">1.</td><td>Loop 계산시 Pattern 이용 빠져나오기</td></tr> |
| 42 | 45 |
|
| version.rc | ||
|---|---|---|
| 7 | 7 |
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) |
| 8 | 8 |
# Set not needed items to zero 0. |
| 9 | 9 |
# Local Build $BUILD_NUMBER=0 |
| 10 |
filevers=(3,1,2,0),
|
|
| 11 |
prodvers=(3,1,2,0),
|
|
| 10 |
filevers=(3,1,3,0),
|
|
| 11 |
prodvers=(3,1,3,0),
|
|
| 12 | 12 |
# Contains a bitmask that specifies the valid bits 'flags'r |
| 13 | 13 |
mask=0x3f, |
| 14 | 14 |
# Contains a bitmask that specifies the Boolean attributes of the file. |
| ... | ... | |
| 32 | 32 |
u'040904B0', |
| 33 | 33 |
[StringStruct(u'CompanyName', u'SECL'), |
| 34 | 34 |
StringStruct(u'FileDescription', u'Hydraulic Calculator'), |
| 35 |
StringStruct(u'FileVersion', u'3.1.2.0'),
|
|
| 35 |
StringStruct(u'FileVersion', u'3.1.3.0'),
|
|
| 36 | 36 |
StringStruct(u'InternalName', u'HYTOS'), |
| 37 | 37 |
StringStruct(u'LegalCopyright', u'Copyright(c) SECL'), |
| 38 | 38 |
StringStruct(u'OriginalFilename', u'HYTOS.exe'), |
| 39 | 39 |
StringStruct(u'ProductName', u'HYTOS'), |
| 40 |
StringStruct(u'ProductVersion', u'3.1.2.0')])
|
|
| 40 |
StringStruct(u'ProductVersion', u'3.1.3.0')])
|
|
| 41 | 41 |
]), |
| 42 | 42 |
VarFileInfo([VarStruct(u'Translation', [1033, 1200])]) |
| 43 | 43 |
] |
내보내기 Unified diff
