csp-commits

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv2659/Include/SimData

Modified Files:
	Conversions.h 
Log Message:


Index: Conversions.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Conversions.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Conversions.h	19 Oct 2003 23:53:56 -0000	1.7
--- Conversions.h	1 Nov 2003 16:08:40 -0000	1.8
***************
*** 68,72 ****
  /// meters per second to knots
  template <typename T>
! T mps_kts(T x) { return x * 1.94385; }
  SIMDATA_CVT(mps_kts)
  
--- 68,72 ----
  /// meters per second to knots
  template <typename T>
! T mps_kts(T x) { return x * 1.943846; }
  SIMDATA_CVT(mps_kts)
  
***************
*** 88,92 ****
  /// pounds to kilograms
  template <typename T>
! T lb_kg(T x) { return x * 0.45360; }
  SIMDATA_CVT(lb_kg)
  
--- 88,92 ----
  /// pounds to kilograms
  template <typename T>
! T lb_kg(T x) { return x * 0.453597; }
  SIMDATA_CVT(lb_kg)
  
***************
*** 103,112 ****
  /// pascals to millimeters of mercury
  template <typename T>
! T pa_mmhg(T x) { return x * 0.00752; }
  SIMDATA_CVT(pa_mmhg)
  
  /// millimeters of mercury to pascals
  template <typename T>
! T mmhg_pa(T x) { return x * 133.0; }
  SIMDATA_CVT(mmhg_pa)
  
--- 103,112 ----
  /// pascals to millimeters of mercury
  template <typename T>
! T pa_mmhg(T x) { return x * 0.00750062; }
  SIMDATA_CVT(pa_mmhg)
  
  /// millimeters of mercury to pascals
  template <typename T>
! T mmhg_pa(T x) { return x * 133.3224; }
  SIMDATA_CVT(mmhg_pa)
  
***************
*** 118,122 ****
  /// newtons to pounds
  template <typename T>
! T n_lb(T x) { return x * 0.22481; }
  SIMDATA_CVT(n_lb)
  
--- 118,122 ----
  /// newtons to pounds
  template <typename T>
! T n_lb(T x) { return x * 0.224809; }
  SIMDATA_CVT(n_lb)