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 12309 for NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser – NEMO

Ignore:
Timestamp:
2020-01-10T12:53:25+01:00 (4 years ago)
Author:
agn
Message:

Corrected reversion in tramle.F90 whereby ikmax set too late

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/TRA/tramle.F90

    r12217 r12309  
    151151    ELSE !do not use osn_mle 
    152152       !                                      !==  MLD used for MLE  ==! 
    153        !                                                ! convert density into buoyancy 
     153       !                                                ! compute from the 10m density to deal with the diurnal cycle 
    154154       inml_mle(:,:) = mbkt(:,:) + 1                    ! init. to number of ocean w-level (T-level + 1) 
    155155       IF ( nla10 > 0 ) THEN                            ! avoid case where first level is thicker than 10m 
     
    162162          END DO 
    163163       ENDIF 
     164       ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation 
    164165 
    165166       ! 
     
    203204       END SELECT 
    204205       !                                                ! convert density into buoyancy 
    205        ikmax = MIN( MAXVAL( inml_mle(:,:) ), jpkm1 )                  ! max level of the computation 
    206206       zbm(:,:) = + grav * zbm(:,:) / MAX( e3t_n(:,:,1), zmld(:,:) ) 
    207207       ! 
     
    352352         WRITE(numout,*) '         Density difference used to define ML for FK              rn_rho_c_mle  = ', rn_rho_c_mle 
    353353      ENDIF 
    354  
    355  
    356       IF( ln_osm_mle .AND. ln_mle ) THEN 
    357          WRITE(numout,*) 'WARNING: You are running with both OSM-FK and default FK' 
    358          ! CALL ctl_stop('STOP in zdf_osm_init: Cannot run with both OSM-FK and default FK') 
    359      END IF 
    360  
    361      IF(lwp) THEN 
     354      ! 
     355      IF(lwp) THEN 
    362356         WRITE(numout,*) 
    363357         IF( ln_mle ) THEN 
Note: See TracChangeset for help on using the changeset viewer.