Changeset 4046

Timestamp:

2013-09-27T18:18:21+02:00 (11 years ago)

Author:

davestorkey

Message:

1. Minor bug fix involving scale factors.
2. Comment out limit on radiation velocities for now.

File:

• branches/2013/dev_r3987_METO1_MERCATOR6_OBC_BDY_merge/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90 (modified) (10 diffs)

branches/2013/dev_r3987_METO1_MERCATOR6_OBC_BDY_merge/NEMOGCM/NEMO/OPA_SRC/BDY/bdylib.F90

@@ -59 +59 @@
       INTEGER  ::   flagu, flagv                           ! short cuts
       REAL(wp) ::   zmask_x, zmask_y1, zmask_y2
-      REAL(wp) ::   zex, zey, zey1, zey2
+      REAL(wp) ::   zex1, zex2, zey, zey1, zey2
       REAL(wp) ::   zdt, zdx, zdy, znor2, zrx, zry         ! intermediate calculations
       REAL(wp) ::   zout, zwgt, zdy_centred
@@ -123 +123 @@
          !
          ! Calculate scale factors for calculation of spatial derivatives.        
-         zex = ( abs(iibm1-iibm2) * pe_xdif(iibm2+ii_offset,ijbm2          )         &
-        &      + abs(ijbm1-ijbm2) * pe_ydif(iibm2          ,ijbm2+ij_offset) ) 
+         zex1 = ( abs(iibm1-iibm2) * pe_xdif(iibm1+ii_offset,ijbm1          )         &
+        &       + abs(ijbm1-ijbm2) * pe_ydif(iibm1          ,ijbm1+ij_offset) ) 
+         zex2 = ( abs(iibm1-iibm2) * pe_xdif(iibm2+ii_offset,ijbm2          )         &
+        &       + abs(ijbm1-ijbm2) * pe_ydif(iibm2          ,ijbm2+ij_offset) ) 
          zey1 = ( (iibm1-iibm1jm1) * pe_xdif(iibm1jm1+ii_offset,ijbm1jm1          )  & 
         &      +  (ijbm1-ijbm1jm1) * pe_ydif(iibm1jm1          ,ijbm1jm1+ij_offset) ) 
@@ -132 +134 @@
          if( zey1 .lt. rsmall ) zey1 = zey2
          if( zey2 .lt. rsmall ) zey2 = zey1
-         zex = max(zex,rsmall); zey1 = max(zey1,rsmall); zey2 = max(zey2,rsmall); 
+         zex1 = max(zex1,rsmall); zex2 = max(zex2,rsmall)
+         zey1 = max(zey1,rsmall); zey2 = max(zey2,rsmall); 
          !
          ! Calculate masks for calculation of spatial derivatives.        
@@ -149 +152 @@
          ! zrx and zry.
          zdt = phia(iibm1,ijbm1) - phib(iibm1,ijbm1)
-         zdx = ( ( phia(iibm1,ijbm1) - phia(iibm2,ijbm2) ) / zex ) * zmask_x 
+         zdx = ( ( phia(iibm1,ijbm1) - phia(iibm2,ijbm2) ) / zex2 ) * zmask_x 
          zdy_1 = ( ( phib(iibm1   ,ijbm1   ) - phib(iibm1jm1,ijbm1jm1) ) / zey1 ) * zmask_y1    
          zdy_2 = ( ( phib(iibm1jp1,ijbm1jp1) - phib(iibm1   ,ijbm1)    ) / zey2 ) * zmask_y2 
@@ -161 +164 @@
          znor2 = max(znor2,zepsilon)
          !
-         zrx = zdt * zdx / ( zex * znor2 ) 
-         zrx = min(zrx,2.0_wp)
+         zrx = zdt * zdx / ( zex1 * znor2 ) 
+!!$         zrx = min(zrx,2.0_wp)
          zout = sign( 1., zrx )
          zout = 0.5*( zout + abs(zout) )
@@ -215 +218 @@
       INTEGER  ::   flagu, flagv                           ! short cuts
       REAL(wp) ::   zmask_x, zmask_y1, zmask_y2
-      REAL(wp) ::   zex, zey, zey1, zey2
+      REAL(wp) ::   zex1, zex2, zey, zey1, zey2
       REAL(wp) ::   zdt, zdx, zdy, znor2, zrx, zry         ! intermediate calculations
       REAL(wp) ::   zout, zwgt, zdy_centred
@@ -281 +284 @@
             !
             ! Calculate scale factors for calculation of spatial derivatives.        
-            zex = ( abs(iibm1-iibm2) * pe_xdif(iibm2+ii_offset,ijbm2          )         &
-           &      + abs(ijbm1-ijbm2) * pe_ydif(iibm2          ,ijbm2+ij_offset) ) 
+            zex1 = ( abs(iibm1-iibm2) * pe_xdif(iibm1+ii_offset,ijbm1          )         &
+           &       + abs(ijbm1-ijbm2) * pe_ydif(iibm1          ,ijbm1+ij_offset) ) 
+            zex2 = ( abs(iibm1-iibm2) * pe_xdif(iibm2+ii_offset,ijbm2          )         &
+           &       + abs(ijbm1-ijbm2) * pe_ydif(iibm2          ,ijbm2+ij_offset) ) 
             zey1 = ( (iibm1-iibm1jm1) * pe_xdif(iibm1jm1+ii_offset,ijbm1jm1          )  & 
            &      +  (ijbm1-ijbm1jm1) * pe_ydif(iibm1jm1          ,ijbm1jm1+ij_offset) ) 
@@ -290 +295 @@
             if( zey1 .lt. rsmall ) zey1 = zey2
             if( zey2 .lt. rsmall ) zey2 = zey1
-            zex = max(zex,rsmall); zey1 = max(zey1,rsmall); zey2 = max(zey2,rsmall); 
+            zex1 = max(zex1,rsmall); zex2 = max(zex2,rsmall); 
+            zey1 = max(zey1,rsmall); zey2 = max(zey2,rsmall); 
             !
             ! Calculate masks for calculation of spatial derivatives.        
@@ -305 +311 @@
             ! this reason. 
             zdt = phia(iibm1,ijbm1,jk) - phib(iibm1,ijbm1,jk)
-            zdx = ( ( phia(iibm1,ijbm1,jk) - phia(iibm2,ijbm2,jk) ) / zex ) * zmask_x                  
+            zdx = ( ( phia(iibm1,ijbm1,jk) - phia(iibm2,ijbm2,jk) ) / zex2 ) * zmask_x                  
             zdy_1 = ( ( phib(iibm1   ,ijbm1   ,jk) - phib(iibm1jm1,ijbm1jm1,jk) ) / zey1 ) * zmask_y1  
             zdy_2 = ( ( phib(iibm1jp1,ijbm1jp1,jk) - phib(iibm1   ,ijbm1   ,jk) ) / zey2 ) * zmask_y2      
@@ -318 +324 @@
             !
             ! update boundary value:
-            zrx = zdt * zdx / ( zex * znor2 )
-            zrx = min(zrx,2.0_wp)
+            zrx = zdt * zdx / ( zex1 * znor2 )
+!!$            zrx = min(zrx,2.0_wp)
             zout = sign( 1., zrx )
             zout = 0.5*( zout + abs(zout) )