Changeset 13429


Ignore:
Timestamp:
2020-08-24T11:31:16+02:00 (5 months ago)
Author:
techene
Message:

commit error : back to previous state

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/ICE/iceistate.F90

    r13418 r13429  
    2121   USE sbc_ice , ONLY : tn_ice, snwice_mass, snwice_mass_b 
    2222   USE eosbn2         ! equation of state 
    23 # if defined key_qco 
    24    USE domqco         ! Variable volume 
    25 # else 
    2623   USE domvvl         ! Variable volume 
    27 # endif 
    2824   USE ice            ! sea-ice: variables 
    2925   USE ice1D          ! sea-ice: thermodynamics variables 
     
    431427         ssh(:,:,Kbb) = ssh(:,:,Kbb) - snwice_mass(:,:) * r1_rho0 
    432428         ! 
    433 #if defined key_qco 
    434          IF( .NOT.ln_linssh )   CALL dom_qco_zgr( Kbb, Kmm, Kaa )   ! interpolation scale factor, depth and water column 
    435 #else 
    436429         IF( .NOT.ln_linssh )   CALL dom_vvl_zgr( Kbb, Kmm, Kaa )   ! interpolation scale factor, depth and water column 
    437 #endif 
    438  
     430! !!st 
     431!          IF( .NOT.ln_linssh ) THEN 
     432!             ! 
     433!             WHERE( ht_0(:,:) > 0 )   ;   z2d(:,:) = 1._wp + ssh(:,:,Kmm)*tmask(:,:,1) / ht_0(:,:) 
     434!             ELSEWHERE                ;   z2d(:,:) = 1._wp   ;   END WHERE 
     435!             ! 
     436!             DO jk = 1,jpkm1                     ! adjust initial vertical scale factors 
     437!                e3t(:,:,jk,Kmm) = e3t_0(:,:,jk) * z2d(:,:) 
     438!                e3t(:,:,jk,Kbb) = e3t(:,:,jk,Kmm) 
     439!                e3t(:,:,jk,Kaa) = e3t(:,:,jk,Kmm) 
     440!             END DO 
     441!             ! 
     442!             ! Reconstruction of all vertical scale factors at now and before time-steps 
     443!             ! ========================================================================= 
     444!             ! Horizontal scale factor interpolations 
     445!             ! -------------------------------------- 
     446!             CALL dom_vvl_interpol( e3t(:,:,:,Kbb), e3u(:,:,:,Kbb), 'U' ) 
     447!             CALL dom_vvl_interpol( e3t(:,:,:,Kbb), e3v(:,:,:,Kbb), 'V' ) 
     448!             CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3u(:,:,:,Kmm), 'U' ) 
     449!             CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3v(:,:,:,Kmm), 'V' ) 
     450!             CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3f(:,:,:), 'F' ) 
     451!             ! Vertical scale factor interpolations 
     452!             ! ------------------------------------ 
     453!             CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3w (:,:,:,Kmm), 'W'  ) 
     454!             CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3uw(:,:,:,Kmm), 'UW' ) 
     455!             CALL dom_vvl_interpol( e3v(:,:,:,Kmm), e3vw(:,:,:,Kmm), 'VW' ) 
     456!             CALL dom_vvl_interpol( e3u(:,:,:,Kbb), e3uw(:,:,:,Kbb), 'UW' ) 
     457!             CALL dom_vvl_interpol( e3v(:,:,:,Kbb), e3vw(:,:,:,Kbb), 'VW' ) 
     458!             ! t- and w- points depth 
     459!             ! ---------------------- 
     460!             !!gm not sure of that.... 
     461!             gdept(:,:,1,Kmm) = 0.5_wp * e3w(:,:,1,Kmm) 
     462!             gdepw(:,:,1,Kmm) = 0.0_wp 
     463!             gde3w(:,:,1) = gdept(:,:,1,Kmm) - ssh(:,:,Kmm) 
     464!             DO jk = 2, jpk 
     465!                gdept(:,:,jk,Kmm) = gdept(:,:,jk-1,Kmm) + e3w(:,:,jk  ,Kmm) 
     466!                gdepw(:,:,jk,Kmm) = gdepw(:,:,jk-1,Kmm) + e3t(:,:,jk-1,Kmm) 
     467!                gde3w(:,:,jk) = gdept(:,:,jk  ,Kmm) - ssh (:,:,Kmm) 
     468!             END DO 
     469!          ENDIF 
    439470      ENDIF 
    440471       
Note: See TracChangeset for help on using the changeset viewer.