dadada/ns-3-leo
dadada/ns-3-leo
1
0
Fork 0
mirror of https://gitlab.ibr.cs.tu-bs.de/tschuber/ns-3-leo.git synced 2025-06-08 01:53:58 +02:00
Code Issues Releases Wiki Activity

Fix ISL LOS

Browse source
This commit is contained in:
Tim Schubert 2020-08-28 13:10:21 +02:00
parent ae1d24ca80
commit 5aa6ec32b7
2 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
examples/leo-delay-tracing-example.cc
View file

@ -44,7 +44,7 @@ int main (int argc, char *argv[])
uint32_t lonGws = 20; uint32_t lonGws = 20;
double interval; double interval;
double duration; double duration;
bool islEnable = false; bool islEnabled = false;
bool traceDrops = false; bool traceDrops = false;
bool traceTxRx = false; bool traceTxRx = false;
std::string routingProto = "aodv"; std::string routingProto = "aodv";
@ -61,7 +61,7 @@ int main (int argc, char *argv[])
cmd.AddValue("ttlThresh", "ns3::aodv::RoutingProtocol::TtlThreshold"); cmd.AddValue("ttlThresh", "ns3::aodv::RoutingProtocol::TtlThreshold");
cmd.AddValue("netDiameter", "ns3::aodv::RoutingProtocol::NetDiameter"); cmd.AddValue("netDiameter", "ns3::aodv::RoutingProtocol::NetDiameter");
cmd.AddValue("routeTimeout", "ns3::aodv::RoutingProtocol::ActiveRouteTimeout"); cmd.AddValue("routeTimeout", "ns3::aodv::RoutingProtocol::ActiveRouteTimeout");
cmd.AddValue("islEnable", "Enable inter-satellite links", islEnable); cmd.AddValue("islEnabled", "Enable inter-satellite links", islEnabled);
cmd.AddValue("traceDrops", "Enable tracing of PHY and MAC drops", traceDrops); cmd.AddValue("traceDrops", "Enable tracing of PHY and MAC drops", traceDrops);
cmd.AddValue("traceTxRx", "Enable tracing of PHY and MAC transmits", traceTxRx); cmd.AddValue("traceTxRx", "Enable tracing of PHY and MAC transmits", traceTxRx);
cmd.AddValue("latGws", "Latitudal rows of gateways", latGws); cmd.AddValue("latGws", "Latitudal rows of gateways", latGws);
@ -100,7 +100,8 @@ int main (int argc, char *argv[])
else else
{ {
AodvHelper aodv; AodvHelper aodv;
//aodv.Set ("EnableHello", BooleanValue (false)); aodv.Set ("EnableHello", BooleanValue (false));
//aodv.Set ("RreqLimit", UintegerValue (2));
stack.SetRoutingHelper (aodv); stack.SetRoutingHelper (aodv);
} }
@ -114,7 +115,7 @@ int main (int argc, char *argv[])
ipv4.SetBase ("10.1.0.0", "255.255.0.0"); ipv4.SetBase ("10.1.0.0", "255.255.0.0");
ipv4.Assign (utNet); ipv4.Assign (utNet);
if (islEnable) if (islEnabled)
{ {
std::cerr << "ISL enabled" << std::endl; std::cerr << "ISL enabled" << std::endl;
IslHelper islCh; IslHelper islCh;

38
model/isl-propagation-loss-model.cc
View file

@ -35,15 +35,19 @@ IslPropagationLossModel::~IslPropagationLossModel ()
bool bool
IslPropagationLossModel::GetLos (Ptr<MobilityModel> moda, Ptr<MobilityModel> modb) IslPropagationLossModel::GetLos (Ptr<MobilityModel> moda, Ptr<MobilityModel> modb)
{ {
// TODO get max distance with line-sphere intersection
// origin of LOS // origin of LOS
Vector3D oc = moda->GetPosition (); Vector3D apos = moda->GetPosition ();
Vector3D bp = modb->GetPosition (); Vector3D bpos = modb->GetPosition ();
// select upper satellite as origin
Vector oc = apos.GetLength () > bpos.GetLength () ? apos : bpos;
Vector bp = apos.GetLength () > bpos.GetLength () ? bpos : apos;
Vector3D u = bp - oc;
// distance from s1 to s2
double s2 = u.GetLength ();
// direction unit vector // direction unit vector
Vector3D u = Vector3D (bp.x - oc.x, bp.y - oc.y, bp.z - oc.z); u = Vector3D (u.x / s2, u.y / s2, u.z / s2);
u = Vector3D (u.x / u.GetLength (), u.y / u.GetLength (), u.z / u.GetLength ());
double a = u.x*u.x + u.y*u.y + u.z*u.z; double a = u.x*u.x + u.y*u.y + u.z*u.z;
double b = 2.0 * (oc.x*u.x + oc.y*u.y + oc.z*u.z); double b = 2.0 * (oc.x*u.x + oc.y*u.y + oc.z*u.z);
@ -57,7 +61,23 @@ IslPropagationLossModel::GetLos (Ptr<MobilityModel> moda, Ptr<MobilityModel> mod
<<";c="<<c <<";c="<<c
<<";disc="<<discriminant); <<";disc="<<discriminant);
return discriminant < 0; if (discriminant < 0)
{
return true;
}
else
{
// distances from oc (first sat)
double t1 = (-b - sqrt (discriminant)) / (2.0 * a);
double t2 = (-b + sqrt (discriminant)) / (2.0 * a);
NS_LOG_DEBUG ("t1="<<t1
<<"t2="<<t2
<<"s2="<<s2);
// check if second sat is behind earth
return (s2 < abs (t1) && s2 < abs (t2));
}
} }
double double
@ -65,14 +85,12 @@ IslPropagationLossModel::DoCalcRxPower (double txPowerDbm,
Ptr<MobilityModel> a, Ptr<MobilityModel> a,
Ptr<MobilityModel> b) const Ptr<MobilityModel> b) const
{ {
NS_LOG_FUNCTION (this << txPowerDbm << a << b);
if (!GetLos (a, b)) if (!GetLos (a, b))
{ {
NS_LOG_DEBUG ("DROP;"<<a->GetPosition ()<<";"<<b->GetPosition ());
return -1000.0; return -1000.0;
} }
NS_LOG_DEBUG ("LOS;"<<a->GetPosition ()<<";"<<b->GetPosition ());
return txPowerDbm; return txPowerDbm;
} }