New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 2370 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step.F90 – NEMO

Ignore:
Timestamp:
2010-11-10T08:48:54+01:00 (13 years ago)
Author:
gm
Message:

v3.3beta: ice-ocean stress at kt with VP & EVP (LIM-2 and -3)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step.F90

    r2348 r2370  
    2626 
    2727   !!---------------------------------------------------------------------- 
    28    !!   stp            : OPA system time-stepping 
     28   !!   stp             : OPA system time-stepping 
    2929   !!---------------------------------------------------------------------- 
    3030   USE step_oce         ! time stepping definition modules  
    3131#if defined key_top 
    32    USE trcstp          ! passive tracer time-stepping      (trc_stp routine) 
    33 #endif 
    34    USE asminc          ! assimilation increments    (tra_asm_inc, dyn_asm_inc routines) 
    35    USE stpctl          ! time stepping control            (stp_ctl routine) 
    36    USE restart         ! ocean restart                    (rst_wri routine) 
    37    USE prtctl          ! Print control                    (prt_ctl routine) 
     32   USE trcstp           ! passive tracer time-stepping      (trc_stp routine) 
     33#endif 
     34   USE asminc           ! assimilation increments    (tra_asm_inc, dyn_asm_inc routines) 
     35   USE stpctl           ! time stepping control            (stp_ctl routine) 
     36   USE restart          ! ocean restart                    (rst_wri routine) 
     37   USE prtctl           ! Print control                    (prt_ctl routine) 
    3838 
    3939#if defined key_agrif 
     
    4444   PRIVATE 
    4545 
    46    PUBLIC   stp        ! called by opa.F90 
     46   PUBLIC   stp   ! called by opa.F90 
    4747 
    4848   !! * Substitutions 
     
    5252   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
    5353   !! $Id$ 
    54    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    55    !!---------------------------------------------------------------------- 
    56  
     54   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     55   !!---------------------------------------------------------------------- 
    5756CONTAINS 
    5857 
     
    149148         IF( ln_zps )    CALL zps_hde( kstp, jpts, tsb, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient 
    150149            &                                      rhd, gru , grv  )      ! of t, s, rd at the last ocean level 
    151          IF ( .NOT. ln_traldf_grif ) THEN 
    152                          CALL ldf_slp( kstp, rhd, rn2b )        ! before slope of the lateral mixing 
     150         IF( ln_traldf_grif ) THEN                           ! before slope for Griffies operator 
     151                         CALL ldf_slp_grif( kstp ) 
    153152         ELSE 
    154                          CALL ldf_slp_grif( kstp ) 
    155                          IF ( ln_dynldf_bilap .OR. ln_dynldf_iso ) CALL ldf_slp( kstp, rhd, rn2b ) 
    156       ENDIF 
     153                         CALL ldf_slp( kstp, rhd, rn2b )     ! before slope for Madec operator 
     154         ENDIF 
    157155      ENDIF 
    158156#if defined key_traldf_c2d 
Note: See TracChangeset for help on using the changeset viewer.