Changeset 3908

Timestamp:

2013-06-11T12:25:38+02:00 (11 years ago)

Author:

davestorkey

Message:

Bug fixes for BDY - see ticket #1105.

Location:

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/BDY

Files:

• bdydta.F90 (modified) (1 diff)
• bdyini.F90 (modified) (5 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90

@@ -554 +554 @@
             ! Recalculate field counts
             !-------------------------
-            nb_bdy_fld_sum = 0
             IF( ib_bdy .eq. 1 ) THEN 
+               nb_bdy_fld_sum = 0
                nb_bdy_fld(ib_bdy) = jfld
                nb_bdy_fld_sum     = jfld              

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -247 +247 @@
       ! ---------------------------------------------
       REWIND( numnam )                    
+      jpbdta = 1
       DO ib_bdy = 1, nb_bdy
 
-         jpbdta = 1
          IF( .NOT. ln_coords_file(ib_bdy) ) THEN ! Work out size of global arrays from namelist parameters
  
@@ -317 +317 @@
 
             nblendta(:,ib_bdy) = nblendta(:,ib_bdy) * nn_rimwidth(ib_bdy)
-            jpbdta = MAXVAL(nblendta(:,ib_bdy))               
+            jpbdta = MAX( jpbdta, MAXVAL(nblendta(:,ib_bdy)) )
 
 
@@ -324 +324 @@
 
             CALL iom_open( cn_coords_file(ib_bdy), inum )
-            jpbdta = 1
+
             DO igrd = 1, jpbgrd
                id_dummy = iom_varid( inum, 'nbi'//cgrid(igrd), kdimsz=kdimsz )  
@@ -330 +330 @@
                jpbdta = MAX(jpbdta, kdimsz(1))
             ENDDO
+            CALL iom_close( inum )
 
          ENDIF 
@@ -507 +508 @@
          ELSE            ! Read global index arrays from boundary coordinates file.
 
+            CALL iom_open( cn_coords_file(ib_bdy), inum )
             DO igrd = 1, jpbgrd
                CALL iom_get( inum, jpdom_unknown, 'nbi'//cgrid(igrd), dta_global(1:nblendta(igrd,ib_bdy),:,1) )