Ignore:
Timestamp:
2019-05-15T21:19:35+02:00 (18 months ago)
Author:
acc
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : interface changes to tra and trc routines for design compliance and consistency. Fully SETTE tested (non-AGRIF, only)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/TRA/trabbc.F90

    r10954 r10985  
    5151CONTAINS 
    5252 
    53    SUBROUTINE tra_bbc( kt, Kmm, Krhs ) 
     53   SUBROUTINE tra_bbc( kt, Kmm, pts, Krhs ) 
    5454      !!---------------------------------------------------------------------- 
    5555      !!                  ***  ROUTINE tra_bbc  *** 
     
    7373      !!              Emile-Geay and Madec, 2009, Ocean Science. 
    7474      !!---------------------------------------------------------------------- 
    75       INTEGER, INTENT(in) ::   kt   ! ocean time-step index 
    76       INTEGER, INTENT(in) ::   Kmm, Krhs  ! time level indices 
     75      INTEGER,                                   INTENT(in   ) :: kt         ! ocean time-step index 
     76      INTEGER,                                   INTENT(in   ) :: Kmm, Krhs  ! time level indices 
     77      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts,jpt), INTENT(inout) :: pts        ! active tracers and RHS of tracer equation 
    7778      ! 
    7879      INTEGER  ::   ji, jj    ! dummy loop indices 
     
    8485      IF( l_trdtra )   THEN         ! Save the input temperature trend 
    8586         ALLOCATE( ztrdt(jpi,jpj,jpk) ) 
    86          ztrdt(:,:,:) = ts(:,:,:,jp_tem,Krhs) 
     87         ztrdt(:,:,:) = pts(:,:,:,jp_tem,Krhs) 
    8788      ENDIF 
    8889      !                             !  Add the geothermal trend on temperature 
    8990      DO jj = 2, jpjm1 
    9091         DO ji = 2, jpim1 
    91             ts(ji,jj,mbkt(ji,jj),jp_tem,Krhs) = ts(ji,jj,mbkt(ji,jj),jp_tem,Krhs) + qgh_trd0(ji,jj) / e3t(ji,jj,mbkt(ji,jj),Kmm) 
     92            pts(ji,jj,mbkt(ji,jj),jp_tem,Krhs) = pts(ji,jj,mbkt(ji,jj),jp_tem,Krhs) + qgh_trd0(ji,jj) / e3t(ji,jj,mbkt(ji,jj),Kmm) 
    9293         END DO 
    9394      END DO 
    9495      ! 
    95       CALL lbc_lnk( 'trabbc', ts(:,:,:,jp_tem,Krhs) , 'T', 1. ) 
     96      CALL lbc_lnk( 'trabbc', pts(:,:,:,jp_tem,Krhs) , 'T', 1. ) 
    9697      ! 
    9798      IF( l_trdtra ) THEN        ! Send the trend for diagnostics 
    98          ztrdt(:,:,:) = ts(:,:,:,jp_tem,Krhs) - ztrdt(:,:,:) 
     99         ztrdt(:,:,:) = pts(:,:,:,jp_tem,Krhs) - ztrdt(:,:,:) 
    99100         CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_tem, jptra_bbc, ztrdt ) 
    100101         DEALLOCATE( ztrdt ) 
    101102      ENDIF 
    102103      ! 
    103       IF(ln_ctl)   CALL prt_ctl( tab3d_1=ts(:,:,:,jp_tem,Krhs), clinfo1=' bbc  - Ta: ', mask1=tmask, clinfo3='tra-ta' ) 
     104      IF(ln_ctl)   CALL prt_ctl( tab3d_1=pts(:,:,:,jp_tem,Krhs), clinfo1=' bbc  - Ta: ', mask1=tmask, clinfo3='tra-ta' ) 
    104105      ! 
    105106      IF( ln_timing )   CALL timing_stop('tra_bbc') 
Note: See TracChangeset for help on using the changeset viewer.