Changeset 1438 for trunk/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2009-05-11T16:34:47+02:00 (15 years ago)

Author:

rblod

Message:

Merge VVL branch with the trunk (act II), see ticket #429

File:

• trunk/NEMO/OPA_SRC/DOM/domain.F90 (modified) (14 diffs)

trunk/NEMO/OPA_SRC/DOM/domain.F90

@@ -4 +4 @@
    !! Ocean initialization : domain initialization
    !!==============================================================================
-
+   !! History :  OPA  !  1990-10  (C. Levy - G. Madec)  Original code
+   !!                 !  1991-11  (G. Madec)
+   !!                 !  1992-01  (M. Imbard) insert time step initialization
+   !!                 !  1996-06  (G. Madec) generalized vertical coordinate 
+   !!                 !  1997-02  (G. Madec) creation of domwri.F
+   !!                 !  2001-05  (E.Durand - G. Madec) insert closed sea
+   !!   NEMO     1.0  !  2002-08  (G. Madec)  F90: Free form and module
+   !!            2.0  !  2005-11  (V. Garnier) Surface pressure gradient organization
+   !!----------------------------------------------------------------------
+   
    !!----------------------------------------------------------------------
    !!   dom_init       : initialize the space and time domain
@@ -10 +19 @@
    !!   dom_ctl        : control print for the ocean domain
    !!----------------------------------------------------------------------
-   !! * Modules used
    USE oce             ! 
    USE dom_oce         ! ocean space and time domain
@@ -30 +38 @@
    PRIVATE
 
-   !! * Routine accessibility
-   PUBLIC dom_init       ! called by opa.F90
+   PUBLIC   dom_init   ! called by opa.F90
 
    !! * Substitutions
 #  include "domzgr_substitute.h90"
-   !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
+   !!-------------------------------------------------------------------------
+   !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
-   !!----------------------------------------------------------------------
+   !! Software is governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !!-------------------------------------------------------------------------
 
 CONTAINS
@@ -58 +65 @@
       !!      - dom_stp: defined the model time step
       !!      - dom_wri: create the meshmask file if nmsh=1
-      !!
-      !! History :
-      !!        !  90-10  (C. Levy - G. Madec)  Original code
-      !!        !  91-11  (G. Madec)
-      !!        !  92-01  (M. Imbard) insert time step initialization
-      !!        !  96-06  (G. Madec) generalized vertical coordinate 
-      !!        !  97-02  (G. Madec) creation of domwri.F
-      !!        !  01-05  (E.Durand - G. Madec) insert closed sea
-      !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
-      !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
-      !!----------------------------------------------------------------------
-      !! * Local declarations
+      !!----------------------------------------------------------------------
       INTEGER ::   jk                ! dummy loop argument
       INTEGER ::   iconf = 0         ! temporary integers
@@ -90 +86 @@
       CALL dom_msk                        ! Masks
 
-      IF( lk_vvl )   CALL dom_vvl_ini     ! Vertical variable mesh
+      IF( lk_vvl )   CALL dom_vvl         ! Vertical variable mesh
 
       ! Local depth or Inverse of the local depth of the water column at u- and v-points
       ! ------------------------------
       ! Ocean depth at U- and V-points
-      hu(:,:) = 0.
-      hv(:,:) = 0.
-
+      hu(:,:) = 0.e0
+      hv(:,:) = 0.e0
       DO jk = 1, jpk
          hu(:,:) = hu(:,:) + fse3u(:,:,jk) * umask(:,:,jk)
@@ -105 +100 @@
       hur(:,:) = fse3u(:,:,1)             ! Lower bound : thickness of the first model level
       hvr(:,:) = fse3v(:,:,1)
-
       DO jk = 2, jpk                      ! Sum of the vertical scale factors
          hur(:,:) = hur(:,:) + fse3u(:,:,jk) * umask(:,:,jk)
          hvr(:,:) = hvr(:,:) + fse3v(:,:,jk) * vmask(:,:,jk)
       END DO
-
       ! Compute and mask the inverse of the local depth
       hur(:,:) = 1. / hur(:,:) * umask(:,:,1)
       hvr(:,:) = 1. / hvr(:,:) * vmask(:,:,1)
 
-
       CALL dom_stp                        ! Time step
 
@@ -121 +113 @@
 
       IF( .NOT.ln_rstart )   CALL dom_ctl    ! Domain control
-
+      !
    END SUBROUTINE dom_init
 
@@ -134 +126 @@
       !!              - namdom namelist
       !!              - namcla namelist
-      !!
-      !! History :
-      !!   9.0  !  03-08  (G. Madec)  Original code
-      !!----------------------------------------------------------------------
-      !! * Modules used
+      !!----------------------------------------------------------------------
       USE ioipsl
       NAMELIST/namrun/ no    , cexper, cn_ocerst_in, cn_ocerst_out, ln_rstart, nrstdt,   &
@@ -156 +144 @@
       ENDIF
 
-      ! Namelist namrun : parameters of the run
-      REWIND( numnam )
+      REWIND( numnam )              ! Namelist namrun : parameters of the run
       READ  ( numnam, namrun )
-
       IF(lwp) THEN
          WRITE(numout,*) '        Namelist namrun'
@@ -228 +214 @@
       ENDIF
 
-      ! Namelist namdom : space/time domain (bathymetry, mesh, timestep)
-      REWIND( numnam )
+      REWIND( numnam )              ! Namelist namdom : space/time domain (bathymetry, mesh, timestep)
       READ  ( numnam, namdom )
 
@@ -252 +237 @@
       ENDIF
 
-      ! Default values
       n_cla = 0
-
-      ! Namelist cross land advection
-      REWIND( numnam )
+      REWIND( numnam )              ! Namelist cross land advection
       READ  ( numnam, namcla )
       IF(lwp) THEN
@@ -264 +246 @@
       ENDIF
 
-      IF( nbit_cmp == 1 .AND. n_cla /= 0 ) THEN
-         CALL ctl_stop( ' Reproductibility tests (nbit_cmp=1) require n_cla = 0' )
-      END IF
-
+      IF( nbit_cmp == 1 .AND. n_cla /= 0 )   CALL ctl_stop( ' Reproductibility tests (nbit_cmp=1) require n_cla = 0' )
+      !
    END SUBROUTINE dom_nam
 
@@ -278 +258 @@
       !!
       !! ** Method  :   compute and print extrema of masked scale factors
-      !!
-      !! History :
-      !!   8.5  !  02-08  (G. Madec)    Original code
-      !!----------------------------------------------------------------------
-      !! * Local declarations
+      !!----------------------------------------------------------------------
       INTEGER ::   iimi1, ijmi1, iimi2, ijmi2, iima1, ijma1, iima2, ijma2
       INTEGER, DIMENSION(2) ::   iloc      ! 
       REAL(wp) ::   ze1min, ze1max, ze2min, ze2max
       !!----------------------------------------------------------------------
-
-      ! Extrema of the scale factors
 
       IF(lwp)WRITE(numout,*)
@@ -325 +299 @@
          WRITE(numout,"(14x,'e2t mini: ',1f10.2,' at i = ',i5,' j= ',i5)") ze2min, iimi2, ijmi2
       ENDIF
-
+      !
    END SUBROUTINE dom_ctl