Commit f3033e45 authored by Juergen Reuter's avatar Juergen Reuter
Browse files

435b648 Merge branch 'metadata_300_final' into 'master'

parent 3854945c
......@@ -19,7 +19,6 @@ So Young Shim <soyoung.shim@desy.de>
Pascal Stienemeier <pascal.stienemeier@desy.de>
Tobias Striegl <striegl@physik.uni-siegen.de>
Christian Schwinn <schwinn@physik.rwth-aachen.de>
Manuel Utsch <utsch@physik.uni-siegen.de>
Christian Weiss <christian.weiss@desy.de>
......@@ -33,5 +32,6 @@ Daniel Gordo Gomez
Sebastian Schmidt
Marco Sekulla
Florian Staub
Manuel Utsch
Daniel Wiesler
Zhijie Zhao
General:
* WHIZARD 3.0+ currently runs only with the NAGFOR 6.2 (or newer) and
gfortran 5.1.0 (or newer) Fortran compilers as well as Intel ifort
19.0.2 (or newer). gfortran 6.5 has a severe regression, and cannot
be used.
gfortran 6.2.0 (or newer) Fortran compilers as well as Intel ifort
19.0.2 (or newer). gfortran 7.5 and newer is recommended.
[See the file EXTENSIONS for the list of Fortran 2003/2008/2018
features that the compiler must support.]
......
......@@ -2,7 +2,10 @@ ChangeLog -- Summary of changes to the WHIZARD package
Use svn log to see detailed changes.
Version 3.0.0_beta+
Version 3.0.0
2021-04-27
RELEASE: version 3.0.0
2021-04-20
Minimal required OCaml version is now 4.05.0.
......
......@@ -25,7 +25,7 @@ Prerequisites are:
- Make
- Objective Caml compiler (version 4.05.0 or higher)
- Fortran 2003/2008/2018 compiler
- Fortran 2008/2018 compiler
- C/C++ (for PYTHIA8/FastJet/HepMC/LHAPDF/LCIO interfaces)
The Objective Caml (OCaml) compiler is available from
......@@ -78,7 +78,7 @@ WHIZARD:
Available from: http://hepmc.web.cern.ch/hepmc
-- LCIO for the corresponding file standard.
Available from: http://lcio.desy.de/
Available from: https://github.com/iLCSoft/LCIO
-- Other external programs like PYTHIA and HERWIG for parton
showering and hadronization can be included in a standard
......@@ -257,6 +257,7 @@ Optional Features:
--enable-lhapdf enable LHAPDF for structure functions [[yes]]
--enable-hepmc enable HepMC for handling event data [[yes]]
--enable-lcio enable LCIO for binary event files [[yes]]
--enable-hdf5 build WHIZARD with HDF5 support [[yes]]
--enable-pythia6 enable internal PYTHIA6 for hadronization [[yes]]
--enable-pythia6_eh PYTHIA6 patches for high-energy eh collisions [[no]
--enable-pythia8 enable PYTHIA8 for shower and hadronization [[no]]
......@@ -290,6 +291,8 @@ Optional Packages:
--with-recola=dir assume the given directory for Recola
--with-rootsys top of the ROOT installation directory
--with-hepmc=dir assume the given directory for HepMC
--with-hdf5=DIR root directory of HDF5 installation (default =
HDF5_DIR)
--with-pythia8=dir assume the given directory for PYTHIA8
--with-fastjet=dir assume the given directory for FastJet
--with-gosam=dir assume the given directory for GoSam
......@@ -330,6 +333,7 @@ Some influential environment variables:
TIRPC_CFLAGS
C compiler flags for TIRPC, overriding pkg-config
TIRPC_LIBS linker flags for TIRPC, overriding pkg-config
HDF5_DIR root directory of HDF5 installation
#-------------------------------------------------------------
# building from svn (developer version)
......
......@@ -3,5 +3,5 @@ NEWS -- User-visible changes for the WHIZARD package
(for NEWS on the O'Mega matrix element generator cf. its
corresponding NEWS file)
version 3.0.0_beta+
version 3.0.0
for details cf. the ChangeLog file
......@@ -3,7 +3,7 @@
@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Implementation of [[circe2]]}
<<Version>>=
'Version 3.0.0_beta+'
'Version 3.0.0'
@
<<[[implicit none]]>>=
implicit none
......
......@@ -33,7 +33,7 @@ dnl FCFLAGS Fortran compiler flags
dnl ***********************************************************************
dnl
dnl Start configuration
AC_INIT([XXXWHIZARDXXX],[3.0.0_beta+])
AC_INIT([XXXWHIZARDXXX],[3.0.0])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.12.2 color-tests parallel-tests])
AC_PREREQ([2.65])
......@@ -49,8 +49,8 @@ AC_MSG_NOTICE([**************************************************************])
WO_CONFIGURE_SECTION([Start of package configuration])
### Further version information
PACKAGE_DATE="Aug 30 2020"
PACKAGE_STATUS="beta"
PACKAGE_DATE="Apr 27 2021"
PACKAGE_STATUS="release"
AC_SUBST(PACKAGE_DATE)
AC_SUBST(PACKAGE_STATUS)
......@@ -70,7 +70,7 @@ echo "$PACKAGE_STRING ($PACKAGE_STATUS) $PACKAGE_DATE" \
###---------------------------------------------------------------------
### shared library versioning (not the same as the package version!)
LIBRARY_VERSION="-version-info 2:0:0"
LIBRARY_VERSION="-version-info 2:1:0"
AC_SUBST([LIBRARY_VERSION])
########################################################################
......
(* format_Fortran.ml -- Fortran90+ continuation lines etc.
Copyright (C) 2019-2020 by
Copyright (C) 2019-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
(* format_Fortran.mli -- Fortran90+ continuation lines etc.
Copyright (C) 2019-2020 by
Copyright (C) 2019-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
(* fortran_unit.ml --
Copyright (C) 2019-2020 by
Copyright (C) 2019-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
......@@ -880,7 +880,6 @@ C.~Degrande, C.~Duhr, B.~Fuks, D.~Grellscheid, O.~Mattelaer and T.~Reiter,
Comput.{} Phys.{} Commun.{} \textbf{183} (2012), 1201-1214
doi:10.1016/j.cpc.2012.01.022
[arXiv:1108.2040 [hep-ph]].
%775 citations counted in INSPIRE as of 30 Sep 2020
\end{thebibliography}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
......
(* omega_SM_Maj.ml --
Copyright (C) 1999-2020 by
Copyright (C) 1999-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
(* omega_SM_Maj.ml --
Copyright (C) 1999-2020 by
Copyright (C) 1999-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
(* sets.ml --
Copyright (C) 2019-2020 by
Copyright (C) 2019-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
(* sets.mli --
Copyright (C) 2019-2020 by
Copyright (C) 2019-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
......@@ -2,7 +2,7 @@
! benchmark.f90 -- race O'Mega matrix elements
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! Copyright (C) 1999-2020 by
! Copyright (C) 1999-2021 by
! Wolfgang Kilian <kilian@physik.uni-siegen.de>
! Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
! Juergen Reuter <juergen.reuter@desy.de>
......
......@@ -2,7 +2,7 @@
! benchmark.f90 -- race O'Mega matrix elements
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!
! Copyright (C) 1999-2020 by
! Copyright (C) 1999-2021 by
! Wolfgang Kilian <kilian@physik.uni-siegen.de>
! Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
! Juergen Reuter <juergen.reuter@desy.de>
......
(* keystones.ml --
Copyright (C) 2019-2020 by
Copyright (C) 2019-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
(* keystones.mli --
Copyright (C) 2019-2020 by
Copyright (C) 2019-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
(* keystones_UFO_generate.ml --
Copyright (C) 2019-2020 by
Copyright (C) 2019-2021 by
Wolfgang Kilian <kilian@physik.uni-siegen.de>
Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
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