Changeset 503 for trunk/NEMO/OPA_SRC/DYN/dynspg_flt_jki.F90

Timestamp:

2006-09-27T10:52:29+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_064 : CT : general trends update including the addition of mean windows analysis possibility in the mixed layer

File:

• trunk/NEMO/OPA_SRC/DYN/dynspg_flt_jki.F90 (modified) (13 diffs)

trunk/NEMO/OPA_SRC/DYN/dynspg_flt_jki.F90

@@ -9 +9 @@
    !!   'key_mpp_omp'                              j-k-i loop (vector opt.)
    !!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
    !!   dyn_spg_flt_jki : Update the momentum trend with the surface pressure
    !!                     gradient for the free surf. constant volume case
    !!                     with auto-tasking (j-slab) (no vectior opt.)
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Header$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
-   !!----------------------------------------------------------------------
-   !! * Modules used
    USE oce             ! ocean dynamics and tracers 
    USE dom_oce         ! ocean space and time domain
@@ -51 +47 @@
    !!   OPA 9.0 , LOCEAN-IPSL (2005) 
    !! $Header$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -100 +96 @@
       !! ** Action : - Update (ua,va) with the surf. pressure gradient trend
       !!
-      !! References :
-      !!      Roullet and Madec 1999, JGR.
-      !!
-      !! History :
-      !!        !  98-05 (G. Roullet)  Original code
-      !!        !  98-10 (G. Madec, M. Imbard)  release 8.2
-      !!   8.5  !  02-08 (G. Madec)  F90: Free form and module
-      !!        !  02-11 (C. Talandier, A-M Treguier) Open boundaries
-      !!   9.0  !  04-08 (C. Talandier) New trends organization
-      !!    "   !  05-11  (V. Garnier) Surface pressure gradient organization
+      !! References : Roullet and Madec 1999, JGR.
       !!---------------------------------------------------------------------
-      !! * Arguments
       INTEGER, INTENT( in ) ::   kt          ! ocean time-step index
-      INTEGER, INTENT( out ) ::   kindic     ! solver convergence flag
-                                             ! if the solver doesn t converge
-                                             ! the flag is < 0
-      !! * Local declarations
+      INTEGER, INTENT( out ) ::   kindic     ! solver convergence flag, <0 if the solver doesn t converge
+      !!
       INTEGER  ::   ji, jj, jk               ! dummy loop indices
       REAL(wp) ::   &              ! temporary scalars
@@ -154 +138 @@
             spgv(ji,jj) = - grav * ( sshn(ji  ,jj+1) - sshn(ji,jj) ) / e2v(ji,jj)
          END DO 
-
          !  Add the surface pressure trend to the general trend
          DO jk = 1, jpkm1
@@ -162 +145 @@
             END DO
          END DO
-
          ! Evaluate the masked next velocity (effect of the additional force not included)
          DO jk = 1, jpkm1
@@ -170 +152 @@
             END DO
          END DO
-
          !                                             ! ===============
       END DO                                           !   End of slab
@@ -202 +183 @@
             spgv(ji,jj) = 0.e0
          END DO
-
          ! vertical sum
          DO jk = 1, jpk
@@ -210 +190 @@
             END DO
          END DO
-
          ! transport: multiplied by the horizontal scale factor
          DO ji = 2, jpim1
@@ -216 +195 @@
             spgv(ji,jj) = spgv(ji,jj) * e1v(ji,jj)
          END DO
-
          !                                             ! ===============
       END DO                                           !   End of slab
@@ -302 +280 @@
             WRITE(ctmp1,*) ' ~~~~~~~~~~~~~~~~                not = ', nsolv
             CALL ctl_stop( ' dyn_spg_flt_jki : e r r o r, nsolv = 1, 2, 3 or 4', ctmp1 )
-      ENDIF
-
-      !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,synchro,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-
-!CDIR PARALLEL DO
-!$OMP PARALLEL DO
+         ENDIF
+      ENDIF
+
+      !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,synchro,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+
       !                                                ! ===============
       DO jj = 2, jpjm1                                 !  Vertical slab
@@ -353 +330 @@
          ! 8. Sea surface elevation time stepping
          ! --------------------------------------
-         ! Euler (forward) time stepping, no time filter
-         IF( neuler == 0 .AND. kt == nit000 ) THEN
+         IF( neuler == 0 .AND. kt == nit000 ) THEN         ! Euler (forward) time stepping, no time filter
             DO ji = 1, jpi
                ! after free surface elevation
@@ -362 +338 @@
                sshn(ji,jj) = zssha
             END DO
-         ELSE
-            ! Leap-frog time stepping and time filter
+         ELSE                                              ! Leap-frog time stepping and time filter
             DO ji = 1, jpi
                ! after free surface elevation
@@ -384 +359 @@
          CALL prt_ctl( tab2d_1=sshn, clinfo1=' spg  - ssh: ', mask1=tmask)
       ENDIF
-
-
+      !
    END SUBROUTINE dyn_spg_flt_jki