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 13942 for NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/OCE/SBC/sbcrnf.F90 – NEMO

Ignore:
Timestamp:
2020-12-01T17:14:18+01:00 (4 years ago)
Author:
jchanut
Message:

Merged with trunk @13787

Location:
NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep

    • Property svn:externals

      •  

        old new  
        88 
        99# SETTE 
        10 ^/utils/CI/sette@13292        sette 
         10^/utils/CI/sette@13559        sette 

  • NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/OCE/SBC/sbcrnf.F90

    r13295 r13942  
    215215            END_2D 
    216216         ELSE                    !* variable volume case 
    217             DO_2D( 1, 1, 1, 1 ) 
     217            DO_2D( 1, 1, 1, 1 )              ! update the depth over which runoffs are distributed 
    218218               h_rnf(ji,jj) = 0._wp 
    219                DO jk = 1, nk_rnf(ji,jj)                           ! recalculates h_rnf to be the depth in metres 
     219               DO jk = 1, nk_rnf(ji,jj)                             ! recalculates h_rnf to be the depth in metres 
    220220                  h_rnf(ji,jj) = h_rnf(ji,jj) + e3t(ji,jj,jk,Kmm)   ! to the bottom of the relevant grid box 
    221221               END DO 
    … …  
    374374            ENDIF 
    375375         END_2D 
    376          DO_2D( 1, 1, 1, 1 ) 
     376         DO_2D( 1, 1, 1, 1 )                           ! set the associated depth 
    377377            h_rnf(ji,jj) = 0._wp 
    378378            DO jk = 1, nk_rnf(ji,jj) 
    … …  
    404404         WHERE( zrnfcl(:,:,1) > 0._wp )  h_rnf(:,:) = zacoef * zrnfcl(:,:,1)   ! compute depth for all runoffs 
    405405         ! 
    406          DO_2D( 1, 1, 1, 1 ) 
     406         DO_2D( 1, 1, 1, 1 )                ! take in account min depth of ocean rn_hmin 
    407407            IF( zrnfcl(ji,jj,1) > 0._wp ) THEN 
    408408               jk = mbkt(ji,jj) 
    … …  
    423423         END_2D 
    424424         ! 
    425          DO_2D( 1, 1, 1, 1 ) 
     425         DO_2D( 1, 1, 1, 1 )                          ! set the associated depth 
    426426            h_rnf(ji,jj) = 0._wp 
    427427            DO jk = 1, nk_rnf(ji,jj) 
Note: See TracChangeset for help on using the changeset viewer.