[hamradio-commits] [xnec2c] 01/03: Imported Upstream version 3.4
Dave Hibberd
hibby-guest at moszumanska.debian.org
Tue Sep 1 22:30:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
hibby-guest pushed a commit to branch master
in repository xnec2c.
commit 2cd9414c8924f13eed04db6b0f1fa0afde76647b
Author: Dave Hibberd <d at vehibberd.com>
Date: Tue Sep 1 22:40:10 2015 +0100
Imported Upstream version 3.4
---
configure | 20 ++++++++++----------
configure.ac | 2 +-
doc/aspell.sh | 5 +++++
doc/xnec2c.html | 8 ++++++++
examples/10-20m_horizomni.nec | 21 +++++++++++++++++++++
examples/10-30m_MultiBand_Vertical.nec | 19 +++++++++++++++++++
examples/10-30m_Vertical.nec | 20 ++++++++++++++++++++
examples/1MHz_3x_helicone.nec | 20 ++++++++++----------
examples/1MHz_3x_helisphere.nec | 2 +-
examples/1MHz_tower.nec | 30 +++++++++++++++---------------
examples/2m_1:4l-gp_on_pole.nec | 14 +++++++-------
examples/2m_EME_ant.nec | 16 ++++++++--------
examples/40-80m_Inv_L.nec | 11 +++++++++++
examples/6m_horizomni.nec | 14 ++++++++++++++
src/Makefile.am | 3 ++-
src/Makefile.in | 3 ++-
src/input.c | 8 ++++++--
17 files changed, 160 insertions(+), 56 deletions(-)
diff --git a/configure b/configure
index aa06ba3..a7abe7d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xnec2c 3.3.
+# Generated by GNU Autoconf 2.69 for xnec2c 3.4.
#
# Report bugs to <nkcyham at yahoo.com>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xnec2c'
PACKAGE_TARNAME='xnec2c'
-PACKAGE_VERSION='3.3'
-PACKAGE_STRING='xnec2c 3.3'
+PACKAGE_VERSION='3.4'
+PACKAGE_STRING='xnec2c 3.4'
PACKAGE_BUGREPORT='nkcyham at yahoo.com'
PACKAGE_URL=''
@@ -1339,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xnec2c 3.3 to adapt to many kinds of systems.
+\`configure' configures xnec2c 3.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1405,7 +1405,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xnec2c 3.3:";;
+ short | recursive ) echo "Configuration of xnec2c 3.4:";;
esac
cat <<\_ACEOF
@@ -1511,7 +1511,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xnec2c configure 3.3
+xnec2c configure 3.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1972,7 +1972,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xnec2c $as_me 3.3, which was
+It was created by xnec2c $as_me 3.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2835,7 +2835,7 @@ fi
# Define the identity of the package.
PACKAGE='xnec2c'
- VERSION='3.3'
+ VERSION='3.4'
cat >>confdefs.h <<_ACEOF
@@ -8018,7 +8018,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xnec2c $as_me 3.3, which was
+This file was extended by xnec2c $as_me 3.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8084,7 +8084,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xnec2c config.status 3.3
+xnec2c config.status 3.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 501e183..56a874b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([xnec2c], [3.3], [nkcyham at yahoo.com])
+AC_INIT([xnec2c], [3.4], [nkcyham at yahoo.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/common.h])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/aspell.sh b/doc/aspell.sh
new file mode 100755
index 0000000..a3bc566
--- /dev/null
+++ b/doc/aspell.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+for file in *.html
+do
+ aspell -c "$file"
+done
diff --git a/doc/xnec2c.html b/doc/xnec2c.html
index 7d1ae9e..686d053 100644
--- a/doc/xnec2c.html
+++ b/doc/xnec2c.html
@@ -936,6 +936,14 @@ reads the commands from the NEC2 input file, where xnec2c would
crash with a segmentation fault when the FR card was after the
RP card. Also modified the Strtod() function to avoid freeing the
end pointer before it was used, causing problems.</p>
+<p><b>Version 3.4:</b> I fixed a bug in the code that implements
+the modified GS (scaling) card. In NEC2 the GS card scales all
+of the structure, but in Xnec2c I modified the code so that it
+is possible to specify a range of tag numbers to apply scaling
+to only. When a GS card follows a GX card, selective scaling
+doesn't work correctly because a symmetric structure is created.
+If you are using a GS card, it may be better to avoid specifying
+a tag number range, just in case the bug fix is not complete.</p>
<p><b><a name="Bugs" id="Bugs">9. Bugs and Inadequacies:</a></b><br>
Xnec2c is based on nec2c, my translation to C of the original
FORTRAN NEC2 code. Any bugs discovered in nec2c will affect xnec2c
diff --git a/examples/10-20m_horizomni.nec b/examples/10-20m_horizomni.nec
new file mode 100644
index 0000000..97957d9
--- /dev/null
+++ b/examples/10-20m_horizomni.nec
@@ -0,0 +1,21 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CE --- End Comments ---
+GW 1 15 -1.27000E+00 -1.27000E+00 0.00000E+00 1.27000E+00 -1.27000E+00 0.00000E+00 1.50000E-03
+GW 1 15 1.27000E+00 -1.27000E+00 0.00000E+00 1.27000E+00 1.27000E+00 0.00000E+00 1.50000E-03
+GW 1 15 -1.27000E+00 -1.27000E+00 0.00000E+00 -1.27000E+00 1.27000E+00 0.00000E+00 1.50000E-03
+GW 1 7 -5.00000E-02 1.27000E+00 0.00000E+00 -1.27000E+00 1.27000E+00 0.00000E+00 1.50000E-03
+GW 1 7 5.00000E-02 1.27000E+00 0.00000E+00 1.27000E+00 1.27000E+00 0.00000E+00 1.50000E-03
+GM 1 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.00000E+00
+GS 2 2 8.05000E-01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GS 3 3 6.90000E-01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GS 4 4 5.95000E-01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GS 5 5 5.30000E-01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 5 8 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 161 0 0 1.40000E+01 1.00000E-01 3.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 1.00000E+01 1.00000E+01 0.00000E+00 0.00000E+00
+TL 1 8 2 8 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 2 8 3 8 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 3 8 4 8 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 4 8 5 8 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/10-30m_MultiBand_Vertical.nec b/examples/10-30m_MultiBand_Vertical.nec
new file mode 100644
index 0000000..fac8fd0
--- /dev/null
+++ b/examples/10-30m_MultiBand_Vertical.nec
@@ -0,0 +1,19 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CM Multiband Vertical covering all bands from 10m-30m
+CM No traps are used and only one element (30m) is
+CM fed power. A vertical element for each band is needed
+CM close to the central driven element. A good ground
+CM plane system will be needed for good performance.
+CE --- End Comments ---
+GW 1 35 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 7.20000E+00 1.25000E-02
+GW 2 25 4.00000E-01 0.00000E+00 0.00000E+00 4.00000E-01 0.00000E+00 5.00000E+00 6.00000E-03
+GW 3 20 1.00000E-01 2.30000E-01 0.00000E+00 1.00000E-01 2.30000E-01 4.00000E+00 6.00000E-03
+GW 4 17 -2.50000E-01 1.90000E-01 0.00000E+00 -2.50000E-01 1.90000E-01 3.40000E+00 6.00000E-03
+GW 5 14 -2.60000E-01 -1.90000E-01 0.00000E+00 -2.60000E-01 -1.90000E-01 2.89000E+00 6.00000E-03
+GW 6 12 9.00000E-02 -2.70000E-01 0.00000E+00 9.00000E-02 -2.70000E-01 2.55000E+00 6.00000E-03
+GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 1 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 93 0 0 7.00000E+00 2.50000E-01 3.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
+GN 1 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/10-30m_Vertical.nec b/examples/10-30m_Vertical.nec
new file mode 100644
index 0000000..98d7a50
--- /dev/null
+++ b/examples/10-30m_Vertical.nec
@@ -0,0 +1,20 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CM Multiband Vertical covering all bands from 10m-30m
+CM No traps are used and only one element (30m) is
+CM fed power. A vertical element for each band is needed
+CM close to the central driven element. A good ground
+CM plane system will be needed for good performance.
+CE --- End Comments ---
+GW 1 35 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 7.25000E+00 1.25000E-02
+GW 2 25 2.50000E-01 0.00000E+00 0.00000E+00 2.50000E-01 0.00000E+00 5.05000E+00 6.00000E-03
+GW 7 8 1.50000E-01 1.50000E-01 0.00000E+00 1.50000E-01 1.50000E-01 1.45000E+00 6.00000E-03
+GW 3 20 7.70000E-02 2.38000E-01 0.00000E+00 7.70000E-02 2.38000E-01 4.02000E+00 6.00000E-03
+GW 4 17 -2.02000E-01 1.47000E-01 0.00000E+00 -2.02000E-01 1.47000E-01 3.43000E+00 6.00000E-03
+GW 5 14 -2.02000E-01 -1.47000E-01 0.00000E+00 -2.02000E-01 -1.47000E-01 2.92000E+00 6.00000E-03
+GW 6 12 7.70000E-02 -2.48000E-01 0.00000E+00 7.70000E-02 -2.48000E-01 2.58000E+00 6.00000E-03
+GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 1 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 121 0 0 2.80000E+01 2.00000E-01 5.20000E+01 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
+GN 1 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/1MHz_3x_helicone.nec b/examples/1MHz_3x_helicone.nec
index 80fda29..b0537d4 100644
--- a/examples/1MHz_3x_helicone.nec
+++ b/examples/1MHz_3x_helicone.nec
@@ -3,17 +3,17 @@ CM Top-loaded helical vertical for 1.0 MHz, over perfect ground.
CM Three helices are used in parallel to raise the input impedance
CM to near 50 Ohms. The top hat is conical to add to radiation.
CE --- End Comments ---
-GW 1 20 0.00000E+00 0.00000E+00 1.35000E+01 1.07000E+01 0.00000E+00 1.90000E+01 3.00000E-02
-GW 1 7 1.07000E+01 0.00000E+00 1.90000E+01 9.88550E+00 4.09470E+00 1.90000E+01 3.00000E-02
-GR 0 16 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GH 2 120 1.30000E+00 1.30000E+01 1.20000E+00 1.20000E+00 1.20000E+00 1.20000E+00 3.00000E-02
-GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 -3.00000E+00 0.00000E+00 0.00000E+00 2.00000E+00
-GW 3 3 -1.80000E+00 0.00000E+00 1.30000E+01 0.00000E+00 0.00000E+00 1.30000E+01 3.00000E-02
-GM 0 2 0.00000E+00 0.00000E+00 1.20000E+02 0.00000E+00 0.00000E+00 0.00000E+00 2.00000E+00
-GW 4 1 0.00000E+00 0.00000E+00 1.30000E+01 0.00000E+00 0.00000E+00 1.35000E+01 5.00000E-02
-GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 1 20 0.00000E+00 0.00000E+00 1.35000E+01 1.07000E+01 0.00000E+00 1.90000E+01 3.00000E-02
+GW 1 7 1.07000E+01 0.00000E+00 1.90000E+01 9.88550E+00 4.09470E+00 1.90000E+01 3.00000E-02
+GR 0 16 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GH 2 120 1.30000E+00 1.30000E+01 1.20000E+00 1.20000E+00 1.20000E+00 1.20000E+00 3.00000E-02
+GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 -3.00000E+00 0.00000E+00 0.00000E+00 2.00000E+00
+GW 3 3 -1.80000E+00 0.00000E+00 1.30000E+01 0.00000E+00 0.00000E+00 1.30000E+01 3.00000E-02
+GM 0 2 0.00000E+00 0.00000E+00 1.20000E+02 0.00000E+00 0.00000E+00 0.00000E+00 2.00000E+00
+GW 4 1 0.00000E+00 0.00000E+00 1.30000E+01 0.00000E+00 0.00000E+00 1.35000E+01 5.00000E-02
+GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
GN 1 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-FR 0 41 0 0 9.00000E-01 5.00000E-03 1.10000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 2 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
RP 0 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
+FR 0 41 0 0 9.00000E-01 5.00000E-03 1.10000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/1MHz_3x_helisphere.nec b/examples/1MHz_3x_helisphere.nec
index 04314f2..559ad91 100644
--- a/examples/1MHz_3x_helisphere.nec
+++ b/examples/1MHz_3x_helisphere.nec
@@ -13,7 +13,7 @@ GM 0 2 0.00000E+00 0.00000E+00 1.20000E+02 0.00000E+00 0.00000E+00
GW 4 1 0.00000E+00 0.00000E+00 1.03000E+01 0.00000E+00 0.00000E+00 1.08000E+01 5.00000E-02
GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
GN 1 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-FR 0 41 0 0 9.00000E-01 5.00000E-03 1.10000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 2 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
RP 0 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
+FR 0 41 0 0 9.00000E-01 5.00000E-03 1.10000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/1MHz_tower.nec b/examples/1MHz_tower.nec
index c78f194..ed60658 100644
--- a/examples/1MHz_tower.nec
+++ b/examples/1MHz_tower.nec
@@ -3,23 +3,22 @@ CM Top-loaded tower for 1.0 MHz, over perfect ground.
CM Each leg is loaded by an inductance to ground.
CM Tower is fed at one of the loaded legs.
CE --- End Comments ---
-GW 1 1 1.24900E+00 0.00000E+00 1.24900E+00 0.00000E+00 1.24900E+00 1.24900E+00 5.00000E-02
-GW 1 1 1.24900E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.24900E+00 1.24900E+00 5.00000E-02
-GM 0 8 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.24900E+00 0.00000E+00
-GW 1 6 1.24900E+00 0.00000E+00 0.00000E+00 1.24900E+00 0.00000E+00 1.12400E+01 5.00000E-02
-GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.24900E+00 0.00000E+00
-GW 2 4 8.92500E+00 -1.83600E+00 1.24900E+01 1.24900E+00 0.00000E+00 1.24900E+01 5.00000E-02
-GW 2 4 8.92500E+00 1.83600E+00 1.24900E+01 1.24900E+00 0.00000E+00 1.24900E+01 5.00000E-02
-GW 2 4 7.39500E+00 -4.95300E+00 1.24900E+01 1.24900E+00 0.00000E+00 1.24900E+01 5.00000E-02
-GW 2 4 7.39500E+00 4.95300E+00 1.24900E+01 1.24900E+00 0.00000E+00 1.24900E+01 5.00000E-02
-GW 2 1 1.24900E+00 0.00000E+00 1.24900E+00 0.00000E+00 1.24900E+00 1.24900E+00 5.00000E-02
-GW 3 1 1.24900E+00 0.00000E+00 0.00000E+00 1.24900E+00 0.00000E+00 1.24900E+00 5.00000E-02
-GS 0 0 1.25000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GR 3 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 1 1 1.24900E+00 0.00000E+00 1.24900E+00 0.00000E+00 1.24900E+00 1.24900E+00 5.00000E-02
+GW 1 1 1.24900E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.24900E+00 1.24900E+00 5.00000E-02
+GM 0 8 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.24900E+00 0.00000E+00
+GW 1 6 1.24900E+00 0.00000E+00 0.00000E+00 1.24900E+00 0.00000E+00 1.12400E+01 5.00000E-02
+GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.24900E+00 0.00000E+00
+GW 2 4 8.92500E+00 -1.83600E+00 1.24900E+01 1.24900E+00 0.00000E+00 1.24900E+01 5.00000E-02
+GW 2 4 8.92500E+00 1.83600E+00 1.24900E+01 1.24900E+00 0.00000E+00 1.24900E+01 5.00000E-02
+GW 2 4 7.39500E+00 -4.95300E+00 1.24900E+01 1.24900E+00 0.00000E+00 1.24900E+01 5.00000E-02
+GW 2 4 7.39500E+00 4.95300E+00 1.24900E+01 1.24900E+00 0.00000E+00 1.24900E+01 5.00000E-02
+GW 2 1 1.24900E+00 0.00000E+00 1.24900E+00 0.00000E+00 1.24900E+00 1.24900E+00 5.00000E-02
+GW 3 1 1.24900E+00 0.00000E+00 0.00000E+00 1.24900E+00 0.00000E+00 1.24900E+00 5.00000E-02
+GS 0 0 1.25000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GR 3 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
GN 1 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EK 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-FR 0 21 0 0 9.80000E-01 2.00000E-03 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 3 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
LD 5 0 0 0 3.70000E+07 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
LD 0 3 1 1 0.00000E+00 8.50000E-05 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
@@ -29,4 +28,5 @@ LD 0 12 1 1 0.00000E+00 8.50000E-05 0.00000E+00 0.00000E+00
NH 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
NE 0 1 20 15 0.00000E+00 -1.90000E+01 2.00000E+00 0.00000E+00 2.00000E+00 2.00000E+00
RP 0 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
+FR 0 21 0 0 9.80000E-01 2.00000E-03 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/2m_1:4l-gp_on_pole.nec b/examples/2m_1:4l-gp_on_pole.nec
index c7a155e..091b535 100644
--- a/examples/2m_1:4l-gp_on_pole.nec
+++ b/examples/2m_1:4l-gp_on_pole.nec
@@ -2,13 +2,13 @@ CM --- NEC2 Input File created or edited by xnec2c 3.2 ---
CM Ground Plane for 2m mounted on a 3m pole
CM It just shows where your RF goes with such a setup ;-)
CE --- End Comments ---
-GW 1 13 0.00000E+00 0.00000E+00 0.00000E+00 -3.40000E-01 0.00000E+00 -3.40000E-01 7.50000E-03
-GR 0 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GW 2 13 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 4.80000E-01 7.50000E-03
-GW 3 75 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 -3.00000E+00 2.50000E-02
-GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.25000E+00 0.00000E+00
-GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 1 13 0.00000E+00 0.00000E+00 0.00000E+00 -3.40000E-01 0.00000E+00 -3.40000E-01 7.50000E-03
+GR 0 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 2 13 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 4.80000E-01 7.50000E-03
+GW 3 75 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 -3.00000E+00 2.50000E-02
+GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.25000E+00 0.00000E+00
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 2 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-FR 0 21 0 0 1.40000E+02 5.00000E-01 1.50000E+02 0.00000E+00 0.00000E+00 0.00000E+00
RP 0 37 73 0 0.00000E+00 0.00000E+00 5.00000E+00 5.00000E+00 0.00000E+00 0.00000E+00
+FR 0 21 0 0 1.40000E+02 5.00000E-01 1.50000E+02 0.00000E+00 0.00000E+00 0.00000E+00
EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/2m_EME_ant.nec b/examples/2m_EME_ant.nec
index 6f7f321..77354a9 100644
--- a/examples/2m_EME_ant.nec
+++ b/examples/2m_EME_ant.nec
@@ -3,13 +3,13 @@ CM EME antenna for 2m, with extended double Zeppelin driven element
CM and reflector. Director is traditional Yagi sized in length.
CM Feeding is done with a balanced line harness, not shown here.
CE --- End Comments ---
-GW 1 55 1.39500E+00 0.00000E+00 0.00000E+00 -1.39500E+00 0.00000E+00 0.00000E+00 7.50000E-03
-GW 2 61 1.52500E+00 -2.60000E-01 0.00000E+00 -1.52500E+00 -2.60000E-01 0.00000E+00 7.50000E-03
-GW 3 17 4.20000E-01 2.50000E-01 0.00000E+00 -4.20000E-01 2.50000E-01 0.00000E+00 7.50000E-03
-GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 -2.05000E+00 0.00000E+00 -2.40000E+00 0.00000E+00
-GM 3 3 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.60000E+00 0.00000E+00
-GM 12 1 0.00000E+00 0.00000E+00 0.00000E+00 4.10000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 1 55 1.39500E+00 0.00000E+00 0.00000E+00 -1.39500E+00 0.00000E+00 0.00000E+00 7.50000E-03
+GW 2 61 1.52500E+00 -2.60000E-01 0.00000E+00 -1.52500E+00 -2.60000E-01 0.00000E+00 7.50000E-03
+GW 3 17 4.20000E-01 2.50000E-01 0.00000E+00 -4.20000E-01 2.50000E-01 0.00000E+00 7.50000E-03
+GM 0 0 0.00000E+00 0.00000E+00 0.00000E+00 -2.05000E+00 0.00000E+00 -2.40000E+00 0.00000E+00
+GM 3 3 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.60000E+00 0.00000E+00
+GM 12 1 0.00000E+00 0.00000E+00 0.00000E+00 4.10000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 1 28 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 4 28 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 7 28 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
@@ -18,6 +18,6 @@ EX 0 13 28 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 16 28 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 19 28 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
EX 0 22 28 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-FR 0 11 0 0 1.44000E+02 2.00000E-01 1.46000E+02 0.00000E+00 0.00000E+00 0.00000E+00
RP 0 73 37 0 0.00000E+00 0.00000E+00 2.50000E+00 1.00000E+01 0.00000E+00 0.00000E+00
+FR 0 11 0 0 1.44000E+02 2.00000E-01 1.46000E+02 0.00000E+00 0.00000E+00 0.00000E+00
EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/40-80m_Inv_L.nec b/examples/40-80m_Inv_L.nec
new file mode 100644
index 0000000..15de37c
--- /dev/null
+++ b/examples/40-80m_Inv_L.nec
@@ -0,0 +1,11 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CE --- End Comments ---
+GW 1 20 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.20000E+01 1.25000E-03
+GW 2 26 0.00000E+00 0.00000E+00 1.20000E+01 1.60000E+01 0.00000E+00 1.20000E+01 1.25000E-03
+GE 1 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 1 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 101 0 0 3.00000E+00 5.00000E-02 8.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 5.00000E+00 1.00000E+01 0.00000E+00 0.00000E+00
+GN 0 16 0 0 1.20000E+01 1.00000E-02 1.00000E+01 5.00000E-03 0.00000E+00 0.00000E+00
+LD 0 1 1 1 1.00000E-01 1.50000E-05 6.00000E-11 0.00000E+00 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/examples/6m_horizomni.nec b/examples/6m_horizomni.nec
new file mode 100644
index 0000000..c2c45d2
--- /dev/null
+++ b/examples/6m_horizomni.nec
@@ -0,0 +1,14 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.3 ---
+CE --- End Comments ---
+GW 1 15 -5.00000E-01 -4.90000E-01 0.00000E+00 5.00000E-01 -4.90000E-01 0.00000E+00 1.50000E-03
+GW 1 15 -5.00000E-01 -4.90000E-01 0.00000E+00 -5.00000E-01 4.90000E-01 0.00000E+00 1.50000E-03
+GW 1 15 5.00000E-01 -4.90000E-01 0.00000E+00 5.00000E-01 4.90000E-01 0.00000E+00 1.50000E-03
+GW 1 7 2.00000E-02 4.90000E-01 0.00000E+00 5.00000E-01 4.90000E-01 0.00000E+00 1.50000E-03
+GW 1 7 -2.00000E-02 4.90000E-01 0.00000E+00 -5.00000E-01 4.90000E-01 0.00000E+00 1.50000E-03
+GW 2 1 -3.00000E-02 -4.90000E-01 -2.26000E+00 3.00000E-02 -4.90000E-01 -2.26000E+00 5.00000E-03
+GE 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+EX 0 2 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 1 8 2 1 4.50000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 51 0 0 4.50000E+01 2.00000E-01 5.50000E+01 0.00000E+00 0.00000E+00 0.00000E+00
+RP 0 19 37 1000 0.00000E+00 0.00000E+00 1.00000E+01 1.00000E+01 0.00000E+00 0.00000E+00
+EN 0 0 0 0 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
diff --git a/src/Makefile.am b/src/Makefile.am
index eebd76b..9886e76 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
## Process this file with automake to produce Makefile.in
-AM_LDFLAGS = -Wl,--as-needed,-z,relro,-z,now
+#AM_LDFLAGS = -Wl,--as-needed, -z,relro, -z,now
+
AM_CFLAGS = --pedantic -Wall -std=gnu99 -O2 -D_FORTIFY_SOURCE=2 \
-fstack-protector -Wformat -Werror=format-security -fpie
diff --git a/src/Makefile.in b/src/Makefile.in
index ae03f97..b397556 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,6 +14,8 @@
@SET_MAKE@
+#AM_LDFLAGS = -Wl,--as-needed, -z,relro, -z,now
+
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -295,7 +297,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_LDFLAGS = -Wl,--as-needed,-z,relro,-z,now
AM_CFLAGS = --pedantic -Wall -std=gnu99 -O2 -D_FORTIFY_SOURCE=2 \
-fstack-protector -Wformat -Werror=format-security -fpie
diff --git a/src/input.c b/src/input.c
index f3dc8e5..1cf9bc8 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1219,7 +1219,7 @@ datagn( void )
/* reflect structure along x,y, or z */
/* axes or rotate to form cylinder. */
- case GX: /* _("gx") card */
+ case GX: /* "gx" card */
if( (ns < 0) || (itg < 0) )
{
fprintf( stderr, "xnec2c: datagn(): geometry GX data card error\n" );
@@ -1258,8 +1258,8 @@ datagn( void )
continue;
case GS: /* "gs" card, scale structure dimensions by factor xw1 */
-
if( (itg > 0) && (ns > 0) && (ns >= itg) )
+ {
for( i = 0; i < data.n; i++ )
{
if( (data.itag[i] >= itg) && (data.itag[i] <= ns) )
@@ -1273,6 +1273,10 @@ datagn( void )
data.bi[i]= data.bi[i]* xw1;
}
}
+ /* FIXME corrects errors when GS follows GX but this is just a work-around */
+ data.np = data.n;
+ data.ipsym = 0;
+ }
else for( i = 0; i < data.n; i++ )
{
data.x1[i]= data.x1[i]* xw1;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xnec2c.git
More information about the pkg-hamradio-commits
mailing list