trisurf-ng.git - Gitblit

parent: 04694fe0 | patch | commit | ignore whitespace

Fixes in a0 calculation and calculation of stretching energy in vertexmove

Samo Penic

2018-05-21 699ac44864e75549fb3d238d36f0bc1dd645ddac

Fixes in a0 calculation and calculation of stretching energy in vertexmove

5 files modified

	config.guess	137 ●●●●● patch \| view \| raw \| blame \| history
	config.sub	38 ●●●●● patch \| view \| raw \| blame \| history
	src/initial_distribution.c	2 ●●●●● patch \| view \| raw \| blame \| history
	src/restore.c	2 ●●●●● patch \| view \| raw \| blame \| history
	src/vertexmove.c	4 ●●●●● patch \| view \| raw \| blame \| history

 config.guess

@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
#   Copyright 1992-2016 Free Software Foundation, Inc.
#   Copyright 1992-2015 Free Software Foundation, Inc.

timestamp='2016-10-02'
timestamp='2015-08-20'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
# Please send patches to <config-patches@gnu.org>.

@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)

Originally written by Per Bothner.
Copyright 1992-2016 Free Software Foundation, Inc.
Copyright 1992-2015 Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -186,12 +186,9 @@
        *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
    esac
    # The Operating System including object format, if it has switched
    # to ELF recently (or will in the future) and ABI.
    # to ELF recently, or will in the future.
    case "${UNAME_MACHINE_ARCH}" in
        earm*)
        os=netbsdelf
        ;;
        arm*|i386|m68k|ns32k|sh3*|sparc|vax)
        arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
        eval $set_cc_for_build
        if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
            | grep -q __ELF__
@@ -240,10 +237,6 @@
    UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
    echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
    exit ;;
    *:LibertyBSD:*:*)
    UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
    echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
    exit ;;
    *:ekkoBSD:*:*)
    echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
    exit ;;
@@ -275,42 +268,42 @@
    ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
    case "$ALPHA_CPU_TYPE" in
        "EV4 (21064)")
        UNAME_MACHINE=alpha ;;
        UNAME_MACHINE="alpha" ;;
        "EV4.5 (21064)")
        UNAME_MACHINE=alpha ;;
        UNAME_MACHINE="alpha" ;;
        "LCA4 (21066/21068)")
        UNAME_MACHINE=alpha ;;
        UNAME_MACHINE="alpha" ;;
        "EV5 (21164)")
        UNAME_MACHINE=alphaev5 ;;
        UNAME_MACHINE="alphaev5" ;;
        "EV5.6 (21164A)")
        UNAME_MACHINE=alphaev56 ;;
        UNAME_MACHINE="alphaev56" ;;
        "EV5.6 (21164PC)")
        UNAME_MACHINE=alphapca56 ;;
        UNAME_MACHINE="alphapca56" ;;
        "EV5.7 (21164PC)")
        UNAME_MACHINE=alphapca57 ;;
        UNAME_MACHINE="alphapca57" ;;
        "EV6 (21264)")
        UNAME_MACHINE=alphaev6 ;;
        UNAME_MACHINE="alphaev6" ;;
        "EV6.7 (21264A)")
        UNAME_MACHINE=alphaev67 ;;
        UNAME_MACHINE="alphaev67" ;;
        "EV6.8CB (21264C)")
        UNAME_MACHINE=alphaev68 ;;
        UNAME_MACHINE="alphaev68" ;;
        "EV6.8AL (21264B)")
        UNAME_MACHINE=alphaev68 ;;
        UNAME_MACHINE="alphaev68" ;;
        "EV6.8CX (21264D)")
        UNAME_MACHINE=alphaev68 ;;
        UNAME_MACHINE="alphaev68" ;;
        "EV6.9A (21264/EV69A)")
        UNAME_MACHINE=alphaev69 ;;
        UNAME_MACHINE="alphaev69" ;;
        "EV7 (21364)")
        UNAME_MACHINE=alphaev7 ;;
        UNAME_MACHINE="alphaev7" ;;
        "EV7.9 (21364A)")
        UNAME_MACHINE=alphaev79 ;;
        UNAME_MACHINE="alphaev79" ;;
    esac
    # A Pn.n version is a patched version.
    # A Vn.n version is a released version.
    # A Tn.n version is a released field test version.
    # A Xn.n version is an unreleased experimental baselevel.
    # 1.2 uses "1.2" for uname -r.
    echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
    echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
    exitcode=$?
    trap '' 0
