necpp 1.8.2__tar.gz → 2.2.1__tar.gz

{necpp-1.8.2 → necpp-2.2.1}/MANIFEST.in

@@ -1,7 +1,7 @@
 include LICENCE.txt
 
 include necpp_src/src/*.h
-include necpp_src/config.h
+include necpp_src/src/config.h.in
 
 include necpp_src/example/test.py
 include example/*.py

{necpp-1.8.2/necpp.egg-info → necpp-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: necpp
-Version: 1.8.2
+Version: 2.2.1
 Summary: Python Antenna Simulation Module (nec2++) C-style interface
 Author-email: Tim Molteno <tim@physics.otago.ac.nz>
 License-Expression: GPL-3.0-only
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENCE.txt
 Dynamic: license-file
 
+<!-- Copyright (c) 2008-2026 Tim Molteno (tim@elec.ac.nz) -->
 # python-necpp: Antenna simulation in python
 
 This module allows you to do antenna simulations in Python using the nec2++ antenna

{necpp-1.8.2 → necpp-2.2.1}/README.md

@@ -1,3 +1,4 @@
+<!-- Copyright (c) 2008-2026 Tim Molteno (tim@elec.ac.nz) -->
 # python-necpp: Antenna simulation in python
 
 This module allows you to do antenna simulations in Python using the nec2++ antenna

{necpp-1.8.2 → necpp-2.2.1}/example/antenna_util.py

@@ -1,3 +1,4 @@
+# Copyright (c) 2008-2026 Tim Molteno (tim@elec.ac.nz)
 #
 # Some antenna utility functions
 #

{necpp-1.8.2 → necpp-2.2.1}/example/different_material.py

@@ -1,3 +1,4 @@
+# Copyright (c) 2008-2026 Tim Molteno (tim@elec.ac.nz)
 from necpp import *
 import math
 

{necpp-1.8.2 → necpp-2.2.1}/example/impedance_plot.py

@@ -1,3 +1,4 @@
+# Copyright (c) 2008-2026 Tim Molteno (tim@elec.ac.nz)
 #
 #  Plot of reflection coefficient vs antenna length for a fixed base height.
 #

{necpp-1.8.2 → necpp-2.2.1}/example/monopole.py

@@ -1,3 +1,4 @@
+# Copyright (c) 2008-2026 Tim Molteno (tim@elec.ac.nz)
 #
 #  Simple vertical monopole antenna simulation using python-necpp
 #  pip install necpp

{necpp-1.8.2 → necpp-2.2.1}/example/optimized.py

@@ -1,3 +1,4 @@
+# Copyright (c) 2008-2026 Tim Molteno (tim@elec.ac.nz)
 #
 #  Automatically tune antenna
 #

{necpp-1.8.2 → necpp-2.2.1/necpp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: necpp
-Version: 1.8.2
+Version: 2.2.1
 Summary: Python Antenna Simulation Module (nec2++) C-style interface
 Author-email: Tim Molteno <tim@physics.otago.ac.nz>
 License-Expression: GPL-3.0-only
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENCE.txt
 Dynamic: license-file
 
+<!-- Copyright (c) 2008-2026 Tim Molteno (tim@elec.ac.nz) -->
 # python-necpp: Antenna simulation in python
 
 This module allows you to do antenna simulations in Python using the nec2++ antenna

{necpp-1.8.2 → necpp-2.2.1}/necpp.egg-info/SOURCES.txt

@@ -14,7 +14,6 @@ necpp.egg-info/PKG-INFO
 necpp.egg-info/SOURCES.txt
 necpp.egg-info/dependency_links.txt
 necpp.egg-info/top_level.txt
-necpp_src/config.h
 necpp_src/example/test.py
 necpp_src/src/AntennaInput.h
 necpp_src/src/BaseInput.h
@@ -32,6 +31,7 @@ necpp_src/src/c_ggrid.h
 necpp_src/src/c_plot_card.cpp
 necpp_src/src/c_plot_card.h
 necpp_src/src/common.h
+necpp_src/src/config.h.in
 necpp_src/src/electromag.cpp
 necpp_src/src/electromag.h
 necpp_src/src/libNEC.cpp

{necpp-1.8.2 → necpp-2.2.1}/necpp_src/src/c_evlcom.cpp

@@ -186,7 +186,7 @@ void c_evlcom::gshank( nec_complex start, nec_complex dela, complex_array& sum,
 				if (den < denm)
 					den=denm;
 				a1=q1[i][j]-a1;
-				amg=fabs(real(a1)+fabs(imag(a1)));
+				amg=fabs(real(a1))+fabs(imag(a1));
 				if (amg > den)
 				{
 					brk = true;
@@ -563,54 +563,52 @@ void c_evlcom::evlua( nec_complex *erv, nec_complex *ezv,
 	gshank(cp1,delta,ans,6,sum,0,bk,bk);
 	rmis=m_rho*(real(m_ck1)-m_ck2);
 	
-	bool jump = false;
-	if ( (rmis >= 2.*m_ck2) && (m_rho >= 1.e-10) )
-	{
-		if (m_zph >= 1.e-10)
-		{
-			bk=nec_complex(-m_zph,m_rho)*(m_ck1-cp3);
-			rmis = -real(bk)/fabs(imag(bk));
-			if (rmis > 4.*m_rho/m_zph)
-				jump = true;
-		}
-		
-		if ( false == jump )
-		{
-			/* integrate up between branch cuts, then to + infinity */
-			cp1=m_ck1- nec_complex(0.1,+0.2);
-			cp2=cp1+.2;
-			bk=nec_complex(0.,del);
-			gshank(cp1,bk,sum,6,ans,0,bk,bk);
-			m_contour_a=cp1;
-			m_contour_b=cp2;
-			rom1(6,ans,1);
-			for (int i = 0; i < 6; i++ )
-				ans[i] -= sum[i];
-			
-			gshank(cp3,bk,sum,6,ans,0,bk,bk);
-			gshank(cp2,delta2,ans,6,sum,0,bk,bk);
-		}
-		
-		jump = true;	
-	} /* if ( (rmis >= 2.*m_ck2) || (m_rho >= 1.e-10) ) */
-	else
+	bool jump;
+	if ( (rmis < 2.*m_ck2) || (m_rho < 1.e-10) )
+		jump = true;
+	else if ( m_zph < 1.e-10 )
 		jump = false;
