From 83c5bc3b2efa5ec103d633f98e4fd077988523f7 Mon Sep 17 00:00:00 2001
From: Tim Schubert <tim.schubert@tu-bs.de>
Date: Mon, 27 Jul 2020 13:10:01 +0200
Subject: [PATCH] Use hard cutoff as first step to proper propagation loss

---
 model/isl-propagation-loss-model.cc | 16 +++++++++++-----
 model/leo-propagation-loss-model.cc |  7 +++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/model/isl-propagation-loss-model.cc b/model/isl-propagation-loss-model.cc
index f9c6bc0..86b8cb7 100644
--- a/model/isl-propagation-loss-model.cc
+++ b/model/isl-propagation-loss-model.cc
@@ -23,6 +23,7 @@
  */
 
 #include "ns3/log.h"
+#include "ns3/mobility-model.h"
 
 #include "isl-propagation-loss-model.h"
 
@@ -53,13 +54,18 @@ IslPropagationLossModel::~IslPropagationLossModel ()
 
 double
 IslPropagationLossModel::DoCalcRxPower (double txPowerDbm,
-                                           Ptr<MobilityModel> a,
-                                           Ptr<MobilityModel> b) const
+                                        Ptr<MobilityModel> a,
+                                        Ptr<MobilityModel> b) const
 {
-  //Vector aPos = a->GetPosition ();
-  //Vector bPos = b->GetPosition ();
 
-  // TODO perform line-earth intersection (ray tracing)
+  // TODO perform line-earth intersection (ray tracing or based on earth
+  // curvature + distance)
+
+  // primitivec cut-of at 1000 km
+  if (a->GetDistanceFrom (b) > 1000000.0)
+    {
+      return 0;
+    }
 
   double rxc = 0;//-m_variable->GetValue ();
   NS_LOG_DEBUG ("attenuation coefficient="<<rxc<<"Db");
diff --git a/model/leo-propagation-loss-model.cc b/model/leo-propagation-loss-model.cc
index 59810f5..178c496 100644
--- a/model/leo-propagation-loss-model.cc
+++ b/model/leo-propagation-loss-model.cc
@@ -1,6 +1,8 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 
 #include "ns3/log.h"
+#include "ns3/mobility-model.h"
+
 #include "leo-propagation-loss-model.h"
 
 namespace ns3 {
@@ -38,6 +40,11 @@ LeoPropagationLossModel::DoCalcRxPower (double txPowerDbm,
 
   // TODO perform line-earth intersection (ray tracing)
   // TODO check angle between satellite and ground-station
+  // primitivec cut-of at 1000 km
+  if (a->GetDistanceFrom (b) > 1000000.0)
+    {
+      return 0;
+    }
 
   double rxc = 0;//-m_variable->GetValue ();
   //NS_LOG_DEBUG ("attenuation coefficient="<<rxc<<"Db");