개정판 a91aec5b
issue # 1060 계산식 수정 - 펌프 헤드가 입력이 안되어있는 경우에만 CV의 DP값을 보정
Change-Id: I6c36b7c8485d729b160f3dfafa72e13e5f0a6013
HYTOS/HYTOS/Commands/HydroCalculationCommand.py | ||
---|---|---|
146 | 146 |
name = str(loop.items[i + 1]).replace( |
147 | 147 |
'_{}'.format(str(loop.items[i + 1]).split('_')[len(str(loop.items[i + 1]).split('_')) - 1]), '') |
148 | 148 |
if pump == name: |
149 |
loop.pressure_drops[loop.items[i + 1]] = pumpdp_final |
|
150 | ||
149 |
# '계산 분기점 (펌프 헤드가 입력 안되있는 경우에 가동됨) |
|
150 |
if not loop.items[i + 1] in loop.pressure_drops: |
|
151 |
loop.pressure_drops[loop.items[i + 1]] = pumpdp_final |
|
152 | ||
153 |
if loop.fill_end - loop.fill_start != 3: |
|
154 |
loop.suction_cal(2) |
|
155 |
loop.discharge_cal(2) |
|
156 | ||
157 |
# 'cv의 압력강하를 fill_end를 이용하여 기입해준다 |
|
158 |
# '(fill_end가 cv의 위치를 나타내주는거니까) |
|
159 |
loop.pressure_drops[loop.items[loop.fill_end - 2]] = loop.pressures[loop.items[ |
|
160 |
loop.fill_end - 2]] - loop.pressures[loop.items[loop.fill_end - 1]] |
|
161 |
''' |
|
151 | 162 |
if len(pumps) > 0: |
152 | 163 |
for loop in self.loops: |
153 | 164 |
if loop.fill_end - loop.fill_start != 3: |
... | ... | |
157 | 168 |
# 'cv의 압력강하를 fill_end를 이용하여 기입해준다 |
158 | 169 |
# '(fill_end가 cv의 위치를 나타내주는거니까) |
159 | 170 |
loop.pressure_drops[loop.items[loop.fill_end - 2]] = loop.pressures[loop.items[loop.fill_end - 2]] - loop.pressures[loop.items[loop.fill_end - 1]] |
171 |
''' |
|
160 | 172 | |
161 | 173 |
def execute_second(self, param): |
162 | 174 |
try: |
readme.html | ||
---|---|---|
46 | 46 |
<tr><td class="filesChanged">2.</td><td>계산 오류시 X 표시는 하지 않도록 수정</td></tr> |
47 | 47 |
<tr><td class="filesChanged">3.</td><td>Control Valve 데이터가 없을 시 발생 오류 수정</td></tr> |
48 | 48 |
<tr><td class="filesChanged">4.</td><td>열교환기 오류(Loop 생성 시 열교환기를 Line Splitter처럼 처리) 수정</td></tr> |
49 |
|
|
50 |
<tr><td style="tr-title" colspan="2" bgcolor=lightgray><B>3.0.7.0 [2020.09.02]</B></td></tr> |
|
51 |
<tr><td class="filesChanged">1.</td><td>펌프 헤드가 입력이 안되어있는 경우에만 CV의 DP값을 보정</td></tr> |
|
49 | 52 |
</table> |
50 | 53 |
</BODY> |
51 | 54 |
</html> |
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,0,6,0),
|
|
11 |
prodvers=(3,0,6,0),
|
|
10 |
filevers=(3,0,7,0),
|
|
11 |
prodvers=(3,0,7,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.0.6.0'),
|
|
35 |
StringStruct(u'FileVersion', u'3.0.7.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.0.6.0')])
|
|
40 |
StringStruct(u'ProductVersion', u'3.0.7.0')])
|
|
41 | 41 |
]), |
42 | 42 |
VarFileInfo([VarStruct(u'Translation', [1033, 1200])]) |
43 | 43 |
] |
내보내기 Unified diff