From 10f882eebab017607418df2df4552ff02c2d7c47 Mon Sep 17 00:00:00 2001
From: Gabriel Ferreira <gabrielcarvfer@gmail.com>
Date: Wed, 8 May 2024 15:33:22 +0200
Subject: [PATCH] antenna, spectrum: Enable superposed nodes in 3GPP assuming
 minimum separation

---
 src/antenna/model/angles.cc                                  | 5 +++--
 .../model/three-gpp-spectrum-propagation-loss-model.cc       | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/antenna/model/angles.cc b/src/antenna/model/angles.cc
index ef86c9511..83c94f525 100644
--- a/src/antenna/model/angles.cc
+++ b/src/antenna/model/angles.cc
@@ -210,8 +210,9 @@ Angles::Angles(Vector v)
     // azimuth and inclination angles for zero-length vectors are not defined
     if (v.x == 0.0 && v.y == 0.0 && v.z == 0.0)
     {
-        m_azimuth = NAN;
-        m_inclination = NAN;
+        // assume x and length equals to 1 mm to avoid nans
+        m_azimuth = std::atan2(v.y, 0.001);
+        m_inclination = std::acos(v.z / 0.001);
     }
 
     NormalizeAngles();
diff --git a/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.cc b/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.cc
index 879fc4259..527c686eb 100644
--- a/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.cc
+++ b/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.cc
@@ -511,10 +511,6 @@ ThreeGppSpectrumPropagationLossModel::DoCalcRxPowerSpectralDensity(
     NS_LOG_FUNCTION(this << spectrumSignalParams << a << b << aPhasedArrayModel
                          << bPhasedArrayModel);
 
-    if (a->GetPosition() == b->GetPosition())
-    {
-        return spectrumSignalParams->Copy();
-    }
     uint32_t aId = a->GetObject<Node>()->GetId(); // id of the node a
     uint32_t bId = b->GetObject<Node>()->GetId(); // id of the node b
     NS_ASSERT_MSG(aPhasedArrayModel, "Antenna not found for node " << aId);