Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating stdout for output files written #257

Merged
merged 10 commits into from
Feb 21, 2023
Merged

Updating stdout for output files written #257

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d9fe912
Updating stdout for output files written
eirikurj Nov 11, 2022
6b5a984
Merge remote-tracking branch 'mdolab/main' into addStdoutWritingFiles
eirikurj Jan 18, 2023
2dd36ad
fix typo
eirikurj Jan 18, 2023
0f7cccf
more updates to stdout write
eirikurj Jan 18, 2023
1a20535
typo
eirikurj Jan 23, 2023
6717e68
more updates to stdout
eirikurj Jan 23, 2023
ad4d379
Merge branch 'main' into addStdoutWritingFiles
eirikurj Feb 8, 2023
489b05a
Merge branch 'main' into addStdoutWritingFiles
eirikurj Feb 15, 2023
28a5203
Merge branch 'main' into addStdoutWritingFiles
eirikurj Feb 20, 2023
8f1f91c
Merge remote-tracking branch 'mdolab/main' into addStdoutWritingFiles
eirikurj Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/output/tecplotIO.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,12 +312,12 @@ subroutine writeSlicesFile(fileName, nodalValues)

if(myID == 0 .and. printIterations) then
print "(a)", "#"
print "(a)", "# Writing slices file(s) ..."
print "(a)", "# Writing slices file(s): "
endif

do sps=1,nTimeIntervalsSpectral
do sps=1, nTimeIntervalsSpectral

! If it is time spectral we need to agument the filename
! If it is time spectral we need to augument the filename
eirikurj marked this conversation as resolved.
Show resolved Hide resolved
if (equationMode == timeSpectral) then
write(intString,"(i7)") sps
intString = adjustl(intString)
Expand All @@ -329,6 +329,8 @@ subroutine writeSlicesFile(fileName, nodalValues)
file = 11
! Open file on root proc:
if (myid == 0) then
! Print the filename to stdout
print "(a,4x,a)", "#", trim(fname)
open(unit=file, file=trim(fname))

! Write Header Information
Expand Down
6 changes: 4 additions & 2 deletions src/output/writeCGNSGrid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ subroutine writeCGNSGridFile

if(myID == 0 .and. printIterations) then
print "(a)", "#"
print "(a,a)", "# Writing grid file(s): ",trim(gridFileNames(1))
print "(a)", "# Writing grid file(s):"
endif

! All grid information is stored on all processors, with the
Expand Down Expand Up @@ -445,9 +445,11 @@ subroutine writeCGNSGridFrame(cgnsZone, ind)

type(cgnsBcDatasetType), pointer, dimension(:) :: dataSet

! Print the filename to stdout
print "(a,4x,a)", "#", trim(gridFileNames(ind))

! Open the CGNS file for writing and check if it went okay.
! Store the file index afterwards.

call cg_open_f(gridFileNames(ind), mode_write, cgnsInd, ierr)
if(ierr /= CG_OK) then
write(errorMessage,*) "File ", trim(gridfileNames(ind)), &
Expand Down
5 changes: 4 additions & 1 deletion src/output/writeCGNSSurface.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ subroutine writeCGNSSurfaceSol(famList)

if(myID == 0 .and. printIterations) then
print "(a)", "#"
print "(a,a)", "# Writing surface solution file(s): ", trim(surfSolFileNames(1))
print "(a)", "# Writing surface solution file(s):"
endif

! Allocate the memory for the fileIDs and the bases.
Expand All @@ -77,6 +77,9 @@ subroutine writeCGNSSurfaceSol(famList)

solLoop: do nn=1,nSurfSolToWrite

! Print the filename to stdout
print "(a,4x,a)", "#", trim(surfSolFileNames(nn))

! Open the cgns file for writing and check if it went okay.
! Store the file index for later purposes.
call cg_open_f(surfSolFileNames(nn), mode_write, cgnsInd, &
Expand Down
12 changes: 11 additions & 1 deletion src/output/writeCGNSVolume.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ subroutine writeCGNSVolumeSol

if(myID == 0 .and. printIterations) then
print "(a)", "#"
print "(a,a)", "# Writing volume solution file(s): ",trim(volSolFileNames(1))
print "(a)", "# Writing volume solution file(s):"
endif

! Open the CGNS file(s), the convergence info and if needed the
Expand Down Expand Up @@ -409,6 +409,9 @@ subroutine openCGNSVolumeSol

if(writeGrid .and. (.not. useLinksInCGNS)) then
do nn=1,nVolSolToWrite
! Print the filename to stdout
print "(a,4x,a)", "#", trim(volSolFileNames(nn))

call writeCGNSHeader(fileIDs(nn), cgnsBases(nn))
enddo

Expand All @@ -433,6 +436,10 @@ subroutine openCGNSVolumeSol
! that the files must be opened in write mode.

do nn=1,nVolSolToWrite
! Print the filename to stdout
print "(a,4x,a)", "#", trim(volSolFileNames(nn))

! Open the cgns file for writing and check if it went okay.
call cg_open_f(volSolFileNames(nn), mode_write, &
fileIDs(nn), ierr)
if(ierr /= CG_OK) then
Expand Down Expand Up @@ -460,6 +467,9 @@ subroutine openCGNSVolumeSol
! in modify mode.

do nn=1,nVolSolToWrite
! Print the filename to stdout
print "(a,4x,a)", "#", trim(volSolFileNames(nn))

call cg_open_f(volSolFileNames(nn), mode_modify, &
fileIDs(nn), ierr)
if(ierr /= CG_OK) then
Expand Down