From 8be981ffaf1fda463f0890980aeb268442720a8a Mon Sep 17 00:00:00 2001
From: Mikhail Iliushin <miliushi@lxplus0102.cern.ch>
Date: Thu, 20 Aug 2015 13:24:23 +0200
Subject: [PATCH] adding jhu 5.6.3 to experimental and path for jhu-5.6.3
---
cmake/toolchain/heptools-experimental.cmake | 1 +
generators/patches/jhu-5.6.3.patch | 79 +++++++++++++++++++++
2 files changed, 80 insertions(+)
create mode 100644 generators/patches/jhu-5.6.3.patch
diff --git a/cmake/toolchain/heptools-experimental.cmake b/cmake/toolchain/heptools-experimental.cmake
index 4ae5e6bd1a..1c3a02cfa0 100644
--- a/cmake/toolchain/heptools-experimental.cmake
+++ b/cmake/toolchain/heptools-experimental.cmake
@@ -287,6 +287,7 @@ LCG_external_package(professor 1.4.0 ${MCGENPATH}/professor
+LCG_external_package(jhu 5.6.3 ${MCGENPATH}/jhu )
LCG_external_package(jhu 5.2.5 ${MCGENPATH}/jhu )
LCG_external_package(jhu 4.8.1 ${MCGENPATH}/jhu )
LCG_external_package(jhu 3.1.8 ${MCGENPATH}/jhu )
diff --git a/generators/patches/jhu-5.6.3.patch b/generators/patches/jhu-5.6.3.patch
new file mode 100644
index 0000000000..7db0a1cf3c
--- /dev/null
+++ b/generators/patches/jhu-5.6.3.patch
@@ -0,0 +1,79 @@
+--- JHUGenerator/makefile.orig 2015-08-20 12:51:55.000000001 +0200
++++ JHUGenerator/makefile 2015-08-20 12:52:35.000000001 +0200
+@@ -1,13 +1,13 @@
+-Here = $(PWD)
++
+ Makefile=makefile
+-ModuleDir = $(Here)/modules
+-ObjectDir = $(Here)/objects
+-PDFDir = $(Here)/pdfs
+-VegasDir = $(Here)/vegas
++ModuleDir = modules
++ObjectDir = objects
++PDFDir = pdfs
++VegasDir = vegas
+
+ # compiler options, Comp='ifort' or 'gfort'
+ Opt = Yes
+-Comp = gfort
++Comp = gfortran
+
+ # link pdfs via LHA library ('Yes' or 'No')
+ UseLHAPDF=No
+@@ -20,7 +20,7 @@
+
+
+
+-ifeq ($(Comp),gfort)
++ifeq ($(Comp),gfortran)
+ ifeq ($(Opt),Yes)
+ OptOpts = -O3
+ else
+@@ -31,7 +31,7 @@
+ else
+ LHAPDFflags = -DuseLHAPDF=0
+ endif
+- fcomp = f95 $(OptOpts) -ffree-line-length-none -I$(VegasDir) -I$(ModuleDir) -J$(ModuleDir) $(LHAPDFflags) -Dcompiler=2
++ fcomp = gfortran $(OptOpts) -ffree-line-length-none -I$(VegasDir) -I$(ModuleDir) -J$(ModuleDir) $(LHAPDFflags) -Dcompiler=2
+ endif
+
+
+--- JHUGenMELA/makefile.orig 2015-08-20 12:52:50.000000001 +0200
++++ JHUGenMELA/makefile 2015-08-20 12:53:10.000000001 +0200
+@@ -1,11 +1,11 @@
+-Comp = gfort
++Comp = gfortran
+
+ ifeq ($(Comp),ifort)
+ fcomp = ifort -fpp -O2 -vec-report0 -Dcompiler=1
+ # fcomp = ifort -fpp -O0 -vec-report0 -Dcompiler=1
+ endif
+-ifeq ($(Comp),gfort)
+-fcomp = f95 -O3 -ffree-line-length-none -Dcompiler=2
++ifeq ($(Comp),gfortran)
++fcomp = gfortran -O3 -ffree-line-length-none -Dcompiler=2
+ endif
+
+ ccomp = gcc
+
+--- JHUGenerator/pdfs/Cteq61Pdf.f.orig 2015-08-20 13:10:49.000000001 +0200
++++ JHUGenerator/pdfs/Cteq61Pdf.f 2015-08-20 13:12:46.000000001 +0200
+@@ -134,6 +134,7 @@
+ > / 'cteq6m', 'cteq6d', 'cteq6l', 'cteq6l','ctq61.'/
+ Data Isetold, Isetmin0, Isetmin1, Isetmax1 /-987,1,100,140/
+ Data Isetmin2,Isetmax2 /200,240/
++ CHARACTER(LEN=255) jhu_home
+ save
+
+ C If data file not initialized, do so.
+@@ -153,7 +154,8 @@
+ Print *, 'Invalid Iset number in SetCtq6 :', Iset
+ Stop
+ Endif
+- Open(IU, File='pdfs/'//Tablefile
++ CALL getenv('JHU_HOME',jhu_home)
++ Open(IU, File=TRIM(jhu_home)//'/pdfs/'//Tablefile
+ . ,Status='OLD', Err=100)
+ 21 Call ReadTbl (IU)
+ Close (IU)
+
--
GitLab