Commit 20d6fb68 authored by Vincent Rothe's avatar Vincent Rothe
Browse files

v2.2.7

parent 9e23da43
......@@ -8,7 +8,7 @@ for acc in ilc200 ilc230 ilc250 ilc350 ilc500; do
ln -s $guinea_pig_dir/$acc .
sh ./fill_circe2_template \
$acc/output template.circe2_input \
prefix=$acc/ > $acc.circe2_input
prefix=$acc/ roots="`echo $acc | sed 's/^ilc//'`" > $acc.circe2_input
$circe2_tool -f $acc.circe2_input
cp $acc/beams.circe $acc.circe
done
......
......@@ -139,7 +139,7 @@ if NOWEB_AVAILABLE
$(NOTANGLE_IT)
circe2_ls.f90: circe2.nw
$(NOTANGLE_IT)
cat $(WEBS) | $(NOTANGLE) -R'[[$@]]' | $(CPIF) $@
taorng.f90: postlude.nw
cat $(WEBS) | $(NOTANGLE) -R'[[$@]]' | $(CPIF) $@
......@@ -236,6 +236,9 @@ endif
clean-local: clean-noweb
-rm -f *.cm[aiox] *.cmxa *.[ao] *.l[oa] *.$(FC_MODULE_EXT) \
*.g90 $(CIRCE2_NATIVE) $(CIRCE2_BYTECODE) $(CIRCE2_DERIVED)
if FC_SUBMODULES
-rm -f *.smod
endif
## Remove backup files
maintainer-clean-backup:
......
......@@ -372,7 +372,7 @@ contains
return
end if
if (ierror .gt. 0) then
write (*, '(2A)') 'circe2_load: ', 'Version 2.2.6'
write (*, '(2A)') 'circe2_load: ', 'Version 2.2.7'
end if
prefix = index (design, '*') - 1
do
......
......@@ -2,7 +2,7 @@
@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Implementation of [[circe2]]}
<<Version>>=
'Version 2.2.6'
'Version 2.2.7'
@
<<[[implicit none]]>>=
implicit none
......
......@@ -375,7 +375,7 @@ let _ =
let usage = "usage: " ^ Sys.argv.(0) ^ " [options]" in
let nbins = ref 100
and triangle = ref false
and shrink = ref true
and shrink = ref false
and verbose = ref false
and action = ref Nothing
and suffix = ref ".histo"
......@@ -423,8 +423,8 @@ let _ =
("-h", Arg.Unit (fun () ->
histogram_to_file := Histogram.as_bins_to_file), "");
("-b", Arg.Int (fun n -> nbins := n), "#bins");
("-s", Arg.Set shrink, "shrinkwrap interval [default]");
("-S", Arg.Clear shrink, "don't shrinkwrap interval");
("-s", Arg.Set shrink, "shrinkwrap interval");
("-S", Arg.Clear shrink, "don't shrinkwrap interval [default]");
("-t", Arg.Set triangle,
"project symmetrical distribution onto triangle");
("-v", Arg.Set verbose, "verbose");
......
......@@ -90,18 +90,24 @@ let copy_suite =
let fold_left ?inf ?sup f x a =
let acc = ref x in
for i = decode_inf ?inf a to decode_sup ?sup a do
acc := f !acc a.(i)
done;
!acc
try
for i = decode_inf ?inf a to decode_sup ?sup a do
acc := f !acc a.(i)
done;
!acc
with
| Out_of_bounds (_, _) -> x
let iter ?inf ?sup f a =
fold_left ?inf ?sup (fun () x -> f x) () a
let iter ?inf ?sup f a =
for i = decode_inf ?inf a to decode_sup ?sup a do
f a.(i)
done
try
for i = decode_inf ?inf a to decode_sup ?sup a do
f a.(i)
done
with
| Out_of_bounds (_, _) -> ()
let sum_float ?inf ?sup a =
fold_left ?inf ?sup (+.) 0.0 a
......
......@@ -63,7 +63,7 @@ AM_CONDITIONAL([DL_AVAILABLE], [test "$enable_dl" = "yes"])
### care of library interdependencies on MAC OS X
case $host in
*-darwin*)
DYLD_FLAGS="DYLD_LIBRARY_PATH=\$(pwd)/../src/.libs:\$(pwd)/../omega/src/.libs:\${DYLD_LIBRARY_PATH}; export DYLD_LIBRARY_PATH" ;;
DYLD_FLAGS="DYLD_LIBRARY_PATH=\$(pwd)/../../src/.libs:\$(pwd)/../../src/whizard-core/.libs:\$(pwd)/../../omega/src/.libs:\${DYLD_LIBRARY_PATH}; export DYLD_LIBRARY_PATH" ;;
*)
DYLD_FLAGS="" ;;
esac
......
......@@ -553,6 +553,54 @@ AC_DEFUN([WO_FC_CHECK_ISO_FORTRAN_ENV],
]
)
### Check for the TR19767 extensions (submodules)
AC_DEFUN([WO_FC_CHECK_TR19767],
[AC_CACHE_CHECK([whether $FC supports submodules (F2008)],
[wo_cv_fc_submodules],
[dnl
AC_REQUIRE([AC_PROG_FC])
AC_LANG([Fortran])
AC_COMPILE_IFELSE([dnl
module conftest_mod
type :: point
real :: x, y
end type point
interface
module function point_dist(a, b) result(distance)
type(point), intent(in) :: a, b
real :: distance
end function point_dist
end interface
end module conftest_mod
submodule (conftest_mod) conftest_mod_a
contains
module function point_dist(a, b) result(distance)
type(point), intent(in) :: a, b
real :: distance
distance = sqrt((a%x - b%x)**2 + (a%y - b%y)**2)
end function point_dist
end submodule conftest_mod_a
program conftest
use conftest_mod
end program conftest
],
[wo_cv_fc_submodules="yes"],
[wo_cv_fc_submodules="no"])
])
rm -f conftest_mod.*
FC_SUPPORTS_SUBMODULES="$wo_cv_fc_submodules"
AC_SUBST([FC_SUPPORTS_SUBMODULES])
AM_CONDITIONAL([FC_SUBMODULES],
[test "$wo_cv_fc_submodules" = "yes"])
if test "$FC_SUPPORTS_SUBMODULES" = "no"; then
AC_MSG_NOTICE([NOTE: Fortran compiler does not support submodules (F2008).])
fi])
### end WO_FC_CHECK_TR19767
### Check for wrapping of linker flags
### (nagfor 'feature': must be wrapped twice)
AC_DEFUN([WO_FC_CHECK_LDFLAGS_WRAPPING],
......
......@@ -101,6 +101,14 @@ else
fi
AC_SUBST([GOSAM_DIR])
if test "$enable_gosam" = "yes"; then
GOSAM_AVAILABLE_FLAG=".true."
else
GOSAM_AVAILABLE_FLAG=".false."
fi
AC_SUBST([GOSAM_AVAILABLE_FLAG])
AM_CONDITIONAL([GOSAM_AVAILABLE], [test "$enable_gosam" = "yes"])
]) dnl WO_PROG_GOSAM
......
......@@ -39,6 +39,14 @@ else
fi
AC_SUBST([OPENLOOPS_DIR])
if test "$enable_openloops" = "yes"; then
OPENLOOPS_AVAILABLE_FLAG=".true."
else
OPENLOOPS_AVAILABLE_FLAG=".false."
fi
AC_SUBST([OPENLOOPS_AVAILABLE_FLAG])
AM_CONDITIONAL([OPENLOOPS_AVAILABLE], [test "$enable_openloops" = "yes"])
]) dnl WO_PROG_OPENLOOPS
......
......@@ -25,6 +25,13 @@ fi
AC_SUBST([PYTHIA8_CXXFLAGS])
AC_SUBST([PYTHIA8_LIBS])
if test "$enable_pythia8" = "yes"; then
PYTHIA8_AVAILABLE_FLAG=".true."
else
PYTHIA8_AVAILABLE_FLAG=".false."
fi
AC_SUBST([PYTHIA8_AVAILABLE_FLAG])
AM_CONDITIONAL([PYTHIA8_AVAILABLE], [test "$enable_pythia8" = "yes"])
])
......
......@@ -32,7 +32,7 @@ else
AC_MSG_CHECKING([for PYTHIA6])
AC_MSG_RESULT([(disabled)])
fi
AC_SUBST(PYTHIA_AVAILABLE_FLAG)
AC_SUBST(PYTHIA6_AVAILABLE_FLAG)
AM_CONDITIONAL([PYTHIA6_AVAILABLE],
[test "$PYTHIA6_AVAILABLE_FLAG" = ".true."])
......
NEWS -- User-visible changes for O'Mega
version 2.2.6
version 2.2.7
for details cf. the WHIZARD ChangeLog file
......@@ -553,6 +553,54 @@ AC_DEFUN([WO_FC_CHECK_ISO_FORTRAN_ENV],
]
)
### Check for the TR19767 extensions (submodules)
AC_DEFUN([WO_FC_CHECK_TR19767],
[AC_CACHE_CHECK([whether $FC supports submodules (F2008)],
[wo_cv_fc_submodules],
[dnl
AC_REQUIRE([AC_PROG_FC])
AC_LANG([Fortran])
AC_COMPILE_IFELSE([dnl
module conftest_mod
type :: point
real :: x, y
end type point
interface
module function point_dist(a, b) result(distance)
type(point), intent(in) :: a, b
real :: distance
end function point_dist
end interface
end module conftest_mod
submodule (conftest_mod) conftest_mod_a
contains
module function point_dist(a, b) result(distance)
type(point), intent(in) :: a, b
real :: distance
distance = sqrt((a%x - b%x)**2 + (a%y - b%y)**2)
end function point_dist
end submodule conftest_mod_a
program conftest
use conftest_mod
end program conftest
],
[wo_cv_fc_submodules="yes"],
[wo_cv_fc_submodules="no"])
])
rm -f conftest_mod.*
FC_SUPPORTS_SUBMODULES="$wo_cv_fc_submodules"
AC_SUBST([FC_SUPPORTS_SUBMODULES])
AM_CONDITIONAL([FC_SUBMODULES],
[test "$wo_cv_fc_submodules" = "yes"])
if test "$FC_SUPPORTS_SUBMODULES" = "no"; then
AC_MSG_NOTICE([NOTE: Fortran compiler does not support submodules (F2008).])
fi])
### end WO_FC_CHECK_TR19767
### Check for wrapping of linker flags
### (nagfor 'feature': must be wrapped twice)
AC_DEFUN([WO_FC_CHECK_LDFLAGS_WRAPPING],
......
# Makefile.am -- Makefile for O'Mega within and without WHIZARD
# $Id: Makefile.am 6465 2015-01-10 15:22:31Z jr_reuter $
# $Id: Makefile.am 7140 2015-08-07 21:11:59Z jr_reuter $
##
## Process this file with automake to produce Makefile.in
##
......@@ -192,6 +192,9 @@ endif OCAML_AVAILABLE
clean-local:
rm -f *.cm[aiox] *.cmxa *.[ao] *.l[oa] *.$(FC_MODULE_EXT) \
$(OMEGA_DERIVED_CAML) omegalib.stamp
if FC_SUBMODULES
-rm -f *.smod
endif
distclean-local:
-test "$(srcdir)" != "." && rm -f config.mli
......
! WHIZARD <<Version>> <<Date>>
!
! Copyright (C) 1999-2015 by
! Wolfgang Kilian <kilian@physik.uni-siegen.de>
! Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
......
......@@ -2497,7 +2497,7 @@ contains
type(varying_string), intent(out), optional :: separator
logical, intent(in), optional :: back
! Split a varying string into two verying strings
! Split a varying string into two varying strings
call split_CH(string, word, char(set), separator, back)
......@@ -2520,7 +2520,7 @@ contains
logical :: back_
integer :: i_separator
! Split a varying string into two verying strings
! Split a varying string into two varying strings
if(PRESENT(back)) then
back_ = back
......
Supports Markdown
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