necpp 2.2.1__tar.gz → 2.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: necpp
-Version: 2.2.1
+Version: 2.2.3
 Summary: Python Antenna Simulation Module (nec2++) C-style interface
 Author-email: Tim Molteno <tim@physics.otago.ac.nz>
 License-Expression: GPL-3.0-only

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: necpp
-Version: 2.2.1
+Version: 2.2.3
 Summary: Python Antenna Simulation Module (nec2++) C-style interface
 Author-email: Tim Molteno <tim@physics.otago.ac.nz>
 License-Expression: GPL-3.0-only

{necpp-2.2.1 → necpp-2.2.3}/necpp_src/src/c_geometry.cpp

@@ -1971,12 +1971,18 @@ void c_geometry::sc_card(int i2,
     default:
       throw nec_exception("PATCH DATA ERROR ns ", this->patch_type );
   }
-  patch( this->patch_type, i2, 
-          this->patch_x1(0), this->patch_x1(1), this->patch_x1(2), 
+  /* The patch shape is conveyed by the ny argument (i2); nx must be 0 so
+     that patch() treats this as a single shaped patch rather than an
+     nx-by-ny grid (nx > 0 would expand each SC card into a grid of
+     patches, bloating the interaction matrix). This mirrors the
+     file-parser path (parse_sc_card), which calls
+     patch(st.card_int_1 = 0, st.card_int_2, ...). */
+  patch( 0, i2,
+          this->patch_x1(0), this->patch_x1(1), this->patch_x1(2),
           this->patch_x2(0), this->patch_x2(1), this->patch_x2(2),
           this->patch_x3(0), this->patch_x3(1), this->patch_x3(2),
           this->patch_x4(0), this->patch_x4(1), this->patch_x4(2));
-  
+
   _prev_sc = true;
 }
 
@@ -2024,16 +2030,18 @@ void c_geometry::sc_multiple_card(int i2,
     default:
       throw nec_exception("PATCH DATA ERROR i2 = ", i2 );
   }
