Changeset 359 for trunk/NEMO/OPA_SRC/DYN

Timestamp:

2005-12-21T11:46:45+01:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_033 : RB + CT : Add new surface pressure gradient algorithms

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• dynhpg.F90 (modified) (1 diff)
• dynnxt.F90 (modified) (3 diffs)
• dynspg_exp.F90 (modified) (1 diff)
• dynspg_rl.F90 (modified) (7 diffs)
• dynspg_ts.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -28 +28 @@
    !! * Accessibility
    PUBLIC dyn_hpg                ! routine called by step.F90
-
-#if defined key_autotasking
-   !!----------------------------------------------------------------------
-   !!   'key_autotasking' :                             j-k-i loop (j-slab)
-   !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynhpg_tsk = .TRUE.    !: autotasked hpg flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynhpg     = .FALSE.   !: vector hpg flag
-#else
-   !!----------------------------------------------------------------------
-   !!   default case :                             k-j-i loop (vector opt.)
-   !!----------------------------------------------------------------------   
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynhpg_tsk = .FALSE.   !: autotasked hpg flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynhpg     = .TRUE.    !: vector hpg flag
-#endif
 
    !! * Substitutions

trunk/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -36 +36 @@
       !!      After velocity is compute using a leap-frog scheme environment:
       !!         (ua,va) = (ub,vb) + 2 rdt (ua,va)
-      !!      Note that if lk_dynspg_fsc=T, the time stepping has already been
+      !!      Note that if lk_dynspg_flt=T, the time stepping has already been
       !!      performed in dynspg module
       !!      Time filter applied on now horizontal velocity to avoid the
@@ -56 +56 @@
       !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
       !!        !  02-10  (C. Talandier, A-M. Treguier) Open boundary cond.
+      !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
       !! * Arguments
@@ -88 +89 @@
          ! Next velocity
          ! -------------
-#if defined key_dynspg_fsc
+#if defined key_dynspg_flt
          ! Leap-frog time stepping already done in dynspg.F routine
 #else

trunk/NEMO/OPA_SRC/DYN/dynspg_exp.F90

@@ -34 +34 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LODYC-IPSL  (2005)
-   !!----------------------------------------------------------------------
+   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! $Header$ 
+   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
+   !!----------------------------------------------------------------------
+
 
 CONTAINS

trunk/NEMO/OPA_SRC/DYN/dynspg_rl.F90

@@ -18 +18 @@
    USE ldfdyn_oce      ! ocean dynamics: lateral physics
    USE zdf_oce         ! ocean vertical physics
-   USE trdmod          ! ocean dynamics trends 
-   USE trdmod_oce      ! ocean variables trends
-   USE in_out_manager  ! I/O manager
    USE sol_oce         ! ocean elliptic solver
    USE solpcg          ! preconditionned conjugate gradient solver
@@ -30 +27 @@
    USE lib_mpp         ! distributed memory computing library
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+   USE in_out_manager  ! I/O manager
 
    IMPLICIT NONE
@@ -36 +34 @@
    !! * Accessibility
    PUBLIC dyn_spg_rl   ! called by step.F90
-
-   !! * Shared module variables
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynspg_rl = .TRUE.    !: rigid-lid flag
 
    !! * Substitutions
@@ -80 +75 @@
       !!
       !! ** Action : - Update (ua,va) with the surf. pressure gradient trend
-      !!             - Save the trends in (ztdua,ztdva) ('key_trddyn')
       !!
       !! References :
@@ -97 +91 @@
       !!        !  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
       !!---------------------------------------------------------------------
-      !! * Modules used     
-      USE oce, ONLY :    ztdua => ta,    & ! use ta as 3D workspace   
-                         ztdva => sa       ! use sa as 3D workspace   
       !! * Arguments
       INTEGER, INTENT( in  ) ::   kt       ! ocean time-step index
@@ -532 +524 @@
       END DO
 
-      ! save the surface pressure gradient trends for diagnostic
-      ! momentum trends
-      IF( l_trddyn )   THEN
-         DO jk = 1, jpkm1
-            ztdua(:,:,jk) = - spgu(:,:)
-            ztdva(:,:,jk) = - spgv(:,:)
-         END DO
-
-         CALL trd_mod(ztdua, ztdva, jpdtdldf, 'DYN', kt)
-      ENDIF
-
    END SUBROUTINE dyn_spg_rl
 
@@ -549 +530 @@
    !!   'key_dynspg_rl'                                        NO rigid lid
    !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynspg_rl = .FALSE.   !: rigid-lid flag
 CONTAINS
    SUBROUTINE dyn_spg_rl( kt, kindic )       ! Empty routine

trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -39 +39 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LODYC-IPSL  (2005)
+   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! $Header$ 
+   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------