Changeset 3244 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

Timestamp:

2012-01-04T11:31:09+01:00 (12 years ago)

Author:

cetlod

Message:

dev_NEMO_MERGE_2011 : Minor reorganisation of initialisation phase of TOP ; needed to get calendar information before the use of fldread

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -39 +39 @@
    PUBLIC   trc_rst_read      ! called by ???
    PUBLIC   trc_rst_wri       ! called by ???
+   PUBLIC   trc_rst_cal
 
    INTEGER, PUBLIC ::   numrtr, numrtw   !: logical unit for trc restart (read and write)
@@ -99 +100 @@
       !!----------------------------------------------------------------------
       INTEGER  ::  jn     
-      INTEGER  ::  jlibalt = jprstlib
-      LOGICAL  ::  llok
 
       !!----------------------------------------------------------------------
       !
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'trc_rst_read : read the TOP restart file'
+      IF(lwp) WRITE(numout,*) 'trc_rst_read : read data in the TOP restart file'
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
-
-      IF ( jprstlib == jprstdimg ) THEN
-        ! eventually read netcdf file (monobloc)  for restarting on different number of processors
-        ! if {cn_trcrst_in}.nc exists, then set jlibalt to jpnf90 
-        INQUIRE( FILE = TRIM(cn_trcrst_in)//'.nc', EXIST = llok )
-        IF ( llok ) THEN ; jlibalt = jpnf90  ; ELSE ; jlibalt = jprstlib ; ENDIF 
-      ENDIF
-
-      CALL iom_open( cn_trcrst_in, numrtr, kiolib = jlibalt ) 
-
-      ! Time domain : restart
-      ! ---------------------
-      CALL trc_rst_cal( nittrc000, 'READ' )   ! calendar
 
       ! READ prognostic variables and computes diagnostic variable
@@ -209 +195 @@
       CHARACTER(len=*), INTENT(in) ::   cdrw       ! "READ"/"WRITE" flag
       !
+      INTEGER  ::  jlibalt = jprstlib
+      LOGICAL  ::  llok
       REAL(wp) ::  zkt, zrdttrc1
       REAL(wp) ::  zndastp
@@ -216 +204 @@
 
       IF( TRIM(cdrw) == 'READ' ) THEN
+
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'trc_rst_cal : read the TOP restart file for calendar'
+         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
+
+         IF ( jprstlib == jprstdimg ) THEN
+           ! eventually read netcdf file (monobloc)  for restarting on different number of processors
+           ! if {cn_trcrst_in}.nc exists, then set jlibalt to jpnf90 
+           INQUIRE( FILE = TRIM(cn_trcrst_in)//'.nc', EXIST = llok )
+           IF ( llok ) THEN ; jlibalt = jpnf90  ; ELSE ; jlibalt = jprstlib ; ENDIF
+         ENDIF
+
+         CALL iom_open( cn_trcrst_in, numrtr, kiolib = jlibalt )
+
          CALL iom_get ( numrtr, 'kt', zkt )   ! last time-step of previous run
          IF(lwp) THEN