regtests build on ursa

Author: NickSzapiro-NOAA

model/src/SCRIP/scrip_remap_conservative.F

@@ -255,7 +255,7 @@ subroutine remap_conserv(l_master, l_test)
 #ifdef W3_SCRIPMPI
       USE WMMDATMD, ONLY: MPI_COMM_GRD
       USE W3ODATMD, ONLY: IAPROC, NTPROC
-      INCLUDE "mpif.h"
+      use mpi_f08
 #endif
       logical(SCRIP_Logical), intent(in) :: l_master   ! Am I the master
                                                    ! processor (do I/O)?
@@ -271,7 +271,7 @@ subroutine remap_conserv(l_master, l_test)
       integer (SCRIP_i4) :: IERR_MPI, IPROC, ratio
       integer (SCRIP_i4) :: j, ij, add1, add2, got_weight
       integer (SCRIP_i4) :: nlink, min_link, max_link
-      integer (SCRIP_i4), dimension(MPI_STATUS_SIZE) :: status
+      type(MPI_STATUS)   :: status
       integer (SCRIP_i4), dimension(:), allocatable :: Numlinks
       integer (SCRIP_i4), dimension(:), allocatable :: Asendi
       integer (SCRIP_i4), dimension(:), allocatable :: Arecv1

model/src/w3psmcmd.F90

@@ -3336,7 +3336,7 @@ SUBROUTINE W3GATHSMC ( ISPEC, FIELD )
     IF ( BSTAT(IBFLOC) .EQ. 2 ) THEN
       IOFF =  1 + (BISPL(IBFLOC)-1)*NRQSG2
       IF ( NRQSG2 .GT. 0 ) CALL                              &
-           MPI_WAITALL ( NRQSG2, IRQSG2(IOFF,2),             &
+           MPI_WAITALL ( NRQSG2, IRQSG2(IOFF:IOFF+NRQSG2-1,2),             &
            STATUS, IERR_MPI )
       BSTAT(IBFLOC) = 0
     END IF
@@ -3348,7 +3348,7 @@ SUBROUTINE W3GATHSMC ( ISPEC, FIELD )
       BISPL(IBFLOC) = ISPLOC
       IOFF =  1 + (ISPLOC-1)*NRQSG2
       IF ( NRQSG2 .GT. 0 ) CALL                              &
-           MPI_STARTALL ( NRQSG2, IRQSG2(IOFF,1), IERR_MPI )
+           MPI_STARTALL ( NRQSG2, IRQSG2(IOFF:IOFF+NRQSG2-1,1), IERR_MPI )
     END IF
     !
     ! 2.c Put local spectral densities in store
@@ -3361,7 +3361,7 @@ SUBROUTINE W3GATHSMC ( ISPEC, FIELD )
     !
     IOFF =  1 + (BISPL(IBFLOC)-1)*NRQSG2
     IF ( NRQSG2 .GT. 0 ) CALL                                  &
-         MPI_WAITALL ( NRQSG2, IRQSG2(IOFF,1), STATUS, IERR_MPI )
+         MPI_WAITALL ( NRQSG2, IRQSG2(IOFF:IOFF+NRQSG2-1,1), STATUS, IERR_MPI )
     !
     ! 2.e Convert storage array to field.
     !
@@ -3383,7 +3383,7 @@ SUBROUTINE W3GATHSMC ( ISPEC, FIELD )
         BISPL(IB0) = IS0
         IOFF       = 1 + (IS0-1)*NRQSG2
         IF ( NRQSG2 .GT. 0 ) CALL                            &
-             MPI_STARTALL ( NRQSG2, IRQSG2(IOFF,1), IERR_MPI )
+             MPI_STARTALL ( NRQSG2, IRQSG2(IOFF:IOFF+NRQSG2-1,1), IERR_MPI )
         NPST       = NPST + 1
       END IF
       IF ( NPST .GE. 2 ) EXIT
@@ -3569,7 +3569,7 @@ SUBROUTINE W3SCATSMC ( ISPEC, MAPSTA, FIELD )
     !
     IOFF   = 1 + (ISPLOC-1)*NRQSG2
     IF ( NRQSG2 .GT. 0 ) CALL                                  &
-         MPI_STARTALL ( NRQSG2, IRQSG2(IOFF,2), IERR_MPI )
+         MPI_STARTALL ( NRQSG2, IRQSG2(IOFF:IOFF+NRQSG2-1,2), IERR_MPI )
     BSTAT(IBFLOC) = 2
     !
     ! 2.d Save locally stored results
@@ -3589,13 +3589,13 @@ SUBROUTINE W3SCATSMC ( ISPEC, MAPSTA, FIELD )
       IF ( BSTAT(IB0) .EQ. 2 ) THEN
         IOFF   = 1 + (BISPL(IB0)-1)*NRQSG2
         IF ( NRQSG2 .GT. 0 ) THEN
-          CALL MPI_TESTALL ( NRQSG2, IRQSG2(IOFF,2), DONE,  &
+          CALL MPI_TESTALL ( NRQSG2, IRQSG2(IOFF:IOFF+NRQSG2-1,2), DONE,  &
                STATUS, IERR_MPI )
         ELSE
           DONE   = .TRUE.
         END IF
         IF ( DONE .AND. NRQSG2.GT.0 ) CALL                   &
-             MPI_WAITALL ( NRQSG2, IRQSG2(IOFF,2),       &
+             MPI_WAITALL ( NRQSG2, IRQSG2(IOFF:IOFF+NRQSG2-1,2),       &
              STATUS, IERR_MPI )
         IF ( DONE ) THEN
           BSTAT(IB0) = 0
@@ -3612,7 +3612,7 @@ SUBROUTINE W3SCATSMC ( ISPEC, MAPSTA, FIELD )
         IF ( BSTAT(IB0) .EQ. 2 ) THEN
           IOFF   = 1 + (BISPL(IB0)-1)*NRQSG2
           IF ( NRQSG2 .GT. 0 ) CALL                        &
-               MPI_WAITALL ( NRQSG2, IRQSG2(IOFF,2),       &
+               MPI_WAITALL ( NRQSG2, IRQSG2(IOFF:IOFF+NRQSG2-1,2),       &
                STATUS, IERR_MPI )
           BSTAT(IB0) = 0
         END IF