This commit is contained in:
Tim Schubert 2020-08-24 11:35:37 +02:00
parent 1c96f7d2f6
commit ee268592ad
2 changed files with 5 additions and 6 deletions

View file

@ -22,11 +22,11 @@ int main(int argc, char *argv[])
CommandLine cmd; CommandLine cmd;
std::string orbitFile; std::string orbitFile;
std::string traceFile; std::string traceFile;
Time duration; double duration;
cmd.AddValue("orbitFile", "CSV file with orbit parameters", orbitFile); cmd.AddValue("orbitFile", "CSV file with orbit parameters", orbitFile);
cmd.AddValue("traceFile", "CSV file to store mobility trace in", traceFile); cmd.AddValue("traceFile", "CSV file to store mobility trace in", traceFile);
cmd.AddValue("precision", "ns3::LeoCircularOrbitMobilityModel::Precision"); cmd.AddValue("precision", "ns3::LeoCircularOrbitMobilityModel::Precision");
cmd.AddValue("duration", "Duration of the simulation", duration); cmd.AddValue("duration", "Duration of the simulation in seconds", duration);
cmd.Parse (argc, argv); cmd.Parse (argc, argv);
LeoOrbitNodeHelper orbit; LeoOrbitNodeHelper orbit;
@ -46,7 +46,7 @@ int main(int argc, char *argv[])
std::cout << "Time,Satellite,x,y,z,Speed" << std::endl; std::cout << "Time,Satellite,x,y,z,Speed" << std::endl;
Simulator::Stop (duration); Simulator::Stop (Seconds (duration));
Simulator::Run (); Simulator::Run ();
Simulator::Destroy (); Simulator::Destroy ();

View file

@ -46,15 +46,14 @@ LeoOrbitNodeHelper::Install (const std::string &orbitFile)
{ {
MobilityHelper mobility; MobilityHelper mobility;
mobility.SetPositionAllocator ("ns3::LeoCircularOrbitPostionAllocator", mobility.SetPositionAllocator ("ns3::LeoCircularOrbitPostionAllocator",
"NumOrbits", IntegerValue (orbit.inc), "NumOrbits", IntegerValue (orbit.planes),
"NumSatellites", IntegerValue (orbit.sats)); "NumSatellites", IntegerValue (orbit.sats));
mobility.SetMobilityModel ("ns3::LeoCircularOrbitMobilityModel", mobility.SetMobilityModel ("ns3::LeoCircularOrbitMobilityModel",
"Altitude", DoubleValue (orbit.alt), "Altitude", DoubleValue (orbit.alt),
"Inclination", DoubleValue (orbit.inc)); "Inclination", DoubleValue (orbit.inc));
NodeContainer c; NodeContainer c;
Ptr<Node> node = m_nodeFactory.Create<Node> (); c.Create (orbit.sats*orbit.planes);
c.Add (node);
mobility.Install (c); mobility.Install (c);
nodes.Add (c); nodes.Add (c);
NS_LOG_DEBUG ("Added orbit plane"); NS_LOG_DEBUG ("Added orbit plane");