- Timestamp:
- 2015-10-01T14:48:08+02:00 (9 years ago)
- Location:
- branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/DYN
- Files:
-
- 4 edited
-
divcur.F90 (modified) (6 diffs)
-
dynspg.F90 (modified) (1 diff)
-
dynspg_flt.F90 (modified) (3 diffs)
-
sshwzv.F90 (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90
r5737 r5770 18 18 !! - ! 2010-10 (R. Furner, G. Madec) runoff and cla added directly here 19 19 !! 3.6 ! 2014-11 (P. Mathiot) isf added directly here 20 !! 3.7 ! 2015-10 (G. Madec) remove cross-land advection 20 21 !!---------------------------------------------------------------------- 21 22 … … 29 30 USE sbcrnf ! river runoff 30 31 USE sbcisf ! ice shelf 31 USE cla ! cross land advection (cla_div routine)32 32 USE in_out_manager ! I/O manager 33 33 USE lbclnk ! ocean lateral boundary conditions (or mpp link) … … 68 68 !! - compute the now divergence given by : 69 69 !! hdivn = 1/(e1t*e2t*e3t) ( di[e2u*e3u un] + dj[e1v*e3v vn] ) 70 !! correct hdiv with runoff inflow (div_rnf), ice shelf melting (div_isf) 71 !! and cross land flow (div_cla) 70 !! correct hdiv with runoff inflow (div_rnf) and ice shelf melting (div_isf) 72 71 !! II. vorticity : 73 72 !! - save the curl computed at the previous time-step … … 226 225 IF( ln_rnf ) CALL sbc_rnf_div( hdivn ) ! runoffs (update hdivn field) 227 226 IF( ln_divisf .AND. (nn_isf /= 0) ) CALL sbc_isf_div( hdivn ) ! ice shelf (update hdivn field) 228 IF( nn_cla == 1 ) CALL cla_div ( kt ) ! Cross Land Advection (Update Hor. divergence)229 227 230 228 ! 4. Lateral boundary conditions on hdivn and rotn … … 256 254 !! - compute the now divergence given by : 257 255 !! hdivn = 1/(e1t*e2t*e3t) ( di[e2u*e3u un] + dj[e1v*e3v vn] ) 258 !! correct hdiv with runoff inflow (div_rnf) and cross land flow (div_cla)256 !! correct hdiv with runoff inflow (div_rnf) 259 257 !! - Relavtive Vorticity : 260 258 !! - save the curl computed at the previous time-step (rotb = rotn) … … 325 323 IF( ln_rnf ) CALL sbc_rnf_div( hdivn ) ! runoffs (update hdivn field) 326 324 IF( ln_divisf .AND. (nn_isf .GT. 0) ) CALL sbc_isf_div( hdivn ) ! ice shelf (update hdivn field) 327 IF( nn_cla == 1 ) CALL cla_div ( kt ) ! Cross Land Advection (update hdivn field)328 325 ! 329 326 CALL lbc_lnk( hdivn, 'T', 1. ) ; CALL lbc_lnk( rotn , 'F', 1. ) ! lateral boundary cond. (no sign change) -
branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90
r5120 r5770 271 271 CALL solver_init( nit000 ) ! Elliptic solver initialisation 272 272 #endif 273 274 ! ! Control of timestep choice275 IF( lk_dynspg_ts .OR. lk_dynspg_exp ) THEN276 IF( nn_cla == 1 ) CALL ctl_stop( 'Crossland advection not implemented for this free surface formulation' )277 ENDIF278 279 273 ! ! Control of hydrostatic pressure choice 280 IF( lk_dynspg_ts .AND. ln_dynhpg_imp ) THEN 281 CALL ctl_stop( 'Semi-implicit hpg not compatible with time splitting' ) 282 ENDIF 274 IF( lk_dynspg_ts .AND. ln_dynhpg_imp ) CALL ctl_stop( 'Semi-implicit hpg not compatible with time splitting' ) 283 275 ! 284 276 IF( nn_timing == 1 ) CALL timing_stop('dyn_spg_init') -
branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90
r4990 r5770 14 14 !! 3.2 ! 2009-03 (G. Madec, M. Leclair, R. Benshila) introduce sshwzv module 15 15 !! 3.7 ! 2014-04 (F. Roquet, G. Madec) add some trends diag 16 !! - ! 2014-12 (G. Madec) remove cross-land advection (cla) 16 17 !!---------------------------------------------------------------------- 17 18 #if defined key_dynspg_flt || defined key_esopa … … 36 37 USE bdydyn ! ocean open boundary condition on dynamics 37 38 USE bdyvol ! ocean open boundary condition (bdy_vol routine) 38 USE cla ! cross land advection39 39 USE trd_oce ! trends: ocean variables 40 40 USE trddyn ! trend manager: dynamics … … 206 206 CALL Agrif_dyn( kt ) ! Update velocities on each coarse/fine interfaces 207 207 #endif 208 IF( nn_cla == 1 .AND. cp_cfg == 'orca' .AND. jp_cfg == 2 ) CALL cla_dynspg( kt ) ! Cross Land Advection (update (ua,va))209 208 210 209 ! compute the next vertically averaged velocity (effect of the additional force not included) -
branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90
r5737 r5770 80 80 IF( nn_timing == 1 ) CALL timing_start('ssh_nxt') 81 81 ! 82 CALL wrk_alloc( jpi, jpj,zhdiv )82 CALL wrk_alloc( jpi,jpj, zhdiv ) 83 83 ! 84 84 IF( kt == nit000 ) THEN 85 !86 85 IF(lwp) WRITE(numout,*) 87 86 IF(lwp) WRITE(numout,*) 'ssh_nxt : after sea surface height' 88 87 IF(lwp) WRITE(numout,*) '~~~~~~~ ' 89 !90 88 ENDIF 91 89 ! … … 159 157 !! Reference : Leclair, M., and G. Madec, 2009, Ocean Modelling. 160 158 !!---------------------------------------------------------------------- 161 ! 162 INTEGER, INTENT(in) :: kt ! time step 159 INTEGER, INTENT(in) :: kt ! time step 160 ! 161 INTEGER :: ji, jj, jk ! dummy loop indices 162 REAL(wp) :: z1_2dt ! local scalars 163 163 REAL(wp), POINTER, DIMENSION(:,: ) :: z2d 164 164 REAL(wp), POINTER, DIMENSION(:,:,:) :: z3d, zhdiv 165 ! 166 INTEGER :: ji, jj, jk ! dummy loop indices 167 REAL(wp) :: z1_2dt ! local scalars 168 !!---------------------------------------------------------------------- 169 165 !!---------------------------------------------------------------------- 166 ! 170 167 IF( nn_timing == 1 ) CALL timing_start('wzv') 171 168 ! 172 169 IF( kt == nit000 ) THEN 173 !174 170 IF(lwp) WRITE(numout,*) 175 171 IF(lwp) WRITE(numout,*) 'wzv : now vertical velocity ' … … 177 173 ! 178 174 wn(:,:,jpk) = 0._wp ! bottom boundary condition: w=0 (set once for all) 179 !180 175 ENDIF 181 176 ! !------------------------------! … … 216 211 217 212 #if defined key_bdy 218 IF (lk_bdy) THEN213 IF( lk_bdy ) THEN 219 214 DO jk = 1, jpkm1 220 215 wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:) … … 224 219 ! 225 220 IF( nn_timing == 1 ) CALL timing_stop('wzv') 226 227 221 ! 228 222 END SUBROUTINE wzv 223 229 224 230 225 SUBROUTINE ssh_swp( kt ) … … 265 260 sshb(:,:) = sshn(:,:) ! before <-- now 266 261 sshn(:,:) = ssha(:,:) ! now <-- after (before already = now) 262 ! 267 263 ELSE !** Leap-Frog time-stepping: Asselin filter + swap 268 264 sshb(:,:) = sshn(:,:) + atfp * ( sshb(:,:) - 2 * sshn(:,:) + ssha(:,:) ) ! before <-- now filtered
Note: See TracChangeset
for help on using the changeset viewer.
