Changeset 4724 for branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2014-07-18T17:32:27+02:00 (10 years ago)

Author:

mathiot

Message:

ISF branch: add comments, fix mpp and restar issues, add test to stop if incompatible options and fix mask issue in sbcice and sbcblk.

File:

• branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (7 diffs)

branches/2014/dev_r4650_UKMO2_ice_shelves/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -299 +299 @@
       ENDIF
 
-! need to be like this to compute the pressure gradient with ISF
+! need to be like this to compute the pressure gradient with ISF. If not, level beneath the ISF are not aligned (sum(e3t) /= depth)
 ! define e3t_0 and e3w_0 as the differences between gdept and gdepw respectively
       DO jk = 1, jpkm1
@@ -1023 +1023 @@
       END WHERE
     
-
+! basic check for the compatibility of bathy and icedep. I think it should be offline because it is not perfect and cannot solved all the situation
       icompt = 0 
+! run the bathy check 10 times to be sure all the modif in the bathy or iceshelf draft are compatible together
       DO jl = 1, 10 
         IF( lk_mpp ) THEN
@@ -1058 +1059 @@
             bathy(:,:)   = 0._wp
          END WHERE
-
+! Case where bathy and icedep compatible but not the level variable mbathy/micedep because of partial cell condition
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -1075 +1076 @@
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
+               ! T point
                IF( zmicedep(ji,jj) == zmbathy(ji,jj) .AND. zmbathy(ji,jj) .GT. 1) THEN
                   mbathy(ji,jj) = zmbathy(ji,jj) + 1 
                   bathy(ji,jj)=gdepw_1d(mbathy(ji,jj)) + MIN( e3zps_min, e3t_1d(mbathy(ji,jj))*e3zps_rat )
                ENDIF
+               ! V point
                IF( zmicedep(ji,jj+1) == zmbathy(ji,jj) .AND. zmbathy(ji,jj) .GT. 1) THEN
                   mbathy(ji,jj) = zmbathy(ji,jj) + 1 
                   bathy(ji,jj)=gdepw_1d(mbathy(ji,jj)) + MIN( e3zps_min, e3t_1d(mbathy(ji,jj))*e3zps_rat )
                ENDIF
+               ! V point -1
                IF( zmicedep(ji,jj-1) == zmbathy(ji,jj) .AND. zmbathy(ji,jj) .GT. 1) THEN
                   mbathy(ji,jj) = zmbathy(ji,jj) + 1 
                   bathy(ji,jj)=gdepw_1d(mbathy(ji,jj)) + MIN( e3zps_min, e3t_1d(mbathy(ji,jj))*e3zps_rat )
                ENDIF
+               ! U point
                IF( zmicedep(ji+1,jj) == zmbathy(ji,jj) .AND. zmbathy(ji,jj) .GT. 1) THEN
                   mbathy(ji,jj) = zmbathy(ji,jj) + 1 
                   bathy(ji,jj)=gdepw_1d(mbathy(ji,jj)) + MIN( e3zps_min, e3t_1d(mbathy(ji,jj))*e3zps_rat )
                ENDIF
+               ! U point -1
                IF( zmicedep(ji-1,jj) == zmbathy(ji,jj) .AND. zmbathy(ji,jj) .GT. 1) THEN
                   mbathy(ji,jj) = zmbathy(ji,jj) + 1 
@@ -1217 +1223 @@
             mbathy(:,:) = INT( zbathy(:,:) )
         ENDIF 
-        ! remove pool of water stuck between ice shelf and bathymetry
+        ! remove 1 cell pool of water stuck between ice shelf and bathymetry (need a 3D flood filling tools to do this properly)
         DO jk = 1, jpk
         WHERE (micedep==0) micedep=jpk
@@ -1344 +1350 @@
                 e3w_0  (ji,jj,ik+1) = gdept_1d(ik+1) - gdept_0(ji,jj,ik)
 
-                IF( ik + 1 == mbathy(ji,jj) ) THEN               ! ice shelf point only 
+                IF( ik + 1 == mbathy(ji,jj) ) THEN               ! ice shelf point only (2 cell water column) 
                    e3w_0  (ji,jj,ik+1) = gdept_0(ji,jj,ik+1) - gdept_0(ji,jj,ik) 
                 ENDIF 
@@ -1398 +1404 @@
          DO jj = 1, jpjm1 
             DO ji = 1, fs_jpim1   ! vector opt. 
-! (ISF)** NEEDS CHANGING TO SECOND OPTION FOR ICE SHELF BUT WILL CHANGE RESULTS WITHOUT ICE (DIFFER AT THE 1e-13 LEVEL) 
                e3uw_0(ji,jj,jk) = MIN( gdept_0(ji,jj,jk), gdept_0(ji+1,jj  ,jk) ) - MAX( gdept_0(ji,jj,jk-1), gdept_0(ji+1,jj  ,jk-1) )
                e3vw_0(ji,jj,jk) = MIN( gdept_0(ji,jj,jk), gdept_0(ji  ,jj+1,jk) ) - MAX( gdept_0(ji,jj,jk-1), gdept_0(ji  ,jj+1,jk-1) )