Changeset 2382 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/C1D_SRC/dynnxt_c1d.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/C1D_SRC/dynnxt_c1d.F90 (modified) (4 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/C1D_SRC/dynnxt_c1d.F90

@@ -11 +11 @@
    !!   'key_c1d'                                          1D Configuration
    !!----------------------------------------------------------------------  
-   !!----------------------------------------------------------------------
    !!   dyn_nxt_c1d : update the horizontal velocity from the momentum trend
    !!----------------------------------------------------------------------
@@ -27 +26 @@
    !! NEMO/C1D 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
 
@@ -36 +34 @@
       !!                  ***  ROUTINE dyn_nxt_c1d  ***
       !!                   
-      !! ** Purpose :   Compute the after horizontal velocity from the 
-      !!      momentum trend.
+      !! ** Purpose :   Compute the after horizontal velocity from the momentum trend.
       !!
       !! ** Method  :   Apply lateral boundary conditions on the trends (ua,va) 
@@ -61 +58 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) 'dyn_nxt_c1d : time stepping on 1D configuation'
-         IF(lwp) WRITE(numout,*) '~~~~~~~'
+         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
       ENDIF
 
-      ! Local constant initialization
-      z2dt = 2. * rdt
+      z2dt = 2._wp * rdt                                                   ! Local constant initialization
       IF( neuler == 0 .AND. kt == nit000 )  z2dt = rdt
 
-      ! Lateral boundary conditions on ( ua, va )
-      CALL lbc_lnk( ua, 'U', -1. )
-      CALL lbc_lnk( va, 'V', -1. )
+      CALL lbc_lnk( ua, 'U', -1. )   ;   CALL lbc_lnk( va, 'V', -1. )      ! Lateral boundary conditions
 
-      DO jk = 1, jpkm1      ! Next Velocity
+      DO jk = 1, jpkm1                                                     ! Next Velocity
          ua(:,:,jk) = ( ub(:,:,jk) + z2dt * ua(:,:,jk) ) * umask(:,:,jk)
          va(:,:,jk) = ( vb(:,:,jk) + z2dt * va(:,:,jk) ) * vmask(:,:,jk)
       END DO 
  
-      DO jk = 1, jpkm1      ! Time filter and swap of dynamics arrays
-         IF( neuler == 0 .AND. kt == nit000 ) THEN      ! Euler (forward) time stepping
+      DO jk = 1, jpkm1                                                     ! Time filter and swap of dynamics arrays
+         IF( neuler == 0 .AND. kt == nit000 ) THEN                               ! Euler (forward) time stepping
              ub(:,:,jk) = un(:,:,jk)
              vb(:,:,jk) = vn(:,:,jk)
              un(:,:,jk) = ua(:,:,jk)
              vn(:,:,jk) = va(:,:,jk)
-         ELSE                                           ! Leap-frog time stepping
+         ELSE                                                                    ! Leap-frog time stepping
              ub(:,:,jk) = atfp * ( ub(:,:,jk) + ua(:,:,jk) ) + atfp1 * un(:,:,jk)
              vb(:,:,jk) = atfp * ( vb(:,:,jk) + va(:,:,jk) ) + atfp1 * vn(:,:,jk)