From: Anders G. <an...@us...> - 2009-02-06 19:13:51
|
Update of /cvsroot/jsbsim/JSBSim/src In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13145 Modified Files: JSBSim.cxx Log Message: Renamed /consumables/fuel/tank[i]/level-lb to /consumables/fuel/tank[i]/level-lbs. Index: JSBSim.cxx =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/JSBSim.cxx,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** JSBSim.cxx 24 Jan 2009 20:36:53 -0000 1.38 --- JSBSim.cxx 6 Feb 2009 19:13:41 -0000 1.39 *************** *** 212,216 **** Propulsion->GetTank(i)->SetContents(node->getDoubleValue("level-gal_us") * 6.6); } else { ! node->setDoubleValue("level-lb", Propulsion->GetTank(i)->GetContents()); node->setDoubleValue("level-gal_us", Propulsion->GetTank(i)->GetContents() / 6.6); } --- 212,216 ---- Propulsion->GetTank(i)->SetContents(node->getDoubleValue("level-gal_us") * 6.6); } else { ! node->setDoubleValue("level-lbs", Propulsion->GetTank(i)->GetContents()); node->setDoubleValue("level-gal_us", Propulsion->GetTank(i)->GetContents() / 6.6); } *************** *** 627,631 **** FGTank * tank = Propulsion->GetTank(i); tank->SetContents(node->getDoubleValue("level-gal_us") * 6.6); ! // tank->SetContents(node->getDoubleValue("level-lb")); } --- 627,631 ---- FGTank * tank = Propulsion->GetTank(i); tank->SetContents(node->getDoubleValue("level-gal_us") * 6.6); ! // tank->SetContents(node->getDoubleValue("level-lbs")); } *************** *** 867,871 **** double temp = tank->GetTemperature_degC(); node->setDoubleValue("level-gal_us", contents/6.6); ! node->setDoubleValue("level-lb", contents); if (temp != -9999.0) node->setDoubleValue("temperature_degC", temp); } --- 867,871 ---- double temp = tank->GetTemperature_degC(); node->setDoubleValue("level-gal_us", contents/6.6); ! node->setDoubleValue("level-lbs", contents); if (temp != -9999.0) node->setDoubleValue("temperature_degC", temp); } |