1999-08-10 03:40:34 +00:00
|
|
|
/*****************************************************************************
|
|
|
|
|
|
|
|
Module: FGLocalWeatherDatabase.cpp
|
|
|
|
Author: Christian Mayer
|
|
|
|
Date started: 28.05.99
|
|
|
|
Called by: main program
|
|
|
|
|
1999-10-20 22:19:07 +00:00
|
|
|
-------- Copyright (C) 1999 Christian Mayer (fgfs@christianmayer.de) --------
|
1999-08-10 03:40:34 +00:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify it under
|
|
|
|
the terms of the GNU General Public License as published by the Free Software
|
|
|
|
Foundation; either version 2 of the License, or (at your option) any later
|
|
|
|
version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
|
|
details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
|
|
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
|
|
Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
Further information about the GNU General Public License can also be found on
|
|
|
|
the world wide web at http://www.gnu.org.
|
|
|
|
|
|
|
|
FUNCTIONAL DESCRIPTION
|
|
|
|
------------------------------------------------------------------------------
|
|
|
|
Database for the local weather
|
|
|
|
This database is the only one that gets called from FG
|
|
|
|
|
|
|
|
HISTORY
|
|
|
|
------------------------------------------------------------------------------
|
|
|
|
28.05.1999 Christian Mayer Created
|
|
|
|
16.06.1999 Durk Talsma Portability for Linux
|
|
|
|
20.06.1999 Christian Mayer added lots of consts
|
1999-10-14 20:30:54 +00:00
|
|
|
11.10.1999 Christian Mayer changed set<> to map<> on Bernie Bright's
|
|
|
|
suggestion
|
1999-10-20 22:19:07 +00:00
|
|
|
19.10.1999 Christian Mayer change to use PLIB's sg instead of Point[2/3]D
|
|
|
|
and lots of wee code cleaning
|
1999-12-23 16:54:54 +00:00
|
|
|
14.12.1999 Christian Mayer Changed the internal structure to use Dave
|
|
|
|
Eberly's spherical interpolation code. This
|
|
|
|
stops our dependancy on the (ugly) voronoi
|
|
|
|
code and simplyfies the code structure a lot.
|
2000-09-30 03:55:57 +00:00
|
|
|
07.05.2000 Tony Peden Added functionality to get the weather data
|
|
|
|
on 'the bus'
|
|
|
|
18.05.2000 Christian Mayer Minor clean-ups. Changed the code to use
|
|
|
|
FGWeatherUtils.h for unit conversion
|
2001-07-19 22:10:14 +00:00
|
|
|
18.07.2001 Christian Mayer Added the posibility to limit the amount of
|
|
|
|
stations for a faster init.
|
1999-08-10 03:40:34 +00:00
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
/****************************************************************************/
|
|
|
|
/* INCLUDES */
|
|
|
|
/****************************************************************************/
|
2000-02-15 03:30:01 +00:00
|
|
|
#include <simgear/compiler.h>
|
|
|
|
#include <simgear/constants.h>
|
1999-10-20 22:19:07 +00:00
|
|
|
|
|
|
|
#include <Aircraft/aircraft.hxx>
|
2001-07-19 22:10:14 +00:00
|
|
|
#include <Main/fg_props.hxx>
|
1999-10-20 22:19:07 +00:00
|
|
|
|
1999-08-10 03:40:34 +00:00
|
|
|
#include "FGLocalWeatherDatabase.h"
|
|
|
|
|
1999-11-03 18:06:52 +00:00
|
|
|
#include "FGWeatherParse.h"
|
1999-08-10 03:40:34 +00:00
|
|
|
|
2000-09-30 03:55:57 +00:00
|
|
|
#include "FGWeatherUtils.h"
|
|
|
|
|
1999-08-10 03:40:34 +00:00
|
|
|
/****************************************************************************/
|
|
|
|
/********************************** CODE ************************************/
|
|
|
|
/****************************************************************************/
|
|
|
|
|
|
|
|
FGLocalWeatherDatabase* FGLocalWeatherDatabase::theFGLocalWeatherDatabase = 0;
|
|
|
|
FGLocalWeatherDatabase *WeatherDatabase;
|
|
|
|
|
2000-07-06 22:13:24 +00:00
|
|
|
void FGLocalWeatherDatabase::init( const WeatherPrecision visibility,
|
|
|
|
const DatabaseWorkingType type,
|
2000-09-30 03:55:57 +00:00
|
|
|
const string &root )
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
2001-06-01 20:29:03 +00:00
|
|
|
FGPhysicalProperties f[2]; //make an standard weather that's the same at the whole world
|
|
|
|
|
1999-08-10 03:40:34 +00:00
|
|
|
cerr << "Initializing FGLocalWeatherDatabase\n";
|
|
|
|
cerr << "-----------------------------------\n";
|
|
|
|
|
|
|
|
if (theFGLocalWeatherDatabase)
|
|
|
|
{
|
|
|
|
cerr << "Error: only one local weather allowed";
|
|
|
|
exit(-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
setWeatherVisibility(visibility);
|
1999-10-20 22:19:07 +00:00
|
|
|
|
1999-08-10 03:40:34 +00:00
|
|
|
DatabaseStatus = type;
|
1999-12-23 16:54:54 +00:00
|
|
|
database = 0; //just get sure...
|
1999-08-10 03:40:34 +00:00
|
|
|
|
1999-11-03 18:06:52 +00:00
|
|
|
Thunderstorm = false;
|
|
|
|
//I don't need to set theThunderstorm as Thunderstorm == false
|
1999-08-10 03:40:34 +00:00
|
|
|
|
|
|
|
switch(DatabaseStatus)
|
|
|
|
{
|
|
|
|
case use_global:
|
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
cerr << "Error: there's no global database anymore!\n";
|
|
|
|
exit(-1);
|
1999-11-03 18:06:52 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case use_internet:
|
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
FGWeatherParse *parsed_data = new FGWeatherParse();
|
2001-07-19 22:10:14 +00:00
|
|
|
sgVec2 *p;
|
|
|
|
FGPhysicalProperties *f;
|
|
|
|
string path_to_weather = root + "/weather/current.txt.gz";
|
|
|
|
parsed_data->input( path_to_weather.c_str() );
|
1999-12-23 16:54:54 +00:00
|
|
|
unsigned int n = parsed_data->stored_stations();
|
2001-07-19 22:10:14 +00:00
|
|
|
int m = fgGetInt("/environment/weather/max-stations", -1);
|
|
|
|
|
|
|
|
if ( ( m < 0 ) || ( m > n ) )
|
|
|
|
{
|
|
|
|
m = n;
|
|
|
|
|
|
|
|
p = new sgVec2 [n];
|
|
|
|
f = new FGPhysicalProperties[n];
|
|
|
|
|
|
|
|
// fill the database
|
|
|
|
for (unsigned int i = 0; i < n; i++)
|
|
|
|
{
|
|
|
|
f[i] = parsed_data->getFGPhysicalProperties(i);
|
|
|
|
parsed_data->getPosition(i, p[i]);
|
|
|
|
|
|
|
|
if ( (i%100) == 0)
|
|
|
|
cerr << ".";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // we have to limit the amount of stations
|
|
|
|
|
|
|
|
//store the "distance" between the station and the current
|
|
|
|
//position. As the distance is calculated from the lat/lon
|
|
|
|
//values it's not worth much - but it's good enough for
|
|
|
|
//comparison
|
|
|
|
map<float, unsigned int> squared_distance;
|
|
|
|
sgVec2 cur_pos;
|
|
|
|
|
|
|
|
cur_pos[0] = cache->last_known_position[0];
|
|
|
|
cur_pos[1] = cache->last_known_position[1];
|
|
|
|
|
|
|
|
unsigned int i;
|
|
|
|
for( i = 0; i < n; i++ )
|
|
|
|
{
|
|
|
|
sgVec2 pos;
|
|
|
|
parsed_data->getPosition(i, pos);
|
|
|
|
squared_distance[sgDistanceSquaredVec2(cur_pos, pos)] = i;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = new sgVec2 [m];
|
|
|
|
f = new FGPhysicalProperties[m];
|
|
|
|
|
|
|
|
map<float, unsigned int>::const_iterator ci;
|
|
|
|
ci = squared_distance.begin();
|
|
|
|
|
|
|
|
// fill the database
|
|
|
|
for ( i = 0; i < m; i++ )
|
|
|
|
{
|
|
|
|
f[i] = parsed_data->getFGPhysicalProperties(ci->second);
|
|
|
|
parsed_data->getPosition(ci->second, p[i]);
|
|
|
|
|
|
|
|
if ( (i%100) == 0)
|
|
|
|
cerr << ".";
|
|
|
|
|
|
|
|
ci++;
|
|
|
|
}
|
|
|
|
}
|
1999-11-03 18:06:52 +00:00
|
|
|
|
1999-12-23 16:54:54 +00:00
|
|
|
// free the memory of the parsed data to ease the required memory
|
|
|
|
// for the very memory consuming spherical interpolation
|
|
|
|
delete parsed_data;
|
|
|
|
|
|
|
|
//and finally init the interpolation
|
2001-07-19 22:10:14 +00:00
|
|
|
cerr << "\nInitialiating Interpolation. (2-3 minutes on a PII-350 for ca. 3500 stations)\n";
|
|
|
|
database = new SphereInterpolate<FGPhysicalProperties>(m, p, f);
|
1999-12-23 16:54:54 +00:00
|
|
|
|
|
|
|
//and free my allocations:
|
|
|
|
delete[] p;
|
|
|
|
delete[] f;
|
1999-11-03 18:06:52 +00:00
|
|
|
cerr << "Finished weather init.\n";
|
|
|
|
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case distant:
|
|
|
|
cerr << "FGLocalWeatherDatabase error: Distant database isn't implemented yet!\n";
|
|
|
|
cerr << " using random mode instead!\n";
|
|
|
|
case random:
|
|
|
|
case manual:
|
|
|
|
case default_mode:
|
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
double x[2] = {0.0, 0.0}; //make an standard weather that's the same at the whole world
|
|
|
|
double y[2] = {0.0, 0.0}; //make an standard weather that's the same at the whole world
|
|
|
|
double z[2] = {1.0, -1.0}; //make an standard weather that's the same at the whole world
|
|
|
|
database = new SphereInterpolate<FGPhysicalProperties>(2,x,y,z,f);
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
cerr << "FGLocalWeatherDatabase error: Unknown database type specified!\n";
|
|
|
|
};
|
2001-07-19 22:10:14 +00:00
|
|
|
|
|
|
|
cache->latitude_deg = fgGetNode("/position/latitude-deg" );
|
|
|
|
cache->longitude_deg = fgGetNode("/position/longitude-deg");
|
|
|
|
cache->altitude_ft = fgGetNode("/position/altitude-ft" );
|
|
|
|
|
|
|
|
fgTie("/environment/weather/wind-north-mps", this, &FGLocalWeatherDatabase::get_wind_north);
|
|
|
|
fgTie("/environment/weather/wind-east-mps", this, &FGLocalWeatherDatabase::get_wind_east);
|
|
|
|
fgTie("/environment/weather/wind-up-mps", this, &FGLocalWeatherDatabase::get_wind_up);
|
|
|
|
fgTie("/environment/weather/temperature-K", this, &FGLocalWeatherDatabase::get_temperature);
|
|
|
|
fgTie("/environment/weather/air-pressure-Pa", this, &FGLocalWeatherDatabase::get_air_pressure);
|
|
|
|
fgTie("/environment/weather/vapor-pressure-Pa", this, &FGLocalWeatherDatabase::get_vapor_pressure);
|
|
|
|
fgTie("/environment/weather/air-density", this, &FGLocalWeatherDatabase::get_air_density);
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
FGLocalWeatherDatabase::~FGLocalWeatherDatabase()
|
|
|
|
{
|
|
|
|
//Tidying up:
|
1999-12-23 16:54:54 +00:00
|
|
|
delete database;
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/****************************************************************************/
|
|
|
|
/* reset the whole database */
|
|
|
|
/****************************************************************************/
|
1999-10-20 22:19:07 +00:00
|
|
|
void FGLocalWeatherDatabase::reset(const DatabaseWorkingType type)
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
cerr << "FGLocalWeatherDatabase::reset isn't supported yet\n";
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/****************************************************************************/
|
|
|
|
/* update the database. Since the last call we had dt seconds */
|
|
|
|
/****************************************************************************/
|
1999-10-20 22:19:07 +00:00
|
|
|
void FGLocalWeatherDatabase::update(const WeatherPrecision dt)
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
//if (DatabaseStatus==use_global)
|
|
|
|
// global->update(dt);
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
1999-10-20 22:19:07 +00:00
|
|
|
void FGLocalWeatherDatabase::update(const sgVec3& p) //position has changed
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
1999-11-03 18:06:52 +00:00
|
|
|
//uncomment this when you are using the GlobalDatabase
|
|
|
|
/*
|
|
|
|
cerr << "****\nupdate(p) inside\n";
|
|
|
|
cerr << "Parameter: " << p[0] << "/" << p[1] << "/" << p[2] << "\n";
|
1999-12-23 16:54:54 +00:00
|
|
|
cerr << FGPhysicalProperties2D(get(p2d), p2d);
|
1999-11-03 18:06:52 +00:00
|
|
|
cerr << "****\n";
|
|
|
|
*/
|
1999-12-23 16:54:54 +00:00
|
|
|
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
1999-10-20 22:19:07 +00:00
|
|
|
void FGLocalWeatherDatabase::update(const sgVec3& p, const WeatherPrecision dt) //time and/or position has changed
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************************************************************************/
|
|
|
|
/* Get the physical properties on the specified point p out of the database */
|
|
|
|
/****************************************************************************/
|
1999-10-20 22:19:07 +00:00
|
|
|
FGPhysicalProperty FGLocalWeatherDatabase::get(const sgVec3& p) const
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
2000-12-20 23:50:44 +00:00
|
|
|
return FGPhysicalProperty(database->Evaluate(p), p[2]);
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
2000-09-10 00:04:50 +00:00
|
|
|
#ifdef macintosh
|
2000-02-10 23:37:56 +00:00
|
|
|
/* fix a problem with mw compilers in that they don't know the
|
|
|
|
difference between the next two methods. Since the first one
|
|
|
|
doesn't seem to be used anywhere, I commented it out. This is
|
|
|
|
supposed to be fixed in the forthcoming CodeWarrior Release
|
|
|
|
6. */
|
|
|
|
#else
|
1999-10-14 20:30:54 +00:00
|
|
|
FGPhysicalProperties FGLocalWeatherDatabase::get(const sgVec2& p) const
|
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
return database->Evaluate(p);
|
1999-10-14 20:30:54 +00:00
|
|
|
}
|
2000-02-10 23:37:56 +00:00
|
|
|
#endif
|
1999-10-14 20:30:54 +00:00
|
|
|
|
1999-10-20 22:19:07 +00:00
|
|
|
WeatherPrecision FGLocalWeatherDatabase::getAirDensity(const sgVec3& p) const
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
2000-12-20 23:50:44 +00:00
|
|
|
FGPhysicalProperty dummy(database->Evaluate(p), p[2]);
|
1999-08-10 03:40:34 +00:00
|
|
|
|
|
|
|
return
|
|
|
|
(dummy.AirPressure*FG_WEATHER_DEFAULT_AIRDENSITY*FG_WEATHER_DEFAULT_TEMPERATURE) /
|
|
|
|
(dummy.Temperature*FG_WEATHER_DEFAULT_AIRPRESSURE);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-10-20 22:19:07 +00:00
|
|
|
void FGLocalWeatherDatabase::setSnowRainIntensity(const WeatherPrecision x, const sgVec2& p)
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
/* not supported yet */
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
1999-10-20 22:19:07 +00:00
|
|
|
void FGLocalWeatherDatabase::setSnowRainType(const SnowRainType x, const sgVec2& p)
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
/* not supported yet */
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
1999-10-20 22:19:07 +00:00
|
|
|
void FGLocalWeatherDatabase::setLightningProbability(const WeatherPrecision x, const sgVec2& p)
|
1999-08-10 03:40:34 +00:00
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
/* not supported yet */
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void FGLocalWeatherDatabase::setProperties(const FGPhysicalProperties2D& x)
|
|
|
|
{
|
1999-12-23 16:54:54 +00:00
|
|
|
/* not supported yet */
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void fgUpdateWeatherDatabase(void)
|
|
|
|
{
|
1999-10-20 22:19:07 +00:00
|
|
|
sgVec3 position;
|
2000-09-30 03:55:57 +00:00
|
|
|
|
|
|
|
sgSetVec3(position,
|
|
|
|
current_aircraft.fdm_state->get_Latitude(),
|
|
|
|
current_aircraft.fdm_state->get_Longitude(),
|
2001-03-24 04:56:46 +00:00
|
|
|
current_aircraft.fdm_state->get_Altitude() * SG_FEET_TO_METER);
|
2000-05-11 19:17:33 +00:00
|
|
|
|
1999-10-20 22:19:07 +00:00
|
|
|
WeatherDatabase->update( position );
|
2000-09-30 03:55:57 +00:00
|
|
|
|
|
|
|
// get the data on 'the bus' for the FDM
|
|
|
|
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
/* FGPhysicalProperty porperty = WeatherDatabase->get(position);
|
2000-09-30 03:55:57 +00:00
|
|
|
|
|
|
|
current_aircraft.fdm_state->set_Static_temperature( Kelvin2Rankine(porperty.Temperature) );
|
|
|
|
current_aircraft.fdm_state->set_Static_pressure( Pascal2psf(porperty.AirPressure) );
|
|
|
|
|
|
|
|
current_aircraft.fdm_state->set_Density( SIdensity2JSBsim( Density(porperty.AirPressure, porperty.Temperature) ) );
|
|
|
|
|
2000-07-06 22:13:24 +00:00
|
|
|
#define MSTOFPS 3.2808 //m/s to ft/s
|
2000-09-30 03:55:57 +00:00
|
|
|
current_aircraft.fdm_state->set_Velocities_Local_Airmass(porperty.Wind[1]*MSTOFPS,
|
|
|
|
porperty.Wind[0]*MSTOFPS,
|
I tested:
LaRCsim c172 on-ground and in-air starts, reset: all work
UIUC Cessna172 on-ground and in-air starts work as expected, reset
results in an aircraft that is upside down but does not crash FG. I
don't know what it was like before, so it may well be no change.
JSBSim c172 and X15 in-air starts work fine, resets now work (and are
trimmed), on-ground starts do not -- the c172 ends up on its back. I
suspect this is no worse than before.
I did not test:
Balloon (the weather code returns nan's for the atmosphere data --this
is in the weather module and apparently is a linux only bug)
ADA (don't know how)
MagicCarpet (needs work yet)
External (don't know how)
known to be broken:
LaRCsim c172 on-ground starts with a negative terrain altitude (this
happens at KPAO when the scenery is not present). The FDM inits to
about 50 feet AGL and the model falls to the ground. It does stay
upright, however, and seems to be fine once it settles out, FWIW.
To do:
--implement set_Model on the bus
--bring Christian's weather data into JSBSim
-- add default method to bus for updating things like the sin and cos of
latitude (for Balloon, MagicCarpet)
-- lots of cleanup
The files:
src/FDM/flight.cxx
src/FDM/flight.hxx
-- all data members now declared protected instead of private.
-- eliminated all but a small set of 'setters', no change to getters.
-- that small set is declared virtual, the default implementation
provided preserves the old behavior
-- all of the vector data members are now initialized.
-- added busdump() method -- FG_LOG's all the bus data when called,
useful for diagnostics.
src/FDM/ADA.cxx
-- bus data members now directly assigned to
src/FDM/Balloon.cxx
-- bus data members now directly assigned to
-- changed V_equiv_kts to V_calibrated_kts
src/FDM/JSBSim.cxx
src/FDM/JSBSim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with JSBSim specific
logic
-- changed the static FDMExec to a dynamic fdmex (needed so that the
JSBSim object can be deleted when a model change is called for)
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- added logic to bring up FGEngInterface objects and set the RPM and
throttle values.
src/FDM/LaRCsim.cxx
src/FDM/LaRCsim.hxx
-- bus data members now directly assigned to
-- implemented the FGInterface virtual setters with LaRCsim specific
logic, uses LaRCsimIC
-- implemented constructor and destructor, moved some of the logic
formerly in init() to constructor
-- moved default inertias to here from fg_init.cxx
-- eliminated the climb rate calculation. The equivalent, climb_rate =
-1*vdown, is now in copy_from_LaRCsim().
src/FDM/LaRCsimIC.cxx
src/FDM/LaRCsimIC.hxx
-- similar to FGInitialCondition, this class has all the logic needed to
turn data like Vc and Mach into the more fundamental quantities LaRCsim
needs to initialize.
-- put it in src/FDM since it is a class
src/FDM/MagicCarpet.cxx
-- bus data members now directly assigned to
src/FDM/Makefile.am
-- adds LaRCsimIC.hxx and cxx
src/FDM/JSBSim/FGAtmosphere.h
src/FDM/JSBSim/FGDefs.h
src/FDM/JSBSim/FGInitialCondition.cpp
src/FDM/JSBSim/FGInitialCondition.h
src/FDM/JSBSim/JSBSim.cpp
-- changes to accomodate the new bus
src/FDM/LaRCsim/atmos_62.h
src/FDM/LaRCsim/ls_geodesy.h
-- surrounded prototypes with #ifdef __cplusplus ... #endif , functions
here are needed in LaRCsimIC
src/FDM/LaRCsim/c172_main.c
src/FDM/LaRCsim/cherokee_aero.c
src/FDM/LaRCsim/ls_aux.c
src/FDM/LaRCsim/ls_constants.h
src/FDM/LaRCsim/ls_geodesy.c
src/FDM/LaRCsim/ls_geodesy.h
src/FDM/LaRCsim/ls_step.c
src/FDM/UIUCModel/uiuc_betaprobe.cpp
-- changed PI to LS_PI, eliminates preprocessor naming conflict with
weather module
src/FDM/LaRCsim/ls_interface.c
src/FDM/LaRCsim/ls_interface.h
-- added function ls_set_model_dt()
src/Main/bfi.cxx
-- eliminated calls that set the NED speeds to body components. They
are no longer needed and confuse the new bus.
src/Main/fg_init.cxx
-- eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). or set default values. The bus now handles the
defaults and updates itself when the setters are called (for LaRCsim and
JSBSim). A default method for doing this needs to be added to the bus.
-- added fgVelocityInit() to set the speed the user asked for. Both
JSBSim and LaRCsim can now be initialized using any of:
vc,mach, NED components, UVW components.
src/Main/main.cxx
--eliminated call to fgFDMSetGroundElevation, this data is now 'pulled'
onto the bus every update()
src/Main/options.cxx
src/Main/options.hxx
-- added enum to keep track of the speed requested by the user
-- eliminated calls to set NED velocity properties to body speeds, they
are no longer needed.
-- added options for the NED components.
src/Network/garmin.cxx
src/Network/nmea.cxx
--eliminated calls that just brought the bus data up-to-date (e.g.
set_sin_cos_latitude). The bus now updates itself when the setters are
called (for LaRCsim and JSBSim). A default method for doing this needs
to be added to the bus.
-- changed set_V_equiv_kts to set_V_calibrated_kts. set_V_equiv_kts no
longer exists ( get_V_equiv_kts still does, though)
src/WeatherCM/FGLocalWeatherDatabase.cpp
-- commented out the code to put the weather data on the bus, a
different scheme for this is needed.
2000-10-24 00:34:50 +00:00
|
|
|
porperty.Wind[2]*MSTOFPS); */
|
|
|
|
|
2000-09-30 03:55:57 +00:00
|
|
|
|
1999-08-10 03:40:34 +00:00
|
|
|
}
|
|
|
|
|