a few conflicts in merged files (potfft.for, imgen.for, hio.c) but else

merged clean. Code compiles clean, except for xmtv

Author: teuben

MIR4

@@ -0,0 +1,3 @@
+Notes on what was done to miriad for the MIR4 transition:
+
+

README.bima

@@ -1,15 +1,22 @@
 Miriad is a radio-astronomy data reduction package, developed by Bob
 Sault for BIMA, starting in 1987. Although it was originally developed
-to meet the needs of  the BIMA consortium, an ATNF version - derived
+to meet the needs of  the BIMA consortium; an ATNF version - derived
 from the same code base - is also available independantly. Apart from
 BIMA and ATNF, MIRIAD is also known to handle e.g. VLA and WSRT data.
 
 This BIMA release of MIRIAD is under CVS control, and daily snapshots
 are available.  If you see a file 'VERSION.cvs' in the root directory,
-this is not an officially blessed MIRIAD release, but the daily
+this is not an officially blessed MIRIAD release, but the "CVS"
 snapshot. The VERSION file contains the official release number (3.0.0
 or higher in CVS)
 
+Major new features in MIRIAD since the CVS based releases:
+	- simplified automatic install on linux and solaris  (V3.0.x)
+	- better scalability for larger arrays 		     (V3.1.x)
+	  (MAXDIM/MAXDIM2, MAXANT/MAXANT2, ...)
+	- maximum filesize is now > 2GB			     (V4.0.0)
+	  (scratch files still limited to 8GB)		     (t.b.a)
+
 To install the BIMA version of MIRIAD, there are a few options:
 	- binary releases (astromake/linux versions now available)
 	- follow 'install.MIR' (the classical method - not recommended)
@@ -18,9 +25,6 @@ To install the BIMA version of MIRIAD, there are a few options:
  	- follow http://www.astro.umd.edu/~teuben/miriad/cvs.html
 		(the recommended way if you want to keep up with changes)
 
-
-
 					Peter Teuben
 					[email protected]
-					December 2002
-
+					February 2003

TODO

@@ -0,0 +1,3 @@
+- integer*8 support; ratty flag to go back to the old situation if
+  the fortran compiler does not support integer*8
+  [this will support scratchfiles > 8GB]

VERSIONS

@@ -6,4 +6,8 @@
 3.1.0  03feb23  dual MAXDIM/MAXDIM2, MAXCHAN/MAXCHAN2 , ....
 		  this was the last CVS mainbranch release of the 3.x series
 		  from now on this will be a MIR3 branch for 3.1.x patches
+3.1.1  W.I.P.   
+
 4.x    n/a      MIR4 branch in CVS (LFS able to write 2GB+ files)
+4.0.1  03feb23	end of MIR4 as a branch
+4.0.2  W.I.P.   merged MIR4 into the HEAD

src/prog/analysis/imgen.for

@@ -149,12 +149,13 @@ c    pjt   21jan02  using MAXDIM1
 c    pjt   25jun02  allow imsize to be 3 dimensional [for MIR4]
 c    pjt    3dec02  using MAXDIM again, MAXDIM1 retired; MAXDIM2 is new
 c    pjt   30jan03  merged MIR4 into current release
+c    pjt   23feb03  officially merged MIR4
 c---
 c ToDo: 
 c    write good headers if 3D cubes written
 c------------------------------------------------------------------------
 	character version*(*)
-	parameter(version='Imgen: version 30-jan-03')
+	parameter(version='Imgen: version 23-feb-03')
 	include 'mirconst.h'
 	include 'maxdim.h'
 	include 'maxnax.h'

src/prog/analysis/potfft.for

@@ -58,6 +58,7 @@ c   peter           double prec
 c   mousumi  8aug02 Replace with QGAUSS with QROMB 
 c   peter           internal real*8, but miriad in real*4 as it should be
 c   peter    9aug02 forgot to scale sech() with h
+c   peter   23feb03 merged MIR4
 c Todo:
 c   scaleheight should be allowed to vary
 c
@@ -70,7 +71,7 @@ c
       INTEGER INVPARM
       PARAMETER(INVPARM=1)
       CHARACTER VERSION*(*)
-      PARAMETER (VERSION='Version 13-aug-02')
+      PARAMETER (VERSION='Version 23-feb-03')
 c
       CHARACTER in*128,out*128,outg*128
       INTEGER nin(MAXNAX),nout(MAXNAX),npadin(MAXNAX)
