New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 3909 – NEMO

Changeset 3909


Ignore:
Timestamp:
2013-06-11T13:01:03+02:00 (11 years ago)
Author:
davestorkey
Message:

Bug fixes for BDY module - see ticket #1106.

Location:
trunk/NEMOGCM/NEMO/OPA_SRC/BDY
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90

    r3851 r3909  
    476476            IF( nn_dyn2d(ib_bdy) .gt. 0 .and. ( nn_dyn2d_dta(ib_bdy) .eq. 1 .or. nn_dyn2d_dta(ib_bdy) .eq. 3 ) ) THEN  
    477477 
    478                IF( nn_tra(ib_bdy) .ne. 4 ) THEN ! runoff condition : no ssh reading 
     478               IF( nn_dyn2d(ib_bdy) .ne. jp_frs .and. nn_tra(ib_bdy) .ne. 4 ) THEN ! runoff condition : no ssh reading 
    479479                  jfld = jfld + 1 
    480480                  blf_i(jfld) = bn_ssh 
     
    572572            ! Recalculate field counts 
    573573            !------------------------- 
    574             nb_bdy_fld_sum = 0 
    575574            IF( ib_bdy .eq. 1 ) THEN  
     575               nb_bdy_fld_sum = 0 
    576576               nb_bdy_fld(ib_bdy) = jfld 
    577577               nb_bdy_fld_sum     = jfld               
     
    616616               ALLOCATE( dta_bdy(ib_bdy)%u2d(ilen0(2)) ) 
    617617               ALLOCATE( dta_bdy(ib_bdy)%v2d(ilen0(3)) ) 
    618                IF (nn_dyn2d_dta(ib_bdy).eq.1.or.nn_dyn2d_dta(ib_bdy).eq.3) THEN 
     618               IF ( nn_dyn2d(ib_bdy) .ne. jp_frs .and. (nn_dyn2d_dta(ib_bdy).eq.1.or.nn_dyn2d_dta(ib_bdy).eq.3) ) THEN 
    619619                  jfld = jfld + 1 
    620620                  dta_bdy(ib_bdy)%ssh => bf(jfld)%fnow(:,1,1) 
  • trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

    r3703 r3909  
    10531053       
    10541054      bdytmask(:,:) = tmask(:,:,1) 
     1055      IF( .not. ln_mask_file ) THEN 
     1056         ! If .not. ln_mask_file then we need to derive mask on U and V grid  
     1057         ! from mask on T grid here. 
     1058         bdyumask(:,:) = 0.e0 
     1059         bdyvmask(:,:) = 0.e0 
     1060         DO ij=1, jpjm1 
     1061            DO ii=1, jpim1 
     1062               bdyumask(ii,ij)=bdytmask(ii,ij)*bdytmask(ii+1, ij ) 
     1063               bdyvmask(ii,ij)=bdytmask(ii,ij)*bdytmask(ii  ,ij+1)   
     1064            END DO 
     1065         END DO 
     1066         CALL lbc_lnk( bdyumask(:,:), 'U', 1. )   ;   CALL lbc_lnk( bdyvmask(:,:), 'V', 1. )      ! Lateral boundary cond. 
     1067      ENDIF 
    10551068 
    10561069      ! bdy masks and bmask are now set to zero on boundary points: 
Note: See TracChangeset for help on using the changeset viewer.