Changeset 4380 for branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2014-01-29T14:54:00+01:00 (10 years ago)

Author:

hliu

Message:

wetting and drying: some bugs removed from dynspg_ts.F90

File:

• branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (2 diffs)

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -372 +372 @@
             h_oce     = gdepw_0(jpk)
          ELSE                                         ! bump centered in the basin
+            !IF(lwp) WRITE(numout,*)
+            !IF(lwp) WRITE(numout,*) '         bathymetry field: flat basin with a bump'
+            !ii_bump = jpidta / 2                           ! i-index of the bump center
+            !ij_bump = jpjdta / 2                           ! j-index of the bump center
+            !r_bump  = 50000._wp                            ! bump radius (meters)       
+            !h_bump  =  2700._wp                            ! bump height (meters)
+            !h_oce   = gdepw_0(jpk)                         ! background ocean depth (meters)
+            !IF(lwp) WRITE(numout,*) '            bump characteristics: '
+            !IF(lwp) WRITE(numout,*) '               bump center (i,j)   = ', ii_bump, ii_bump
+            !IF(lwp) WRITE(numout,*) '               bump height         = ', h_bump , ' meters'
+            !IF(lwp) WRITE(numout,*) '               bump radius         = ', r_bump , ' index'
+            !IF(lwp) WRITE(numout,*) '            background ocean depth = ', h_oce  , ' meters'
+            !!                                        
+            !DO jj = 1, jpjdta                              ! zdta :
+            !   DO ji = 1, jpidta
+            !      zi = FLOAT( ji - ii_bump ) * ppe1_m / r_bump
+            !      zj = FLOAT( jj - ij_bump ) * ppe2_m / r_bump
+            !      zdta(ji,jj) = h_oce - h_bump * EXP( -( zi*zi + zj*zj ) )
+            !   END DO
+            !END DO
+
             IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) '         bathymetry field: flat basin with a bump'
-            ii_bump = jpidta / 2                           ! i-index of the bump center
-            ij_bump = jpjdta / 2                           ! j-index of the bump center
-            r_bump  = 50000._wp                            ! bump radius (meters)       
-            h_bump  =  2700._wp                            ! bump height (meters)
+            IF(lwp) WRITE(numout,*) '         bathymetry field: Thacker''s parabolic basin'
+            ii_bump = jpidta / 2 + 1                       ! i-index of the basin center
+            ij_bump = jpjdta / 2 + 1                       ! j-index of the basin center
+            r_bump  = 430620._wp                           ! basin radius (meters)       
+            h_bump  =     50._wp                           ! basin depth  (meters)
             h_oce   = gdepw_0(jpk)                         ! background ocean depth (meters)
-            IF(lwp) WRITE(numout,*) '            bump characteristics: '
-            IF(lwp) WRITE(numout,*) '               bump center (i,j)   = ', ii_bump, ii_bump
-            IF(lwp) WRITE(numout,*) '               bump height         = ', h_bump , ' meters'
-            IF(lwp) WRITE(numout,*) '               bump radius         = ', r_bump , ' index'
+            IF(lwp) WRITE(numout,*) '           basin characteristics: '
+            IF(lwp) WRITE(numout,*) '              basin center (i,j)   = ', ii_bump, ii_bump
+            IF(lwp) WRITE(numout,*) '              basin depth          = ', h_bump , ' meters'
+            IF(lwp) WRITE(numout,*) '              basin radius         = ', r_bump , ' index'
             IF(lwp) WRITE(numout,*) '            background ocean depth = ', h_oce  , ' meters'
-            !                                        
+                                                    
             DO jj = 1, jpjdta                              ! zdta :
                DO ji = 1, jpidta
-                  zi = FLOAT( ji - ii_bump ) * ppe1_m / r_bump
-                  zj = FLOAT( jj - ij_bump ) * ppe2_m / r_bump
-                  zdta(ji,jj) = h_oce - h_bump * EXP( -( zi*zi + zj*zj ) )
+                  zi = FLOAT( ji - ii_bump ) * ppe1_m 
+                  zj = FLOAT( jj - ij_bump ) * ppe2_m 
+                  zdta(ji,jj) = h_bump * ( 1._wp - ( zi*zi + zj*zj ) / (r_bump * r_bump) )
                END DO
             END DO
+            !IF(lwp) WRITE(numout,*)
+            !IF(lwp) WRITE(numout,*) '         bathymetry field: Thacker''s parabolic channel'
+            !ii_bump = jpidta / 2                           ! i-index of the bump center
+            !r_bump  = 81000._wp                            ! bump radius (meters)       
+            !h_bump  =    20._wp                            ! bump height (meters)
+            !h_oce   = gdepw_0(jpk)                         ! background ocean depth (meters)
+            !IF(lwp) WRITE(numout,*) '            channel characteristics: '
+            !IF(lwp) WRITE(numout,*) '               channel center (i,j)   = ', ii_bump, ii_bump
+            !IF(lwp) WRITE(numout,*) '               channel depth          = ', h_bump , ' meters'
+            !IF(lwp) WRITE(numout,*) '               channel radius         = ', r_bump , ' index'
+            !IF(lwp) WRITE(numout,*) '            background ocean depth = ', h_oce  , ' meters'
+            !                                        
+            !DO jj = 1, jpjdta                              ! zdta :
+            !   DO ji = 1, jpidta
+            !      zi = FLOAT( ji - ii_bump ) * ppe1_m 
+            !      zdta(ji,jj) = h_bump * ( 1._wp - (zi/r_bump) ** 2) - 10._wp
+            !   END DO
+            !END DO
             !                                              ! idta :
             IF( ln_sco ) THEN                                   ! s-coordinate (zsc       ): idta()=jpk
@@ -1418 +1457 @@
                   IF( scobot(ji,jj) >= fsdept(ji,jj,jk) ) THEN
                     mbathy(ji,jj) = MAX( 2, jk )
-                  ELSE IF(scobot(ji,jj) <= rn_landele) THEN
+                  ELSE IF(scobot(ji,jj) <= - rn_landele) THEN
                     mbathy(ji,jj) = 0
                   ELSE