Changeset 4704 for branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90

Timestamp:

2014-07-03T18:47:30+02:00 (10 years ago)

Author:

mathiot

Message:

Ice Shelf: correction of minor bugs if running without ice shelf

File:

• branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) (1 diff)

branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90

@@ -118 +118 @@
                      
                      ! (ISH)
-                     ! ice shelf level level 
+                     ! ice shelf level level MAX(2,jk) => only where ice shelf
                      iku = miku(ji,jj) 
                      ikv = mikv(ji,jj) 
-                     IF( iku == jk ) THEN 
+                     IF( iku == MAX(2,jk) ) THEN 
                         zabe1 = fsahtu(ji,jj,iku) * umask(ji,jj,iku) * re2u_e1u(ji,jj) * fse3u_n(ji,jj,iku) 
                         ztu(ji,jj,jk) = zabe1 * pgui(ji,jj,jn) 
                      ENDIF 
-                     IF( ikv == jk ) THEN 
+                     IF( ikv == MAX(2,jk) ) THEN 
                         zabe2 = fsahtv(ji,jj,ikv) * vmask(ji,jj,ikv) * re1v_e2v(ji,jj) * fse3v_n(ji,jj,ikv) 
                         ztv(ji,jj,jk) = zabe2 * pgvi(ji,jj,jn)