Changeset 359 for trunk/NEMO/OPA_SRC/step.F90

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

File:

• trunk/NEMO/OPA_SRC/step.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/step.F90

@@ -35 +35 @@
    USE dynhpg          ! hydrostatic pressure grad.       (dyn_hpg routine)
    USE dynhpg_atsk     ! hydrostatic pressure grad.  (dyn_hpg_atsk routine)
-   USE dynspg_fsc      ! surface pressure gradient   (dyn_spg_fsc  routine)
-   USE dynspg_fsc_atsk ! surface pressure gradient (dyn_spgfsc_atsk routine)
-   USE dynspg_rl       ! surface pressure gradient     (dyn_spg_rl routine)
+   USE dynspg          ! surface pressure gradient        (dyn_spg routine)
    USE dynkeg          ! kinetic energy gradient          (dyn_keg routine)
    USE dynvor          ! vorticity term              (dyn_vor_... routines)
@@ -166 +164 @@
       !!    "   !  04-08  (C. Talandier) New trends organization
       !!    "   !  05-01  (C. Ethe) Add the KPP closure scheme
+      !!    "   !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
       !! * Arguments
@@ -369 +368 @@
 
       !                                                       ! horizontal gradient of Hydrostatic pressure 
-      IF( lk_dynhpg        )   CALL dyn_hpg     ( kstp )             ! default case  (k-j-i loop)
-      IF( lk_dynhpg_tsk    )   CALL dyn_hpg_atsk( kstp )             ! autatask case (j-k-i loop)
+      IF ( lk_jki ) THEN
+                               CALL dyn_hpg_atsk( kstp )             ! autotask case (j-k-i loop)
+      ELSE
+                               CALL dyn_hpg     ( kstp )             ! default case  (k-j-i loop)
+      ENDIF
 
                                CALL dyn_zad    ( kstp )       ! vertical advection       
@@ -387 +389 @@
       CALL lbc_lnk( emp, 'T', 1. )
 !i
-      !                                                       ! surface pressure gradient
-      IF( lk_dynspg_fsc     )   CALL dyn_spg_fsc     ( kstp, indic )  ! free surface constant volume case
-      IF( lk_dynspg_fsc_tsk )   CALL dyn_spg_fsc_atsk( kstp, indic )  ! autotask free surface constant volume case
-      IF( lk_dynspg_rl      )   CALL dyn_spg_rl      ( kstp, indic )  ! rigid-lid case
-
-                                CALL dyn_nxt( kstp )          ! lateral velocity at next time step 
+                               CALL dyn_spg( kstp, indic )    ! surface pressure gradient
+
+                               CALL dyn_nxt( kstp )           ! velocity at next time step