[Gcblue-commits] gcb_wx/include/database tcSubDBObject.h,1.1,1.2

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5550/include/database

Modified Files:
	tcSubDBObject.h 
Log Message:
Diesel-electric battery and snorkeling

Index: tcSubDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSubDBObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcSubDBObject.h	7 Jul 2005 01:13:23 -0000	1.1
--- tcSubDBObject.h	10 Jul 2005 20:32:01 -0000	1.2
***************
*** 51,55 ****
          bool isDieselElectric;            ///< true if diesel electric
          float batteryCapacity_kJ;         ///< battery capacity when fully charged
!         float batteryRate_kW;             ///< battery drain rate at max thrust
          float batteryCharge_kW;           ///< charge rate when snorkeling on generators
  
--- 51,55 ----
          bool isDieselElectric;            ///< true if diesel electric
          float batteryCapacity_kJ;         ///< battery capacity when fully charged
!         float batteryRate_kW;             ///< battery drain rate at min thrust, scaled to 4x at max thrust
          float batteryCharge_kW;           ///< charge rate when snorkeling on generators
  
***************
*** 82,86 ****
          // calculated parameters       
          float invCavitationSlope; ///< 1/cavitationSlope
!         float batteryDrainConstant; /// [kW/mps]
  
          void CalculateParams();
--- 82,87 ----
          // calculated parameters       
          float invCavitationSlope; ///< 1/cavitationSlope
!         float batteryDrainConstant; ///< [kW/mps]
! 		float invMaxSpeed_mps; ///< 1 / max speed in mps
  
          void CalculateParams();