Merge pull request #7 from LyceanEM/master

merge in head
LyceanEM · Mar 13, 2024 · 9df000e · 9df000e
2 parents d317142 + fc7794f
commit 9df000e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -24,15 +24,7 @@ Further documentation can be found [here](https://lyceanem-python.readthedocs.io
 
 If you use LyceanEM in an academic project, please cite our paper:
 
-::
-
-    @article{Pelham2021,
-        author      = {Timothy G Pelham and Geoff Hilton and Evangelos Mellios and Rob Lewis},
-        title       = {Conformal Antenna Array Design Using Aperture Synthesis and On-Platform Modeling},
-        journal     = {IEEE Access},
-        year        = {2021},
-        doi         = {10.1109/ACCESS.2021.3074317}
-    }
+[LyceanEM: A python package for virtual prototyping of antenna arrays, time and frequency domain channel modelling](https://doi.org/10.21105/joss.05234)
 
 ## Core Features
 
@@ -107,7 +99,5 @@ of users. Thank you for your support!
 ## Resources
 
 * Code: [github.com/LyceanEM/LyceanEM-Python](https://github.com/LyceanEM/LyceanEM-Python)
-*
-Documentation: [https://documentation.lyceanem.com/en/latest/index.html](https://documentation.lyceanem.com/en/latest/index.html)
-*
-License: [github.com/LyceanEM/LyceanEM-Python/blob/master/LICENSE.txt](https://github.com/LyceanEM/LyceanEM-Python/blob/master/LICENSE.txt)
+* Documentation: [https://documentation.lyceanem.com/en/latest/index.html](https://documentation.lyceanem.com/en/latest/index.html)
+* License: [github.com/LyceanEM/LyceanEM-Python/blob/master/LICENSE.txt](https://github.com/LyceanEM/LyceanEM-Python/blob/master/LICENSE.txt)
diff --git a/lyceanem/base_classes.py b/lyceanem/base_classes.py
@@ -962,9 +962,9 @@ def export_ffe(self, path, source_name="Antenna Export"):
                 imag_etheta,
                 real_ephi,
                 imag_ephi,
-                20 * np.log10(dtheta[:, 1:].transpose().ravel()),
-                20 * np.log10(dphi[:, 1:].transpose().ravel()),
-                10 * np.log10(dtotal[:, 1:].transpose().ravel()),
+                dtheta[:, 1:].transpose().ravel(),
+                dphi[:, 1:].transpose().ravel(),
+                dtotal[:, 1:].transpose().ravel(),
             ]
         ).transpose()
         datablock[np.where(np.isinf(datablock))] = -1e6

diff --git a/lyceanem/models/frequency_domain.py b/lyceanem/models/frequency_domain.py
@@ -176,7 +176,7 @@ def calculate_farfield(
         unified_weights = np.ones((unified_model.shape[0], 3), dtype=np.complex64)
         if source_weights is None:
             unified_weights[0:num_sources, :] = (
-                conformal_E_vectors / num_sources
+                conformal_E_vectors #/ num_sources
             )  # set total amplitude to 1 for the aperture
         else:
             unified_weights[0:num_sources, :] = source_weights
@@ -257,7 +257,7 @@ def calculate_farfield(
         unified_weights = np.ones((unified_model.shape[0], 3), dtype=np.complex64)
         if source_weights is None:
             unified_weights[0:num_sources, :] = (
-                conformal_E_vectors / num_sources
+                conformal_E_vectors# / num_sources
             )  # set total amplitude to 1 for the aperture
         else:
             unified_weights[0:num_sources, :] = source_weights
@@ -372,13 +372,13 @@ def calculate_farfield(
             point_informationv2[0:num_sources]["ey"] = 0.0
             point_informationv2[0:num_sources]["ez"] = 0.0
             point_informationv2[element]["ex"] = (
-                conformal_E_vectors[element, 0] / num_sources
+                conformal_E_vectors[element, 0] #/ num_sources
             )
             point_informationv2[element]["ey"] = (
-                conformal_E_vectors[element, 1] / num_sources
+                conformal_E_vectors[element, 1] #/ num_sources
             )
             point_informationv2[element]["ez"] = (
-                conformal_E_vectors[element, 2] / num_sources
+                conformal_E_vectors[element, 2] #/ num_sources
             )
             # unified_weights[0:num_sources, :] = 0.0
             # unified_weights[element, :] = (conformal_E_vectors[element, :] / num_sources)*v_transmit
@@ -753,7 +753,7 @@ def calculate_scattering(
                     desired_E_axis[e_inc, :],
                     np.asarray(aperture_coords.normals).astype(np.float32),
                 )
-                unified_weights[0:num_sources, :] = conformal_E_vectors / num_sources
+                unified_weights[0:num_sources, :] = conformal_E_vectors# / num_sources
                 point_informationv2[:]["ex"] = unified_weights[:, 0]
                 point_informationv2[:]["ey"] = unified_weights[:, 1]
                 point_informationv2[:]["ez"] = unified_weights[:, 2]
@@ -789,17 +789,17 @@ def calculate_scattering(
                     point_informationv2[0:num_sources]["ey"] = 0.0
                     point_informationv2[0:num_sources]["ez"] = 0.0
                     point_informationv2[element]["ex"] = (
-                        conformal_E_vectors[element, 0] / num_sources
+                        conformal_E_vectors[element, 0] #/ num_sources
                     )
                     point_informationv2[element]["ey"] = (
-                        conformal_E_vectors[element, 1] / num_sources
+                        conformal_E_vectors[element, 1] #/ num_sources
                     )
                     point_informationv2[element]["ez"] = (
-                        conformal_E_vectors[element, 2] / num_sources
+                        conformal_E_vectors[element, 2] #/ num_sources
                     )
                     unified_weights[0:num_sources, :] = 0.0
                     unified_weights[element, :] = (
-                        conformal_E_vectors[element, :] / num_sources
+                        conformal_E_vectors[element, :]# / num_sources
                     )
                     scatter_map = EM.EMGPUFreqDomain(
                         num_sources,