From 10f37b70c7f01b1f0351942b33584742c93f1993 Mon Sep 17 00:00:00 2001
From: pierog <tanguy.pierog@kit.edu>
Date: Fri, 3 Sep 2021 14:07:02 +0200
Subject: [PATCH] update conex files for FLUKA and link with CORSIKA7 (not
change for CXROOT but consistent files)
---
src/conex_mod.F | 9 ++++++---
src/conex_sub.F | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/conex_mod.F b/src/conex_mod.F
index a61f4ab..eac4f5a 100644
--- a/src/conex_mod.F
+++ b/src/conex_mod.F
@@ -22022,9 +22022,9 @@ c-----------------------------------------------------------------------
INCLUDE '(PHNCCM)' !
INCLUDE '(CTITLE)' !
-C FLUKA 2011.2 BLOCK DATA PROGRAMS
+C FLUKA 2020.4 BLOCK DATA PROGRAMS
EXTERNAL BDINPT,BDTRNS,BDHDR1,BDHDR2,BDHDR3,BDPART,BDPRDC,
- & BDNOPT,BDEVAP,BDPREE
+ & BDNOPT,BDEVAP,BDPREE,BDESJE
DIMENSION WHAT (6)
CHARACTER SDUM*10
@@ -22197,7 +22197,6 @@ c-----------------------------------------------------------------------
if(isx.ge.4)call cxalist('Determine FLUKA Production&',0,0,0)
#endif
nptlxs=0
- np=0
C CONVERT PARTICLE TYPE TO FLUKA
@@ -22224,6 +22223,10 @@ C USE THE FLUKA-INTERNALLY USED DIRECTION COSINES:
IJ = KPROJ
C CALCULATE THE MOMENTUM WITH FLUKA MASSES
POO = PPROJ
+C RESET STACK INDEX
+ NP=0
+ NP0=0
+ NPHEAV=0
C NOW INTERACTION IS PERFORMED
CALL EVENTV( IJ,POO,EKIN1,TXX,TYY,TZZ,WEE,MMMAT )
c write(ifck,*)'target used',ibtar,ichtar,mmmat,ibres
diff --git a/src/conex_sub.F b/src/conex_sub.F
index 418dfe9..9a194c9 100644
--- a/src/conex_sub.F
+++ b/src/conex_sub.F
@@ -14424,11 +14424,11 @@ c Dummy functions when we don't want to use compressed files (old CORSIKA and CO
end
subroutine CorDataNextText(dum)
- double precision dum,dum2
+ character*20 dum,dum2
dum2=dum
end
- function CorDataNextNumber()
+ double precision function CorDataNextNumber()
end
integer function size(array)
--
GitLab