Skip to content

Commit

Permalink
Bugs:
Browse files Browse the repository at this point in the history
- In src/interface/init_load.F a too long description ( > 100 Chars) was causing seg-fault

Changes:
- Tests option removed from Makefile. To be soon replaced by the use of the test-suite branch.
  • Loading branch information
andreamarini authored and sangallidavide committed Feb 17, 2017
1 parent 662b5de commit 678098b
Show file tree
Hide file tree
Showing 6 changed files with 114 additions and 28 deletions.
15 changes: 1 addition & 14 deletions config/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,10 @@ includedir = @includedir@
CFGFILES = config/setup config/Makefile config/report sbin/make_message.pl \
sbin/make_makefile.sh driver/codever.h src/wf_and_fft/sgfft.F \
src/external_c/.objects Makefile driver/version.h \
sbin/objects_debug.sh driver/editor.h tests/load_paths_and_executables.sh
sbin/objects_debug.sh driver/editor.h
TARGETS = all yambo interfaces ypp
CLEANS = clean clean_all
INTERFCS = a2y p2y e2y
TESTS = test_GoWo
#
# Libraries (ordered for compiling & linking)
#
Expand Down Expand Up @@ -99,30 +98,23 @@ ypp: libs
@LIBS2DO="$(YPPLIBS)" ; $(mksrc)
@X2DO="ypp" ;XPATH="ypp";XLIBS="$(YPPLIBS)";$(mkx)
#
# TESTS #
test_all: test_GoWo
test_GoWo: yambo interfaces
./tests/test_GoWo.sh
clean: clean_fast
clean_fast:
@$(objects_clean)
@$(lib_mod_clean)
@$(xclean)
@$(tests_clean)
clean_all:
@$(objects_clean)
@$(lib_mod_netcdf_clean)
@$(conf_clean)
@$(xclean)
@$(tests_clean)

# Functions
define make_message
echo;echo "YAMBO" @SVERSION@.@SPATCHLEVEL@.@SSUBLEVEL@ r.@SREVISION@ targets;echo;\
for target in $(TARGETS); do echo " [stable] $$target" ; done;echo;\
for target in $(PROJECTS); do echo " [devel] $$target" ; done;echo;\
for target in $(UTILS); do echo " [util] $$target" ; done;echo
for target in $(TESTS); do echo " [tests] $$target" ; done;echo
for target in $(CLEANS); do echo " [clean] $$target" ; done;echo
endef
define mksrc
Expand Down Expand Up @@ -185,11 +177,6 @@ define xclean
for exe in $(INTERFCS); do rm -f $(bindir)/$$exe; done
echo "[CLEAN] Targets ... done"
endef
define tests_clean
find tests/ -name '*dir' -type d -print | xargs rm -fr
rm -fr tests/PPs
echo "[CLEAN] Tests ... done"
endef
define conf_clean
rm -f $(CFGFILES)
rm -f config.status config.log
Expand Down
4 changes: 2 additions & 2 deletions config/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330,Boston,
# MA 02111-1307, USA or visit http://www.gnu.org/copyleft/gpl.txt.
#
AC_INIT(Yambo, 3.2.2 r.616 , [email protected])
AC_INIT(Yambo, 3.2.2 r.633 , [email protected])
SVERSION="3"
SPATCHLEVEL="2"
SSUBLEVEL="2"
SREVISION="616"
SREVISION="633"
AC_SUBST(SVERSION)
AC_SUBST(SPATCHLEVEL)
AC_SUBST(SSUBLEVEL)
Expand Down
20 changes: 10 additions & 10 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.63 for Yambo 3.2.2 r.616 .
# Generated by GNU Autoconf 2.63 for Yambo 3.2.2 r.633 .
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Yambo'
PACKAGE_TARNAME='yambo'
PACKAGE_VERSION='3.2.2 r.616 '
PACKAGE_STRING='Yambo 3.2.2 r.616 '
PACKAGE_VERSION='3.2.2 r.633 '
PACKAGE_STRING='Yambo 3.2.2 r.633 '
PACKAGE_BUGREPORT='[email protected]'

