Changeset 11670 for NEMO/branches/2019/dev_r11613_ENHANCE-04_namelists_as_internalfiles/src/OCE

Timestamp:

2019-10-09T14:52:03+02:00 (5 years ago)

Author:

acc

Message:

Branch 2019/dev_r11613_ENHANCE-04_namelists_as_internalfiles. Final substantive change to enable this branch to work with AGRIF. Most changes have occurred on an AGRIF development branch: ^{/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif which is needed to make this work. Previous commit to this branch has set the svn:externals reference accordingly}

File:

• NEMO/branches/2019/dev_r11613_ENHANCE-04_namelists_as_internalfiles/src/OCE/LBC/lib_mpp.F90 (modified) (4 diffs)

NEMO/branches/2019/dev_r11613_ENHANCE-04_namelists_as_internalfiles/src/OCE/LBC/lib_mpp.F90

@@ -519 +519 @@
       call MPI_BCAST(kleng, 1, MPI_INT, 0, mpi_comm_oce, iflag)
       call MPI_BARRIER(mpi_comm_oce, iflag)
+!$AGRIF_DO_NOT_TREAT
       IF ( .NOT. ALLOCATED(cdnambuff) ) ALLOCATE( CHARACTER(LEN=kleng) :: cdnambuff )
+!$AGRIF_END_DO_NOT_TREAT
       call MPI_BCAST(cdnambuff, kleng, MPI_CHARACTER, 0, mpi_comm_oce, iflag)
       call MPI_BARRIER(mpi_comm_oce, iflag)
@@ -1311 +1313 @@
       INTEGER, INTENT(IN)                          :: kout
       LOGICAL, INTENT(IN)                          :: ldwp  !: .true. only for the root broadcaster
-      INTEGER                                      :: itot, iun, iltc, inl, ios
+      INTEGER                                      :: itot, iun, iltc, inl, ios, itotsav
       !
       ! Check if the namelist buffer has already been allocated. Return if it has.
@@ -1340 +1342 @@
          ! Allocate text cdnambuff for condensed namelist
          !
+!$AGRIF_DO_NOT_TREAT
          ALLOCATE( CHARACTER(LEN=itot) :: cdnambuff )
-         WRITE(*,*) 'ALLOCATED ', itot
+!$AGRIF_END_DO_NOT_TREAT
+         itotsav = itot
          !
          ! Second pass: read and transfer pruned characters into cdnambuff
@@ -1365 +1369 @@
      40  CONTINUE
          itot = itot - 1
-         WRITE(*,*) 'ASSIGNED ',itot
+         IF( itotsav .NE. itot ) WRITE(*,*) 'WARNING in load_nml. Allocated ',itotsav,' for read buffer; but used ',itot
          !
          ! Close namelist file