Changeset 2831 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obcini.F90

Timestamp:

2011-08-25T18:24:45+02:00 (13 years ago)

Author:

davestorkey

Message:

Change to allow the choice of initial fields as boundary data for
each group of variables (TRA, U2D, U3D) independently.

File:

• branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obcini.F90 (modified) (8 diffs)

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/OBC/obcini.F90

@@ -67 +67 @@
       !!
       NAMELIST/namobc/ nb_obc, ln_coords_file, cn_coords_file,             &
-         &             ln_mask_file, cn_mask_file, nn_dyn2d, nn_dyn3d,     &
-         &             nn_tra,                                             &
+         &             ln_mask_file, cn_mask_file, nn_dyn2d, nn_dyn2d_dta, &
+         &             nn_dyn3d, nn_dyn3d_dta, nn_tra, nn_tra_dta,         &  
 #if defined key_lim2
-         &             nn_ice_lim2,                                        &
+         &             nn_ice_lim2, nn_ice_lim2_dta,                       &
 #endif
-         &             nn_tides, ln_vol, ln_clim, nn_dtactl, nn_volctl,    &
+         &             nn_tides, ln_vol, ln_clim, nn_volctl,               &
          &             nn_rimwidth, nn_dmp2d_in, nn_dmp2d_out,             &
          &             nn_dmp3d_in, nn_dmp3d_out
@@ -87 +87 @@
          &                               ' and general open boundary condition are not compatible' )
 
-      cgrid= (/'T','U','V'/)
+      cgrid= (/'t','u','v'/)
 
       ! -----------------------------------------
@@ -99 +99 @@
       cn_mask_file(:)   = ''
       nn_dyn2d(:)       = 0
+      nn_dyn2d_dta(:)   = -1  ! uninitialised flag
       nn_dyn3d(:)       = 0
+      nn_dyn3d_dta(:)   = -1  ! uninitialised flag
       nn_tra(:)         = 0
+      nn_tra_dta(:)     = -1  ! uninitialised flag
 #if defined key_lim2
       nn_ice_lim2(:)    = 0
+      nn_ice_lim2_dta(:)= -1  ! uninitialised flag
 #endif
       ln_vol            = .false.
       ln_clim(:)        = .false.
-      nn_dtactl(:)      = -1  ! uninitialised flag
       nn_tides(:)       =  0  ! default to no tidal forcing
       nn_volctl         = -1  ! uninitialised flag
@@ -135 +138 @@
         IF(lwp) WRITE(numout,*) '------ Open boundary data set ',ib_obc,'------' 
 
-        !                                         ! check type of data used (nn_dtactl value)
-        SELECT CASE( nn_dtactl(ib_obc) )                   ! 
-          CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      initial state used for obc data'        
-          CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      boundary data taken from file'
-          CASE DEFAULT   ;   CALL ctl_stop( 'nn_dtactl must be 0 or 1' )
-        END SELECT
-        IF(lwp) WRITE(numout,*)
-
         IF(lwp) WRITE(numout,*) 'Boundary conditions for barotropic solution:  '
         SELECT CASE( nn_dyn2d(ib_obc) )                  
@@ -150 +145 @@
           CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for nn_dyn2d' )
         END SELECT
+        IF( nn_dyn2d(ib_obc) .gt. 0 ) THEN
+           SELECT CASE( nn_dyn2d_dta(ib_obc) )                   ! 
+              CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      initial state used for obc data'        
+              CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      boundary data taken from file'
+              CASE DEFAULT   ;   CALL ctl_stop( 'nn_dyn2d_dta must be 0 or 1' )
+           END SELECT
+        ENDIF
         IF(lwp) WRITE(numout,*)
 
@@ -158 +160 @@
           CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for nn_dyn3d' )
         END SELECT
+        IF( nn_dyn3d(ib_obc) .gt. 0 ) THEN
+           SELECT CASE( nn_dyn3d_dta(ib_obc) )                   ! 
+              CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      initial state used for obc data'        
+              CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      boundary data taken from file'
+              CASE DEFAULT   ;   CALL ctl_stop( 'nn_dyn3d_dta must be 0 or 1' )
+           END SELECT
+        ENDIF
         IF(lwp) WRITE(numout,*)
 
@@ -166 +175 @@
           CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for nn_tra' )
         END SELECT
+        IF( nn_tra(ib_obc) .gt. 0 ) THEN
+           SELECT CASE( nn_tra_dta(ib_obc) )                   ! 
+              CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      initial state used for obc data'        
+              CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      boundary data taken from file'
+              CASE DEFAULT   ;   CALL ctl_stop( 'nn_tra_dta must be 0 or 1' )
+           END SELECT
+        ENDIF
         IF(lwp) WRITE(numout,*)
 
 #if defined key_lim2
         IF(lwp) WRITE(numout,*) 'Boundary conditions for sea ice:  '
-        SELECT CASE( nn_tra(ib_obc) )                  
+        SELECT CASE( nn_ice_lim2(ib_obc) )                  
           CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      no open boundary condition'        
           CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      Flow Relaxation Scheme'
           CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for nn_tra' )
         END SELECT
+        IF( nn_ice_lim2(ib_obc) .gt. 0 ) THEN 
+           SELECT CASE( nn_ice_lim2_dta(ib_obc) )                   ! 
+              CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      initial state used for obc data'        
+              CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      boundary data taken from file'
+              CASE DEFAULT   ;   CALL ctl_stop( 'nn_ice_lim2_dta must be 0 or 1' )
+           END SELECT
+        ENDIF
         IF(lwp) WRITE(numout,*)
 #endif
@@ -255 +278 @@
          IF( .NOT. ln_coords_file(ib_obc) ) THEN ! Calculate global index arrays from namelist parameters
 
-           !! Calculate global index arrays from namelist parameters
+            !! Calculate global index arrays from namelist parameters
 
          ELSE            ! Read global index arrays from boundary coordinates file.