프로젝트

일반

사용자정보

개정판 f2c81465

IDf2c81465e73c4896fe02b999acf18f8511311db6
상위 5730b998
하위 dd9923e3

김연진이(가) 4년 이상 전에 추가함

issue #1060 계산식 수정

Change-Id: Ia8ba8b010882fa2bd27b2eb246aeb7173711b3a3

차이점 보기:

HYTOS/HYTOS/Shapes/EngineeringLoopItem.py
995 995

  
996 996
    def vproperty_input(self, vapor_pressure_gradient, press2, density2, velocity, length):
997 997
        try:
998
            vapor_pressure = round(press2, 3)
999
            vapor_density = round(density2, 3)
1000
            vapor_velocity = round(velocity, 3)
998

  
999
            pressure_unit = self.units['Pressure']
1000
            if pressure_unit == 'kg/cm2':
1001
                vapor_pressure = round(press2, 3)
1002
            elif pressure_unit == 'bar':
1003
                vapor_pressure = round(press2 / 1.033 * 1.013, 3)
1004
            elif pressure_unit == 'psi':
1005
                vapor_pressure = round(press2 / 1.033 * 14.7, 3)
1006
            elif pressure_unit == 'mmHg':
1007
                vapor_pressure = round(press2 / 1.033 * 760, 3)
1008
            elif pressure_unit == 'kPa':
1009
                vapor_pressure = round(press2 / 1.033 * 101.325, 3)
1010
            elif pressure_unit == 'MPa':
1011
                vapor_pressure = round(press2 / 1.033 * 0.101325, 3)
1012

  
1013
            velocity_unit = self.units['Velocity']
1014
            if velocity_unit == 'm/s':
1015
                vapor_velocity = round(velocity, 3)
1016
            elif velocity_unit == 'ft/s':
1017
                vapor_velocity = round(velocity * 3.28084, 3)
1018

  
1019
            density_unit = self.units['Density']
1020
            if density_unit == 'kg/m3':
1021
                vapor_density = round(density2, 3)
1022
            elif density_unit == 'lb/ft3':
1023
                vapor_density = round(density2 * 0.062428, 3)
1001 1024

  
1002 1025
            length_unit = self.units['Length']
1003 1026
            if length_unit == 'm':
......
1099 1122
            if self.items[i].vapor_pressure_gradient is None:
1100 1123
                self.items[i].vapor_pressure_gradient = vapor_pressure_gradient
1101 1124

  
1102
            self.pressure_drops[self.items[i]] = press2 - ori_press2
1125
            # self.pressure_drops[self.items[i]] = press2 - ori_press2
1126
            self.pressure_drops[self.items[i]] = vapor_pressure_gradient[-1][0] - vapor_pressure_gradient[0][0]
1103 1127

  
1104 1128
        except Exception as ex:
1105 1129
            from App import App
......
1786 1810
            if self.items[i].vapor_pressure_gradient is None:
1787 1811
                self.items[i].vapor_pressure_gradient = vapor_pressure_gradient
1788 1812
                
1789
            self.pressure_drops[self.items[i]] = ori_press2 - press2
1813
            # self.pressure_drops[self.items[i]] = ori_press2 - press2
1814
            self.pressure_drops[self.items[i]] = vapor_pressure_gradient[0][0] - vapor_pressure_gradient[-1][0]
1790 1815

  
1791 1816
        except Exception as ex:
1792 1817
            from App import App

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)