@@ -383,16 +376,16 @@
    exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
    eval $set_cc_for_build
    SUN_ARCH=i386
    SUN_ARCH="i386"
    # If there is a compiler, see if it is configured for 64-bit objects.
    # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
    # This test works for both compilers.
    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
        if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
        (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
        (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
        grep IS_64BIT_ARCH >/dev/null
        then
        SUN_ARCH=x86_64
        SUN_ARCH="x86_64"
        fi
    fi
    echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -417,7 +410,7 @@
    exit ;;
    sun*:*:4.2BSD:*)
    UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
    test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
    test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
    case "`/bin/arch`" in
        sun3)
        echo m68k-sun-sunos${UNAME_RELEASE}
@@ -642,13 +635,13 @@
            sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
            sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
            case "${sc_cpu_version}" in
              523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
              528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
              523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
              528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
              532)                      # CPU_PA_RISC2_0
            case "${sc_kernel_bits}" in
              32) HP_ARCH=hppa2.0n ;;
              64) HP_ARCH=hppa2.0w ;;
              '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
              32) HP_ARCH="hppa2.0n" ;;
              64) HP_ARCH="hppa2.0w" ;;
              '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
            esac ;;
            esac
        fi
@@ -687,11 +680,11 @@
            exit (0);
        }
EOF
            (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
            (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
            test -z "$HP_ARCH" && HP_ARCH=hppa
        fi ;;
    esac
    if [ ${HP_ARCH} = hppa2.0w ]
    if [ ${HP_ARCH} = "hppa2.0w" ]
    then
        eval $set_cc_for_build

@@ -704,12 +697,12 @@
        # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
        # => hppa64-hp-hpux11.23

        if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
        if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
        grep -q __LP64__
        then
        HP_ARCH=hppa2.0w
        HP_ARCH="hppa2.0w"
        else
        HP_ARCH=hppa64
        HP_ARCH="hppa64"
        fi
    fi
    echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -814,14 +807,14 @@
    echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    exit ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
    FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
    FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
    FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
    FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
    echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    exit ;;
    5000:UNIX_System_V:4.*:*)
    FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
    FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
    FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
    FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
    echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    exit ;;
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -903,7 +896,7 @@
    exit ;;
    *:GNU/*:*:*)
    # other systems with GNU libc and userland
    echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
    echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
    exit ;;
    i*86:Minix:*:*)
    echo ${UNAME_MACHINE}-pc-minix
@@ -926,7 +919,7 @@
      EV68*) UNAME_MACHINE=alphaev68 ;;
    esac
    objdump --private-headers /bin/sh | grep -q ld.so.1
    if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
    if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
    arc:Linux:*:* | arceb:Linux:*:*)
@@ -972,9 +965,6 @@
    ia64:Linux:*:*)
    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
    k1om:Linux:*:*)
    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
    m32r*:Linux:*:*)
    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
@@ -1000,9 +990,6 @@
    eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
    test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
    ;;
    mips64el:Linux:*:*)
    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
    openrisc*:Linux:*:*)
    echo or1k-unknown-linux-${LIBC}
    exit ;;
@@ -1034,9 +1021,6 @@
    exit ;;
    ppcle:Linux:*:*)
    echo powerpcle-unknown-linux-${LIBC}
    exit ;;
    riscv32:Linux:*:* | riscv64:Linux:*:*)
    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
    echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
@@ -1136,7 +1120,7 @@
    # uname -m prints for DJGPP always 'pc', but it prints nothing about
    # the processor, so we play safe by assuming i586.
    # Note: whatever this is, it MUST be the same as what config.sub
    # prints for the "djgpp" host, or else GDB configure will decide that
    # prints for the "djgpp" host, or else GDB configury will decide that
    # this is a cross-build.
    echo i586-pc-msdosdjgpp
    exit ;;
@@ -1285,9 +1269,6 @@
    SX-8R:SUPER-UX:*:*)
    echo sx8r-nec-superux${UNAME_RELEASE}
    exit ;;
    SX-ACE:SUPER-UX:*:*)
    echo sxace-nec-superux${UNAME_RELEASE}
    exit ;;
    Power*:Rhapsody:*:*)
    echo powerpc-apple-rhapsody${UNAME_RELEASE}
    exit ;;
@@ -1301,9 +1282,9 @@
        UNAME_PROCESSOR=powerpc
    fi
    if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
        if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
        if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
            (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
            (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
            grep IS_64BIT_ARCH >/dev/null
        then
            case $UNAME_PROCESSOR in
@@ -1325,7 +1306,7 @@
    exit ;;
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
    UNAME_PROCESSOR=`uname -p`
    if test "$UNAME_PROCESSOR" = x86; then
    if test "$UNAME_PROCESSOR" = "x86"; then
        UNAME_PROCESSOR=i386
        UNAME_MACHINE=pc
    fi
@@ -1356,7 +1337,7 @@
    # "uname -m" is not consistent, so use $cputype instead. 386
    # is converted to i386 for consistency with other x86
    # operating systems.
    if test "$cputype" = 386; then
    if test "$cputype" = "386"; then
        UNAME_MACHINE=i386
    else
        UNAME_MACHINE="$cputype"
@@ -1398,7 +1379,7 @@
    echo i386-pc-xenix
    exit ;;
    i*86:skyos:*:*)
    echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
    echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
    exit ;;
    i*86:rdos:*:*)
    echo ${UNAME_MACHINE}-pc-rdos
@@ -1409,25 +1390,23 @@
    x86_64:VMkernel:*:*)
    echo ${UNAME_MACHINE}-unknown-esx
    exit ;;
    amd64:Isilon\ OneFS:*:*)
    echo x86_64-unknown-onefs
    exit ;;
esac

cat >&2 <<EOF
$0: unable to guess system type

This script (version $timestamp), has failed to recognize the
operating system you are using. If your script is old, overwrite
config.guess and config.sub with the latest versions from:
This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from

  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

If $0 has already been updated, send the following data and any
information you think might be pertinent to config-patches@gnu.org to
provide the necessary information to handle your system.
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
pertinent to <config-patches@gnu.org> in order to provide the needed
information to handle your system.

config.guess timestamp = $timestamp


 config.sub

@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
#   Copyright 1992-2016 Free Software Foundation, Inc.
#   Copyright 1992-2015 Free Software Foundation, Inc.

timestamp='2016-11-04'
timestamp='2015-08-20'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
# Otherwise, we print the canonical config type on stdout and succeed.

# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -53,7 +53,8 @@
me=`echo "$0" | sed -e 's,.*/,,'`

usage="\
Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Usage: $0 [OPTION] CPU-MFR-OPSYS
       $0 [OPTION] ALIAS

Canonicalize a configuration name.

@@ -67,7 +68,7 @@
version="\
GNU config.sub ($timestamp)

Copyright 1992-2016 Free Software Foundation, Inc.
Copyright 1992-2015 Free Software Foundation, Inc.

This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +118,7 @@
  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
  kopensolaris*-gnu* | cloudabi*-eabi* | \
  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -301,7 +302,6 @@
    | open8 | or1k | or1knd | or32 \
    | pdp10 | pdp11 | pj | pjl \
    | powerpc | powerpc64 | powerpc64le | powerpcle \
    | pru \
    | pyramid \
    | riscv32 | riscv64 \
    | rl78 | rx \
@@ -429,7 +429,6 @@
    | orion-* \
    | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
    | pru-* \
    | pyramid-* \
    | riscv32-* | riscv64-* \
    | rl78-* | romp-* | rs6000-* | rx-* \
@@ -522,7 +521,7 @@
        basic_machine=i386-pc
        os=-aros
        ;;
    asmjs)
        asmjs)
        basic_machine=asmjs-unknown
        ;;
    aux)
