From 907f387f82d83011ee2f12c742ce3257ee58960f Mon Sep 17 00:00:00 2001
From: Paul Bartholomew
Date: Tue, 24 Jun 2025 15:56:28 +0100
Subject: [PATCH 1/3] Use gen_iodir_name to make the adios2/vtk location
format-porable
---
src/visu.f90 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/visu.f90 b/src/visu.f90
index 529393c3..e22ffad1 100644
--- a/src/visu.f90
+++ b/src/visu.f90
@@ -167,7 +167,7 @@ subroutine visu_ready ()
! Write the vtk.xml file
if (nrank.eq.0) then
- open(newunit=ioxml, file="./data.bp4/vtk.xml")
+ open(newunit=ioxml, file=gen_iodir_name//"/vtk.xml")
! Header for a uniform grid
write (ioxml, *) ''
From ec2c96f3892ded3311db6bd39efbd45ea2a12ce6 Mon Sep 17 00:00:00 2001
From: Paul Bartholomew
Date: Wed, 25 Jun 2025 13:53:48 +0100
Subject: [PATCH 2/3] Need to pass the base name of the directory we want the
VTK file in
---
src/visu.f90 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/visu.f90 b/src/visu.f90
index e22ffad1..cbe3b3d2 100644
--- a/src/visu.f90
+++ b/src/visu.f90
@@ -167,7 +167,7 @@ subroutine visu_ready ()
! Write the vtk.xml file
if (nrank.eq.0) then
- open(newunit=ioxml, file=gen_iodir_name//"/vtk.xml")
+ open(newunit=ioxml, file=gen_iodir_name("data", io_name)//"/vtk.xml")
! Header for a uniform grid
write (ioxml, *) ''
From f26446c671abfd6ecbd433a75a8e05ebac252484 Mon Sep 17 00:00:00 2001
From: cflag
Date: Wed, 25 Jun 2025 15:06:23 +0200
Subject: [PATCH 3/3] trim the output from gen_iodir_name to avoid a space any
space at the end
---
src/tools.f90 | 4 ++--
src/visu.f90 | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/tools.f90 b/src/tools.f90
index 68c83f5f..d438c824 100644
--- a/src/tools.f90
+++ b/src/tools.f90
@@ -1023,7 +1023,7 @@ subroutine rename(oldname, newname, opt_rank)
end if
if (nrank == exe_rank) then
- oldname_ext = gen_iodir_name(oldname, io_restart)
+ oldname_ext = trim(gen_iodir_name(oldname, io_restart))
inquire(file=oldname_ext, exist=exist)
if (exist) then
cmd = "mv "//oldname_ext//" "//newname
@@ -1124,7 +1124,7 @@ logical function validate_restart(refname, testname, opt_rank)
if (nrank == exe_rank) then
success = .true.
- testname_ext = gen_iodir_name(testname, io_restart)
+ testname_ext = trim(gen_iodir_name(testname, io_restart))
inquire(file=refname, size=refsize, exist=refexist)
inquire(file=testname_ext, size=testsize, exist=testexist)
diff --git a/src/visu.f90 b/src/visu.f90
index cbe3b3d2..1d865253 100644
--- a/src/visu.f90
+++ b/src/visu.f90
@@ -147,7 +147,7 @@ subroutine visu_ready ()
if (.not.outloc_init) then
if (irestart == 1) then
!! Restarting - is the output already available to write to?
- inquire(file=gen_iodir_name("data", io_name), exist=dir_exists)
+ inquire(file=trim(gen_iodir_name("data", io_name)), exist=dir_exists)
if (dir_exists) then
outloc_init = .true.
end if
@@ -167,7 +167,7 @@ subroutine visu_ready ()
! Write the vtk.xml file
if (nrank.eq.0) then
- open(newunit=ioxml, file=gen_iodir_name("data", io_name)//"/vtk.xml")
+ open(newunit=ioxml, file=trim(gen_iodir_name("data", io_name))//"/vtk.xml")
! Header for a uniform grid
write (ioxml, *) ''