Changeset 2382 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2010-11-13T14:08:12+01:00 (13 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/DOM/domain.F90 (modified) (10 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -11 +11 @@
    !!   NEMO     1.0  !  2002-08  (G. Madec)  F90: Free form and module
    !!            2.0  !  2005-11  (V. Garnier) Surface pressure gradient organization
+   !!            3.3  !  2010-11  (G. Madec)  initialisation in C1D configuration
    !!----------------------------------------------------------------------
    
@@ -18 +19 @@
    !!   dom_ctl        : control print for the ocean domain
    !!----------------------------------------------------------------------
-   USE oce             ! 
-   USE dom_oce         ! ocean space and time domain
+   USE oce             ! ocean variables
+   USE dom_oce         ! domain: ocean
    USE sbc_oce         ! surface boundary condition: ocean
    USE phycst          ! physical constants
@@ -32 +33 @@
    USE domwri          ! domain: write the meshmask file
    USE domvvl          ! variable volume
+#if defined key_c1d
+   USE dyncor_c1d      ! Coriolis term (c1d case)         (cor_c1d routine)
+#endif
 
    IMPLICIT NONE
@@ -43 +47 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence        (NEMOGCM/NEMO_CeCILL.txt)
    !!-------------------------------------------------------------------------
-
 CONTAINS
 
@@ -62 +65 @@
       !!              - dom_stp: defined the model time step
       !!              - dom_wri: create the meshmask file if nmsh=1
+      !!              - "key_c1d": 1D configuration, move Coriolis, u and v at T-point
       !!----------------------------------------------------------------------
       INTEGER ::   jk                ! dummy loop argument
@@ -79 +83 @@
                              CALL dom_msk      ! Masks
       IF( lk_vvl         )   CALL dom_vvl      ! Vertical variable mesh
+      !
+#if defined key_c1d
+      !                                        ! 1D configuration ("key_c1d")
+      CALL cor_c1d                                 ! Coriolis set at T-point
+      umask(:,:,:) = tmask(:,:,:)                  ! U, V moved at T-point
+      vmask(:,:,:) = tmask(:,:,:)
+#endif
       !
       hu(:,:) = 0.e0                           ! Ocean depth at U- and V-points
@@ -188 +199 @@
 #endif
 
-      REWIND( numnam )             ! Namelist namdom : space & time domain (bathymetry, mesh, timestep)
+      REWIND( numnam )              ! Namelist namdom : space & time domain (bathymetry, mesh, timestep)
       READ  ( numnam, namdom )
 
@@ -224 +235 @@
       nclosea   = nn_closea
 
-      REWIND( numnam )             ! Namelist cross land advection
+      REWIND( numnam )              ! Namelist cross land advection
       READ  ( numnam, namcla )
       IF(lwp) THEN
@@ -238 +249 @@
 
 #if defined key_netcdf4
-
-      REWIND( numnam )              ! Namelist namnc4 : netcdf4 chunking parameters
+      !                             ! NetCDF 4 case   ("key_netcdf4" defined)
+      REWIND( numnam )                    ! Namelist namnc4 : netcdf4 chunking parameters
       READ  ( numnam, namnc4 )
-      IF(lwp) THEN
+      IF(lwp) THEN                        ! control print
          WRITE(numout,*)
          WRITE(numout,*) '   Namelist namnc4 - Netcdf4 chunking parameters'
@@ -256 +267 @@
       snc4set%nk   = nn_nchunks_k
       snc4set%luse = ln_nc4zip
-
 #else
-
-      snc4set%luse = .FALSE.
- 
-#endif
+      snc4set%luse = .FALSE.        ! No NetCDF 4 case
+#endif
+      !
    END SUBROUTINE dom_nam