-  
-  patch( this->patch_type, i2, 
-          this->patch_x1(0), this->patch_x1(1), this->patch_x1(2), 
+
+  /* See sc_card(): nx must be 0 to avoid patch() generating an nx-by-ny
+     grid of patches for each linked SC card in the patch string. */
+  patch( 0, i2,
+          this->patch_x1(0), this->patch_x1(1), this->patch_x1(2),
           this->patch_x2(0), this->patch_x2(1), this->patch_x2(2),
           this->patch_x3(0), this->patch_x3(1), this->patch_x3(2),
           this->patch_x4(0), this->patch_x4(1), this->patch_x4(2));
-  
+
   m_output->nec_printf( "\n"
           " %5d%c %10.5f %11.5f %11.5f %11.5f %11.5f %11.5f",
-          this->patch_type, ipt[i2], 
+          this->patch_type, ipt[i2],
           this->patch_x1(0), this->patch_x1(1), this->patch_x1(2),
           this->patch_x2(0), this->patch_x2(1), this->patch_x2(2));
 
@@ -2475,7 +2483,7 @@ void c_geometry::read_geometry_card(FILE* input_fp,  char *gm,
   nec_float *in_x2, nec_float *in_y2, nec_float *in_z2,
   nec_float *in_rad )
 {
-  char line_buf[134];
+  char line_buf[LINE_LEN+1];
   load_line( line_buf, input_fp );
   parse_geometry_card_line(line_buf, gm, in_i1, in_i2, in_x1, in_y1, in_z1, in_x2, in_y2, in_z2, in_rad);
 }
@@ -2486,7 +2494,7 @@ void c_geometry::read_geometry_card(std::istream& is,  char *gm,
   nec_float *in_x2, nec_float *in_y2, nec_float *in_z2,
   nec_float *in_rad )
 {
-  char line_buf[134];
+  char line_buf[LINE_LEN+1];
   load_line( line_buf, is );
   parse_geometry_card_line(line_buf, gm, in_i1, in_i2, in_x1, in_y1, in_z1, in_x2, in_y2, in_z2, in_rad);
 }

{necpp-2.2.1 → necpp-2.2.3}/necpp_src/src/matrix_algebra.cpp

@@ -330,8 +330,8 @@ void factrs(nec_output_file& s_output,    int64_t np, int64_t nrow, complex_arra
     for (int mode = 0; mode < num_symmetric_modes; mode++ ) {
         int64_t mode_offset = mode * np;
         
-        complex_array a_temp = a.segment(mode_offset, a.size()-mode_offset);
-        int_array ip_temp = ip.segment(mode_offset, ip.size()-mode_offset);
+        complex_array a_temp = a.eigen_segment(mode_offset, a.size()-mode_offset);
+        int_array ip_temp = ip.eigen_segment(mode_offset, ip.size()-mode_offset);
         
         lu_decompose(s_output,    np, a_temp, ip_temp, nrow );
     }
@@ -426,9 +426,9 @@ void solves(complex_array& a, int_array& ip, complex_array& b, int64_t neq,
 
         for (int64_t ic = 0; ic < nrh; ic++ ) {
             int64_t column_offset = ic*neq;
-            complex_array a_sub = a.segment(ia, a.size()-ia);
-            complex_array b_sub = b.segment(ia+column_offset, b.size() - (ia+column_offset) );
-            int_array ip_sub = ip.segment(ia, ip.size()-ia);
+            complex_array a_sub = a.eigen_segment(ia, a.size()-ia);
+            complex_array b_sub = b.eigen_segment(ia+column_offset, b.size() - (ia+column_offset) );
+            int_array ip_sub = ip.eigen_segment(ia, ip.size()-ia);
             solve( npeq, a_sub, ip_sub, b_sub, nrow );
         }
     } /* for( kk = 0; kk < nop; kk++ ) */

{necpp-2.2.1 → necpp-2.2.3}/necpp_src/src/misc.cpp

@@ -119,8 +119,19 @@ int load_line( char *buff, FILE *pfile )
 			buff[num_chr] = '\0';
 			eof = EOF;
 		}
-	} /* end of while( num_chr < max_chr ) */
-	
+	} /* end of while( num_chr < LINE_LEN ) */
+
+	/* drain any characters past LINE_LEN so an over-length line
+	 * cannot leak its tail into the next load_line read. Match the
+	 * fill loop's EOF convention (set eof, fall through) rather than
+	 * the single-quote drain's early return, so the buffer's mnemonic
+	 * is still capitalized/terminated and the caller sees EOF. */
+	while( (chr != CR) && (chr != LF) )
+		if( (chr = fgetc(pfile)) == EOF ) {
+			eof = EOF;
+			break;
+		}
+
 	/* Capitalize first two characters (mnemonics) */
 	    buff[0] = static_cast<char>(std::toupper(buff[0]));
 	    buff[1] = static_cast<char>(std::toupper(buff[1]));
@@ -175,6 +186,17 @@ int load_line( char *buff, std::istream& is )
 		}
 	}
 
+	/* drain any characters past LINE_LEN so an over-length line
+	 * cannot leak its tail into the next load_line read. Match the
+	 * fill loop's EOF convention (set eof, fall through). */
+	while ( (chr != CR) && (chr != LF) ) {
+		chr = is.get();
+		if ( !is ) {
+			eof = EOF;
+			break;
+		}
+	}
+
 	buff[0] = static_cast<char>(std::toupper(buff[0]));
 	buff[1] = static_cast<char>(std::toupper(buff[1]));
 	buff[num_chr] = '\0';

{necpp-2.2.1 → necpp-2.2.3}/necpp_src/src/misc.h

@@ -9,7 +9,7 @@
 #define	LF	0x0a
 
 /* max length of a line read from input file */
-#define	LINE_LEN	132
+#define	LINE_LEN	512
 
 /*  usage()
  *

{necpp-2.2.1 → necpp-2.2.3}/necpp_src/src/nec_context.cpp

@@ -2111,7 +2111,7 @@ void nec_context::cmset( int64_t nrow, complex_array& in_cm, nec_float rkhx) {
       cmww( j, i1, in2, in_cm, nrow, in_cm, nrow,1);
 
     if ( im1 <= im2) {
-      complex_array temp = in_cm.segment((ist-1)*nrow, in_cm.size() - ((ist-1)*nrow));
+      complex_array temp = in_cm.eigen_segment((ist-1)*nrow, in_cm.size() - ((ist-1)*nrow));
       cmws( j, im1, im2, temp, nrow, in_cm, nrow, 1);
       /* CMWS (J,IM1,IM2,CM(1,IST),NROW,CM,NROW,1) */
     }
