Changeset 7588 for branches/2016

Timestamp:

2017-01-20T16:24:07+01:00 (7 years ago)

Author:

acc

Message:

Branch dev_merge_2016. Wetting and drying enhancements. Added the reading of bathymetry with land elevations (negative depths) from domain configuration files (if ln_wd is .true.). Also added better detection of convergence in the limiter iterations (wet_dry.F90)

Location:

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/domzgr.F90 (modified) (2 diffs)
• DYN/wet_dry.F90 (modified) (4 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -30 +30 @@
    USE usrdef_zgr     ! user defined vertical coordinate system
    USE depth_e3       ! depth <=> e3
+   USE wet_dry, ONLY: ln_wd, ht_wd
    !
    USE in_out_manager ! I/O manager
@@ -256 +257 @@
       CALL iom_get( inum, jpdom_data, 'bottom_level' , z2d  , lrowattr=ln_use_jattr )   ! last wet T-points
       k_bot(:,:) = INT( z2d(:,:) )
+      !
+      ! bathymetry with orography (wetting and drying only)
+      IF( ln_wd )  CALL iom_get( inum, jpdom_data, 'ht_wd' , ht_wd  , lrowattr=ln_use_jattr )
       !
       CALL iom_close( inum )

branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90

@@ -170 +170 @@
               zdep2 = ht_wd(ji,jj) + sshb1(ji,jj) - rn_wdmin1
               IF(zdep2 .le. 0._wp) THEN  !add more safty, but not necessary
-                !zdep2 = 0._wp
                 sshb1(ji,jj) = rn_wdmin1 - ht_wd(ji,jj)
+                IF(zflxu(ji,  jj) > 0._wp) zwdlmtu(ji  ,jj) = 0._wp
+                IF(zflxu(ji-1,jj) < 0._wp) zwdlmtu(ji-1,jj) = 0._wp
+                IF(zflxv(ji,  jj) > 0._wp) zwdlmtv(ji  ,jj) = 0._wp
+                IF(zflxv(ji,jj-1) < 0._wp) zwdlmtv(ji,jj-1) = 0._wp 
                 wdmask(ji,jj) = 0._wp
               END IF
@@ -202 +205 @@
                  zdep2 = ht_wd(ji,jj) + sshb1(ji,jj) - rn_wdmin1 - z2dt * sshemp(ji,jj)
           
-                 IF(zdep1 > zdep2) THEN
-                   jflag = 1
+                 IF( zdep1 > zdep2 ) THEN
                    wdmask(ji, jj) = 0
                    zcoef = ( ( zdep2 - rn_wdmin2 ) * ztmp - zzflxn * z2dt ) / ( zflxp(ji,jj) * z2dt )
                    !zcoef = ( ( zdep2 - rn_wdmin2 ) * ztmp - zzflxn * z2dt ) / ( zzflxp * z2dt )
-                   zcoef = max(zcoef, 0._wp)
+                   ! flag if the limiter has been used but stop flagging if the only
+                   ! changes have zeroed the coefficient since further iterations will
+                   ! not change anything
+                   IF( zcoef > 0._wp ) THEN
+                      jflag = 1 
+                   ELSE
+                      zcoef = 0._wp
+                   ENDIF
                    IF(jk1 > nn_wdit) zcoef = 0._wp
                    IF(zflxu1(ji,  jj) > 0._wp) zwdlmtu(ji  ,jj) = zcoef
@@ -316 +325 @@
 
               zdep2 = ht_wd(ji,jj) + sshn_e(ji,jj) - rn_wdmin1
-              IF(zdep2 .le. 0._wp) THEN  !add more safty, but not necessary
+              IF(zdep2 .le. 0._wp) THEN  !add more safety, but not necessary
                 sshn_e(ji,jj) = rn_wdmin1 - ht_wd(ji,jj)
+                IF(zflxu(ji,  jj) > 0._wp) zwdlmtu(ji  ,jj) = 0._wp
+                IF(zflxu(ji-1,jj) < 0._wp) zwdlmtu(ji-1,jj) = 0._wp
+                IF(zflxv(ji,  jj) > 0._wp) zwdlmtv(ji  ,jj) = 0._wp
+                IF(zflxv(ji,jj-1) < 0._wp) zwdlmtv(ji,jj-1) = 0._wp 
               END IF
            ENDDO
@@ -348 +361 @@
           
                  IF(zdep1 > zdep2) THEN
-                   jflag = 1
                    zcoef = ( ( zdep2 - rn_wdmin2 ) * ztmp - zzflxn * z2dt ) / ( zflxp(ji,jj) * z2dt )
                    !zcoef = ( ( zdep2 - rn_wdmin2 ) * ztmp - zzflxn * z2dt ) / ( zzflxp * z2dt )
-                   zcoef = max(zcoef, 0._wp)
+                   ! flag if the limiter has been used but stop flagging if the only
+                   ! changes have zeroed the coefficient since further iterations will
+                   ! not change anything
+                   IF( zcoef > 0._wp ) THEN
+                      jflag = 1 
+                   ELSE
+                      zcoef = 0._wp
+                   ENDIF
                    IF(jk1 > nn_wdit) zcoef = 0._wp
                    IF(zflxu1(ji,  jj) > 0._wp) zwdlmtu(ji  ,jj) = zcoef