Fix overlapping symbol names between geant3 and ampt

diff --git a/TAmpt/AMPT/art1f.f b/TAmpt/AMPT/art1f.f
index f2c06f23512062732c79050e14ec5e654c321b16..ebf3a904a8adbb90bd34da96f179f70a71a039e1 100644 (file)
--- a/TAmpt/AMPT/art1f.f
+++ b/TAmpt/AMPT/art1f.f
@@ -1899,7 +1899,7 @@ c                call a1decay(idecay,i1,nnn,iseed,rhomp)
                 IF(E(I1).GT.1.22)PNSTAR=0.6
                 IF(RANART(NSEED).LE.PNSTAR)THEN
 * (1) DECAY TO SINGLE PION+NUCLEON
-                   CALL DECAY(idecay,I1,NNN,ISEED,wid,nt)
+                   CALL DECAYA(idecay,I1,NNN,ISEED,wid,nt)
                 ELSE
 * (2) DECAY TO TWO PIONS + NUCLEON
                    CALL DECAY2(idecay,I1,NNN,ISEED,wid,nt)
@@ -1908,7 +1908,7 @@ c                call a1decay(idecay,i1,nnn,iseed,rhomp)
 c for N*(1535) decay
              elseif(iabs(LB1).eq.12.or.iabs(LB1).eq.13) then
                 NNN=NNN+1
-                CALL DECAY(idecay,I1,NNN,ISEED,wid,nt)
+                CALL DECAYA(idecay,I1,NNN,ISEED,wid,nt)
                 LDECAY=LDECAY+1
              endif
 c
@@ -9922,7 +9922,7 @@ c     BY USING OF BREIT-WIGNER FORMULA
 *         2. DETERMINE THE MOMENTUM AND COORDINATES OF NUCLEON AND PION
 *            AFTER THE DELTA OR N* DECAYING
 * DATE   : JAN. 24,1990, MODIFIED ON MAY 17, 1994 TO INCLUDE ETA 
-        SUBROUTINE DECAY(IRUN,I,NNN,ISEED,wid,nt)
+        SUBROUTINE DECAYA(IRUN,I,NNN,ISEED,wid,nt)
         PARAMETER (MAXSTR=150001,MAXR=1,
      1  AMN=0.939457,ETAM=0.5475,AMP=0.93828,AP1=0.13496,
      2  AP2=0.13957,AM0=1.232,PI=3.1415926)
@@ -10882,7 +10882,7 @@ cc      SAVE /PD/
 * for less energetic reactions, we assume the angular distribution
 * is isotropic.
 ***********************************
-       real function ang(srt,iseed)
+       real function anga(srt,iseed)
       COMMON/RNDF77/NSEED
 cc      SAVE /RNDF77/
       SAVE   
@@ -10912,7 +10912,7 @@ c      endif
        ELSE
        ang2=-(q/2.+sqrt((q/2.)**2+(p/3.)**3))**(1./3.)
        ENDIF
-       ANG=ANG1+ANG2
+       ANGA=ANG1+ANG2
        return
        end
 *--------------------------------------------------------------------------

diff --git a/TAmpt/AMPT/linana.f b/TAmpt/AMPT/linana.f
index 63c9363f4c15dacfc52005b5fc6629ab14383818..d0bc107d44f97ed56cb1b6e2127560eafbf3316d 100644 (file)
--- a/TAmpt/AMPT/linana.f
+++ b/TAmpt/AMPT/linana.f
@@ -274,8 +274,8 @@ c
         IMPLICIT DOUBLE PRECISION(D)  
         DOUBLE PRECISION  enenew, pxnew, pynew, pznew
         DOUBLE PRECISION  de0, beta2, gam
-        common /lor/ enenew, pxnew, pynew, pznew
-cc      SAVE /lor/
+        common /lora/ enenew, pxnew, pynew, pznew
+cc      SAVE /lora/
         COMMON/HPARNT/HIPR1(100),IHPR2(50),HINT1(100),IHNT2(50)
 cc      SAVE /HPARNT/
         common /decom/ptwo(2,5)
@@ -680,8 +680,8 @@ cc      SAVE /anim/
 cc      SAVE /prtn23/
       common /nzpc/nattzp
 cc      SAVE /nzpc/
-      common /lor/ enenew, pxnew, pynew, pznew
-cc      SAVE /lor/
+      common /lora/ enenew, pxnew, pynew, pznew
+cc      SAVE /lora/
       COMMON/LUDAT1A/MSTU(200),PARU(200),MSTJ(200),PARJ(200) 
 cc      SAVE /LUDAT1A/ 
 clin 4/19/2006
@@ -1342,8 +1342,8 @@ c
 cc      SAVE /loclco/
       common /prtn23/ gxp0(3),gyp0(3),gzp0(3),ft0fom
 cc      SAVE /prtn23/
-      common /lor/ enenew, pxnew, pynew, pznew
-cc      SAVE /lor/
+      common /lora/ enenew, pxnew, pynew, pznew
+cc      SAVE /lora/
       SAVE   
 c     for 2-body kinematics:
       if(icall.eq.2) then

diff --git a/TAmpt/AMPT/zpc.f b/TAmpt/AMPT/zpc.f
index 291f9391b95ae8f02c2d09bfcb8172024480b2fe..cffdd438360e3d26bd374bfd8290a30ec520aa7c 100644 (file)
--- a/TAmpt/AMPT/zpc.f
+++ b/TAmpt/AMPT/zpc.f
@@ -425,8 +425,8 @@ cc      SAVE /para5/
 cc      SAVE /prec1/
         common /prec5/ eta(MAXPTN), rap(MAXPTN), tau(MAXPTN)
 cc      SAVE /prec5/
-        common /lor/ enenew, pxnew, pynew, pznew
-cc      SAVE /lor/
+        common /lora/ enenew, pxnew, pynew, pznew
+cc      SAVE /lora/
         common /rndm3/ iseedp
 cc      SAVE /rndm3/
         SAVE   
@@ -636,8 +636,8 @@ cc      SAVE /para6/
      &       PX0(MAXPTN), PY0(MAXPTN), PZ0(MAXPTN), E0(MAXPTN),
      &       XMASS0(MAXPTN), ITYP0(MAXPTN)
 cc      SAVE /prec1/
-        common /lor/ enenew, pxnew, pynew, pznew
-cc      SAVE /lor/
+        common /lora/ enenew, pxnew, pynew, pznew
+cc      SAVE /lora/
         SAVE   
 
         external lorenz
@@ -1914,8 +1914,8 @@ cc      SAVE /aurec2/
 cc      SAVE /ilist1/
         common /ilist3/ size1, size2, size3, v1, v2, v3, size
 cc      SAVE /ilist3/
-        common /lor/ enenew, pxnew, pynew, pznew
-cc      SAVE /lor/
+        common /lora/ enenew, pxnew, pynew, pznew
+cc      SAVE /lora/
         common /cprod/ xn1, xn2, xn3
 cc      SAVE /cprod/
         common /rndm2/ iff
@@ -6435,8 +6435,8 @@ c     add in a cut for beta2 to prevent gam to be nan (infinity)
 
       implicit double precision (a-h, o-z)
 
-      common /lor/ enenew, pxnew, pynew, pznew
-cc      SAVE /lor/
+      common /lora/ enenew, pxnew, pynew, pznew
+cc      SAVE /lora/
       SAVE   
 
       beta2 = bex ** 2 + bey ** 2 + bez ** 2