Changeset 2382 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/opa.F90

Timestamp:

2010-11-13T14:08:12+01:00 (14 years ago)

Author:

gm

Message:

v3.3beta: C1D - bug correction to compile with key_c1d

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/opa.F90 (modified) (5 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/opa.F90

@@ -36 +36 @@
    !!----------------------------------------------------------------------
 
-   USE step_oce        ! Time stepping module definition
+   USE step_oce        ! module used in the ocean time stepping module
    USE sbc_oce         ! surface boundary condition: ocean
    USE domcfg          ! domain configuration               (dom_cfg routine)
@@ -103 +103 @@
       INTEGER ::   istp       ! time step index
       !!----------------------------------------------------------------------
-
+      !
 #if defined key_agrif
       CALL Agrif_Init_Grids()      ! AGRIF: set the meshes
@@ -247 +247 @@
       ELSE                            ;   CALL mpp_init2     ! eliminate land processors
       ENDIF
-!!gm c1d case can be moved in dom_init routine
-#if defined key_c1d
-         CALL cor_c1d                            ! Coriolis defined at T-point
-         umask(:,:,:) = tmask(:,:,:)             ! U, V and T-points are the same
-         vmask(:,:,:) = tmask(:,:,:)             ! 
-#endif
-!!gm c1d end
-
+      !
       !                                      ! General initialization
                             CALL     phy_cst    ! Physical constants
@@ -307 +300 @@
                             CALL     trc_init
 #endif
-      !                                     ! diagnostics
+      !                                     ! Diagnostics
                             CALL     iom_init   ! iom_put initialization
       IF( lk_floats    )    CALL     flo_init   ! drifting Floats
@@ -314 +307 @@
                             CALL dia_hsb_init   ! heat content, salt content and volume budgets
                             CALL trd_mod_init   ! Mixed-layer/Vorticity/Integral constraints trends
-      IF( lk_diaobs    ) THEN
-         CALL dia_obs_init                  ! Initialize observational data
-         CALL dia_obs( nit000 - 1 )         ! Observation operator for restart
+      IF( lk_diaobs    ) THEN                   ! Observation & model comparison
+                            CALL dia_obs_init            ! Initialize observational data
+                            CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
       ENDIF      
-      IF( lk_asminc    )    CALL asm_inc_init     ! Initialize assimilation increments
-      IF(lwp) WRITE(numout,*)'Euler time step switch is ', neuler
-
+      !                                     ! Assimilation increments
+      IF( lk_asminc    )    CALL asm_inc_init   ! Initialize assimilation increments
+      IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler
       !
    END SUBROUTINE opa_init