Changeset 5120 for trunk/NEMOGCM/NEMO/OPA_SRC/step.F90
- Timestamp:
- 2015-03-03T17:11:55+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/step.F90
r5012 r5120 122 122 IF( lk_zdfkpp ) CALL zdf_kpp( kstp ) ! KPP closure scheme for Kz 123 123 IF( lk_zdfcst ) THEN ! Constant Kz (reset avt, avm[uv] to the background value) 124 avt (:,:,:) = rn_avt0 * tmask(:,:,:)125 avmu(:,:,:) = rn_avm0 * umask(:,:,:)126 avmv(:,:,:) = rn_avm0 * vmask(:,:,:)124 avt (:,:,:) = rn_avt0 * wmask (:,:,:) 125 avmu(:,:,:) = rn_avm0 * wumask(:,:,:) 126 avmv(:,:,:) = rn_avm0 * wvmask(:,:,:) 127 127 ENDIF 128 128 IF( ln_rnf_mouth ) THEN ! increase diffusivity at rivers mouths … … 145 145 ! 146 146 IF( lk_ldfslp ) THEN ! slope of lateral mixing 147 CALL eos( tsb, rhd, gdept_0(:,:,:) ) ! before in situ density 148 IF( ln_zps ) CALL zps_hde( kstp, jpts, tsb, gtsu, gtsv, & ! Partial steps: before horizontal gradient 149 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & ! 150 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the last ocean level 147 CALL eos( tsb, rhd, gdept_0(:,:,:) ) ! before in situ density 148 IF( ln_zps .AND. .NOT. ln_isfcav) & 149 & CALL zps_hde ( kstp, jpts, tsb, gtsu, gtsv, & ! Partial steps: before horizontal gradient 150 & rhd, gru , grv ) ! of t, s, rd at the last ocean level 151 IF( ln_zps .AND. ln_isfcav) & 152 & CALL zps_hde_isf( kstp, jpts, tsb, gtsu, gtsv, & ! Partial steps for top cell (ISF) 153 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & 154 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the first ocean level 151 155 IF( ln_traldf_grif ) THEN ! before slope for Griffies operator 152 156 CALL ldf_slp_grif( kstp ) … … 177 181 ! is necessary to compute momentum advection for the rhs of barotropic loop: 178 182 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 179 IF( ln_zps ) CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps: before horizontal gradient 180 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & ! 181 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the last ocean level 183 IF( ln_zps .AND. .NOT. ln_isfcav) & 184 & CALL zps_hde ( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps: before horizontal gradient 185 & rhd, gru , grv ) ! of t, s, rd at the last ocean level 186 IF( ln_zps .AND. ln_isfcav) & 187 & CALL zps_hde_isf( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps for top cell (ISF) 188 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & 189 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the last ocean level 182 190 183 191 ua(:,:,:) = 0.e0 ! set dynamics trends to zero … … 253 261 CALL tra_nxt( kstp ) ! tracer fields at next time step 254 262 CALL eos ( tsa, rhd, rhop, fsdept_n(:,:,:) ) ! Time-filtered in situ density for hpg computation 255 IF( ln_zps ) CALL zps_hde( kstp, jpts, tsa, gtsu, gtsv, & ! Partial steps: before horizontal gradient 256 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & ! 257 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the last ocean level 263 IF( ln_zps .AND. .NOT. ln_isfcav) & 264 & CALL zps_hde ( kstp, jpts, tsa, gtsu, gtsv, & ! Partial steps: before horizontal gradient 265 & rhd, gru , grv ) ! of t, s, rd at the last ocean level 266 IF( ln_zps .AND. ln_isfcav) & 267 & CALL zps_hde_isf( kstp, jpts, tsa, gtsu, gtsv, & ! Partial steps for top cell (ISF) 268 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & 269 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the last ocean level 258 270 ELSE ! centered hpg (eos then time stepping) 259 271 IF ( .NOT. lk_dynspg_ts ) THEN ! eos already called in time-split case 260 272 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 261 IF( ln_zps ) CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps: before horizontal gradient 262 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & ! 263 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the last ocean level 273 IF( ln_zps .AND. .NOT. ln_isfcav) & 274 & CALL zps_hde ( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps: before horizontal gradient 275 & rhd, gru , grv ) ! of t, s, rd at the last ocean level 276 IF( ln_zps .AND. ln_isfcav) & 277 & CALL zps_hde_isf( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps for top cell (ISF) 278 & rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv , & 279 & gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi ) ! of t, s, rd at the last ocean level 264 280 ENDIF 265 281 IF( ln_zdfnpc ) CALL tra_npc( kstp ) ! update after fields by non-penetrative convection
Note: See TracChangeset
for help on using the changeset viewer.