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 15005 – NEMO

Changeset 15005


Ignore:
Timestamp:
2021-06-16T16:27:51+02:00 (3 years ago)
Author:
hadcv
Message:

#2664: Fix ln_traldf_hor crashing with zps coordinate

Location:
NEMO/trunk/src/OCE
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/trunk/src/OCE/step.F90

    r14834 r15005  
    187187      !  LATERAL  PHYSICS 
    188188      ! 
    189       IF( l_ldfslp ) THEN                             ! slope of lateral mixing 
    190                          CALL eos( ts(:,:,:,:,Nbb), rhd, gdept_0(:,:,:) )               ! before in situ density 
     189      IF( ln_zps .OR. l_ldfslp ) CALL eos( ts(:,:,:,:,Nbb), rhd, gdept_0(:,:,:) )               ! before in situ density 
    191190 
    192191      IF( ln_zps .AND. .NOT. ln_isfcav)                                    & 
    … …  
    197196            &            CALL zps_hde_isf( kstp, Nnn, jpts, ts(:,:,:,:,Nbb), gtsu, gtsv, gtui, gtvi,  &  ! Partial steps for top cell (ISF) 
    198197            &                                          rhd, gru , grv , grui, grvi   )       ! of t, s, rd at the first ocean level 
     198 
     199      IF( l_ldfslp ) THEN                             ! slope of lateral mixing 
    199200         IF( ln_traldf_triad ) THEN 
    200201                         CALL ldf_slp_triad( kstp, Nbb, Nnn )             ! before slope for triad operator 

  • NEMO/trunk/src/OCE/stpmlf.F90

    r14834 r15005  
    190190      !  LATERAL  PHYSICS 
    191191      ! 
    192       IF( l_ldfslp ) THEN                             ! slope of lateral mixing 
    193                          CALL eos( ts(:,:,:,:,Nbb), rhd, gdept_0(:,:,:) )               ! before in situ density 
     192      IF( ln_zps .OR. l_ldfslp ) CALL eos( ts(:,:,:,:,Nbb), rhd, gdept_0(:,:,:) )               ! before in situ density 
    194193 
    195194      IF( ln_zps .AND. .NOT. ln_isfcav)                                    & 
    … …  
    200199            &            CALL zps_hde_isf( kstp, Nnn, jpts, ts(:,:,:,:,Nbb), gtsu, gtsv, gtui, gtvi,  &  ! Partial steps for top cell (ISF) 
    201200            &                                          rhd, gru , grv , grui, grvi   )       ! of t, s, rd at the first ocean level 
     201 
     202      IF( l_ldfslp ) THEN                             ! slope of lateral mixing 
    202203         IF( ln_traldf_triad ) THEN 
    203204                         CALL ldf_slp_triad( kstp, Nbb, Nnn )             ! before slope for triad operator 
Note: See TracChangeset for help on using the changeset viewer.