Changeset 789 for trunk/NEMO/OPA_SRC/DYN/dynhpg.F90

Timestamp:

2008-01-11T19:04:56+01:00 (16 years ago)

Author:

rblod

Message:

Suppress jki routines and associated key_mpp_omp

File:

• trunk/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -18 +18 @@
    !!   dyn_hpg      : update the momentum trend with the now horizontal
    !!                  gradient of the hydrostatic pressure
-   !!                  default case : k-j-i loops (vector opt. available)
    !!       hpg_ctl  : initialisation and control of options
    !!       hpg_zco  : z-coordinate scheme
@@ -30 +29 @@
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
-   USE dynhpg_jki      !
    USE phycst          ! physical constants
    USE in_out_manager  ! I/O manager
@@ -42 +40 @@
 
    PUBLIC   dyn_hpg    ! routine called by step module
-
-#if defined key_mpp_omp
-   !!----------------------------------------------------------------------
-   !!   'key_mpp_omp' :                                 j-k-i loop (j-slab)
-   !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynhpg_jki = .TRUE.    !: OpenMP 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_jki = .FALSE.   !: OpenMP hpg flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynhpg     = .TRUE.    !: vector hpg flag
-#endif
 
    !!* Namelist nam_dynhpg : Choice of horizontal pressure gradient computation
@@ -111 +95 @@
       CASE (  5 )   ;   CALL hpg_djc    ( kt )      ! s-coordinate (Density Jacobian with Cubic polynomial)
       CASE (  6 )   ;   CALL hpg_rot    ( kt )      ! s-coordinate (ROTated axes scheme)
-      CASE ( 10 )   ;   CALL hpg_zco_jki( kt )      ! z-coordinate (k-j-i)
-      CASE ( 11 )   ;   CALL hpg_zps_jki( kt )      ! z-coordinate plus partial steps (interpolation) (k-j-i)
-      CASE ( 12 )   ;   CALL hpg_sco_jki( kt )      ! s-coordinate (standard jacobian formulation) (k-j-i)
       END SELECT
 
@@ -186 +167 @@
       IF ( ioptio /= 1 )   CALL ctl_stop( ' NO or several hydrostatic pressure gradient options used' )
 
-      IF( lk_dynhpg_jki ) THEN
-         nhpg = nhpg + 10
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) '          Autotasking or OPENMP: use j-k-i loops (i.e. _jki routines)'
-      ENDIF
       !
    END SUBROUTINE hpg_ctl