From 590463063f9151693c4deb07b50f2dc86a61bc10 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 5 Mar 2024 15:37:09 +0100 Subject: [PATCH 1/2] Adapted trexio file for full path --- src/trexio/export_trexio.irp.f | 2 +- src/trexio/export_trexio_routines.irp.f | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/trexio/export_trexio.irp.f b/src/trexio/export_trexio.irp.f index f9ecc17f..ff12aebb 100644 --- a/src/trexio/export_trexio.irp.f +++ b/src/trexio/export_trexio.irp.f @@ -2,6 +2,6 @@ program export_trexio_prog implicit none read_wf = .True. SOFT_TOUCH read_wf - call export_trexio(.False.) + call export_trexio(.False.,.False.) end diff --git a/src/trexio/export_trexio_routines.irp.f b/src/trexio/export_trexio_routines.irp.f index f25ae370..034b142e 100644 --- a/src/trexio/export_trexio_routines.irp.f +++ b/src/trexio/export_trexio_routines.irp.f @@ -1,18 +1,28 @@ -subroutine export_trexio(update) +subroutine export_trexio(update,full_path) use trexio implicit none BEGIN_DOC ! Exports the wave function in TREXIO format END_DOC - logical, intent(in) :: update + logical, intent(in) :: update, full_path integer(trexio_t) :: f(N_states) ! TREXIO file handle integer(trexio_exit_code) :: rc - integer :: k + integer :: k, iunit double precision, allocatable :: factor(:) - character*(256) :: filenames(N_states) + character*(256) :: filenames(N_states), fp character :: rw + integer, external :: getunitandopen + + if (full_path) then + fp = trexio_filename + call system('realpath '//trim(fp)//' > '//trim(fp)//'.tmp') + iunit = getunitandopen(trim(fp)//'.tmp','r') + read(iunit,'(A)') trexio_filename + close(iunit, status='delete') + endif + filenames(1) = trexio_filename do k=2,N_states write(filenames(k),'(A,I3.3)') trim(trexio_filename)//'.', k-1 @@ -49,6 +59,8 @@ subroutine export_trexio(update) enddo call ezfio_set_trexio_trexio_file(trexio_filename) + + ! ------------------------------------------------------------------------------ ! Electrons From 92a3ecae45247bbf0d003aa71c416ceba1e6207b Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 5 Mar 2024 15:39:57 +0100 Subject: [PATCH 2/2] Fix propagation of error codes in qp command --- etc/qp.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/qp.rc b/etc/qp.rc index d316faf5..bd061e3e 100644 --- a/etc/qp.rc +++ b/etc/qp.rc @@ -120,7 +120,9 @@ function qp() if [[ $? -eq 0 ]] ; then COMMAND='qp_$@' eval "$COMMAND" "${EZFIO_FILE}" + result=$? unset COMMAND + return $result else _qp_usage fi