Changeset 2768

Timestamp:

Jan 23, 2017, 2:55:32 PM (8 years ago)

Author:

dcugnet

Message:

Fix a bug about limit.nc file checking.
The limit.nc number of days does not need to be checked every day ; it
is now checked only at the start of the run ; this avoids the gcm to
stop because of a mismatch between the file and model number of days
(in the case of an irregular calendar) on last day due to the fact
that the calendar is updated before the end of the day.

File:

• LMDZ5/trunk/libf/phylmd/limit_read_mod.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/limit_read_mod.F90

@@ -204 +204 @@
        END IF
 
-       first_call=.FALSE.
-    ENDIF
-  
-!****************************************************************************************
-! 1) Open the file limit.nc if it is the right moment to read, once a day.
-!    The file is read only by the master thread of the master mpi process(is_mpi_root)
-!    Check by the way if the number of records is correct.
-!
-!****************************************************************************************
-
-    is_modified = .FALSE.
-    IF (MOD(itime-1, lmt_pas) == 0 .OR. jour_lu /= jour ) THEN   ! time to read
-       jour_lu = jour
-       is_modified = .TRUE.
 !$OMP MASTER  ! Only master thread
        IF (is_mpi_root) THEN ! Only master processus
-
           ierr = NF90_OPEN ('limit.nc', NF90_NOWRITE, nid)
           IF (ierr /= NF90_NOERR) CALL abort_physic(modname,&
@@ -237 +222 @@
           ierr=NF90_INQUIRE(nid, UnlimitedDimID=ndimid)
           ierr=NF90_INQUIRE_DIMENSION(nid, ndimid, len=nn)
-          CALL num2str(nn,str)
-          abort_message='limit.nc records number ('//TRIM(str)//') does'//&
-            ' not match year length ('
-          CALL num2str(year_len,str)
-          abort_message=TRIM(abort_message)//TRIM(str)//')'
+          WRITE(abort_message,'(a,2(i0,a))')'limit.nc records number (',nn,') does no'//&
+            't match year length (',year_len,')'
           IF(nn/=year_len) CALL abort_physic(modname,abort_message,1)
 
@@ -247 +229 @@
           ierr=NF90_INQ_DIMID(nid, 'points_physiques', ndimid)
           ierr=NF90_INQUIRE_DIMENSION(nid, ndimid, len=nn)
-          CALL num2str(nn,str)
-          abort_message='limit.nc horizontal number of cells ('//TRIM(str)//') does'//&
-            ' not match LMDZ klon_glo ('
-          CALL num2str(klon_glo,str)
-          abort_message=TRIM(abort_message)//TRIM(str)//')'
+          WRITE(abort_message,'(a,2(i0,a))')'limit.nc horizontal number of cells (',nn, &
+            ') does not match LMDZ klon_glo (',klon_glo,')'
           IF(nn/=klon_glo) CALL abort_physic(modname,abort_message,1)
+
+          ierr = NF90_CLOSE(nid)
+          IF (ierr /= NF90_NOERR) CALL abort_physic(modname,'Pb when closing file', 1)
+          first_call=.FALSE.
+       END IF ! is_mpi_root
+!$OMP END MASTER
+!$OMP BARRIER
+    END IF
+
+!****************************************************************************************
+! 1) Open the file limit.nc if it is the right moment to read, once a day.
+!    The file is read only by the master thread of the master mpi process(is_mpi_root)
+!    Check by the way if the number of records is correct.
+!
+!****************************************************************************************
+
+    is_modified = .FALSE.
+    IF (MOD(itime-1, lmt_pas) == 0 .OR. jour_lu /= jour ) THEN   ! time to read
+       jour_lu = jour
+       is_modified = .TRUE.
+!$OMP MASTER  ! Only master thread
+       IF (is_mpi_root) THEN ! Only master processus
+
+          ierr = NF90_OPEN ('limit.nc', NF90_NOWRITE, nid)
+          IF (ierr /= NF90_NOERR) CALL abort_physic(modname,&
+               'Pb d''ouverture du fichier de conditions aux limites',1)
 
           ! La tranche de donnees a lire:
@@ -370 +375 @@
   END SUBROUTINE limit_read_tot
 
-  !--------------------------------------------------------------------------------------
-  SUBROUTINE num2str(n,str)
-  !--------------------------------------------------------------------------------------
-  ! Arguments:
-    INTEGER,           INTENT(IN)  :: n
-    CHARACTER(LEN=99), INTENT(OUT) :: str
-  !--------------------------------------------------------------------------------------
-  ! Local variables:
-    INTEGER :: nn
-  !--------------------------------------------------------------------------------------
-    nn=n; str=''; DO WHILE(nn>0); str=CHAR(nn-10*(nn/10)-48)//TRIM(str); nn=nn/10; END DO
-  END SUBROUTINE num2str
-  !--------------------------------------------------------------------------------------
-
 END MODULE limit_read_mod