-	
+	else
+	{
+		bk=nec_complex(-m_zph,m_rho)*(m_ck1-cp3);
+		rmis = -real(bk)/fabs(imag(bk));
+		if (rmis > 4.*m_rho/m_zph)
+			jump = true;
+		else
+			jump = false;
+	}
+
 	if ( false == jump )
+	{
+		/* integrate up between branch cuts, then to + infinity */
+		cp1=m_ck1- nec_complex(0.1,+0.2);
+		cp2=cp1+.2;
+		bk=nec_complex(0.,del);
+		gshank(cp1,bk,sum,6,ans,0,bk,bk);
+		m_contour_a=cp1;
+		m_contour_b=cp2;
+		rom1(6,ans,1);
+		for (int i = 0; i < 6; i++ )
+			ans[i] -= sum[i];
+
+		gshank(cp3,bk,sum,6,ans,0,bk,bk);
+		gshank(cp2,delta2,ans,6,sum,0,bk,bk);
+	}
+	else
 	{
 		/* integrate below branch points, then to + infinity */
 		for (int i = 0; i < 6; i++ )
 			sum[i] = -ans[i];
-		
+
 		rmis=real(m_ck1)*1.01;
 		if ( (m_ck2+1.) > rmis )
 			rmis=m_ck2+1.;
-		
+
 		bk=nec_complex(rmis,.99*imag(m_ck1));
 		delta=bk-cp3;
 		delta *= del/abs(delta);
 		gshank(cp3,delta,ans,6,sum,1,bk,delta2);
-	} /* if ( false == jump ) */
+	}
 	
 	ans[5] *= m_ck1;
 	
@@ -841,3 +839,45 @@ void hankel( nec_complex z, nec_complex *h0, nec_complex *h0p )
 }
 
 
+
+/* Numerical integration convergence tests used by Sommerfeld integration. */
+
+void test(
+        nec_float f1r, nec_float f2r, nec_float *tr,
+        nec_float f1i, nec_float f2i, nec_float *ti,
+        nec_float dmin )
+{
+    static nec_float _min_val = 1.0e-37;
+    
+    nec_float den = fabs( f2r);
+    nec_float temp_tr = fabs( f2i);
+    
+    if( den < temp_tr)
+        den = temp_tr;
+    if( den < dmin)
+        den = dmin;
+    
+    if( den < _min_val) {
+        *tr = 0.0;
+        *ti = 0.0;
+        return;
+    }
+    
+    *tr= fabs((f1r - f2r)/ den);
+    *ti= fabs((f1i - f2i)/ den); 
+}
+
+nec_float test_simple( nec_float f1r, nec_float f2r, nec_float dmin )
+{
+    static nec_float _min_val = 1.0e-37;
+    
+    nec_float den = fabs(f2r);
+    
+    if( den < dmin)
+        den = dmin;
+    if (den < _min_val)   {
+        return 0.0;
+    }
+    
+    return fabs((f1r - f2r) / den);    
+}

{necpp-1.8.2 → necpp-2.2.1}/necpp_src/src/c_evlcom.h

@@ -61,3 +61,8 @@ private:
 	/*! \brief Flag to select Bessel or Hankel function form (was jh) */
 	bool m_bessel_flag;
 };
+
+/* Numerical integration convergence tests (used by Sommerfeld integration) */
+void test(nec_float f1r, nec_float f2r, nec_float *tr, nec_float f1i,
+  nec_float f2i, nec_float *ti, nec_float dmin);
+nec_float test_simple( nec_float f1r, nec_float f2r, nec_float dmin );