Changeset 7806 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

Timestamp:

2017-03-17T08:46:30+01:00 (7 years ago)

Author:

cbricaud

Message:

phaze dev_r5003_MERCATOR6_CRS branch with rev7805 of 3.6_stable branch

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90 (modified) (5 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

@@ -34 +34 @@
    USE trcstp          ! passive tracer time-stepping      (trc_stp routine)
    USE dtadyn          ! Lecture and interpolation of the dynamical fields
-   !              ! I/O & MPP
+   !                   ! I/O & MPP
    USE iom             ! I/O library
    USE in_out_manager  ! I/O manager
@@ -50 +50 @@
    USE trcnam
    USE trcrst
-   USE diaptr         ! Need to initialise this as some variables are used in if statements later
 
    IMPLICIT NONE
@@ -94 +93 @@
       istp = nit000
       ! 
-      CALL iom_init( cxios_context )            ! 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, "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
-                                CALL stp_ctl  ( istp, indic )  ! Time loop: control and print
+         IF( istp == nit000 )  CALL iom_init( cxios_context )            ! iom_put initialization
+         IF( istp /= nit000 )   CALL day        ( istp )         ! Calendar (day was already called at nit000 in day_init)
+                                CALL iom_setkt  ( istp - nit000 + 1, cxios_context )   ! say to iom that we are at time step kstp
+                                CALL trc_rst_opn( istp )         ! Open tracer                                !   restart file
+                                CALL dta_dyn    ( istp )         ! Interpolation of the dynamical fields
+                                CALL trc_stp    ( istp )         ! time-stepping
+         IF( lk_vvl )           CALL dta_dyn_swp( istp )         ! swap of sea surface height and vertical scale factors
+                                CALL stp_ctl    ( istp, indic )  ! Time loop: control and print
          istp = istp + 1
          IF( lk_mpp )   CALL mpp_max( nstop )
@@ -265 +265 @@
       IF( nn_timing == 1 )  CALL timing_start( 'nemo_init')
       !
-                            CALL     phy_cst    ! Physical constants
-                            CALL     eos_init   ! Equation of state
-      IF( lk_c1d        )   CALL     c1d_init   ! 1D column configuration
-                            CALL     dom_cfg    ! Domain configuration
+                            CALL  phy_cst    ! Physical constants
+                            CALL  eos_init   ! Equation of state
+      IF( lk_c1d        )   CALL  c1d_init   ! 1D column configuration
+                            CALL  dom_cfg    ! Domain configuration
+      !
       !
       INQUIRE( FILE='coordinates.nc', EXIST = llexist )   ! Check if coordinate file exist
       !
-      IF( llexist )  THEN  ;  CALL  dom_init   !  compute the grid from coordinates and bathymetry
-      ELSE                 ;  CALL  dom_rea    !  read grid from the meskmask
+      IF( llexist )  THEN ;  CALL  dom_init   !  compute the grid from coordinates and bathymetry
+      ELSE                ;  CALL  dom_rea    !  read grid from the meskmask
       ENDIF
                             CALL  istate_init   ! ocean initial state (Dynamics and tracers)
 
-      IF( ln_nnogather )    CALL nemo_northcomms   ! Initialise the northfold neighbour lists (must be done after the masks are defined)
-
-      IF( ln_ctl        )   CALL prt_ctl_init   ! Print control
+      IF( ln_nnogather )    CALL  nemo_northcomms   ! Initialise the northfold neighbour lists (must be done after the masks are defined)
+
+      IF( ln_ctl       )    CALL  prt_ctl_init   ! Print control
 
                             CALL     sbc_init   ! Forcings : surface module
@@ -289 +290 @@
 
                             CALL tra_qsr_init   ! penetrative solar radiation qsr
-      IF( lk_trabbl     )   CALL tra_bbl_init   ! advective (and/or diffusive) bottom boundary layer scheme
+      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
                             CALL trc_rst_cal( nit000, 'READ' )   ! calendar
                             CALL dta_dyn_init   ! Initialization for the dynamics
-
                             CALL     trc_init   ! Passive tracers initialization
-                            CALL dia_ptr_init   ! Initialise diaptr as some variables are used 
       !                                         ! in various advection and diffusion routines
       IF(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA