Ignore:
Timestamp:
2015-03-02T20:34:59+01:00 (6 years ago)
Author:
mathiot
Message:

restore e3t/w definition as before merge in domzgr + zpshde if ln_isfcav = false

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5094_UKMO_ISFCLEAN/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

    r5111 r5114  
    298298      ENDIF 
    299299 
    300 !      IF ( ln_isfcav ) THEN 
     300      IF ( ln_isfcav ) THEN 
    301301! need to be like this to compute the pressure gradient with ISF. If not, level beneath the ISF are not aligned (sum(e3t) /= depth) 
    302302! define e3t_0 and e3w_0 as the differences between gdept and gdepw respectively 
     
    310310         END DO 
    311311         e3w_1d(1  ) = 2._wp * (gdept_1d(1) - gdepw_1d(1))  
    312 !      END IF 
     312      END IF 
    313313 
    314314!!gm BUG in s-coordinate this does not work! 
     
    11461146         END DO 
    11471147      END DO 
    1148       !IF ( ln_isfcav ) THEN 
     1148      IF ( ln_isfcav ) THEN 
    11491149      ! (ISF) define e3uw (adapted for 2 cells in the water column) 
     1150      ! Need to test if the modification of only mikt and mbkt levels is enough 
    11501151         DO jk = 2,jpk                           
    11511152            DO jj = 1, jpjm1  
     
    11581159            END DO  
    11591160         END DO 
    1160       !END IF 
    1161       !End (ISF) 
     1161      END IF 
    11621162       
    11631163      CALL lbc_lnk( e3u_0 , 'U', 1._wp )   ;   CALL lbc_lnk( e3uw_0, 'U', 1._wp )   ! lateral boundary conditions 
     
    12581258   SUBROUTINE zgr_isf 
    12591259      !!---------------------------------------------------------------------- 
    1260       !!                    ***  ROUTINE zgr_bat_ctl  *** 
     1260      !!                    ***  ROUTINE zgr_isf  *** 
    12611261      !!    
    12621262      !! ** Purpose :   check the bathymetry in levels 
Note: See TracChangeset for help on using the changeset viewer.