- Timestamp:
- 2019-11-22T15:29:17+01:00 (5 years ago)
- Location:
- NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Property svn:mergeinfo deleted
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/FLO/flodom.F90
r11818 r11949 40 40 CONTAINS 41 41 42 SUBROUTINE flo_dom 42 SUBROUTINE flo_dom( Kmm ) 43 43 !! --------------------------------------------------------------------- 44 44 !! *** ROUTINE flo_dom *** … … 49 49 !! the longitude (degree) and the depth (m). 50 50 !!---------------------------------------------------------------------- 51 INTEGER, INTENT(in) :: Kmm ! ocean time level index 52 ! 51 53 INTEGER :: jfl ! dummy loop 52 54 INTEGER :: inum ! logical unit for file read … … 90 92 CALL flo_add_new_ariane_floats(jpnrstflo+1,jpnfl) 91 93 ELSE !Add new floats with long/lat convention 92 CALL flo_add_new_floats( jpnrstflo+1,jpnfl)94 CALL flo_add_new_floats(Kmm,jpnrstflo+1,jpnfl) 93 95 ENDIF 94 96 ENDIF … … 102 104 CALL flo_add_new_ariane_floats(1,jpnfl) 103 105 ELSE !Add new floats with long/lat convention 104 CALL flo_add_new_floats( 1,jpnfl)106 CALL flo_add_new_floats(Kmm,1,jpnfl) 105 107 ENDIF 106 108 … … 109 111 END SUBROUTINE flo_dom 110 112 111 SUBROUTINE flo_add_new_floats( kfl_start, kfl_end)113 SUBROUTINE flo_add_new_floats(Kmm, kfl_start, kfl_end) 112 114 !! ------------------------------------------------------------- 113 115 !! *** SUBROUTINE add_new_arianefloats *** … … 124 126 !! ** Method : 125 127 !!---------------------------------------------------------------------- 128 INTEGER, INTENT(in) :: Kmm 126 129 INTEGER, INTENT(in) :: kfl_start, kfl_end 127 130 !! … … 170 173 ihtest(jfl) = ihtest(jfl)+1 171 174 DO jk = 1, jpk-1 172 IF( (gdepw _n(ji,jj,jk) <= flzz(jfl)) .AND. (gdepw_n(ji,jj,jk+1) > flzz(jfl)) ) THEN175 IF( (gdepw(ji,jj,jk,Kmm) <= flzz(jfl)) .AND. (gdepw(ji,jj,jk+1,Kmm) > flzz(jfl)) ) THEN 173 176 ikmfl(jfl) = jk 174 177 ivtest(jfl) = ivtest(jfl) + 1 … … 232 235 zgifl(jfl)= (iimfl(jfl)-0.5) + zdxab/e1u(iimfl(jfl)-1,ijmfl(jfl)) + (mig(1)-1) 233 236 zgjfl(jfl)= (ijmfl(jfl)-0.5) + zdyad/e2v(iimfl(jfl),ijmfl(jfl)-1) + (mjg(1)-1) 234 zgkfl(jfl) = (( gdepw _n(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)+1) - flzz(jfl) )* ikmfl(jfl)) &235 & / ( gdepw _n(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)+1) &236 & - gdepw _n(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)) ) &237 & + (( flzz(jfl)-gdepw _n(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)) ) *(ikmfl(jfl)+1)) &238 & / ( gdepw _n(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)+1) &239 & - gdepw _n(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)) )237 zgkfl(jfl) = (( gdepw(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)+1,Kmm) - flzz(jfl) )* ikmfl(jfl)) & 238 & / ( gdepw(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)+1,Kmm) & 239 & - gdepw(iimfl(jfl),ijmfl(jfl),ikmfl(jfl) ,Kmm) ) & 240 & + (( flzz(jfl)-gdepw(iimfl(jfl),ijmfl(jfl),ikmfl(jfl),Kmm) ) *(ikmfl(jfl)+1)) & 241 & / ( gdepw(iimfl(jfl),ijmfl(jfl),ikmfl(jfl)+1,Kmm) & 242 & - gdepw(iimfl(jfl),ijmfl(jfl),ikmfl(jfl),Kmm) ) 240 243 ELSE 241 244 zgifl(jfl) = 0.e0
Note: See TracChangeset
for help on using the changeset viewer.