Changeset 12030 for NEMO/branches/2019/dev_r11943_MERGE_2019/src

Timestamp:

2019-12-02T17:34:26+01:00 (4 years ago)

Author:

acc

Message:

Branch 2019/dev_r11943_MERGE_2019. Work-around for Cray compiler which does not like new-lines in internal files used for namelist reads. This change alters new-lines to spaces which should work universally. The option to use new-lines can be reactivated manually in load_nml (lib_mpp.F90) if needed for future debugging. Also prevented attempts to write to a negative unit number in ctl_opn when calling argument is not set.

File:

• NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LBC/lib_mpp.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/LBC/lib_mpp.F90

@@ -1230 +1230 @@
          &  OPEN(UNIT=knum,FILE='NUL', FORM=cdform, ACCESS=cdacce, STATUS=cdstat                      , ERR=100, IOSTAT=iost )   
       IF( iost == 0 ) THEN
-         IF(ldwp) THEN
+         IF(ldwp .AND. kout > 0) THEN
             WRITE(kout,*) '     file   : ', TRIM(clfile),' open ok'
             WRITE(kout,*) '     unit   = ', knum
@@ -1309 +1309 @@
       CHARACTER(LEN=*), INTENT(IN )                :: cdnamfile
       CHARACTER(LEN=256)                           :: chline
+      CHARACTER(LEN=1)                             :: csp
       INTEGER, INTENT(IN)                          :: kout
       LOGICAL, INTENT(IN)                          :: ldwp  !: .true. only for the root broadcaster
       INTEGER                                      :: itot, iun, iltc, inl, ios, itotsav
+      !
+      !csp = NEW_LINE('A')
+      ! a new line character is the best seperator but some systems (e.g.Cray)
+      ! seem to terminate namelist reads from internal files early if they 
+      ! encounter new-lines. Use a single space for safety.
+      csp = ' '
       !
       ! Check if the namelist buffer has already been allocated. Return if it has.
@@ -1360 +1367 @@
           IF( inl.GT.0 .AND. LEN_TRIM( chline(1:inl) ).GT.0 ) THEN
              cdnambuff(itot:itot+inl-1) = chline(1:inl)
-             WRITE( cdnambuff(itot+inl:itot+inl), '(a)' ) NEW_LINE('A')
+             WRITE( cdnambuff(itot+inl:itot+inl), '(a)' ) csp
              itot = itot + inl + 1
           ENDIF