ac_unique_file="driver/driver.c"
Expand Down Expand Up @@ -1370,7 +1370,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 3.2.2 r.616 to adapt to many kinds of systems.
\`configure' configures Yambo 3.2.2 r.633 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1435,7 +1435,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Yambo 3.2.2 r.616 :";;
short | recursive ) echo "Configuration of Yambo 3.2.2 r.633 :";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1556,7 +1556,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Yambo configure 3.2.2 r.616
Yambo configure 3.2.2 r.633
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
Expand All @@ -1570,7 +1570,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 3.2.2 r.616 , which was
It was created by Yambo $as_me 3.2.2 r.633 , which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -1941,7 +1941,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
SVERSION="3"
SPATCHLEVEL="2"
SSUBLEVEL="2"
SREVISION="616"
SREVISION="633"
Expand Down Expand Up @@ -13643,7 +13643,7 @@ exec 6>&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 3.2.2 r.616 , which was
This file was extended by Yambo $as_me 3.2.2 r.633 , which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -13693,7 +13693,7 @@ Report bugs to <[email protected]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
Yambo config.status 3.2.2 r.616
Yambo config.status 3.2.2 r.633
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Expand Down
2 changes: 1 addition & 1 deletion include/version.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
code_version(1)=3
code_version(2)=2
code_version(3)=2
code_revision=616
code_revision=633
99 changes: 99 additions & 0 deletions sbin/svn2cl.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
#!/usr/bin/perl -w
#
# Copyright (C) 2000-2008 C. Hogan and the YAMBO team
# http://www.yambo-code.org
#
# This file is distributed under the terms of the GNU
# General Public License. You can redistribute it and/or
# modify it under the terms of the GNU General Public
# License as published by the Free Software Foundation;
# either version 2, or (at your option) any later version.
#
# This program is distributed in the hope that it will
# be useful, but WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 59 Temple Place - Suite 330,Boston,
# MA 02111-1307, USA or visit http://www.gnu.org/copyleft/gpl.txt.
#
# Usage
# --------
#
# svn log | perl sbin/svn2cl.pl > ChangeLog
#

require 5.0;
use strict;

my %hackers = (
"marini" => "Andrea Marini <andrea.marini\@roma2.infn.it>",
"cdhogan" => "Conor Hogan <conor.hogan\@roma2.infn.it>",
);

my $parse_next_line = 0;
my $last_line_empty = 0;
my $last_rev = "";

while (my $entry = <>) {

# Axe windows style line endings, since we should try to be consistent, and
# the repos has both styles in its log entries
$entry =~ s/\r\n$/\n/;

# Remove trailing whitespace
$entry =~ s/\s+$/\n/;

my $this_line_empty = $entry eq "\n";

# Avoid duplicate empty lines
next if $this_line_empty and $last_line_empty;

# Don't fail on valid dash-only lines
if ($entry =~ /^-+$/ and length($entry) >= 72) {

# We're at the start of a log entry, so we need to parse the next line
$parse_next_line = 1;

# Check to see if the final line of the commit message was blank,
# if not insert one
print "\n" if $last_rev ne "" and !$last_line_empty;

} elsif ($parse_next_line) {

# Transform from svn style to GNU style
$parse_next_line = 0;

my @parts = split (/ /, $entry);
$last_rev = $parts[0];

if($last_rev !~ /Yambo|Additions|\n/ ) {

my $hacker = $parts[2];
my $tstamp = $parts[4];
my $time = $parts[5];

# Use alias if we can't resolve to name, email
$hacker = $hackers{$hacker} if defined $hackers{$hacker};

printf "%s %s %s %s\n", $tstamp, $time, $last_rev, $hacker;
} else {
print "\t$entry";
}

} elsif ($this_line_empty) {

print "\n";

} else {
print "\t$entry";
}

$last_line_empty = $this_line_empty;
}

1;

2 changes: 1 addition & 1 deletion src/interface/init_load.F
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ subroutine init_load(defs,en,q,k,X,Xw)
& Haydock_treshold,verb_level=V_resp)
call it(defs,'BEnSteps','[BSS] Energy steps',BSS_n_freqs)
call it('f',defs,'WRbsWF', '[BSS] Write to disk excitonic the FWs',verb_level=V_resp)
call it('f',defs,'ALLGexx', '[BSS] Use all Gexx when their FFT size is larger then the correlation part',verb_level=V_resp)
call it('f',defs,'ALLGexx', '[BSS] Force the use use all RL vectors for the exchange part',verb_level=V_resp)
call it('f',defs,'BSHayTer','[BSS] Terminate Haydock continuos fraction',verb_level=V_resp)
!
! F_xc
Expand Down

0 comments on commit 678098b

Please sign in to comment.