Changeset 592 for trunk/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2007-02-09T10:15:25+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_update_001 : CT : - add non linear free surface (variable volume) with new cpp key key_vvl

File:

• trunk/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -337 +337 @@
             idta(:,:) = jpkm1                            ! flat basin 
             zdta(:,:) = gdepw_0(jpk)
+            h_oce     = gdepw_0(jpk)
 
          ELSE                                         ! bump
@@ -342 +343 @@
             IF(lwp) WRITE(numout,*) '         bathymetry field: flat basin with a bump'
 
-            ii_bump = jpidta / 3 + 3       ! i-index of the bump center
+            ii_bump = jpidta / 2           ! i-index of the bump center
             ij_bump = jpjdta / 2           ! j-index of the bump center
-            r_bump  =    6                 ! bump radius (index)       
-            h_bump  =  240.e0              ! bump height (meters)
+            r_bump  = 50000.e0             ! bump radius (meters)       
+            h_bump  = 2700.e0              ! bump height (meters)
             h_oce   = gdepw_0(jpk)         ! background ocean depth (meters)
             IF(lwp) WRITE(numout,*) '            bump characteristics: '
@@ -355 +356 @@
             DO jj = 1, jpjdta
                DO ji = 1, jpidta
-                  zi = FLOAT( ji - ii_bump ) / r_bump      
-                  zj = FLOAT( jj - ij_bump ) / r_bump       
+                  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
@@ -392 +393 @@
             idta( 1    , :    ) = ih                ;      zdta( 1    , :    ) =  zh
             idta(jpidta, :    ) = ih                ;      zdta(jpidta, :    ) =  zh
-         ENDIF
-
-         !  EEL R5 configuration with east and west open boundaries.
-         !  Two rows of zeroes are needed at the south and north for OBCs
-          
-         IF( cp_cfg == "eel" .AND. jp_cfg == 5 ) THEN
-            ih = 0                                  ;      zh = 0.e0
-            IF( ln_sco )   zh = jpkm1               ;      IF( ln_sco )   zh = h_oce
-            idta( : , 2      ) = jpkm1              ;      zdta( : , 2      ) =  h_oce
-            idta( : ,jpjdta-1) = jpkm1              ;      zdta( : ,jpjdta-1) =  h_oce
          ENDIF