@@ -2148,13 +2148,13 @@ void nec_context::cmset( int64_t nrow, complex_array& in_cm, nec_float rkhx) {
 
       if ( i1 <= in2) {
         int64_t tmp_n = (jst-1);
-        complex_array temp = in_cm.segment(tmp_n, in_cm.size()-tmp_n);
+        complex_array temp = in_cm.eigen_segment(tmp_n, in_cm.size()-tmp_n);
         cmsw( jm1, jm2, i1, in2, temp, in_cm, 0, nrow, 1);
       }
 
       if ( im1 <= im2) {
         int64_t tmp_n = (jst-1)+(ist-1)*nrow;
-        complex_array temp = in_cm.segment(tmp_n, in_cm.size()-tmp_n);
+        complex_array temp = in_cm.eigen_segment(tmp_n, in_cm.size()-tmp_n);
         compute_matrix_ss( jm1, jm2, im1, im2, temp, nrow, 1);
       }
     }
@@ -2177,7 +2177,7 @@ void nec_context::cmset( int64_t nrow, complex_array& in_cm, nec_float rkhx) {
         scm[k] = in_cm[row_offset + ka];
       }
 
-      in_cm[row_offset + j] = scm.segment(0,nop).sum(); //scm.sum(0,nop);
+      in_cm[row_offset + j] = scm.eigen_segment(0,nop).sum(); //scm.sum(0,nop);
       
       for( int k = 1; k < nop; k++ ) {
         int ka = j+ k*npeq;
@@ -6819,14 +6819,14 @@ void nec_context::ffld(nec_float thet, nec_float phi,
   /* electric field components */
   roz= rozs;
   { // without ground 
-    complex_array temp = current_vector.segment(m_geometry->n_segments, current_vector.size()-m_geometry->n_segments);
+    complex_array temp = current_vector.eigen_segment(m_geometry->n_segments, current_vector.size()-m_geometry->n_segments);
     m_geometry->fflds(rox, roy, roz, temp, &ex, &ey, &ez);
   }
   if (ground.present())  {
     // with ground
     nec_complex tempx, tempy, tempz;
     
-    complex_array temp = current_vector.segment(m_geometry->n_segments, current_vector.size()-m_geometry->n_segments);
+    complex_array temp = current_vector.eigen_segment(m_geometry->n_segments, current_vector.size()-m_geometry->n_segments);
     m_geometry->fflds(rox, roy, -roz, temp, &tempx, &tempy, &tempz);
   
     if (ground.type_perfect())  {

{necpp-2.2.1 → necpp-2.2.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "necpp"
-version = "2.2.1"
+version = "2.2.3"
 description = "Python Antenna Simulation Module (nec2++) C-style interface"
 readme = "README.md"
 license = "GPL-3.0-only"

{necpp-2.2.1 → necpp-2.2.3}/tests/test_multiple_sc_cards.py

@@ -299,11 +299,11 @@ class TestSurfacePatches(unittest.TestCase):
                           ----- ANTENNA INPUT PARAMETERS -----
       TAG   SEG       VOLTAGE (VOLTS)         CURRENT (AMPS)         IMPEDANCE (OHMS)        ADMITTANCE (MHOS)     POWER
       NO.   NO.     REAL      IMAGINARY     REAL      IMAGINARY     REAL      IMAGINARY    REAL       IMAGINARY   (WATTS)
-      1     8  1.0000E+00  0.0000E+00  9.2145E-03  6.7375E-04  1.0795E+02 -7.8930E+00  9.2145E-03  6.7375E-04  4.6072E-03
+      1     8  1.0000E+00  0.0000E+00  1.4793E-02  3.7433E-03  6.6908E+01 -1.6926E+01  1.4793E-02  3.7433E-03  7.3963E-03
     """
-        self.assertAlmostEqual(nec_impedance_real(nec, 0), 1.0795e02, 3)
-        self.assertAlmostEqual(nec_impedance_imag(nec, 0), -7.8930e00, 3)
-        self.assertAlmostEqual(nec_gain_max(nec, 0), 10.3332, 4)
+        self.assertAlmostEqual(nec_impedance_real(nec, 0), 6.6908e01, 3)
+        self.assertAlmostEqual(nec_impedance_imag(nec, 0), -1.6926e01, 3)
+        self.assertAlmostEqual(nec_gain_max(nec, 0), 1.7660, 4)
 
         self.handle_nec(nec_delete(nec))