Changeset 4152 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

Timestamp:

2013-11-05T12:59:53+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013 the 2nd development branch dev_r3940_CNRS4_IOCRS, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

@@ -47 +47 @@
    USE lib_fortran     ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
 
+   USE trc
+   USE trcnam
+   USE trcrst
+
    IMPLICIT NONE
    PRIVATE
@@ -89 +93 @@
       istp = nit000
       ! 
-      CALL iom_init            ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
+      CALL iom_init( "nemo" )            ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
       ! 
       DO WHILE ( istp <= nitend .AND. nstop == 0 )    ! time stepping
          !
          IF( istp /= nit000 )   CALL day      ( istp )         ! Calendar (day was already called at nit000 in day_init)
-                                CALL iom_setkt( istp - nit000 + 1 )         ! say to iom that we are at time step kstp
+                                CALL iom_setkt( istp - nit000 + 1, "nemo" )   ! say to iom that we are at time step kstp
                                 CALL dta_dyn  ( istp )         ! Interpolation of the dynamical fields
                                 CALL trc_stp  ( istp )         ! time-stepping
@@ -270 +274 @@
       IF( lk_trabbl     )   CALL tra_bbl_init   ! advective (and/or diffusive) bottom boundary layer scheme
 
+                            CALL trc_nam_run  ! Needed to get restart parameters for passive tracers
+      IF( ln_rsttr ) THEN
+        neuler = 1   ! Set time-step indicator at nit000 (leap-frog)
+        CALL trc_rst_cal( nit000, 'READ' )   ! calendar
+      ELSE
+        neuler = 0                  ! Set time-step indicator at nit000 (euler)
+        CALL day_init               ! set calendar
+      ENDIF
+      !                                     ! Dynamics
+                            CALL dta_dyn_init   ! Initialization for the dynamics
+
       !                                     ! Passive tracers
                             CALL     trc_init   ! Passive tracers initialization
-      !                                     ! Dynamics
-                            CALL dta_dyn_init   ! Initialization for the dynamics
 
       IF(lwp) WRITE(numout,cform_aaa)       ! Flag AAAAAAA
@@ -432 +445 @@
       ierr = ierr + zdf_oce_alloc   ()          ! ocean vertical physics
       !
-      ierr = ierr + lib_mpp_alloc   (numout)    ! mpp exchanges
       ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays
       !