Merge pull request #179 from SuperDARN/4.2-release

RST 4.2 release

.profile/superdarn.bash

@@ -11,7 +11,7 @@ export IGRF_PATH=${RSTPATH}"/tables/analysis/mag/"
 export SD_MODEL_TABLE=${RSTPATH}"/tables/superdarn/model"
 
 export AACGM_v2_DAT_PREFIX="${RSTPATH}/tables/analysis/aacgm/aacgm_coeffs-12-"
-export IGRF_COEFFS="${IGRF_PATH}igrf12coeffs.txt"
+export IGRF_COEFFS="${IGRF_PATH}magmodel_1590-2015.txt"
 
 export COLOR_TABLE_PATH=${RSTPATH}"/tables/base/key/"
 

.profile/superdarn.tcsh

@@ -11,7 +11,7 @@ setenv IGRF_PATH ${RSTPATH}"/tables/analysis/mag/"
 setenv SD_MODEL_TABLE ${RSTPATH}"/tables/superdarn/model"
 
 setenv AACGM_v2_DAT_PREFIX "${RSTPATH}/tables/analysis/aacgm/aacgm_coeffs-12-"
-setenv IGRF_COEFFS "${IGRF_PATH}igrf12coeffs.txt"
+setenv IGRF_COEFFS "${IGRF_PATH}magmodel_1590-2015.txt"
 
 setenv COLOR_TABLE_PATH ${RSTPATH}"/tables/base/key/"
 

.travis.yml

@@ -12,9 +12,9 @@ before_install:
   - sudo apt-get -y install libncurses-dev
   - sudo apt-get -y install netpbm
   - sudo apt-get -y install libpng12-dev
-  - wget https://spdf.sci.gsfc.nasa.gov/pub/software/cdf/dist/cdf36_3_1/linux/cdf36_3_1-dist-all.tar.gz
-  - tar -xf cdf36_3_1-dist-all.tar.gz
-  - cd cdf36_3-dist && make clean && make OS=linux ENV=gnu all && make INSTALLDIR=/home/travis/build/SuperDARN/cdf install
+  - wget https://spdf.sci.gsfc.nasa.gov/pub/software/cdf/dist/cdf36_4/linux/cdf36_4-dist-all.tar.gz
+  - tar -xf cdf36_4-dist-all.tar.gz
+  - cd cdf36_4-dist && make clean && make OS=linux ENV=gnu all && make INSTALLDIR=/home/travis/build/SuperDARN/cdf install
   - export RSTPATH=/home/travis/build/SuperDARN/rst
   - . $RSTPATH/.profile.bash
   - export CDF_PATH=/home/travis/build/SuperDARN/cdf

README.md

