- 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/DIA/dia25h.F90
r11536 r11949 39 39 CONTAINS 40 40 41 SUBROUTINE dia_25h_init 41 SUBROUTINE dia_25h_init( Kbb ) 42 42 !!--------------------------------------------------------------------------- 43 43 !! *** ROUTINE dia_25h_init *** … … 47 47 !! ** Method : Read namelist 48 48 !!--------------------------------------------------------------------------- 49 INTEGER, INTENT(in) :: Kbb ! Time level index 50 ! 49 51 INTEGER :: ios ! Local integer output status for namelist read 50 52 INTEGER :: ierror ! Local integer for memory allocation … … 95 97 ! ------------------------- ! 96 98 cnt_25h = 1 ! sets the first value of sum at timestep 1 (note - should strictly be at timestep zero so before values used where possible) 97 tn_25h (:,:,:) = ts b (:,:,:,jp_tem)98 sn_25h (:,:,:) = ts b (:,:,:,jp_sal)99 sshn_25h(:,:) = ssh b(:,:)100 un_25h (:,:,:) = u b (:,:,:)101 vn_25h (:,:,:) = v b (:,:,:)99 tn_25h (:,:,:) = ts (:,:,:,jp_tem,Kbb) 100 sn_25h (:,:,:) = ts (:,:,:,jp_sal,Kbb) 101 sshn_25h(:,:) = ssh(:,:,Kbb) 102 un_25h (:,:,:) = uu (:,:,:,Kbb) 103 vn_25h (:,:,:) = vv (:,:,:,Kbb) 102 104 avt_25h (:,:,:) = avt (:,:,:) 103 105 avm_25h (:,:,:) = avm (:,:,:) … … 116 118 117 119 118 SUBROUTINE dia_25h( kt )120 SUBROUTINE dia_25h( kt, Kmm ) 119 121 !!---------------------------------------------------------------------- 120 122 !! *** ROUTINE dia_25h *** … … 125 127 !!---------------------------------------------------------------------- 126 128 INTEGER, INTENT(in) :: kt ! ocean time-step index 129 INTEGER, INTENT(in) :: Kmm ! ocean time level index 127 130 !! 128 131 INTEGER :: ji, jj, jk … … 150 153 ! wn_25h could not be initialised in dia_25h_init, so we do it here instead 151 154 IF( kt == nn_it000 ) THEN 152 wn_25h(:,:,:) = w n(:,:,:)155 wn_25h(:,:,:) = ww(:,:,:) 153 156 ENDIF 154 157 … … 161 164 ENDIF 162 165 163 tn_25h (:,:,:) = tn_25h (:,:,:) + ts n (:,:,:,jp_tem)164 sn_25h (:,:,:) = sn_25h (:,:,:) + ts n (:,:,:,jp_sal)165 sshn_25h(:,:) = sshn_25h(:,:) + ssh n(:,:)166 un_25h (:,:,:) = un_25h (:,:,:) + u n (:,:,:)167 vn_25h (:,:,:) = vn_25h (:,:,:) + v n (:,:,:)168 wn_25h (:,:,:) = wn_25h (:,:,:) + w n(:,:,:)166 tn_25h (:,:,:) = tn_25h (:,:,:) + ts (:,:,:,jp_tem,Kmm) 167 sn_25h (:,:,:) = sn_25h (:,:,:) + ts (:,:,:,jp_sal,Kmm) 168 sshn_25h(:,:) = sshn_25h(:,:) + ssh(:,:,Kmm) 169 un_25h (:,:,:) = un_25h (:,:,:) + uu (:,:,:,Kmm) 170 vn_25h (:,:,:) = vn_25h (:,:,:) + vv (:,:,:,Kmm) 171 wn_25h (:,:,:) = wn_25h (:,:,:) + ww (:,:,:) 169 172 avt_25h (:,:,:) = avt_25h (:,:,:) + avt (:,:,:) 170 173 avm_25h (:,:,:) = avm_25h (:,:,:) + avm (:,:,:) … … 245 248 ! 246 249 ! After the write reset the values to cnt=1 and sum values equal current value 247 tn_25h (:,:,:) = ts n (:,:,:,jp_tem)248 sn_25h (:,:,:) = ts n (:,:,:,jp_sal)249 sshn_25h(:,:) = ssh n(:,:)250 un_25h (:,:,:) = u n (:,:,:)251 vn_25h (:,:,:) = v n (:,:,:)252 wn_25h (:,:,:) = w n(:,:,:)250 tn_25h (:,:,:) = ts (:,:,:,jp_tem,Kmm) 251 sn_25h (:,:,:) = ts (:,:,:,jp_sal,Kmm) 252 sshn_25h(:,:) = ssh(:,:,Kmm) 253 un_25h (:,:,:) = uu (:,:,:,Kmm) 254 vn_25h (:,:,:) = vv (:,:,:,Kmm) 255 wn_25h (:,:,:) = ww (:,:,:) 253 256 avt_25h (:,:,:) = avt (:,:,:) 254 257 avm_25h (:,:,:) = avm (:,:,:)
Note: See TracChangeset
for help on using the changeset viewer.