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 4451 for branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traswp.F90 – NEMO

Ignore:
Timestamp:
2014-02-04T13:16:21+01:00 (10 years ago)
Author:
trackstand2
Message:

Add use of mbkmax to tra_nxt and traswp

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/DEV_r2739_STFC_dCSE/NEMOGCM/NEMO/OPA_SRC/TRA/traswp.F90

    r3211 r4451  
    66   USE par_oce         ! ocean parameters 
    77   USE oce             ! ocean dynamics and active tracers 
     8   USE dom_oce, ONLY: mbkmax 
    89 
    910   IMPLICIT NONE 
     
    3132      !!---------------------------------------------------------------------- 
    3233      ! 
     34#if defined key_z_first 
     35      INTEGER :: ji,jj,jk 
     36 
     37      DO jj = 1, jpj, 1 
     38         DO ji = 1, jpi, 1 
     39            DO jk = 1, mbkmax(ji,jj), 1 
     40               tsn(ji,jj,jk,jp_tem) = tn(ji,jj,jk)      ;      tsn(ji,jj,jk,jp_sal) = sn(ji,jj,jk) 
     41               tsb(ji,jj,jk,jp_tem) = tb(ji,jj,jk)      ;      tsb(ji,jj,jk,jp_sal) = sb(ji,jj,jk) 
     42               tsa(ji,jj,jk,jp_tem) = ta(ji,jj,jk)      ;      tsa(ji,jj,jk,jp_sal) = sa(ji,jj,jk) 
     43            END DO 
     44         END DO 
     45      END DO 
     46#else 
    3347      tsn(:,:,:,jp_tem) = tn(:,:,:)      ;      tsn(:,:,:,jp_sal) = sn(:,:,:) 
    3448      tsb(:,:,:,jp_tem) = tb(:,:,:)      ;      tsb(:,:,:,jp_sal) = sb(:,:,:) 
    3549      tsa(:,:,:,jp_tem) = ta(:,:,:)      ;      tsa(:,:,:,jp_sal) = sa(:,:,:) 
     50#endif 
    3651      ! 
    3752   END SUBROUTINE tra_swap 
     
    4560      !!---------------------------------------------------------------------- 
    4661      ! 
     62#if defined key_z_first 
     63      INTEGER :: ji,jj,jk 
     64 
     65      DO jj = 1, jpj, 1 
     66         DO ji = 1, jpi, 1 
     67            DO jk = 1, mbkmax(ji,jj), 1 
     68               tn(ji,jj,jk) = tsn(ji,jj,jk,jp_tem)      ;      sn(ji,jj,jk) = tsn(ji,jj,jk,jp_sal) 
     69               tb(ji,jj,jk) = tsb(ji,jj,jk,jp_tem)      ;      sb(ji,jj,jk) = tsb(ji,jj,jk,jp_sal) 
     70               ta(ji,jj,jk) = tsa(ji,jj,jk,jp_tem)      ;      sa(ji,jj,jk) = tsa(ji,jj,jk,jp_sal) 
     71            END DO 
     72         END DO 
     73      END DO 
     74#else 
    4775      tn(:,:,:) = tsn(:,:,:,jp_tem)      ;      sn(:,:,:) = tsn(:,:,:,jp_sal) 
    4876      tb(:,:,:) = tsb(:,:,:,jp_tem)      ;      sb(:,:,:) = tsb(:,:,:,jp_sal) 
    4977      ta(:,:,:) = tsa(:,:,:,jp_tem)      ;      sa(:,:,:) = tsa(:,:,:,jp_sal) 
     78#endif 
    5079      ! 
    5180   END SUBROUTINE tra_unswap 
Note: See TracChangeset for help on using the changeset viewer.