@@ -644,14 +643,6 @@
    dpx2* | dpx2*-bull)
        basic_machine=m68k-bull
        os=-sysv3
        ;;
    e500v[12])
        basic_machine=powerpc-unknown
        os=$os"spe"
        ;;
    e500v[12]-*)
        basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
        os=$os"spe"
        ;;
    ebmon29k)
        basic_machine=a29k-amd
@@ -1032,7 +1023,7 @@
    ppc-* | ppcbe-*)
        basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
        ;;
    ppcle | powerpclittle)
    ppcle | powerpclittle | ppc-le | powerpc-little)
        basic_machine=powerpcle-unknown
        ;;
    ppcle-* | powerpclittle-*)
@@ -1042,7 +1033,7 @@
        ;;
    ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
        ;;
    ppc64le | powerpc64little)
    ppc64le | powerpc64little | ppc64-le | powerpc64-little)
        basic_machine=powerpc64le-unknown
        ;;
    ppc64le-* | powerpc64little-*)
@@ -1392,14 +1383,14 @@
          | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
          | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
          | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
          | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
          | -bitrig* | -openbsd* | -solidbsd* \
          | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
          | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
          | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
          | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
          | -chorusos* | -chorusrdb* | -cegcc* \
          | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
          | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
          | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
          | -linux-newlib* | -linux-musl* | -linux-uclibc* \
          | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
          | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1408,8 +1399,7 @@
          | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
          | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
          | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
          | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
          | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
          | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
    # Remember, each alternative MUST END IN *, to match a version number.
        ;;
    -qnx*)
