[hamradio-commits] [xnec2c] 01/05: New upstream version 3.5.1
Dave Hibberd
hibby-guest at moszumanska.debian.org
Sat Jan 21 17:57:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
hibby-guest pushed a commit to branch master
in repository xnec2c.
commit c511d967a94700a2d74680dab530d8163b6ba34e
Author: Hibby <d at vehibberd.com>
Date: Sat Jan 21 16:30:23 2017 +0000
New upstream version 3.5.1
---
Makefile.am | 2 ++
Makefile.in | 2 ++
configure | 20 ++++++++++----------
configure.ac | 2 +-
doc/xnec2c.html | 5 ++++-
examples/10-30m_MultiBand_Vertical.nec | 4 ++--
examples/10-30m_Vertical.nec | 20 --------------------
examples/137Mhz-QFHA2.nec | 2 +-
examples/137Mhz_xpol_omni.nec | 13 +++++++++++++
examples/2m_Lindenblad.nec | 2 +-
examples/2m_xpol_omni.nec | 18 +++++++++---------
examples/twin-loop.nec | 22 ++++++++++++++++++++++
src/draw_structure.c | 6 +++---
xnec2c.desktop | 10 ++++++++++
xnec2c.png | Bin 0 -> 71540 bytes
15 files changed, 80 insertions(+), 48 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index cca5980..03e34d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,8 @@ EXTRA_DIST = \
autogen.sh \
xnec2c.glade \
xnec2c.gladep \
+ xnec2c.png \
+ xnec2c.desktop \
examples \
doc \
$(INTLTOOL_FILES)
diff --git a/Makefile.in b/Makefile.in
index 830ae4b..d05cbbf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -336,6 +336,8 @@ EXTRA_DIST = \
autogen.sh \
xnec2c.glade \
xnec2c.gladep \
+ xnec2c.png \
+ xnec2c.desktop \
examples \
doc \
$(INTLTOOL_FILES)
diff --git a/configure b/configure
index 033167e..42de81b 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.5.
+# Generated by GNU Autoconf 2.69 for xnec2c 3.5.1.
#
# 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.5'
-PACKAGE_STRING='xnec2c 3.5'
+PACKAGE_VERSION='3.5.1'
+PACKAGE_STRING='xnec2c 3.5.1'
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.5 to adapt to many kinds of systems.
+\`configure' configures xnec2c 3.5.1 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.5:";;
+ short | recursive ) echo "Configuration of xnec2c 3.5.1:";;
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.5
+xnec2c configure 3.5.1
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.5, which was
+It was created by xnec2c $as_me 3.5.1, 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.5'
+ VERSION='3.5.1'
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.5, which was
+This file was extended by xnec2c $as_me 3.5.1, 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.5
+xnec2c config.status 3.5.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index a30453a..36d6d0c 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.5], [nkcyham at yahoo.com])
+AC_INIT([xnec2c], [3.5.1], [nkcyham at yahoo.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/common.h])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/xnec2c.html b/doc/xnec2c.html
index 9b531ad..3441eec 100644
--- a/doc/xnec2c.html
+++ b/doc/xnec2c.html
@@ -952,7 +952,10 @@ this will cause an illegal memory access and will crash xnec2c.<br>
Fixed a bug in the Helix editor which caused incorrect calculation
of the segment length as a percentage of wavelength or of the
number of segments/turn that correspond to a given segment length
-as a percentage of wavelength</p>
+as a percentage of wavelength.</p>
+<p><b>Version 3.5.1:</b> After a request by FanJun BH1SCW, I
+replaced the original makeshift desktop icon with one provided by
+Serge ON4AA.</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
diff --git a/examples/10-30m_MultiBand_Vertical.nec b/examples/10-30m_MultiBand_Vertical.nec
index c410a98..9664ceb 100644
--- a/examples/10-30m_MultiBand_Vertical.nec
+++ b/examples/10-30m_MultiBand_Vertical.nec
@@ -1,7 +1,7 @@
CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
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 No traps are used and only one element (30m) is fed
+CM 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 ---
diff --git a/examples/10-30m_Vertical.nec b/examples/10-30m_Vertical.nec
deleted file mode 100644
index 8683d91..0000000
--- a/examples/10-30m_Vertical.nec
+++ /dev/null
@@ -1,20 +0,0 @@
-CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
-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/137Mhz-QFHA2.nec b/examples/137Mhz-QFHA2.nec
index 5d51264..8187981 100644
--- a/examples/137Mhz-QFHA2.nec
+++ b/examples/137Mhz-QFHA2.nec
@@ -1,7 +1,7 @@
CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM Quadrifilar 1/4 turn Helix Antenna for 137MHz
CE --- End Comments ---
-GH 1 45 3.73600E+00 -9.34000E-01 1.22000E-01 1.22000E-01 1.22000E-01 1.22000E-01 2.50000E-03
+GH 1 45 3.73600E+00 -9.34000E-01 1.22000E-01 1.22000E-01 1.22000E-01 1.22000E-01 2.50000E-03
GW 2 6 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 1.22000E-01 0.00000E+00 2.50000E-03
GW 3 5 -6.10000E-03 -6.10000E-03 9.34000E-01 0.00000E+00 -1.22000E-01 9.34000E-01 2.50000E-03
GM 0 0 0.00000E+00 0.00000E+00 9.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 1.00000E+00
diff --git a/examples/137Mhz_xpol_omni.nec b/examples/137Mhz_xpol_omni.nec
new file mode 100644
index 0000000..cd508ff
--- /dev/null
+++ b/examples/137Mhz_xpol_omni.nec
@@ -0,0 +1,13 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM A Lindnblad omnidirectional RHCP antenna for 2m
+CE --- End Comments ---
+GW 1 31 2.71000E-01 4.75000E-01 2.76000E-01 2.71000E-01 -4.75000E-01 -2.76000E-01 6.00000E-03
+GW 2 18 2.71000E-01 4.75000E-01 2.76000E-01 0.00000E+00 0.00000E+00 1.00000E-02 6.00000E-03
+GW 3 18 2.71000E-01 -4.75000E-01 -2.76000E-01 0.00000E+00 0.00000E+00 -1.00000E-02 6.00000E-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 4 1 0.00000E+00 0.00000E+00 -1.00000E-02 0.00000E+00 0.00000E+00 1.00000E-02 1.50000E-02
+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 4 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 71 0 0 1.10000E+02 1.00000E+00 1.80000E+02 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/examples/2m_Lindenblad.nec b/examples/2m_Lindenblad.nec
index ad057d2..8adbeb2 100644
--- a/examples/2m_Lindenblad.nec
+++ b/examples/2m_Lindenblad.nec
@@ -2,7 +2,7 @@ CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
CM A Lindnblad omnidirectional RHCP antenna for 2m
CE --- End Comments ---
GW 1 31 2.53000E-01 0.00000E+00 4.88000E-01 2.53000E-01 0.00000E+00 -4.88000E-01 6.00000E-03
-GM 0 0 -6.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GM 0 0 -6.00000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
GR 1 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
GW 5 1 0.00000E+00 0.00000E+00 -1.00000E-02 0.00000E+00 0.00000E+00 1.00000E-02 1.50000E-02
GM 0 0 -4.50000E+01 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 5.00000E+00
diff --git a/examples/2m_xpol_omni.nec b/examples/2m_xpol_omni.nec
index 997db11..52194f7 100644
--- a/examples/2m_xpol_omni.nec
+++ b/examples/2m_xpol_omni.nec
@@ -1,13 +1,13 @@
CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
-CM Cross-polarized omni-directional antenna for 144 MHz
+CM A Lindnblad omnidirectional RHCP antenna for 2m
CE --- End Comments ---
-GW 1 20 0.00000E+00 0.00000E+00 2.00000E-02 6.92700E-01 2.51900E-01 2.61800E-01 3.00000E-03
-GW 2 20 0.00000E+00 0.00000E+00 -2.00000E-02 6.92700E-01 -2.51900E-01 -2.61800E-01 3.00000E-03
-GW 3 20 6.92700E-01 2.51900E-01 2.61800E-01 6.92700E-01 -2.51900E-01 -2.61800E-01 3.00000E-03
-GR 3 4 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
-GW 13 1 0.00000E+00 0.00000E+00 -2.00000E-02 0.00000E+00 0.00000E+00 2.00000E-02 3.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 13 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.44000E+02 1.00000E-01 1.46000E+02 0.00000E+00 0.00000E+00 0.00000E+00
+GW 1 31 2.65000E-01 4.51000E-01 2.62000E-01 2.65000E-01 -4.51000E-01 -2.62000E-01 6.00000E-03
+GW 2 18 2.65000E-01 4.51000E-01 2.62000E-01 0.00000E+00 0.00000E+00 1.00000E-02 6.00000E-03
+GW 3 18 2.65000E-01 -4.51000E-01 -2.62000E-01 0.00000E+00 0.00000E+00 -1.00000E-02 6.00000E-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 4 1 0.00000E+00 0.00000E+00 -1.00000E-02 0.00000E+00 0.00000E+00 1.00000E-02 1.50000E-02
+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 4 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 31 0 0 1.20000E+02 2.00000E+00 1.80000E+02 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/examples/twin-loop.nec b/examples/twin-loop.nec
new file mode 100644
index 0000000..b241925
--- /dev/null
+++ b/examples/twin-loop.nec
@@ -0,0 +1,22 @@
+CM --- NEC2 Input File created or edited by xnec2c 3.5 ---
+CM Two identical small loops fed 180 degrees out of phase.
+CM This cancels out the radiation from the driven elements
+CM and so the radiation resistance increases approximately
+CM ten-fold, because the radiation from the two vertical
+CM elements opposing the driven ones is not mostly canceled
+CM by radiation from the driven elements. Try specifying the
+CM transmission line in the second TL card as non-crossed.
+CE --- End Comments ---
+GW 1 31 2.10000E+00 0.00000E+00 -1.00000E+00 2.10000E+00 0.00000E+00 1.00000E+00 1.00000E-02
+GW 1 31 2.10000E+00 0.00000E+00 1.00000E+00 1.00000E-01 0.00000E+00 1.00000E+00 1.00000E-02
+GW 1 31 2.10000E+00 0.00000E+00 -1.00000E+00 1.00000E-01 0.00000E+00 -1.00000E+00 1.00000E-02
+GW 1 31 1.00000E-01 0.00000E+00 -1.00000E+00 1.00000E-01 0.00000E+00 1.00000E+00 1.00000E-02
+GX 1 100 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+GW 3 1 0.00000E+00 0.00000E+00 -3.00000E-02 0.00000E+00 0.00000E+00 3.00000E-02 1.00000E-02
+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 3 1 0 1.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 1 109 3 1 3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+TL 2 109 3 1 -3.00000E+02 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00 0.00000E+00
+FR 0 21 0 0 8.00000E+00 2.00000E-01 1.20000E+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/draw_structure.c b/src/draw_structure.c
index 4a7f29a..de84231 100644
--- a/src/draw_structure.c
+++ b/src/draw_structure.c
@@ -551,9 +551,9 @@ Draw_Surface_Patches( GdkSegment *segm, gint npatch )
for( i = 0; i < npatch; i++ )
{
/* Calculate current along x,y,z vectors */
- cx = (complex double)crnt.cur[j];
- cy = (complex double)crnt.cur[j+1];
- cz = (complex double)crnt.cur[j+2];
+ cx = crnt.cur[j];
+ cy = crnt.cur[j+1];
+ cz = crnt.cur[j+2];
/* Calculate current along t1 and t2 tangent vectors */
ct1 = cx*(double)data.t1x[i] +
diff --git a/xnec2c.desktop b/xnec2c.desktop
new file mode 100644
index 0000000..92cfcc6
--- /dev/null
+++ b/xnec2c.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=xnec2c
+Comment=Antenna analysis
+Exec=xnec2c -j4
+Icon=xnec2c.png
+Terminal=false
+Type=Application
+Categories=HamRadio;Science;Utility
diff --git a/xnec2c.png b/xnec2c.png
new file mode 100644
index 0000000..29b3e57
Binary files /dev/null and b/xnec2c.png differ
--
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