Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -102 +102 @@
       !!
       NAMELIST/nambdy_index/ ctypebdy, nbdyind, nbdybeg, nbdyend
-
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
       !!----------------------------------------------------------------------
 
@@ -119 +119 @@
       cgrid= (/'t','u','v'/)
       
-      ! -----------------------------------------
-      ! Initialise and read namelist parameters
-      ! -----------------------------------------
-
-      nb_bdy            = 0
-      ln_coords_file(:) = .false.
-      cn_coords_file(:) = ''
-      ln_mask_file      = .false.
-      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
-      ln_tra_dmp(:)     = .false.
-      ln_dyn3d_dmp(:)   = .false.
-      rn_time_dmp(:)    = 1.
-#if defined key_lim2
-      nn_ice_lim2(:)    = 0
-      nn_ice_lim2_dta(:)= -1  ! uninitialised flag
-#endif
-      ln_vol            = .false.
-      nn_volctl         = -1  ! uninitialised flag
-      nn_rimwidth(:)    = -1  ! uninitialised flag
-
-      REWIND( numnam )                    
-      READ  ( numnam, nambdy )
+      ! ------------------------
+      ! Read namelist parameters
+      ! ------------------------
+
+      REWIND( numnam_ref )              ! Namelist nambdy in reference namelist :Unstructured open boundaries  
+      READ  ( numnam_ref, nambdy, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist nambdy in configuration namelist :Unstructured open boundaries
+      READ  ( numnam_cfg, nambdy, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in configuration namelist', lwp )
+      WRITE ( numond, nambdy )
 
       ! -----------------------------------------
@@ -301 +285 @@
       ! Work out global dimensions of boundary data
       ! ---------------------------------------------
-      REWIND( numnam )                    
+      REWIND( numnam_cfg )     
+
+      !!----------------------------------------------------------------------
+
+              
                
       nblendta(:,:) = 0
@@ -319 +307 @@
             icount = icount + 1
             ! No REWIND here because may need to read more than one nambdy_index namelist.
-            READ  ( numnam, nambdy_index )
+            ! Read only namelist_cfg to avoid unseccessfull overwrite
+!!          REWIND( numnam_ref )              ! Namelist nambdy_index in reference namelist : Open boundaries indexes
+!!          READ  ( numnam_ref, namrun, IOSTAT = ios, ERR = 903)
+!!903       IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_index in reference namelist', lwp )
+
+!!          REWIND( numnam_cfg )              ! Namelist nambdy_index in configuration namelist : Open boundaries indexes
+            READ  ( numnam_cfg, nambdy_index, IOSTAT = ios, ERR = 904 )
+904         IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_index in configuration namelist', lwp )
+            WRITE ( numond, nambdy_index )
 
             SELECT CASE ( TRIM(ctypebdy) )