프로젝트

일반

사용자정보

개정판 493c7bef

ID493c7bef4b5746659a339c06884444634d8c2ac1
상위 ac10d25d
하위 b331f0ed

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

issue #0000 : 계산식 오류 수정

Change-Id: I5c67cae47327f867d942bf1ff028734e1cb6bd88

차이점 보기:

HYTOS/HYTOS/DiameterEstimation_Vapor.py
234 234
            elif pressure_unit == 'MPa':
235 235
                ccdp = ccdp * 1.033 / 0.101325
236 236

  
237

  
238

  
237 239
            # 조도 구함 (m)
238 240
            roughness = float(self.process_data['Roughness'])
239 241
            roughness_unit = self.units['Roughness']
......
383 385
            for i in range(5):
384 386
                cf[i] = round(cf[i], 5)
385 387

  
386
            # pressure drop
387
            pressure_unit = self.units['Pressure']
388
            if pressure_unit == 'kg/cm2':
389
                for i in range(5):
390
                    cdp[i] = cdp[i]
391
            elif pressure_unit == 'psi':
392
                for i in range(5):
393
                    cdp[i] = cdp[i] / 1.033 * 14.7
394
            elif pressure_unit == 'bar':
395
                for i in range(5):
396
                    cdp[i] = cdp[i] / 1.033 * 1.013
397
            elif pressure_unit == 'mmHg':
398
                for i in range(5):
399
                    cdp[i] = cdp[i] / 1.033 * 760
400
            elif pressure_unit == 'kPa':
401
                for i in range(5):
402
                    cdp[i] = cdp[i] / 1.033 * 101.325
403
            elif pressure_unit == 'MPa':
404
                for i in range(5):
405
                    cdp[i] = cdp[i] / 1.033 * 0.101325
406

  
407 388
            length_unit = self.units['Length']
408 389
            if length_unit == 'm':
409 390
                for i in range(5):
......
429 410
            for i in range(5):
430 411
                self.add_data(nd[i], cvelocity[i], cdp[i], creynolds[i], cf[i])
431 412

  
413
            # pressure drop
414
            pressure_unit = self.units['Pressure']
415
            if pressure_unit == 'kg/cm2':
416
                for i in range(5):
417
                    cdp[i] = cdp[i]
418
            elif pressure_unit == 'psi':
419
                for i in range(5):
420
                    cdp[i] = cdp[i] / 1.033 * 14.7
421
            elif pressure_unit == 'bar':
422
                for i in range(5):
423
                    cdp[i] = cdp[i] / 1.033 * 1.013
424
            elif pressure_unit == 'mmHg':
425
                for i in range(5):
426
                    cdp[i] = cdp[i] / 1.033 * 760
427
            elif pressure_unit == 'kPa':
428
                for i in range(5):
429
                    cdp[i] = cdp[i] / 1.033 * 101.325
430
            elif pressure_unit == 'MPa':
431
                for i in range(5):
432
                    cdp[i] = cdp[i] / 1.033 * 0.101325
433

  
432 434
        except Exception as ex:
433 435
            from App import App
434 436
            from AppDocData import MessageType
......
785 787
                if delta_x == 0 or x2 < 0:
786 788
                    loop = False
787 789

  
788
                return x2
790
            return x2
791

  
789 792
        except Exception as ex:
790 793
            from App import App
791 794
            from AppDocData import MessageType
......
799 802
            if unit == 'kg/cm2':
800 803
                barometric_pressure = 1.033
801 804
            elif unit == 'bar':
802
                barometric_pressure = 1.01325 / 0.980665
805
                barometric_pressure = 1.01325
806
            elif unit == 'psi':
807
                barometric_pressure = 14.7
808
            elif unit == 'mmHg':
809
                barometric_pressure = 760
810
            elif unit == 'kPa':
811
                barometric_pressure = 101.325
812
            elif unit == 'MPa':
813
                barometric_pressure = 0.101325
814

  
815
            conv_factor = 1
816
            if unit == 'kg/cm2':
817
                conv_factor = 1
818
            elif unit == 'bar':
819
                conv_factor = 1 / (1.013 / 1.033)
803 820
            elif unit == 'psi':
804
                barometric_pressure = 14.7 / 14.22334
821
                conv_factor = 1 / (14.7 / 1.033)
805 822
            elif unit == 'mmHg':
806
                barometric_pressure = 760 / 735.5591
823
                conv_factor = 1 / (760 / 1.033)
807 824
            elif unit == 'kPa':
808
                barometric_pressure = 101.325 / 98.0665
825
                conv_factor = 1 / (101.325 / 1.033)
809 826
            elif unit == 'MPa':
810
                barometric_pressure = 0.101325 / 0.0980665
827
                conv_factor = 1 / (0.101325 / 1.033)
811 828

  
812
            return barometric_pressure
829
            return barometric_pressure * conv_factor
813 830
        except Exception as ex:
814 831
            from App import App
815 832
            from AppDocData import MessageType

내보내기 Unified diff

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