Skip to content

Commit

Permalink
Merge branch 'master' into 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sangallidavide committed Sep 17, 2021
2 parents 03fa628 + 01c1eb1 commit 3f0f783
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
6 changes: 3 additions & 3 deletions config/version/version.m4
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
AC_INIT(Yambo, 5.0.4 r.19593 h.b030eead9, [email protected])
AC_INIT(Yambo, 5.0.4 r.19595 h.896bffc02, [email protected])
SVERSION="5"
SSUBVERSION="0"
SPATCHLEVEL="4"
SREVISION="19593"
SHASH="b030eead9"
SREVISION="19595"
SHASH="896bffc02"
AC_SUBST(SVERSION)
AC_SUBST(SSUBVERSION)
AC_SUBST(SPATCHLEVEL)
Expand Down
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Yambo 5.0.4 r.19593 h.b030eead9.
# Generated by GNU Autoconf 2.69 for Yambo 5.0.4 r.19595 h.896bffc02.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Yambo'
PACKAGE_TARNAME='yambo'
PACKAGE_VERSION='5.0.4 r.19593 h.b030eead9'
PACKAGE_STRING='Yambo 5.0.4 r.19593 h.b030eead9'
PACKAGE_VERSION='5.0.4 r.19595 h.896bffc02'
PACKAGE_STRING='Yambo 5.0.4 r.19595 h.896bffc02'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1528,7 +1528,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Yambo 5.0.4 r.19593 h.b030eead9 to adapt to many kinds of systems.
\`configure' configures Yambo 5.0.4 r.19595 h.896bffc02 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1594,7 +1594,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Yambo 5.0.4 r.19593 h.b030eead9:";;
short | recursive ) echo "Configuration of Yambo 5.0.4 r.19595 h.896bffc02:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1798,7 +1798,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Yambo configure 5.0.4 r.19593 h.b030eead9
Yambo configure 5.0.4 r.19595 h.896bffc02
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2477,7 +2477,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Yambo $as_me 5.0.4 r.19593 h.b030eead9, which was
It was created by Yambo $as_me 5.0.4 r.19595 h.896bffc02, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2828,8 +2828,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
SVERSION="5"
SSUBVERSION="0"
SPATCHLEVEL="4"
SREVISION="19593"
SHASH="b030eead9"
SREVISION="19595"
SHASH="896bffc02"



Expand Down Expand Up @@ -14905,7 +14905,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Yambo $as_me 5.0.4 r.19593 h.b030eead9, which was
This file was extended by Yambo $as_me 5.0.4 r.19595 h.896bffc02, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -14967,7 +14967,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Yambo config.status 5.0.4 r.19593 h.b030eead9
Yambo config.status 5.0.4 r.19595 h.896bffc02
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
4 changes: 2 additions & 2 deletions src/bse/K_Transitions_setup.F
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ logical function T_is_ok(Ken,Dip,iq,ik,ikp,iv,ic,i_sp_c,i_res_ares,FORCE_EQ_tran
f_e = ( Ken%f(iv,ikp,i_sp_v))/spin_occ
f_h = (spin_occ-Ken%f(ic,ik ,i_sp_c))/spin_occ
else
f_e = ( Ken%f(ic,ikp,i_sp_c))/spin_occ
f_h = (spin_occ-Ken%f(iv,ik ,i_sp_v))/spin_occ
f_e = ( Ken%f(ic,ik ,i_sp_c))/spin_occ
f_h = (spin_occ-Ken%f(iv,ikp,i_sp_v))/spin_occ
endif
!
f_eh_PL = Ken%f(ic,ikp,i_sp_c)*(spin_occ-Ken%f(iv,ik ,i_sp_v))/spin_occ/spin_occ
Expand Down
1 change: 1 addition & 0 deletions src/bse/K_blocks.F
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ subroutine K_blocks(iq)
enddo
enddo
!
n_BS_blks_CPUs=0
n_BS_blks_CPUs(myid+1)=n_BS_blks
call PP_redux_wait(n_BS_blks_CPUs)
n_BS_blks_min=minval(n_BS_blks_CPUs)
Expand Down

0 comments on commit 3f0f783

Please sign in to comment.