Changeset 1291 for trunk/NEMO/OFF_SRC/opa.F90

Timestamp:

2009-02-03T15:22:22+01:00 (15 years ago)

Author:

cetlod

Message:

update modules, see ticket:320

File:

• trunk/NEMO/OFF_SRC/opa.F90 (modified) (5 diffs)

trunk/NEMO/OFF_SRC/opa.F90

@@ -20 +20 @@
    USE istate          ! initial state setting          (istate_init routine)
    USE eosbn2          ! equation of state            (eos bn2 routine)
-   USE zpshde          ! partial step: hor. derivative (zps_hde routine)
 
    ! ocean physics
@@ -130 +129 @@
       ENDIF
 
-
       !                                     ! ============================== !
       !                                     !  Model general initialization  !
@@ -138 +136 @@
 
                                             ! Domain decomposition
-      IF( jpni*jpnj == jpnij ) THEN
+      IF( jpni * jpnj == jpnij ) THEN
          CALL mpp_init                          ! standard cutting out
       ELSE
@@ -147 +145 @@
 
       CALL dom_cfg                          ! Domain configuration
-      
+
       CALL dom_init                         ! Domain
 
-      CALL day( nit000 )                    ! Calendar
+      CALL istate_init                      ! ocean initial state (Dynamics and tracers)
 
-      CALL istate_init                      ! ocean initial state (Dynamics and tracers)
-!!add
-                       CALL eos( tn, sn, rhd, rhop )        ! before potential and in situ densities
+      CALL trc_ini                           ! Passive tracers
 
-                       CALL bn2( tn, sn, rn2 )              ! before Brunt-Vaisala frequency
+      CALL day_init                          ! Calendar
 
-      IF( ln_zps    )   CALL zps_hde( nit000, tn, sn, rhd,  &  ! Partial steps: before Horizontal DErivative
-                                          gtu, gsu, gru, &  ! of t, s, rd at the bottom ocean level
-                                          gtv, gsv, grv )
-
-!!add
-
-      ! Initialization for the dynamics
-      !
-      CALL dta_dyn(nit000)     
-
-#if defined key_top
-      CALL trc_ini                           ! Passive tracers
-#endif
-
+      CALL dta_dyn( nit000 )                 ! Initialization for the dynamics
       !                                     ! Ocean physics
       CALL tra_qsr_init                         ! Solar radiation penetration
@@ -178 +161 @@
       CALL ldf_tra_init                         ! Lateral ocean tracer physics
 #endif 
-
-      !                                     ! Ocean trends
-
       !                                     ! =============== !
       !                                     !  time stepping  !