Changeset 7616

Timestamp:

2017-01-27T18:09:47+01:00 (8 years ago)

Author:

acc

Message:

Branch 2016/dev_merge_2016. Wetting and drying updates. Includes a slightly modified MY_SRC copy of domain.F90 to enable a north-south cyclic test domain (jperio=7). Other changes include fixes in usrdef_zgr.F90 to correct metrics on the northern boundary and a new test case (#8) which uses the north-south cyclic option.

Location:

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC

Files:

• domain.F90 (added)
• usrdef_istate.F90 (modified) (1 diff)
• usrdef_nam.F90 (modified) (1 diff)
• usrdef_zgr.F90 (modified) (3 diffs)

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC/usrdef_istate.F90

@@ -90 +90 @@
             end do
             !                                     ! ====================
-         CASE ( 2 )                               ! WAD 2 configuration
+         CASE ( 2, 8 )                            ! WAD 2 configuration
             !                                     ! ====================
             !

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC/usrdef_nam.F90

@@ -94 +94 @@
       !                             ! Set the lateral boundary condition of the global domain
       kperio = 0                    ! WAD_TEST_CASES configuration : closed domain
+      IF( nn_wad_test == 8 ) kperio = 7 ! North-South cyclic test
       !
       WRITE(ldtxt(ii),*) '   '                                                                          ;   ii = ii + 1

branches/2016/dev_merge_2016/NEMOGCM/CONFIG/WAD_TEST_CASES/MY_SRC/usrdef_zgr.F90

@@ -112 +112 @@
                zht(:,mj0(jpjglo):mj1(jpjglo)) = -4._wp
                !                                     ! ====================
-            CASE ( 2, 3 )                            ! WAD 2 or 3  configuration
+            CASE ( 2, 3, 8 )                         ! WAD 2 or 3  configuration
                !                                     ! ====================
                !
@@ -125 +125 @@
                zht(mi0(1):mi1(1),:) = -4._wp
                zht(mi0(jpiglo):mi1(jpiglo),:) = -4._wp
-               zht(:,mj0(1):mj1(1)) = -4._wp
-               zht(:,mj0(jpjglo):mj1(jpjglo)) = -4._wp
+               IF( nn_cfg /= 8 ) THEN
+                  zht(:,mj0(1):mj1(1)) = -4._wp
+                  zht(:,mj0(jpjglo):mj1(jpjglo)) = -4._wp
+               ENDIF
                !                                     ! ====================
             CASE ( 4 )                               ! WAD 4 configuration
@@ -305 +307 @@
                   zwet = MAX( zhu(ji,jj), rn_wdmin1 )
                   pe3u (ji,jj,jk) = zwet * z1_jpkm1
+                  pe3uw(ji,jj,jk) = zwet * z1_jpkm1
                   pe3f (ji,jj,jk) = zwet * z1_jpkm1
-                  pe3uw(ji,jj,jk) = zwet * z1_jpkm1
                   zwet = MAX( zhv(ji,jj), rn_wdmin1 )
+                  pe3v (ji,jj,jk) = zwet * z1_jpkm1
                   pe3vw(ji,jj,jk) = zwet * z1_jpkm1
-                  pe3v (ji,jj,jk) = zwet * z1_jpkm1
               END DO      
            END DO      
          END DO      
+         CALL lbc_lnk( pdept, 'T', 1. )
+         CALL lbc_lnk( pdepw, 'T', 1. )
+         CALL lbc_lnk( pe3t , 'T', 1. )
+         CALL lbc_lnk( pe3w , 'T', 1. )
          CALL lbc_lnk( pe3u , 'U', 1. )
          CALL lbc_lnk( pe3uw, 'U', 1. )
+         CALL lbc_lnk( pe3f , 'F', 1. )
          CALL lbc_lnk( pe3v , 'V', 1. )
          CALL lbc_lnk( pe3vw, 'V', 1. )
-         CALL lbc_lnk( pe3f , 'F', 1. )
          WHERE( pe3t (:,:,:) == 0._wp )   pe3t (:,:,:) = 1._wp
          WHERE( pe3u (:,:,:) == 0._wp )   pe3u (:,:,:) = 1._wp