프로젝트

일반

사용자정보

개정판 f89580c3

IDf89580c3377379af455bf852ed39696b400af6c7
상위 8ac2c287
하위 68a2ec49

김연진이(가) 약 5년 전에 추가함

issue #1060 계산식 - Get_Barometric_Pressure() 오류 수정

Change-Id: Ia8973488d2634816ea8a1f4c0a1d820f205d08fc

차이점 보기:

HYTOS/HYTOS/Calculation.py
724 724
            message = 'error occurred({}) in {}:{}'.format(ex, sys.exc_info()[-1].tb_frame.f_code.co_filename,
725 725
                                                           sys.exc_info()[-1].tb_lineno)
726 726
            App.mainWnd().addMessage.emit(MessageType.Error, message)
727

  
727 728
    def get_barometric_pressure(self):
728 729
        try:
729 730
            unit = self.units['Pressure']
730 731
            if unit == 'kg/cm2':
731 732
                barometric_pressure = 1.033
732 733
            elif unit == 'bar':
733
                barometric_pressure = 1.01325
734
                barometric_pressure = 1.01325 / 0.980665
734 735
            elif unit == 'psi':
735
                barometric_pressure = 14.7
736
                barometric_pressure = 14.7 / 14.22334
736 737
            elif unit == 'mmHg':
737
                barometric_pressure = 760
738
                barometric_pressure = 760 / 735.5591
738 739
            elif unit == 'kPa':
739
                barometric_pressure = 101.325
740
                barometric_pressure = 101.325 / 98.0665
740 741
            elif unit == 'MPa':
741
                barometric_pressure = 0.101325
742
                barometric_pressure = 0.101325 / 0.0980665
742 743

  
743 744
            return barometric_pressure
744 745
        except Exception as ex:
......
2299 2300
        if pressure_unit == 'kg/cm2':
2300 2301
            barometric_pressure = 1.033
2301 2302
        elif pressure_unit == 'bar':
2302
            barometric_pressure = 1.01325
2303
            barometric_pressure = 1.01325 / 0.980665
2303 2304
        elif pressure_unit == 'psi':
2304
            barometric_pressure = 14.7
2305
            barometric_pressure = 14.7 / 14.22334
2305 2306
        elif pressure_unit == 'mmHg':
2306
            barometric_pressure = 760
2307
            barometric_pressure = 760 / 735.5591
2307 2308
        elif pressure_unit == 'kPa':
2308
            barometric_pressure = 101.325
2309
            barometric_pressure = 101.325 / 98.0665
2309 2310
        elif pressure_unit == 'MPa':
2310
            barometric_pressure = 0.101325
2311
            barometric_pressure = 0.101325 / 0.0980665
2311 2312

  
2312 2313
        return barometric_pressure
2313 2314

  
HYTOS/HYTOS/Commands/HydroCalculationCommand.py
422 422
                        '''
423 423

  
424 424
    def get_barometric_pressure(self):
425

  
425 426
        pressure_unit = self.units['Pressure']
426 427
        if pressure_unit == 'kg/cm2':
427 428
            barometric_pressure = 1.033
428 429
        elif pressure_unit == 'bar':
429
            barometric_pressure = 1.01325
430
            barometric_pressure = 1.01325 / 0.980665
430 431
        elif pressure_unit == 'psi':
431
            barometric_pressure = 14.7
432
            barometric_pressure = 14.7 / 14.22334
432 433
        elif pressure_unit == 'mmHg':
433
            barometric_pressure = 760
434
            barometric_pressure = 760 / 735.5591
434 435
        elif pressure_unit == 'kPa':
435
            barometric_pressure = 101.325
436
            barometric_pressure = 101.325 / 98.0665
436 437
        elif pressure_unit == 'MPa':
437
            barometric_pressure = 0.101325
438
            barometric_pressure = 0.101325 / 0.0980665
438 439

  
439 440
        return barometric_pressure
440 441

  
HYTOS/HYTOS/DiameterEstimation_Vapor.py
802 802
            if unit == 'kg/cm2':
803 803
                barometric_pressure = 1.033
804 804
            elif unit == 'bar':
805
                barometric_pressure = 1.01325
805
                barometric_pressure = 1.01325 / 0.980665
806 806
            elif unit == 'psi':
807
                barometric_pressure = 14.7
807
                barometric_pressure = 14.7 / 14.22334
808 808
            elif unit == 'mmHg':
809
                barometric_pressure = 760
809
                barometric_pressure = 760 / 735.5591
810 810
            elif unit == 'kPa':
811
                barometric_pressure = 101.325
811
                barometric_pressure = 101.325 / 98.0665
812 812
            elif unit == 'MPa':
813
                barometric_pressure = 0.101325
813
                barometric_pressure = 0.101325 / 0.0980665
814 814

  
815 815
            return barometric_pressure
816 816
        except Exception as ex:
HYTOS/HYTOS/PressureGradient.py
99 99
            if unit == 'kg/cm2':
100 100
                barometric_pressure = 1.033
101 101
            elif unit == 'bar':
102
                barometric_pressure = 1.01325
102
                barometric_pressure = 1.01325 / 0.980665
103 103
            elif unit == 'psi':
104
                barometric_pressure = 14.7
104
                barometric_pressure = 14.7 / 14.22334
105 105
            elif unit == 'mmHg':
106
                barometric_pressure = 760
106
                barometric_pressure = 760 / 735.5591
107 107
            elif unit == 'kPa':
108
                barometric_pressure = 101.325
108
                barometric_pressure = 101.325 / 98.0665
109 109
            elif unit == 'MPa':
110
                barometric_pressure = 0.101325
110
                barometric_pressure = 0.101325 / 0.0980665
111 111

  
112 112
            return barometric_pressure
113 113
        except Exception as ex:
HYTOS/HYTOS/Shapes/EngineeringLoopItem.py
1391 1391
            if unit == 'kg/cm2':
1392 1392
                barometric_pressure = 1.033
1393 1393
            elif unit == 'bar':
1394
                barometric_pressure = 1.01325
1394
                barometric_pressure = 1.01325 / 0.980665
1395 1395
            elif unit == 'psi':
1396
                barometric_pressure = 14.7
1396
                barometric_pressure = 14.7 / 14.22334
1397 1397
            elif unit == 'mmHg':
1398
                barometric_pressure = 760
1398
                barometric_pressure = 760 / 735.5591
1399 1399
            elif unit == 'kPa':
1400
                barometric_pressure = 101.325
1400
                barometric_pressure = 101.325 / 98.0665
1401 1401
            elif unit == 'MPa':
1402
                barometric_pressure = 0.101325
1402
                barometric_pressure = 0.101325 / 0.0980665
1403 1403

  
1404 1404
            return barometric_pressure
1405 1405
        except Exception as ex:

내보내기 Unified diff

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