@@ -256,7 +257,6 @@ c
          DO i=1,NKEYS
             CALL hdcopy(lin,lout,keyw(i))
          ENDDO
-c
          CALL xyclose(lout)
       ENDIF
       CALL xyclose(lin)

src/subs/bug.c

@@ -10,23 +10,26 @@
 /*    pjt     23sep01 darwin						*/
 /*    pjt      4dec01 bypass fatal errors (for alien clients) if req'd  */
 /*                    through the new bugrecover_c() routine            */
+/*    pjt     17jun02 prototypes for MIR4                               */
 /************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include "miriad.h"
 
-static char *errmsg_c();
-void bug_c();
+static char *errmsg_c(int n);
 
 char *Name = NULL;
 int reentrant=0;
 
+/*  HPUX cannot handle the (void) thing */
+
 typedef void (*proc)(void);  /* helper definition for function pointers */
 static proc bug_cleanup=NULL;
 
 /************************************************************************/
-void bugrecover_c(cl)
-void (*cl)(void);
+void bugrecover_c(void (*cl)(void))
 /** bugrecover_c -- bypass fatal bug calls for alien clients            */
 /*& pjt                                                                 */
 /*: error-handling                                                      */
@@ -44,18 +47,17 @@ void (*cl)(void);
 
     ..
     bugrecover_c(my_handler);
-    ..
+    ..                                                                  */
 /*--                                                                    */
 /*----------------------------------------------------------------------*/
 {
     bug_cleanup = cl;
 }
 
 /************************************************************************/
-void buglabel_c(name)
-char *name;
+void buglabel_c(Const char *name)
 /** buglabel -- Give the "program name" to be used as a label in messages. */
-/*& mjs									*/
+/*& pjt									*/
 /*: error-handling							*/
 /*+ FORTRAN call sequence:
 	subroutine buglabel(name)
@@ -75,36 +77,9 @@ char *name;
   strcpy(Name,name);
 }
 /************************************************************************/
-void bugno_c(s,n)
-char s;
-int n;
-/** bugno -- Issue an error message, given a system error number.	*/
-/*& mjs									*/
-/*: error-handling							*/
-/*+ FORTRAN call sequence:
-	subroutine bugno(severity,errno)
-
-	implicit none
-	character severity*1
-	integer errno
-
-  Output the error message associated with a particular error number.
-
-  Input:
-    severity	Error severity. Can be one of 'i', 'w', 'e' or 'f'
-		for "informational", "warning", "error", or "fatal"
-    errno	host error number.					*/
-/*--									*/
-/*----------------------------------------------------------------------*/
-{
-  if (n == -1)bug_c(s,"End of file detected");
-  else bug_c(s,errmsg_c(n));
-}
-/************************************************************************/
-void bug_c(s,m)
-char s,*m;
+void bug_c(char s,Const char *m)
 /** bug -- Issue an error message, given by the caller.			*/
-/*& mjs									*/
+/*& pjt									*/
 /*: error-handling							*/
 /*+ FORTRAN call sequence:
 	subroutine bug(severity,message)
@@ -150,8 +125,31 @@ char s,*m;
   }
 }
 /************************************************************************/
-static char *errmsg_c(n)
-int n;
+void bugno_c(char s,int n)
+/** bugno -- Issue an error message, given a system error number.	*/
+/*& pjt									*/
+/*: error-handling							*/
+/*+ FORTRAN call sequence:
+	subroutine bugno(severity,errno)
+
+	implicit none
+	character severity*1
+	integer errno
+
+  Output the error message associated with a particular error number.
+
+  Input:
+    severity	Error severity. Can be one of 'i', 'w', 'e' or 'f'
+		for "informational", "warning", "error", or "fatal"
+    errno	host error number.					*/
+/*--									*/
+/*----------------------------------------------------------------------*/
+{
+  if (n == -1)bug_c(s,"End of file detected");
+  else bug_c(s,errmsg_c(n));
+}
+/************************************************************************/
+static char *errmsg_c(int n)
 /*
   Return the error message associated with some error number.
 ------------------------------------------------------------------------*/

src/subs/bugwrap.f2c

@@ -1,3 +1,4 @@
+#include "miriad.h"
 /************************************************************************/
 fortran subroutine bugno(character severity,integer n)
 {