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

Add test for propagation loss and fix bugs

Browse source
This commit is contained in:
Tim Schubert 2020-08-11 18:14:43 +02:00
parent 090ef28e99
commit 2f94c15455
3 changed files with 121 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
model/leo-propagation-loss-model.cc
View file

@ -28,7 +28,7 @@ LeoPropagationLossModel::GetTypeId (void)
MakeDoubleChecker<double> ())
.AddAttribute ("ElevationAngle",
"Cut-off angle for signal propagation",
DoubleValue (20.0),
DoubleValue (M_PI / 9),
MakeDoubleAccessor (&LeoPropagationLossModel::m_elevationAngle),
MakeDoubleChecker<double> ())
.AddAttribute ("AtmosphericLoss",
@ -39,7 +39,7 @@ LeoPropagationLossModel::GetTypeId (void)
.AddAttribute ("FreeSpacePathLoss",
"Free space path loss in dB",
DoubleValue (0.0),
MakeDoubleAccessor (&LeoPropagationLossModel::m_atmosphericLoss),
MakeDoubleAccessor (&LeoPropagationLossModel::m_freeSpacePathLoss),
MakeDoubleChecker<double> ())
.AddAttribute ("LinkMargin",
"Link margin in dB",
@ -76,7 +76,7 @@ LeoPropagationLossModel::DoCalcRxPower (double txPowerDbm,
Ptr<MobilityModel> a,
Ptr<MobilityModel> b) const
{
if (a->GetDistanceFrom (b) > m_cutoffDistance && GetAngle (a, b) > m_elevationAngle / 2.0)
if (a->GetDistanceFrom (b) > m_cutoffDistance || GetAngle (a, b) > m_elevationAngle / 2.0)
{
return 0.0;
}