Changeset 6012 for branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

2015-12-07T16:11:45+01:00 (8 years ago)

Author:

mathiot

Message:

merge MetO branch with dev_r5151_UKMO_ISF

Location:

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• dom_oce.F90 (modified) (2 diffs)
• domhgr.F90 (modified) (1 diff)
• domvvl.F90 (modified) (1 diff)
• domzgr.F90 (modified) (8 diffs)

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -256 +256 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   tmask_i            !: interior domain T-point mask
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   tmask_h            !: internal domain T-point mask (Figure 8.5 NEMO book)
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   bmask                     !: land/ocean mask of barotropic stream function
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   bmask              !: land/ocean mask of barotropic stream function
 
    INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   misfdep                 !: top first ocean level                (ISF)
@@ -390 +390 @@
 
       ALLOCATE( mbathy(jpi,jpj) , bathy  (jpi,jpj) ,                                       &
-         &     tmask_i(jpi,jpj) , tmask_h(jpi, jpj),                                       & 
+         &     tmask_i(jpi,jpj) , tmask_h(jpi,jpj) ,                                       & 
          &     ssmask (jpi,jpj) , ssumask(jpi,jpj) , ssvmask(jpi,jpj) , ssfmask(jpi,jpj) , &
          &     bmask(jpi,jpj)   ,                                                          &

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90

@@ -506 +506 @@
       CALL iom_close( inum )
       
-!!gm   THIS is TO BE REMOVED !!!!!!!
-
-! need to be define for the extended grid south of -80S
-! some point are undefined but you need to have e1 and e2 .NE. 0
-      WHERE (e1t==0.0_wp)
-         e1t=1.0e2
-      END WHERE
-      WHERE (e1v==0.0_wp)
-         e1v=1.0e2
-      END WHERE
-      WHERE (e1u==0.0_wp)
-         e1u=1.0e2
-      END WHERE
-      WHERE (e1f==0.0_wp)
-         e1f=1.0e2
-      END WHERE
-      WHERE (e2t==0.0_wp)
-         e2t=1.0e2
-      END WHERE
-      WHERE (e2v==0.0_wp)
-         e2v=1.0e2
-      END WHERE
-      WHERE (e2u==0.0_wp)
-         e2u=1.0e2
-      END WHERE
-      WHERE (e2f==0.0_wp)
-         e2f=1.0e2
-      END WHERE
-!!gm end
-       
     END SUBROUTINE hgr_read
     

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -975 +975 @@
       !
       IF( ioptio /= 1 )   CALL ctl_stop( 'Choose ONE vertical coordinate in namelist nam_vvl' )
-      IF( .NOT. ln_vvl_zstar .AND. nn_isf .NE. 0) CALL ctl_stop( 'Only vvl_zstar has been tested with ice shelf cavity' )
+      IF( .NOT. ln_vvl_zstar .AND. ln_isf ) CALL ctl_stop( 'Only vvl_zstar has been tested with ice shelf cavity' )
       !
       IF(lwp) THEN                   ! Print the choice

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1258 +1258 @@
       END WHERE
 
+      ! remove very shallow ice shelf (less than ~ 10m if 75L)
+      WHERE (risfdep(:,:) <= 10._wp .AND. misfdep(:,:) > 1)
+         misfdep = 0; risfdep = 0.0_wp;
+         mbathy  = 0; bathy   = 0.0_wp;
+      END WHERE
+      WHERE (bathy(:,:) <= 30.0_wp .AND. gphit < -60._wp)
+         misfdep = 0; risfdep = 0.0_wp;
+         mbathy  = 0; bathy   = 0.0_wp;
+      END WHERE
+ 
 ! basic check for the compatibility of bathy and risfdep. I think it should be offline because it is not perfect and cannot solved all the situation
       icompt = 0 
@@ -1323 +1333 @@
                      zrisfdepdiff=ABS(risfdep(ji,jj) - (gdepw_1d(misfdep(ji,jj)  ) &
                          &            - MIN( e3zps_min, e3t_1d(misfdep(ji,jj)-1)*e3zps_rat )))
- 
                      IF (bathy(ji,jj) > risfdep(ji,jj) .AND. mbathy(ji,jj) <  misfdep(ji,jj)) THEN
                         IF (zbathydiff <= zrisfdepdiff) THEN
@@ -1369 +1378 @@
          END DO
  
- ! point V mbathy(ji,jj) EQ misfdep(ji,jj+1) 
+ ! point V mbathy(ji,jj) == misfdep(ji,jj+1) 
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
@@ -1405 +1414 @@
             mbathy(:,:)  = INT( zbathy(:,:) )
          ENDIF
- ! point V misdep(ji,jj) EQ mbathy(ji,jj+1) 
+ ! point V misdep(ji,jj) == mbathy(ji,jj+1) 
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
@@ -1443 +1452 @@
          ENDIF 
  
- ! point U mbathy(ji,jj) EQ misfdep(ji,jj+1) 
+ ! point U mbathy(ji,jj) == misfdep(ji,jj+1) 
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
@@ -1480 +1489 @@
          ENDIF 
  
- ! point U misfdep(ji,jj) EQ bathy(ji,jj+1) 
+ ! point U misfdep(ji,jj) == bathy(ji,jj+1) 
          DO jj = 1, jpjm1
             DO ji = 1, jpim1
@@ -1749 +1758 @@
 ! end check compatibility ice shelf/bathy
       ! remove very shallow ice shelf (less than ~ 10m if 75L)
+      WHERE (risfdep(:,:) <= 10._wp)
+         misfdep = 1; risfdep = 0.0_wp;
+      END WHERE
+
       IF( icompt == 0 ) THEN 
          IF(lwp) WRITE(numout,*)'     no points with ice shelf too close to bathymetry' 
@@ -1832 +1845 @@
                ENDIF 
             !       ... on ik / ik-1 
-               e3w_0  (ji,jj,ik  ) = e3t_0  (ji,jj,ik) 
+               e3w_0  (ji,jj,ik  ) = e3t_0  (ji,jj,ik) !2._wp * (gdept_0(ji,jj,ik) - gdepw_0(ji,jj,ik)) 
                e3t_0  (ji,jj,ik-1) = gdepw_0(ji,jj,ik) - gdepw_1d(ik-1)
 ! The next line isn't required and doesn't affect results - included for consistency with bathymetry code