@@ -1540,8 +1530,6 @@
        os=-dicos
        ;;
    -nacl*)
        ;;
    -ios)
        ;;
    -none)
        ;;

 src/initial_distribution.c

@@ -112,7 +112,7 @@
        vesicle->sphHarmonics=NULL;
    }

    vesicle->tlist->a0=sqrt(3)/2*pow((vesicle->tape->dmax+1.0)/2.0,2);  
    vesicle->tlist->a0=sqrt(3)/4*pow((vesicle->tape->dmax+1.0)/2.0,2);  
    return TS_SUCCESS;

}

 src/restore.c

@@ -88,7 +88,7 @@
    mean_curvature_and_energy(vesicle);
    sweep_attraction_bond_energy(vesicle);
    if(vesicle->tape->stretchswitch==1){
        vesicle->tlist->a0=sqrt(3)/2.0*pow((vesicle->tape->dmax+1.0)/2.0,2);  
        vesicle->tlist->a0=sqrt(3)/4.0*pow((vesicle->tape->dmax+1.0)/2.0,2);  
        for(i=0;i<vesicle->tlist->n;i++){
            stretchenergy(vesicle, vesicle->tlist->tria[i]);
        }

 src/vertexmove.c

@@ -115,7 +115,7 @@
    }
    //stretching energy 1 of 3
    if(vesicle->tape->stretchswitch==1){
        for(i=0;i<vtx->tristar_no;i++) dstretchenergy-=vtx->tristar[i]->energy/3.0;
        for(i=0;i<vtx->tristar_no;i++) dstretchenergy-=vtx->tristar[i]->energy;
    }
    delta_energy=0;
    
@@ -199,7 +199,7 @@
    if(vesicle->tape->stretchswitch==1){
        for(i=0;i<vtx->tristar_no;i++){ 
            stretchenergy(vesicle, vtx->tristar[i]);
            dstretchenergy+=vtx->tristar[i]->energy/3.0;
            dstretchenergy+=vtx->tristar[i]->energy;
            }
    }

			@@ -1,8 +1,8 @@
			#! /bin/sh
			# Attempt to guess a canonical system name.
			# Copyright 1992-2016 Free Software Foundation, Inc.
			# Copyright 1992-2015 Free Software Foundation, Inc.

			timestamp='2016-10-02'
			timestamp='2015-08-20'

			# This file is free software; you can redistribute it and/or modify it
			# under the terms of the GNU General Public License as published by
			@@ -27,7 +27,7 @@
			# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
			#
			# You can get the latest version of this script from:
			# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
			# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
			#
			# Please send patches to <config-patches@gnu.org>.

			@@ -50,7 +50,7 @@
			GNU config.guess ($timestamp)

			Originally written by Per Bothner.
			Copyright 1992-2016 Free Software Foundation, Inc.
			Copyright 1992-2015 Free Software Foundation, Inc.

			This is free software; see the source for copying conditions. There is NO
			warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
			@@ -186,12 +186,9 @@
			*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
			esac
			# The Operating System including object format, if it has switched
			# to ELF recently (or will in the future) and ABI.
			# to ELF recently, or will in the future.
			case "${UNAME_MACHINE_ARCH}" in
			earm*)
			os=netbsdelf
			;;
			arm\|i386\|m68k\|ns32k\|sh3\|sparc\|vax)
			arm\|earm\|i386\|m68k\|ns32k\|sh3*\|sparc\|vax)
			eval $set_cc_for_build
			if echo __ELF__ \| $CC_FOR_BUILD -E - 2>/dev/null \
			\| grep -q __ELF__
			@@ -240,10 +237,6 @@
			UNAME_MACHINE_ARCH=`arch \| sed 's/OpenBSD.//'`
			echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
			exit ;;
			:LibertyBSD::*)
			UNAME_MACHINE_ARCH=`arch \| sed 's/^.*BSD\.//'`
			echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
			exit ;;
			:ekkoBSD::*)
			echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
			exit ;;
			@@ -275,42 +268,42 @@
			ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v \| sed -n -e 's/^ The alpha \(.\) processor.$/\1/p' \| head -n 1`
			case "$ALPHA_CPU_TYPE" in
			"EV4 (21064)")
			UNAME_MACHINE=alpha ;;
			UNAME_MACHINE="alpha" ;;
			"EV4.5 (21064)")
			UNAME_MACHINE=alpha ;;
			UNAME_MACHINE="alpha" ;;
			"LCA4 (21066/21068)")
			UNAME_MACHINE=alpha ;;
			UNAME_MACHINE="alpha" ;;
			"EV5 (21164)")
			UNAME_MACHINE=alphaev5 ;;
			UNAME_MACHINE="alphaev5" ;;
			"EV5.6 (21164A)")
			UNAME_MACHINE=alphaev56 ;;
			UNAME_MACHINE="alphaev56" ;;
			"EV5.6 (21164PC)")
			UNAME_MACHINE=alphapca56 ;;
			UNAME_MACHINE="alphapca56" ;;
			"EV5.7 (21164PC)")
			UNAME_MACHINE=alphapca57 ;;
			UNAME_MACHINE="alphapca57" ;;
			"EV6 (21264)")
			UNAME_MACHINE=alphaev6 ;;
			UNAME_MACHINE="alphaev6" ;;
			"EV6.7 (21264A)")
			UNAME_MACHINE=alphaev67 ;;
			UNAME_MACHINE="alphaev67" ;;
			"EV6.8CB (21264C)")
			UNAME_MACHINE=alphaev68 ;;
			UNAME_MACHINE="alphaev68" ;;
			"EV6.8AL (21264B)")
			UNAME_MACHINE=alphaev68 ;;
			UNAME_MACHINE="alphaev68" ;;
			"EV6.8CX (21264D)")
			UNAME_MACHINE=alphaev68 ;;
			UNAME_MACHINE="alphaev68" ;;
			"EV6.9A (21264/EV69A)")
			UNAME_MACHINE=alphaev69 ;;
			UNAME_MACHINE="alphaev69" ;;
			"EV7 (21364)")
			UNAME_MACHINE=alphaev7 ;;
			UNAME_MACHINE="alphaev7" ;;
			"EV7.9 (21364A)")
			UNAME_MACHINE=alphaev79 ;;
			UNAME_MACHINE="alphaev79" ;;
			esac
			# A Pn.n version is a patched version.
			# A Vn.n version is a released version.
			# A Tn.n version is a released field test version.
			# A Xn.n version is an unreleased experimental baselevel.
			# 1.2 uses "1.2" for uname -r.
			echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} \| sed -e 's/^[PVTX]//' \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
			echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} \| sed -e 's/^[PVTX]//' \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
			# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
			exitcode=$?
			trap '' 0
			@@ -383,16 +376,16 @@
			exit ;;
			i86pc:SunOS:5.: \| i86xen:SunOS:5.:)
			eval $set_cc_for_build
			SUN_ARCH=i386
			SUN_ARCH="i386"
			# If there is a compiler, see if it is configured for 64-bit objects.
			# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
			# This test works for both compilers.
			if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
			if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
			if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') \| \
			(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
			(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) \| \
			grep IS_64BIT_ARCH >/dev/null
			then
			SUN_ARCH=x86_64
			SUN_ARCH="x86_64"
			fi
			fi
			echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
			@@ -417,7 +410,7 @@
			exit ;;
			sun::4.2BSD:*)
			UNAME_RELEASE=`(sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null`
			test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
			test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
			case "`/bin/arch`" in
			sun3)
			echo m68k-sun-sunos${UNAME_RELEASE}
			@@ -642,13 +635,13 @@
			sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
			sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
			case "${sc_cpu_version}" in
			523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
			528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
			523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
			528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
			532) # CPU_PA_RISC2_0
			case "${sc_kernel_bits}" in
			32) HP_ARCH=hppa2.0n ;;
			64) HP_ARCH=hppa2.0w ;;
			'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
			32) HP_ARCH="hppa2.0n" ;;
			64) HP_ARCH="hppa2.0w" ;;
			'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
			esac ;;
			esac
			fi
			@@ -687,11 +680,11 @@
			exit (0);
			}
			EOF
			(CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
			(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
			test -z "$HP_ARCH" && HP_ARCH=hppa
			fi ;;
			esac
			if [ ${HP_ARCH} = hppa2.0w ]
			if [ ${HP_ARCH} = "hppa2.0w" ]
			then
			eval $set_cc_for_build

			@@ -704,12 +697,12 @@
			# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
			# => hppa64-hp-hpux11.23

			if echo __LP64__ \| (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \|
			if echo __LP64__ \| (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) \|
			grep -q __LP64__
			then
			HP_ARCH=hppa2.0w
			HP_ARCH="hppa2.0w"
			else
			HP_ARCH=hppa64
			HP_ARCH="hppa64"
			fi
			fi
			echo ${HP_ARCH}-hp-hpux${HPUX_REV}
			@@ -814,14 +807,14 @@
			echo craynv-cray-unicosmp${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
			exit ;;
			F30[01]:UNIX_System_V:: \| F700:UNIX_System_V::)
			FUJITSU_PROC=`uname -m \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
			FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
			FUJITSU_PROC=`uname -m \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
			FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'`
			FUJITSU_REL=`echo ${UNAME_RELEASE} \| sed -e 's/ /_/'`
			echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
			exit ;;
			5000:UNIX_System_V:4.:)
			FUJITSU_SYS=`uname -p \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/\///'`
			FUJITSU_REL=`echo ${UNAME_RELEASE} \| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz \| sed -e 's/ /_/'`
			FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'`
			FUJITSU_REL=`echo ${UNAME_RELEASE} \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/ /_/'`
			echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
			exit ;;
			i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::*)
			@@ -903,7 +896,7 @@
			exit ;;
			:GNU/::)
			# other systems with GNU libc and userland
			echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} \| sed 's,^[^/]/,,' \| tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}\|sed -e 's/[-(].//'`-${LIBC}
			echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} \| sed 's,^[^/]/,,' \| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}\|sed -e 's/[-(].//'`-${LIBC}
			exit ;;
			i86:Minix::*)
			echo ${UNAME_MACHINE}-pc-minix
			@@ -926,7 +919,7 @@
			EV68*) UNAME_MACHINE=alphaev68 ;;
			esac
			objdump --private-headers /bin/sh \| grep -q ld.so.1
			if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
			if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
			echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
			exit ;;
			arc:Linux:: \| arceb:Linux::)
			@@ -972,9 +965,6 @@
			ia64:Linux::)
			echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
			exit ;;
			k1om:Linux::)
			echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
			exit ;;
			m32r:Linux::*)
			echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
			exit ;;
			@@ -1000,9 +990,6 @@
			eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| grep '^CPU'`
			test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
			;;
			mips64el:Linux::)
			echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
			exit ;;
			openrisc:Linux::*)
			echo or1k-unknown-linux-${LIBC}
			exit ;;
			@@ -1034,9 +1021,6 @@
			exit ;;
			ppcle:Linux::)
			echo powerpcle-unknown-linux-${LIBC}
			exit ;;
			riscv32:Linux:: \| riscv64:Linux::)
			echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
			exit ;;
			s390:Linux:: \| s390x:Linux::)
			echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
			@@ -1136,7 +1120,7 @@
			# uname -m prints for DJGPP always 'pc', but it prints nothing about
			# the processor, so we play safe by assuming i586.
			# Note: whatever this is, it MUST be the same as what config.sub
			# prints for the "djgpp" host, or else GDB configure will decide that
			# prints for the "djgpp" host, or else GDB configury will decide that
			# this is a cross-build.
			echo i586-pc-msdosdjgpp
			exit ;;
			@@ -1285,9 +1269,6 @@
			SX-8R:SUPER-UX::)
			echo sx8r-nec-superux${UNAME_RELEASE}
			exit ;;
			SX-ACE:SUPER-UX::)
			echo sxace-nec-superux${UNAME_RELEASE}
			exit ;;
			Power:Rhapsody::*)
			echo powerpc-apple-rhapsody${UNAME_RELEASE}
			exit ;;
			@@ -1301,9 +1282,9 @@
			UNAME_PROCESSOR=powerpc
			fi
			if test `echo "$UNAME_RELEASE" \| sed -e 's/\..*//'` -le 10 ; then
			if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
			if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
			if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') \| \
			(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) \| \
			(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) \| \
			grep IS_64BIT_ARCH >/dev/null
			then
			case $UNAME_PROCESSOR in
			@@ -1325,7 +1306,7 @@
			exit ;;
			:procnto:: \| :QNX:[0123456789]:*)
			UNAME_PROCESSOR=`uname -p`
			if test "$UNAME_PROCESSOR" = x86; then
			if test "$UNAME_PROCESSOR" = "x86"; then
			UNAME_PROCESSOR=i386
			UNAME_MACHINE=pc
			fi
			@@ -1356,7 +1337,7 @@
			# "uname -m" is not consistent, so use $cputype instead. 386
			# is converted to i386 for consistency with other x86
			# operating systems.
			if test "$cputype" = 386; then
			if test "$cputype" = "386"; then
			UNAME_MACHINE=i386
			else
			UNAME_MACHINE="$cputype"
			@@ -1398,7 +1379,7 @@
			echo i386-pc-xenix
			exit ;;
			i86:skyos::*)
			echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} \| sed -e 's/ .*$//'`
			echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` \| sed -e 's/ .*$//'
			exit ;;
			i86:rdos::*)
			echo ${UNAME_MACHINE}-pc-rdos
			@@ -1409,25 +1390,23 @@
			x86_64:VMkernel::)
			echo ${UNAME_MACHINE}-unknown-esx
			exit ;;
			amd64:Isilon\ OneFS::)
			echo x86_64-unknown-onefs
			exit ;;
			esac

			cat >&2 <<EOF
			$0: unable to guess system type

			This script (version $timestamp), has failed to recognize the
			operating system you are using. If your script is old, overwrite
			config.guess and config.sub with the latest versions from:
			This script, last modified $timestamp, has failed to recognize
			the operating system you are using. It is advised that you
			download the most up to date version of the config scripts from

			http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
			http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
			and
			http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
			http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

			If $0 has already been updated, send the following data and any
			information you think might be pertinent to config-patches@gnu.org to
			provide the necessary information to handle your system.
			If the version you run ($0) is already up to date, please
			send the following data and any information you think might be
			pertinent to <config-patches@gnu.org> in order to provide the needed
			information to handle your system.

			config.guess timestamp = $timestamp

			@@ -1,8 +1,8 @@
			#! /bin/sh
			# Configuration validation subroutine script.
			# Copyright 1992-2016 Free Software Foundation, Inc.
			# Copyright 1992-2015 Free Software Foundation, Inc.

			timestamp='2016-11-04'
			timestamp='2015-08-20'

			# This file is free software; you can redistribute it and/or modify it
			# under the terms of the GNU General Public License as published by
			@@ -33,7 +33,7 @@
			# Otherwise, we print the canonical config type on stdout and succeed.

			# You can get the latest version of this script from:
			# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
			# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

			# This file is supposed to be the same for all GNU packages
			# and recognize all the CPU types, system types and aliases
			@@ -53,7 +53,8 @@
			me=`echo "$0" \| sed -e 's,.*/,,'`

			usage="\
			Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
			Usage: $0 [OPTION] CPU-MFR-OPSYS
			$0 [OPTION] ALIAS

			Canonicalize a configuration name.

			@@ -67,7 +68,7 @@
			version="\
			GNU config.sub ($timestamp)

			Copyright 1992-2016 Free Software Foundation, Inc.
			Copyright 1992-2015 Free Software Foundation, Inc.

			This is free software; see the source for copying conditions. There is NO
			warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
			@@ -117,7 +118,7 @@
			nto-qnx* \| linux-gnu* \| linux-android* \| linux-dietlibc \| linux-newlib* \| \
			linux-musl* \| linux-uclibc* \| uclinux-uclibc* \| uclinux-gnu* \| kfreebsd-gnu \| \
			knetbsd-gnu \| netbsd-gnu \| netbsd-eabi \| \
			kopensolaris-gnu \| cloudabi-eabi \| \
			kopensolaris-gnu \| \
			storm-chaos* \| os2-emx* \| rtmk-nova*)
			os=-$maybe_os
			basic_machine=`echo $1 \| sed 's/^\(.\)-\([^-]-[^-]*\)$/\1/'`
			@@ -301,7 +302,6 @@
			\| open8 \| or1k \| or1knd \| or32 \
			\| pdp10 \| pdp11 \| pj \| pjl \
			\| powerpc \| powerpc64 \| powerpc64le \| powerpcle \
			\| pru \
			\| pyramid \
			\| riscv32 \| riscv64 \
			\| rl78 \| rx \
			@@ -429,7 +429,6 @@
			\| orion-* \
			\| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \
			\| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \
			\| pru-* \
			\| pyramid-* \
			\| riscv32-* \| riscv64-* \
			\| rl78-* \| romp-* \| rs6000-* \| rx-* \
			@@ -522,7 +521,7 @@
			basic_machine=i386-pc
			os=-aros
			;;
			asmjs)
			asmjs)
			basic_machine=asmjs-unknown
			;;
			aux)
			@@ -644,14 +643,6 @@
			dpx2* \| dpx2*-bull)
			basic_machine=m68k-bull
			os=-sysv3
			;;
			e500v[12])
			basic_machine=powerpc-unknown
			os=$os"spe"
			;;
			e500v[12]-*)
			basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]*-//'`
			os=$os"spe"
			;;
			ebmon29k)
			basic_machine=a29k-amd
			@@ -1032,7 +1023,7 @@
			ppc-* \| ppcbe-*)
			basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]*-//'`
			;;
			ppcle \| powerpclittle)
			ppcle \| powerpclittle \| ppc-le \| powerpc-little)
			basic_machine=powerpcle-unknown
			;;
			ppcle-* \| powerpclittle-*)
			@@ -1042,7 +1033,7 @@
			;;
			ppc64-) basic_machine=powerpc64-`echo $basic_machine \| sed 's/^[^-]-//'`
			;;
			ppc64le \| powerpc64little)
			ppc64le \| powerpc64little \| ppc64-le \| powerpc64-little)
			basic_machine=powerpc64le-unknown
			;;
			ppc64le-* \| powerpc64little-*)
			@@ -1392,14 +1383,14 @@
			\| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \
			\| -clix* \| -riscos* \| -uniplus* \| -iris* \| -rtu* \| -xenix* \
			\| -hiux* \| -386bsd* \| -knetbsd* \| -mirbsd* \| -netbsd* \
			\| -bitrig* \| -openbsd* \| -solidbsd* \| -libertybsd* \
			\| -bitrig* \| -openbsd* \| -solidbsd* \
			\| -ekkobsd* \| -kfreebsd* \| -freebsd* \| -riscix* \| -lynxos* \
			\| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
			\| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
			\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
			\| -chorusos* \| -chorusrdb* \| -cegcc* \
			\| -cygwin* \| -msys* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
			\| -midipix* \| -mingw32* \| -mingw64* \| -linux-gnu* \| -linux-android* \
			\| -mingw32* \| -mingw64* \| -linux-gnu* \| -linux-android* \
			\| -linux-newlib* \| -linux-musl* \| -linux-uclibc* \
			\| -uxpv* \| -beos* \| -mpeix* \| -udk* \| -moxiebox* \
			\| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \
			@@ -1408,8 +1399,7 @@
			\| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \
			\| -morphos* \| -superux* \| -rtmk* \| -rtmk-nova* \| -windiss* \
			\| -powermax* \| -dnix* \| -nx6 \| -nx7 \| -sei* \| -dragonfly* \
			\| -skyos* \| -haiku* \| -rdos* \| -toppers* \| -drops* \| -es* \
			\| -onefs* \| -tirtos* \| -phoenix* \| -fuchsia*)
			\| -skyos* \| -haiku* \| -rdos* \| -toppers* \| -drops* \| -es* \| -tirtos*)
			# Remember, each alternative MUST END IN *, to match a version number.
			;;
			-qnx*)
			@@ -1540,8 +1530,6 @@
			os=-dicos
			;;
			-nacl*)
			;;
			-ios)
			;;
			-none)
			;;

			@@ -112,7 +112,7 @@
			vesicle->sphHarmonics=NULL;
			}

			vesicle->tlist->a0=sqrt(3)/2*pow((vesicle->tape->dmax+1.0)/2.0,2);
			vesicle->tlist->a0=sqrt(3)/4*pow((vesicle->tape->dmax+1.0)/2.0,2);
			return TS_SUCCESS;

			}

			@@ -88,7 +88,7 @@
			mean_curvature_and_energy(vesicle);
			sweep_attraction_bond_energy(vesicle);
			if(vesicle->tape->stretchswitch==1){
			vesicle->tlist->a0=sqrt(3)/2.0*pow((vesicle->tape->dmax+1.0)/2.0,2);
			vesicle->tlist->a0=sqrt(3)/4.0*pow((vesicle->tape->dmax+1.0)/2.0,2);
			for(i=0;i<vesicle->tlist->n;i++){
			stretchenergy(vesicle, vesicle->tlist->tria[i]);
			}

			@@ -115,7 +115,7 @@
			}
			//stretching energy 1 of 3
			if(vesicle->tape->stretchswitch==1){
			for(i=0;i<vtx->tristar_no;i++) dstretchenergy-=vtx->tristar[i]->energy/3.0;
			for(i=0;i<vtx->tristar_no;i++) dstretchenergy-=vtx->tristar[i]->energy;
			}
			delta_energy=0;

			@@ -199,7 +199,7 @@
			if(vesicle->tape->stretchswitch==1){
			for(i=0;i<vtx->tristar_no;i++){
			stretchenergy(vesicle, vtx->tristar[i]);
			dstretchenergy+=vtx->tristar[i]->energy/3.0;
			dstretchenergy+=vtx->tristar[i]->energy;
			}
			}