Skip to content

Fix hang bug by updating MPI bcast to be from 0 not IAPROC-1 + Restart configurable path debugging for global-workflow #1426

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

Merged
JessicaMeixner-NOAA merged 7 commits into from
May 27, 2025
Merged

Fix hang bug by updating MPI bcast to be from 0 not IAPROC-1 + Restart configurable path debugging for global-workflow #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8fa6da
restart configurable path debug
mingchen-NOAA Apr 30, 2025
a1a2b47
debug when PIO is not used
mingchen-NOAA May 1, 2025
55ef966
fix hang in wave model initialization
JessicaMeixner-NOAA May 8, 2025
a8ac39d
Merge remote-tracking branch 'EMC/dev/ufs-weather-model' into ufs_con…
mingchen-NOAA May 16, 2025
a969636
Merge remote-tracking branch 'EMC/dev/ufs-weather-model' into bug/ini…
JessicaMeixner-NOAA May 19, 2025
729f586
Merge remote-tracking branch 'MC/ufs_config_path_debug' into bug/init…
JessicaMeixner-NOAA May 20, 2025
430c157
ensure timetag variable has commas as some compilers warn about this
JessicaMeixner-NOAA May 22, 2025
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
6 changes: 3 additions & 3 deletions model/src/w3initmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,9 +969,9 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD, FLGR2, FLGD,
if (runtype == 'continue' )then
call set_user_timestring(time,user_timestring)
if (restart_from_binary) then
fname = trim(FNMRST)//trim(user_restfname)//trim(user_timestring)
fname = trim(user_restfname)//trim(user_timestring)
else
fname = trim(FNMRST)//trim(user_restfname)//trim(user_timestring)//'.nc'
fname = trim(user_restfname)//trim(user_timestring)//'.nc'
endif
inquire(file=trim(fname), exist=exists)
if (exists) then
Expand All @@ -986,7 +986,7 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD, FLGR2, FLGD,
else
if (restart_from_binary) then
call set_user_timestring(time,user_timestring)
fname = trim(FNMRST)//trim(user_restfname)//trim(user_timestring)
fname = trim(user_restfname)//trim(user_timestring)
inquire(file=trim(fname), exist=exists)
if (exists) then
call w3iors('READ', nds(6), sig(nk), imod, filename=trim(fname))
Expand Down
2 changes: 1 addition & 1 deletion model/src/w3iogomd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2781,7 +2781,7 @@ SUBROUTINE W3IOGO ( INXOUT, NDSOG, IOTST, IMOD &
J = LEN_TRIM(FNMPRE_LOCAL)
!
! Create TIMETAG for file name using YYYYMMDD.HHMMS prefix
WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2)
#ifdef W3_T
WRITE (NDST,9001) FNMPRE_LOCAL(:J)//TIMETAG//'.out_grd.'//FILEXT(:I)
#endif
Expand Down
14 changes: 7 additions & 7 deletions model/src/w3iopomd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,16 +607,16 @@ SUBROUTINE W3IOPP ( NPT, XPT, YPT, PNAMES, IMOD, MPI_COMM_IOPP )
! Broadcast weight info to all MPI tasks:

!First broadcast NOPTS, used in the next calls:
CALL MPI_BCAST(NOPTS,1,MPI_INTEGER,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
CALL MPI_BCAST(NOPTS,1,MPI_INTEGER,0,MPI_COMM_IOPP,IERR_MPI)
CALL MPI_Barrier(MPI_COMM_IOPP,IERR_MPI)

CALL MPI_BCAST(PTLOC,2*NPT,MPI_REAL,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
CALL MPI_BCAST(PTIFAC,4*NPT,MPI_REAL,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
CALL MPI_BCAST(IPTINT(:,:,1:NOPTS),2*4*NOPTS,MPI_INTEGER,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
CALL MPI_BCAST(PTLOC,2*NPT,MPI_REAL,0,MPI_COMM_IOPP,IERR_MPI)
CALL MPI_BCAST(PTIFAC,4*NPT,MPI_REAL,0,MPI_COMM_IOPP,IERR_MPI)
CALL MPI_BCAST(IPTINT(:,:,1:NOPTS),2*4*NOPTS,MPI_INTEGER,0,MPI_COMM_IOPP,IERR_MPI)

!Send point names individually
DO IPT=1, NOPTS
CALL MPI_BCAST(PTNME(IPT),40,MPI_CHARACTER,IAPROC-1,MPI_COMM_IOPP,IERR_MPI)
CALL MPI_BCAST(PTNME(IPT),40,MPI_CHARACTER,0,MPI_COMM_IOPP,IERR_MPI)
ENDDO

CALL MPI_Barrier(MPI_COMM_IOPP,IERR_MPI)
Expand Down Expand Up @@ -2013,7 +2013,7 @@ SUBROUTINE W3IOPON ( INXOUT, NDSOP, IOTST, IMOD, TOUT )

IF ( OFILES(2) .EQ. 1 ) THEN
! Create TIMETAG for file name using YYYYMMDD.HHMMS prefix
WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2)
filename = FNMPRE_LOCAL(:LEN_TRIM(FNMPRE_LOCAL))//TIMETAG//'.out_pnt.'//FILEXT(:LEN_TRIM(FILEXT))//'.nc'
FNAME = TIMETAG//'.out_pnt.'//FILEXT(:LEN_TRIM(FILEXT))
ELSE
Expand Down Expand Up @@ -2401,7 +2401,7 @@ SUBROUTINE W3IOPO ( INXOUT, NDSOP, IOTST, IMOD &
J = LEN_TRIM(FNMPRE_LOCAL)

! Create TIMETAG for file name using YYYYMMDD.HHMMS prefix
WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2)
!
#ifdef W3_T
WRITE (NDST,9001) FNMPRE_LOCAL(:J)//TIMETAG//'.out_pnt.'// &
Expand Down
2 changes: 1 addition & 1 deletion model/src/w3iorsmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ SUBROUTINE W3IORS ( INXOUT, NDSR, DUMFPI, IMOD, FLRSTRT , filename)
ITMP=0
IF ( PRESENT(FLRSTRT) ) THEN
IF (FLRSTRT) THEN
WRITE(TIMETAG,"(i8.8,'.'i6.6)")TIME(1),TIME(2)
WRITE(TIMETAG, '(i8.8, ".", i6.6)') TIME(1), TIME(2)
FNAME=TIMETAG//'.restart.'//FILEXT(:I)
ITMP=1
END IF
Expand Down
Loading