From 6ea1b64731132eb5ad928971772d4ad2983a400b Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Wed, 24 Apr 2024 10:54:31 -0400 Subject: [PATCH] remove symlink kludge for long paths --- gibuu/gibuu | 9 +++------ gibuu/patches/input.patch | 11 ----------- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 gibuu/patches/input.patch diff --git a/gibuu/gibuu b/gibuu/gibuu index 5ff5aaa..fea1d31 100755 --- a/gibuu/gibuu +++ b/gibuu/gibuu @@ -4,7 +4,7 @@ import os.path config_template = os.path.abspath(os.getenv('GIBUU','.')+'/gibuu_template.opt') gibuu_executable = os.path.abspath(os.getenv('GIBUU','.')+'/release/objects/GiBUU.x') gibuu_converter = os.path.abspath(os.getenv('GIBUU','.')+'/gibuu2lund') -buu_directory = os.path.abspath('./buuinput') +buu_directory = os.path.abspath(os.getenv('GIBUU','.')+'/buuinput') from argparse import Namespace target_choices = { @@ -43,11 +43,8 @@ if not os.path.isfile(gibuu_executable): cli.error('Could not find GiBUU.x executable at $GIBUU or .') if not os.path.isfile(gibuu_converter): cli.error('Could not find gibuu2lund executable at $GIBUU or .') -if os.getenv('GIBUU') is not None: - if os.path.exists('./buuinput'): - print('WARNING: Using existing local ./buuinput') - else: - os.symlink(os.getenv('GIBUU')+'/buuinput','./buuinput') +if not os.path.isdir(buu_directory): + cli.error('Could not find buuinput directory at $GIBUU or .') args = cli.parse_args(sys.argv[1:]) diff --git a/gibuu/patches/input.patch b/gibuu/patches/input.patch deleted file mode 100644 index 0499e37..0000000 --- a/gibuu/patches/input.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- release/code/inputOutput/inputGeneral.f90 2024-04-22 10:58:19.157038516 -0400 -+++ release/code/inputOutput/inputGeneral.f90 2024-04-22 11:06:12.803677657 -0400 -@@ -581,7 +581,7 @@ - - subroutine ExpandPath(p) - character(len=*),intent(inout) :: p -- character(len=100) :: home -+ character(len=512) :: home - integer :: stat - - if (p(1:1)/='~') return