IAP GITLAB

Commit 6ee7c4b6 authored by Tanguy Pierog's avatar Tanguy Pierog

DPMJETIII.19-1 now compiling but not yet properly running

parent 00241123
...@@ -227,8 +227,9 @@ ENDIF (__PHOJET__) ...@@ -227,8 +227,9 @@ ENDIF (__PHOJET__)
IF (__DPMJET17__) IF (__DPMJET17__)
ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1") ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.2017-1")
LIST(APPEND TABS dpmjpar.dat) LIST(APPEND TABS DPMJET-17.1/dpmjet.dat)
LIST(APPEND TABS dpmCT14LL.pds) LIST(APPEND TABS DPMJET-17.1/dpmjpar.dat)
LIST(APPEND TABS DPMJET-17.1/dpmCT14LL.pds)
LIST(APPEND TABS conextar.glb) LIST(APPEND TABS conextar.glb)
SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet17) SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet17)
get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS) get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS)
...@@ -237,10 +238,10 @@ ENDIF (__DPMJET17__) ...@@ -237,10 +238,10 @@ ENDIF (__DPMJET17__)
IF (__DPMJET19__) IF (__DPMJET19__)
ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.2019-1") ADD_SUBDIRECTORY ("${PROJECT_SOURCE_DIR}/src/dpmjet/3.2019-1")
LIST(APPEND TABS DPMJET-19.1/dpmdata/dpmjpar.dat_higher_diff) LIST(APPEND TABS DPMJET-19.1/dpmjpar.dat_higher_diff)
LIST(APPEND TABS DPMJET-19.1/dpmdata/dpmjpar.dat) LIST(APPEND TABS DPMJET-19.1/dpmjpar.dat)
LIST(APPEND TABS DPMJET-19.1/dpmdata/dpmCT14LL.pds) LIST(APPEND TABS DPMJET-19.1/CT14LL.pds)
LIST(APPEND TABS DPMJET-19.1/dpmdata/dpmjet.dat) LIST(APPEND TABS DPMJET-19.1/dpmjet.dat)
LIST(APPEND TABS conextar.glb) LIST(APPEND TABS conextar.glb)
SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet19) SET(STATIC_LIBS ${STATIC_LIBS} Dpmjet19)
get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS) get_property(HELPER SOURCE src/models.F PROPERTY COMPILE_FLAGS)
......
...@@ -4,8 +4,7 @@ FILE(GLOB filesDum DPMJET-19.1/common/*.f) ...@@ -4,8 +4,7 @@ FILE(GLOB filesDum DPMJET-19.1/common/*.f)
FILE(GLOB filesDpm DPMJET-19.1/src/dpmjet/*.f) FILE(GLOB filesDpm DPMJET-19.1/src/dpmjet/*.f)
FILE(GLOB filesPho DPMJET-19.1/src/phojet/*.f) FILE(GLOB filesPho DPMJET-19.1/src/phojet/*.f)
FILE(GLOB filesPyt DPMJET-19.1/src/pythia/*.f) FILE(GLOB filesPyt DPMJET-19.1/src/pythia/*.f)
include_directories(DPMJET-19.1/include/dpmjet DPMJET-19.1/include/phojet DPMJET-19.1/include/pythia DPMJET-19.1/include/flinclude) set_source_files_properties( ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files} PROPERTIES COMPILE_FLAGS "-cpp -mtune=native -Og -Wno-uninitialized -Wno-unused-dummy-argument -std=legacy -D __DPMJET__ -D FOR_CORSIKA -D FOR_CMAKE" )
set_source_files_properties( ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files} PROPERTIES COMPILE_FLAGS "-xf77-cpp-input -D __DPMJET__")
IF (__CRMCSTATIC__) IF (__CRMCSTATIC__)
add_library(Dpmjet19 STATIC ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files}) add_library(Dpmjet19 STATIC ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${files})
...@@ -14,6 +13,8 @@ add_library(Dpmjet19 SHARED ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${fi ...@@ -14,6 +13,8 @@ add_library(Dpmjet19 SHARED ${filesPho} ${filesPyt} ${filesDpm} ${filesDum} ${fi
target_link_libraries(Dpmjet19 CrmcBasic) target_link_libraries(Dpmjet19 CrmcBasic)
ENDIF (__CRMCSTATIC__) ENDIF (__CRMCSTATIC__)
target_include_directories( Dpmjet19 PUBLIC DPMJET-19.1/include/pythia PUBLIC DPMJET-19.1/include/phojet PUBLIC DPMJET-19.1/include/dpmjet PUBLIC DPMJET-19.1/include/flinclude )
INSTALL (TARGETS Dpmjet19 INSTALL (TARGETS Dpmjet19
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
......
SUBROUTINE OAUXFI ( FILE, IONUMB, CHSTTS, IERR ) SUBROUTINE OAUXFI ( FILE, IONUMB, CHSTTS, IERR )
#ifdef FOR_CMAKE
INCLUDE '(DBLPRC)' INCLUDE '(DBLPRC)'
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(IOUNIT)' INCLUDE '(IOUNIT)'
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
*----------------------------------------------------------------------* *----------------------------------------------------------------------*
* *
INCLUDE '(COMPUT)' INCLUDE '(COMPUT)'
#endif
* *
CHARACTER FILE*(*), CHSTTS*(*), CARD*132, FSTATS*10, FFORM*12, CHARACTER FILE*(*), CHSTTS*(*), CARD*132, FSTATS*10, FFORM*12,
& FACCSS*10 & FACCSS*10
......
...@@ -38,12 +38,14 @@ C ...@@ -38,12 +38,14 @@ C
C IMPLICIT DOUBLE PRECISION (A-H,O-Z) C IMPLICIT DOUBLE PRECISION (A-H,O-Z)
C SAVE C SAVE
#ifdef FOR_CMAKE
INCLUDE '(DBLPRC)' INCLUDE '(DBLPRC)'
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(IOUNIT)' INCLUDE '(IOUNIT)'
INCLUDE '(BEAMCM)' INCLUDE '(BEAMCM)'
INCLUDE '(IOIOCM)' INCLUDE '(IOIOCM)'
#endif
DOUBLE PRECISION epn , Pinp , xdumb , xlim1 , xlim2 , xlim3 DOUBLE PRECISION epn , Pinp , xdumb , xlim1 , xlim2 , xlim3
INTEGER ibin , idp , IDPmev , Idpmfs , Idpmhk , Idpmvr , Ifdpm , INTEGER ibin , idp , IDPmev , Idpmfs , Idpmhk , Idpmvr , Ifdpm ,
......
...@@ -17,7 +17,9 @@ C ...@@ -17,7 +17,9 @@ C
& IHMapr , IHMata , Ijdpm , irej , Izp , Izt , kkmat & IHMapr , IHMata , Ijdpm , irej , Izp , Izt , kkmat
SAVE SAVE
#ifdef FOR_CMAKE
INCLUDE '(IOUNIT)' INCLUDE '(IOUNIT)'
#endif
C event flag C event flag
INCLUDE 'inc/dtevno' INCLUDE 'inc/dtevno'
......
...@@ -11,10 +11,12 @@ C = 2 target residual nucleus * ...@@ -11,10 +11,12 @@ C = 2 target residual nucleus *
C This version dated 19.04.95 is written by S. Roesler. * C This version dated 19.04.95 is written by S. Roesler. *
C*********************************************************************** C***********************************************************************
IMPLICIT DOUBLE PRECISION (A-H,O-Z) IMPLICIT DOUBLE PRECISION (A-H,O-Z)
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(GENSTK)' INCLUDE '(GENSTK)'
INCLUDE '(RESNUC)' INCLUDE '(RESNUC)'
INCLUDE '(FHEAVY)' INCLUDE '(FHEAVY)'
#endif
DOUBLE PRECISION am , dum , Eexcf , pe , px , py , pz , TINY10 , DOUBLE PRECISION am , dum , Eexcf , pe , px , py , pz , TINY10 ,
& TINY3 & TINY3
......
...@@ -53,7 +53,8 @@ C flags for input different options ...@@ -53,7 +53,8 @@ C flags for input different options
INCLUDE 'inc/dtflg1' INCLUDE 'inc/dtflg1'
C particle properties (BAMJET index convention) C particle properties (BAMJET index convention)
INCLUDE 'inc/dtpart' INCLUDE 'inc/dtpart'
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(GENSTK)' INCLUDE '(GENSTK)'
INCLUDE '(RESNUC)' INCLUDE '(RESNUC)'
...@@ -73,6 +74,7 @@ C particle properties (BAMJET index convention) ...@@ -73,6 +74,7 @@ C particle properties (BAMJET index convention)
INCLUDE '(NUCDAT)' INCLUDE '(NUCDAT)'
INCLUDE '(PAREVT)' INCLUDE '(PAREVT)'
INCLUDE '(FHEAVY)' INCLUDE '(FHEAVY)'
#endif
C event flag C event flag
INCLUDE 'inc/dtevno' INCLUDE 'inc/dtevno'
......
...@@ -36,10 +36,12 @@ C statistics: residual nuclei ...@@ -36,10 +36,12 @@ C statistics: residual nuclei
C parameter for intranuclear cascade C parameter for intranuclear cascade
INCLUDE 'inc/dtfoti' INCLUDE 'inc/dtfoti'
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(PAREVT)' INCLUDE '(PAREVT)'
INCLUDE '(FRBKCM)' INCLUDE '(FRBKCM)'
INCLUDE '(EVAFLG)' INCLUDE '(EVAFLG)'
#endif
C temporary storage for one final state particle C temporary storage for one final state particle
INCLUDE 'inc/dtfspa' INCLUDE 'inc/dtfspa'
......
...@@ -36,10 +36,12 @@ C particle properties (BAMJET index convention) ...@@ -36,10 +36,12 @@ C particle properties (BAMJET index convention)
C names of hadrons used in input-cards C names of hadrons used in input-cards
INCLUDE 'inc/dtpain' INCLUDE 'inc/dtpain'
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(PAREVT)' INCLUDE '(PAREVT)'
INCLUDE '(EVAFLG)' INCLUDE '(EVAFLG)'
INCLUDE '(FRBKCM)' INCLUDE '(FRBKCM)'
#endif
C emulsion treatment C emulsion treatment
INCLUDE 'inc/dtcomp' INCLUDE 'inc/dtcomp'
......
...@@ -23,8 +23,10 @@ C*********************************************************************** ...@@ -23,8 +23,10 @@ C***********************************************************************
LOGICAL lfirst , lfirdt , lfirph LOGICAL lfirst , lfirdt , lfirph
#ifdef FOR_CMAKE
INCLUDE '(DIMPAR)' INCLUDE '(DIMPAR)'
INCLUDE '(PART)' INCLUDE '(PART)'
#endif
INCLUDE 'inc/pydat1' INCLUDE 'inc/pydat1'
......
SUBROUTINE DT_RESNCL(Epn,Nloop,Mode) SUBROUTINE DT_RESNCL(Epn,Nloop,Mode)
#ifdef FOR_CMAKE
INCLUDE '(DBLPRC)' INCLUDE '(DBLPRC)'
#endif
SAVE SAVE
DOUBLE PRECISION aip , aipz , ait , aitz , amsec , AMUAMU , DOUBLE PRECISION aip , aipz , ait , aitz , amsec , AMUAMU ,
......
#ifndef FOR_CORSIKA
DOUBLE PRECISION FUNCTION DT_RNDM(Vdummy) DOUBLE PRECISION FUNCTION DT_RNDM(Vdummy)
C*********************************************************************** C***********************************************************************
...@@ -92,3 +93,4 @@ C uncomment if needed ...@@ -92,3 +93,4 @@ C uncomment if needed
C IRNCT0 = IRNCT0+1 C IRNCT0 = IRNCT0+1
END FUNCTION END FUNCTION
#endif
#ifndef FOR_CORSIKA
C********************************************************************** C**********************************************************************
C C
...@@ -10,3 +11,4 @@ C********************************************************************** ...@@ -10,3 +11,4 @@ C**********************************************************************
DIMENSION Param(20) , Value(20) DIMENSION Param(20) , Value(20)
CHARACTER*20 Param CHARACTER*20 Param
END SUBROUTINE END SUBROUTINE
#endif
#ifndef FOR_CORSIKA
SUBROUTINE PHO_LHIST(I,X) SUBROUTINE PHO_LHIST(I,X)
...@@ -9,3 +10,4 @@ C* ...@@ -9,3 +10,4 @@ C*
SAVE SAVE
END SUBROUTINE END SUBROUTINE
#endif
#ifndef FOR_CORSIKA
SUBROUTINE PHO_PHIST(Imode,Weight) SUBROUTINE PHO_PHIST(Imode,Weight)
...@@ -43,3 +44,4 @@ C & ' Sigma = ',XSPRO(1,1,1),' mb used for normalization' ...@@ -43,3 +44,4 @@ C & ' Sigma = ',XSPRO(1,1,1),' mb used for normalization'
END IF END IF
END SUBROUTINE END SUBROUTINE
#endif
#ifndef FOR_CORSIKA
DOUBLE PRECISION FUNCTION PYR(Idummy) DOUBLE PRECISION FUNCTION PYR(Idummy)
...@@ -9,3 +10,4 @@ ...@@ -9,3 +10,4 @@
dummy = DBLE(Idummy) dummy = DBLE(Idummy)
PYR = DT_RNDM(dummy) PYR = DT_RNDM(dummy)
END FUNCTION END FUNCTION
#endif
#ifndef FOR_CORSIKA
SUBROUTINE STRUCTM(Xi,Scale2,Uv,Dv,Us,Ds,Ss,Cs,Bs,Ts,Gl) SUBROUTINE STRUCTM(Xi,Scale2,Uv,Dv,Us,Ds,Ss,Cs,Bs,Ts,Gl)
IMPLICIT NONE IMPLICIT NONE
DOUBLE PRECISION Bs , Cs , Ds , Dv , Gl , Scale2 , Ss , Ts , Us , DOUBLE PRECISION Bs , Cs , Ds , Dv , Gl , Scale2 , Ss , Ts , Us ,
& Uv , Xi & Uv , Xi
END SUBROUTINE END SUBROUTINE
#endif
#ifndef FOR_CORSIKA
SUBROUTINE STRUCTP(Xi,Scale2,P2,Ip2,Uv,Dv,Us,Ds,Ss,Cs,Bs,Ts,Gl) SUBROUTINE STRUCTP(Xi,Scale2,P2,Ip2,Uv,Dv,Us,Ds,Ss,Cs,Bs,Ts,Gl)
IMPLICIT NONE IMPLICIT NONE
...@@ -5,3 +6,4 @@ ...@@ -5,3 +6,4 @@
& Us , Uv , Xi & Us , Uv , Xi
INTEGER Ip2 INTEGER Ip2
END SUBROUTINE END SUBROUTINE
#endif
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment