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 2171 for branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DYN/divcur.F90 – NEMO

Ignore:
Timestamp:
2010-10-06T17:31:19+02:00 (14 years ago)
Author:
rfurner
Message:

Some variables renamed and some calculations moved to different modules following comments from Gurvan

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DYN/divcur.F90

    r2118 r2171  
    1616   USE bdy_oce        ! Unstructured open boundaries variables 
    1717   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    18    USE sbcrnf, ONLY  : rnf_dep, rnf_mod_dep  ! River runoff 
    19    USE phycst,  ONLY : rau0                  ! physical constant 
    20    USE sbc_oce, ONLY : ln_rnf, rnf           ! surface boundary condition: ocean 
     18   USE sbcrnf         ! river runoff  
     19   USE sbc_oce, ONLY : ln_rnf   ! surface boundary condition: ocean 
    2120 
    2221   IMPLICIT NONE 
    … …  
    9291      REAL(wp), DIMENSION(   jpi  ,1:jpj+2) ::   zwu   ! workspace 
    9392      REAL(wp), DIMENSION(-1:jpi+2,  jpj  ) ::   zwv   ! workspace 
    94       REAL(wp) ::  zraur,  zdep   ! temporary scalar 
    9593      !!---------------------------------------------------------------------- 
    9694 
    … …  
    249247      !                                                ! =============== 
    250248 
    251       IF ( ln_rnf ) THEN 
    252       zraur = 1. / rau0 
    253         DO ji=1,jpi 
    254           DO jj=1,jpj 
    255             zdep = 1. / rnf_dep(ji,jj) 
    256             DO jk=1,rnf_mod_dep(ji,jj) 
    257               hdivn(ji,jj,jk) = hdivn(ji,jj,jk) - rnf(ji,jj)*zraur*zdep 
    258             ENDDO 
    259           ENDDO 
    260         ENDDO 
    261       ENDIF 
     249      IF( ln_rnf )  CALL sbc_rnf_div( hdivn )          ! runoffs (update hdivn field) 
    262250       
    263251      ! 4. Lateral boundary conditions on hdivn and rotn 
    … …  
    317305      !! * Local declarations 
    318306      INTEGER  ::   ji, jj, jk          ! dummy loop indices 
    319       REAL(wp) ::  zraur,  zdep   ! temporary scalar 
    320307      !!---------------------------------------------------------------------- 
    321308 
    … …  
    390377      !                                                ! =============== 
    391378 
    392       IF ( ln_rnf ) THEN 
    393       zraur = 1. / rau0 
    394         DO ji=1,jpi 
    395           DO jj=1,jpj 
    396             zdep = 1. / rnf_dep(ji,jj) 
    397             DO jk=1,rnf_mod_dep(ji,jj) 
    398               hdivn(ji,jj,jk) = hdivn(ji,jj,jk) - rnf(ji,jj)*zraur*zdep 
    399             ENDDO 
    400           ENDDO 
    401         ENDDO 
    402       ENDIF 
     379      IF( ln_rnf )  CALL sbc_rnf_div( hdivn )          ! runoffs (update hdivn field) 
    403380 
    404381      ! 4. Lateral boundary conditions on hdivn and rotn 
Note: See TracChangeset for help on using the changeset viewer.