@@ -73,7 +73,7 @@ For macOS it is also available through macports, as are all listed dependencies
 
 	 ```
 	 cd $RSTPATH/codebase/superdarn/src.lib/tk
-	 tar -P -czuf idl.tar.gz idl
+	 tar -P -czvf idl.tar.gz idl
 	 rm -rf idl
 	 cd $RSTPATH/build/script
 	 make.code
@@ -107,26 +107,26 @@ For macOS it is also available through macports, as are all listed dependencies
 - 3.2   -  First release with DLM support (Nov 2010)
 - 3.1   -  First release of ROS 3 (Jun 2010)
 - 2.11  -  added support for I&Q sample analysis (Mar 2008)
-- 2.10  -  bug fixes to the fitacfex library and rnk hardware.dat (Jun 2007)
+- 2.10  -  bug fixes to the fitacfex library and rnk hardware.dat (May 2007)
 - 2.09  -  fixed known errors in the documentation - gold release (Mar 2007)
 - 2.08  -  further bug fixes, fitacfex and documentation system
-           included. 
-- 2.07  -  introduced fitacf version 2.0 and numerous bug fixes
+           included. (Mar 2007)
+- 2.07  -  introduced fitacf version 2.0 and numerous bug fixes (Feb 2007)
 - 2.06  -  introduction of the origin flag and the beam azimuth parameter
-           together with numerous bug fixes
-- 2.05  -  modification to deal with arbitrary numbers of radar beams (Apr 2006)
+           together with numerous bug fixes (Aug 2006)
+- 2.05  -  modification to deal with arbitrary numbers of radar beams (Mar 2006)
 - 2.04  -  bug fixes from the deployment of the Radar Operating System (Feb 2006)
-- 2.03  -  added ksh enviroment as an option plus more bug fixes
-- 2.02  -  more bug fixes and more XML documentation completed.
+- 2.03  -  added ksh enviroment as an option plus more bug fixes (Sep 2005)
+- 2.02  -  more bug fixes and more XML documentation completed. (Aug 2005)
 - 2.01  -  various bug fixes and improvements to the IDL libraries (Jul 2005)
 - 2.00  -  code adopted as official release. (Apr 2005)
-- 1.07  -  numerous bug fixes.
+- 1.07  -  numerous bug fixes. (Apr 2005)
 - 1.06  -  completed IDL interfaces for grid and map data, incorporated help
            and error messages derived from XML documentation. (Nov 2004)
 - 1.05  -  adopted the DataMap format for grid and map data, incorporated
            outline documentation and fixed a lot of bugs. (Oct 2004)
-- 1.04  -  general bug fixes, addition of Mac OS X support (Sep 2004)
+- 1.04  -  general bug fixes, addition of Mac OS X support (Aug 2004)
 - 1.03  -  implemented the legacy IDL interfaces and incorporated the
            data tables into this release (Aug 2004)
 - 1.02  -  incorporated the IDL interfaces and fixed a lot of bugs (Aug 2004)
-- 1.01  -  initial revision of the code.
+- 1.01  -  initial revision of the code. (Jul 2004)

build/script/make.build

@@ -16,7 +16,7 @@ set -e
 #
 # Description:
 #
-# Make the buld software.
+# Make the build software.
 #
 
 ############################################################################

codebase/analysis/src.bin/aacgm/aacgmeval.1.2/aacgm.c

@@ -86,6 +86,12 @@ double strtime(char *text) {
 
 }
 
+int rst_opterr(char *txt) {
+  fprintf(stderr,"Option not recognized: %s\n",txt);
+  fprintf(stderr,"Please try: aacgmeval --help\n");
+  return(-1);
+}
+
 int main(int argc,char *argv[]) {
   int arg;
 
@@ -98,6 +104,7 @@ int main(int argc,char *argv[]) {
 
   unsigned char option=0;
   unsigned char help=0;
+  unsigned char version=0;
   unsigned char flag=0;
   int c;
 
@@ -113,6 +120,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
   OptionAdd(&opt,"i",'x',&flag);
   OptionAdd(&opt,"lon",'d',&ilon);
   OptionAdd(&opt,"lat",'d',&ilat);
@@ -123,7 +131,11 @@ int main(int argc,char *argv[]) {
   OptionAdd(&opt,"t",'t',&tmetxt);              /* Time for AACGM_v2 transformation */
   OptionAdd(&opt,"d",'t',&dtetxt);              /* Date for AACGM_v2 transformation */
 
-  arg=OptionProcess(1,argc,argv,&opt,NULL);
+  arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
+
+  if (arg==-1) {
+    exit(-1);
+  }
 
   if (help==1) {
     OptionPrintInfo(stdout,hlpstr);
@@ -135,6 +147,11 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if (fmt==NULL) fmt=dfmt;
 
   if (old_aacgm==0) {

codebase/analysis/src.bin/aacgm/aacgmeval.1.2/doc/aacgmeval.doc.xml

@@ -12,6 +12,8 @@
 
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-i</on><od>perform the inverse conversion from AACGM to geographic.</od>
 </option>
 <option><on>-lat <ar>lat</ar></on><od>calculate for the latitude <ar>lat</ar>.</od>

codebase/analysis/src.bin/aacgm_v2/aacgm_test.1.0/test_aacgm.c

@@ -12,7 +12,7 @@ int main(void)
 {
 double lat,lon,hgt;
 double h, mlt_c, mlt_t;
-double rtp[3];
+/*double rtp[3];*/
 double mlat,mlon,r;
 int k, err, npts;
 int yr, mo, dy, hr, mt, sc, dno;

codebase/analysis/src.bin/cdf/istp_plot.1.11/doc/istp_plot.doc.xml

@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-
 <binary>
 <project>analysis</project>
 <name>istp_plot</name>
 <location>src.bin/cdf/istp_plot</location>
+
 <syntax>istp_plot --help</syntax>
 <syntax>istp_plot [-cf <ar>cfname</ar>] [<ar>options</ar>]</syntax>
+<syntax>istp_plot -png [<ar>options</ar>]</syntax>
 <syntax>istp_plot -ps [-land] [-xp <ar>xoff</ar>] [-yp <ar>yoff</ar>] [<ar>options</ar>]</syntax>
 <syntax>istp_plot -ppm [<ar>options</ar>]</syntax>
 <syntax>istp_plot -ppmx [<ar>options</ar>]</syntax>
 <syntax>istp_plot -xml [<ar>options</ar>]</syntax>
 <syntax>istp_plot  -x [-display <ar>display</ar>] [-xoff <ar>xoff</ar>] [-yoff <ar>yoff</ar>] [<ar>options</ar>]</syntax>
+
 <option><on>--help</on><od>print the help message and exit.</od>
 </option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
+</option>
 <option><on>-cf <ar>cfname</ar></on><od>read command line options from the file <ar>cfname</ar>.</od>
 </option>
 <option><on>-plot <ar>names...</ar></on><od>plot the parameters given by the comma separated list of parameters,<ar>names</ar>.</od>
@@ -59,6 +63,8 @@
 </option>
 <option><on>-geotail</on><od>plot Geotail data.</od>
 </option>
+<option><on>-png</on><od>produce a Portable Network Graphics (PNG) image as the output.</od>
+</option>
 <option><on>-ps</on><od>produce a PostScript plot as the output.</od>
 </option>
 <option><on>-xp <ar>xoff</ar></on><od>set the X offset of the PostScript plot to <ar>xoff</ar>.</od>
@@ -79,22 +85,22 @@
 </option>
 <option><on>-yoff <ar>yoff</ar></on><od>open the window <ar>ypad</ar> pixels from the top edge of the screen.</od>
 </option>
+
 <synopsis><p>Plot ISTP data from CDF files.</p></synopsis>
 <description>
-<p>Plot ISTP magnetic field and solar wind data from a set of CDF files. The output can be to an X terminal, XML rplot file, Portable PixMap (PPM) file, extended Portable PixMap (PPMX) file, or PostScript file. The default output is XML. The output file is written to standard output.</p>
+<p>Plot ISTP magnetic field and solar wind data from a set of CDF files. The output can be to an X terminal, XML rplot file, Portable PixMap (PPM) file, extended Portable PixMap (PPMX) file, Portable Network Graphics (PNG), or PostScript file. The default output is XML. The output file is written to standard output.</p>
 <p>The program usually plots 24 hours of magnetic field data in GSM co-ordinates for a given start date and satellite.</p>
 <p>Magnetic field and solar wind data can be plotted together by combining the appropriate options.</p>
 <p>The data files are taken from the sub-directories "<code>ace</code>", "<code>wind</code>", "<code>imp8</code>" and "<code>geotail</code>", of the path given by the "<code>-path</code>" option or by the environment variable <ar>ISTP_PATH</ar>.</p>
 </description>
 
 <example>
-<command>istp_plot -x  -ace -sd 19990406</command>
+<command>istp_plot -x -ace -sd 19990406</command>
 <description> Plot 24 hours of ACE data starting at 00:00UT on April, 6 1999 on the X terminal.</description>
 </example>
 
-
 <example>
-<command>istp_plot -ps  -ace -mfi -swe -sd 19980404 -st 12:00 -ex 8:00 &gt; plot.ps</command>
+<command>istp_plot -ps -ace -mfi -swe -sd 19980404 -st 12:00 -ex 8:00 &gt; plot.ps</command>
 <description>Generate a PostScript plot of Ace MFI and SWE data for the 8 hour period starting at 12:00UT on April 4, 1998. The plot is stored in the file "<code>plot.ps</code>".</description>
 </example>
 <example type="rplot">example1</example>
@@ -105,7 +111,4 @@
 </example>
 <example type="rplot">example2</example>
 
-
-
-
 </binary>

codebase/analysis/src.bin/cdf/istp_plot.1.11/istp_plot.c

@@ -425,7 +425,13 @@ int stream(char *buf,int sze,void *data) {
   fwrite(buf,sze,1,stdout);
   return 0;
 } 
-
+
+int rst_opterr(char *txt) {
+  fprintf(stderr,"Option not recognized: %s\n",txt);
+  fprintf(stderr,"Please try: istp_plot --help\n");
+  return(-1);
+}
+
 int main(int argc,char *argv[]) {
 
 #ifdef _XLIB_
@@ -460,6 +466,7 @@ int main(int argc,char *argv[]) {
   unsigned char posf=0;
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
   char *st_time_txt=NULL;
   char *extime_txt=NULL;
@@ -508,6 +515,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
 
 #ifdef _XLIB_ 
   OptionAdd(&opt,"x",'x',&xd);
@@ -557,7 +565,10 @@ int main(int argc,char *argv[]) {
   OptionAdd(&opt,"cf",'t',&cfname);
 
   if (argc>1) { 
-    arg=OptionProcess(1,argc,argv,&opt,NULL);   
+    arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
+    if (arg==-1) {
+      exit(-1);
+    }
     if (cfname !=NULL) { /* load the configuration file */
       do {
         fp=fopen(cfname,"r");
@@ -566,7 +577,12 @@ int main(int argc,char *argv[]) {
         cfname=NULL;
         optf=OptionProcessFile(fp);
         if (optf !=NULL) {
-          arg=OptionProcess(0,optf->argc,optf->argv,&opt,NULL);
+          arg=OptionProcess(0,optf->argc,optf->argv,&opt,rst_opterr);
+          if (arg==-1) {
+            fclose(fp);
+            OptionFreeFile(optf);
+            exit(-1);
+          }
           OptionFreeFile(optf);
 	}   
         fclose(fp);
@@ -588,6 +604,11 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
 
 
   if (plot !=NULL) {

codebase/analysis/src.bin/cdf/istp_text.1.24/doc/istp_text.doc.xml

@@ -5,7 +5,10 @@
 <location>src.bin/cdf/istp_text</location>
 <syntax>istp_text --help</syntax>
 <syntax>istp_text  [-cf <ar>cfgname</ar>] [-h] [-path <ar>pathname</ar>] [-sd <ar>yyyymmdd</ar>] [-st <ar>hr:mn</ar>] [-ed <ar>yyyymmdd</ar>] [-et <ar>hr:mn</ar>] [-ex <ar>hr:mn</ar> [-gse] [-pos] [-mfi] [-swe] [-mag] [-pla] [-mgf] [-lep] [-cpi] [-ace] [-wind] [-imp8] [-geotail]</syntax>
-<synopsis><p>Extract ASCII listings of  ISTP data from CDF files.</p></synopsis><option><on>--help</on><od>print the help message and exit.</od>
+<synopsis><p>Extract ASCII listings of  ISTP data from CDF files.</p></synopsis>
+<option><on>--help</on><od>print the help message and exit.</od>
+</option>
+<option><on>--version</on><od>print the RST version number and exit.</od>
 </option>
 <option><on>-cf <ar>cfname</ar></on><od>read command line options from the file <ar>cfname</ar>.</od>
 </option>

codebase/analysis/src.bin/cdf/istp_text.1.24/istp_text.c

@@ -400,7 +400,11 @@ int load_geo() {
   return 0;
 }
 
-
+int rst_opterr(char *txt) {
+  fprintf(stderr,"Option not recognized: %s\n",txt);
+  fprintf(stderr,"Please try: istp_text --help\n");
+  return(-1);
+}
 
 int main(int argc,char *argv[]) {
   int arg;
@@ -416,6 +420,7 @@ int main(int argc,char *argv[]) {
 
   unsigned char help=0;
   unsigned char option=0;
+  unsigned char version=0;
 
 
   char *stime_txt=NULL;
@@ -446,6 +451,7 @@ int main(int argc,char *argv[]) {
 
   OptionAdd(&opt,"-help",'x',&help);
   OptionAdd(&opt,"-option",'x',&option);
+  OptionAdd(&opt,"-version",'x',&version);
 
   OptionAdd(&opt,"h",'x',&hdr);
 
@@ -476,7 +482,10 @@ int main(int argc,char *argv[]) {
   OptionAdd(&opt,"cf",'t',&cfname);
 
   if (argc>1) { 
-    arg=OptionProcess(1,argc,argv,&opt,NULL);   
+    arg=OptionProcess(1,argc,argv,&opt,rst_opterr);
+    if (arg==-1) {
+      exit(-1);
+    }
     if (cfname !=NULL) { /* load the configuration file */
       do {
         fp=fopen(cfname,"r");
@@ -485,7 +494,12 @@ int main(int argc,char *argv[]) {
         cfname=NULL;
         optf=OptionProcessFile(fp);
         if (optf !=NULL) {
-          arg=OptionProcess(0,optf->argc,optf->argv,&opt,NULL);
+          arg=OptionProcess(0,optf->argc,optf->argv,&opt,rst_opterr);
+          if (arg==-1) {
+            fclose(fp);
+            OptionFreeFile(optf);
+            exit(-1);
+          }
           OptionFreeFile(optf);
 	}   
         fclose(fp);
@@ -507,6 +521,11 @@ int main(int argc,char *argv[]) {
     exit(0);
   }
 
+  if (version==1) {
+    OptionVersion(stdout);
+    exit(0);
+  }
+
   if ((ace+wind+imp+geo)==0) ace=1;
 
   if ((ace+wind+imp+geo)>1) {