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 12062 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcav.F90 – NEMO

Ignore:
Timestamp:
2019-12-05T10:57:46+01:00 (4 years ago)
Author:
mathiot
Message:

changes required by N.J. review

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcav.F90

    r11987 r12062  
    2525   USE par_oce  , ONLY: jpi,jpj                ! ocean space and time domain 
    2626   USE phycst   , ONLY: grav,rau0,r1_rau0_rcp  ! physical constants 
    27    USE eosbn2   , ONLY: l_useCT                ! l_useCT 
     27   USE eosbn2   , ONLY: ln_teos10               ! use ln_teos10 or not 
    2828   ! 
    2929   USE in_out_manager ! I/O manager 
     
    8484      ! 
    8585      ! initialisation 
    86       IF (TRIM(cn_gammablk) == 'HJ99' ) zqoce_b (:,:) = ptsc(:,:,jp_tem) * rau0_rcp ! last time step total heat fluxes (to speed up convergence) 
     86      IF (TRIM(cn_gammablk) == 'vel_stab' ) zqoce_b (:,:) = ptsc(:,:,jp_tem) * rau0_rcp ! last time step total heat fluxes (to speed up convergence) 
    8787      ! 
    8888      ! compute ice shelf melting 
     
    103103         ! define if we need to iterate 
    104104         SELECT CASE ( cn_gammablk ) 
    105          CASE ( 'spe','ad15' ) 
     105         CASE ( 'spe','vel' ) 
    106106            ! no convergence needed 
    107107            lit = .FALSE. 
    108          CASE ( 'hj99' ) 
     108         CASE ( 'vel_stab' ) 
    109109            ! compute error between 2 iterations 
    110110            zerr = MAXVAL(ABS(zqoce(:,:) - zqoce_b(:,:))) 
     
    112112            ! define if iteration needed 
    113113            IF (nit >= 100) THEN              ! too much iteration 
    114                CALL ctl_stop( 'STOP', 'isf_cav: HJ99 gamma formulation had too many iterations ...' ) 
     114               CALL ctl_stop( 'STOP', 'isf_cav: vel_stab gamma formulation had too many iterations ...' ) 
    115115            ELSE IF ( zerr <= 0.01_wp ) THEN  ! convergence is achieve 
    116116               lit = .FALSE. 
     
    163163      INTEGER :: ierr 
    164164      !!--------------------------------------------------------------------- 
    165       PRINT *, cn_isfcav_mlt 
    166165      ! 
    167166      !============== 
     
    212211         ! coeficient for linearisation of potential tfreez 
    213212         ! Crude approximation for pressure (but commonly used) 
    214          IF ( l_useCT ) THEN   ! linearisation from Jourdain et al. (2017) 
     213         IF ( ln_teos10 ) THEN   ! linearisation from Jourdain et al. (2017) 
    215214            risf_lamb1 =-0.0564_wp 
    216215            risf_lamb2 = 0.0773_wp 
Note: See TracChangeset for help on using the changeset viewer.