Changeset 2118
- Timestamp:
- 2010-09-24T10:12:40+02:00 (14 years ago)
- Location:
- branches/DEV_R1821_Rivers/NEMO/OPA_SRC
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DYN/divcur.F90
r1792 r2118 16 16 USE bdy_oce ! Unstructured open boundaries variables 17 17 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 21 19 22 IMPLICIT NONE … … 89 92 REAL(wp), DIMENSION( jpi ,1:jpj+2) :: zwu ! workspace 90 93 REAL(wp), DIMENSION(-1:jpi+2, jpj ) :: zwv ! workspace 94 REAL(wp) :: zraur, zdep ! temporary scalar 91 95 !!---------------------------------------------------------------------- 92 96 … … 244 248 END DO ! End of slab 245 249 ! ! =============== 250 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 246 262 247 263 ! 4. Lateral boundary conditions on hdivn and rotn … … 301 317 !! * Local declarations 302 318 INTEGER :: ji, jj, jk ! dummy loop indices 319 REAL(wp) :: zraur, zdep ! temporary scalar 303 320 !!---------------------------------------------------------------------- 304 321 … … 372 389 END DO ! End of slab 373 390 ! ! =============== 374 391 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 403 375 404 ! 4. Lateral boundary conditions on hdivn and rotn 376 405 ! ---------------------------------=======---====== -
branches/DEV_R1821_Rivers/NEMO/OPA_SRC/DYN/sshwzv.F90
r2101 r2118 164 164 165 165 ! ! Sea surface elevation time stepping 166 ssha(:,:) = ( sshb(:,:) - z2dt * ( zraur * ( emp(:,:)-rnf(:,:) ) + zhdiv(:,:) ) ) * tmask(:,:,1)166 ssha(:,:) = ( sshb(:,:) - z2dt * ( zraur * emp(:,:) + zhdiv(:,:) ) ) * tmask(:,:,1) 167 167 168 168 #if defined key_obc -
branches/DEV_R1821_Rivers/NEMO/OPA_SRC/SBC/sbcrnf.F90
r2101 r2118 50 50 TYPE(FLD), ALLOCATABLE, DIMENSION(:) :: sf_tmp_rnf !: structure of input river runoff temperature (file information, fields read) 51 51 52 REAL , PUBLIC, DIMENSION(jpi,jpj) :: rnf_dep !: depth of runoff in m53 INTEGER, PUBLIC, DIMENSION(jpi,jpj) :: rnf_mod_dep !: depth of runoff in model levels54 REAL , PUBLIC, DIMENSION(jpi,jpj) :: rnf_sal !: salinity of river runoff55 REAL , PUBLIC, DIMENSION(jpi,jpj) :: rnf_tmp !: temperature of river runoff52 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rnf_dep !: depth of runoff in m 53 INTEGER, PUBLIC, DIMENSION(jpi,jpj) :: rnf_mod_dep !: depth of runoff in model levels 54 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rnf_sal !: salinity of river runoff 55 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rnf_tmp !: temperature of river runoff 56 56 57 57 INTEGER :: ji, jj ,jk ! dummy loop indices
Note: See TracChangeset
for help on using the changeset viewer.