Changeset 2944 for branches/2011/dev_r2802_TOP_substepping
- Timestamp:
- 2011-10-17T16:54:25+02:00 (13 years ago)
- Location:
- branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/TOP_SRC
- Files:
-
- 2 edited
-
trc.F90 (modified) (3 diffs)
-
trcsub.F90 (modified) (21 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/TOP_SRC/trc.F90
r2910 r2944 106 106 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: vn_tm !: j-horizontal velocity average [m/s] 107 107 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: wn_tm !: k-vertical velocity average [m/s] 108 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: tsn_tm !: t/s average [m/s] 108 109 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avt_tm !: vertical viscosity & diffusivity coeff. at w-point [m2/s] 109 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshn_tm !: average ssh for the now step [m] 110 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshb_hold !:hold sshb from the beginning of each sub-stepping[m] 111 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshu_n_tm !: average ssh for the now step [m] 112 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshu_b_hold !:hold sshb from the beginning of each sub-stepping[m] 113 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshv_n_tm !: average ssh for the now step [m] 114 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshv_b_hold !:hold sshb from the beginning of each sub-stepping[m] 110 # if defined key_zdfddm 111 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avs_tm !: salinity vertical diffusivity coeff. at w-point [m/s] 112 # endif 115 113 #if defined key_ldfslp 116 114 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: wslpi_tm !: i-direction slope at u-, w-points … … 119 117 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: vslp_tm !: j-direction slope at u-, w-points 120 118 #endif 121 122 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: tsn_tm !: t/s average [m/s] 119 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshn_tm !: average ssh for the now step [m] 120 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshu_n_tm !: average ssh for the now step [m] 121 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshv_n_tm !: average ssh for the now step [m] 122 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshb_hold !:hold sshb from the beginning of each sub-stepping[m] 123 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshu_b_hold !:hold sshb from the beginning of each sub-stepping[m] 124 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshv_b_hold !:hold sshb from the beginning of each sub-stepping[m] 125 126 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: rnf_tm !: river runoff 127 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: h_rnf_tm !: depth in metres to the bottom of the relevant grid box 128 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: hmld_tm !: mixed layer depth average [m] 123 129 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fr_i_tm !: average ice fraction [m/s] 124 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: hmld_tm !: mixed layer depth average [m] 130 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emp_tm !: freshwater budget: volume flux [Kg/m2/s] 131 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emps_tm !: freshwater budget:concentration/dilution [Kg/m2/s] 132 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emp_b_hold !: hold emp from the beginning of each sub-stepping[m] 125 133 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: qsr_tm !: solar radiation average [m] 126 134 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: wndm_tm !: 10m wind average [m] 127 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emp_tm !: freshwater budget: volume flux [Kg/m2/s]128 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emp_b_hold !: hold emp from the beginning of each sub-stepping[m]129 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: emps_tm !: freshwater budget:concentration/dilution [Kg/m2/s]130 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: rnf_tm !: river runoff131 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: h_rnf_tm !: depth in metres to the bottom of the relevant grid box132 !133 # if defined key_zdfddm134 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: avs_tm !: salinity vertical diffusivity coeff. at w-point [m/s]135 # endif136 135 ! 137 136 #if defined key_traldf_c3d … … 164 163 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshn_temp, sshb_temp, ssha_temp, rnf_temp,h_rnf_temp 165 164 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshu_n_temp, sshu_b_temp, sshu_a_temp 166 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshf_n_temp , sshf_b_temp, sshf_a_temp165 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshf_n_temp 167 166 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshv_n_temp, sshv_b_temp, sshv_a_temp 168 167 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: hu_temp, hv_temp, hur_temp, hvr_temp -
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/TOP_SRC/trcsub.F90
r2914 r2944 88 88 wn_tm (:,:,:) = wn_tm (:,:,:) + wn (:,:,:) * fse3w(:,:,:) 89 89 tsn_tm (:,:,:,jp_tem) = tsn_tm (:,:,:,jp_tem) + tsn (:,:,:,jp_tem) * fse3t(:,:,:) 90 tsn_tm (:,:,:,jp_sal) = tsn_tm (:,:,:,jp_ tem) + tsn (:,:,:,jp_sal) * fse3t(:,:,:)90 tsn_tm (:,:,:,jp_sal) = tsn_tm (:,:,:,jp_sal) + tsn (:,:,:,jp_sal) * fse3t(:,:,:) 91 91 avt_tm (:,:,:) = avt_tm (:,:,:) + avt (:,:,:) * fse3w(:,:,:) 92 92 # if defined key_zdfddm … … 155 155 ELSE ! It is time to substep 156 156 ! 1. set temporary arrays to hold physics variables 157 un_temp (:,:,:) = un (:,:,:) 158 vn_temp (:,:,:) = vn (:,:,:) 159 wn_temp (:,:,:) = wn (:,:,:) 160 tsn_temp (:,:,:,:) = tsn (:,:,:,:) 161 avt_temp (:,:,:) = avt (:,:,:) 162 # if defined key_zdfddm 163 avs_temp(:,:,:) = avs (:,:,:) 164 # endif 165 #if defined key_ldfslp 166 wslpi_temp (:,:,:) = wslpi (:,:,:) 167 wslpj_temp (:,:,:) = wslpj (:,:,:) 168 uslp_temp (:,:,:) = uslp (:,:,:) 169 vslp_temp (:,:,:) = vslp (:,:,:) 170 #endif 157 171 sshn_temp (:,:) = sshn (:,:) 158 172 sshu_n_temp(:,:) = sshu_n(:,:) … … 167 181 rnf_temp (:,:) = rnf (:,:) 168 182 h_rnf_temp (:,:) = h_rnf (:,:) 169 rotn_temp (:,:,:) = rotn (:,:,:)170 hdivn_temp (:,:,:) = hdivn (:,:,:)171 rotb_temp (:,:,:) = rotb (:,:,:)172 hdivb_temp (:,:,:) = hdivb (:,:,:)173 un_temp (:,:,:) = un (:,:,:)174 vn_temp (:,:,:) = vn (:,:,:)175 wn_temp (:,:,:) = wn (:,:,:)176 tsn_temp (:,:,:,:) = tsn (:,:,:,:)177 avt_temp (:,:,:) = avt (:,:,:)178 # if defined key_zdfddm179 avs_temp(:,:,:) = avs (:,:,:)180 # endif181 183 hmld_temp (:,:) = hmld (:,:) 182 qsr_temp (:,:) = qsr (:,:) 183 wndm_temp (:,:) = wndm (:,:) 184 fr_i_temp (:,:) = fr_i (:,:) 184 185 emp_temp (:,:) = emp (:,:) 185 186 emp_b_temp (:,:) = emp_b (:,:) 186 187 emps_temp (:,:) = emps (:,:) 187 #if defined key_ldfslp 188 wslpi_temp (:,:,:) = wslpi (:,:,:) 189 wslpj_temp (:,:,:) = wslpj (:,:,:) 190 uslp_temp (:,:,:) = uslp (:,:,:) 191 vslp_temp (:,:,:) = vslp (:,:,:) 192 #endif 193 hu_temp (:,:) = hu (:,:) 194 hv_temp (:,:) = hv (:,:) 195 hur_temp (:,:) = hur (:,:) 196 hvr_temp (:,:) = hvr (:,:) 188 qsr_temp (:,:) = qsr (:,:) 189 wndm_temp (:,:) = wndm (:,:) 197 190 #if defined key_traldf_c3d 198 191 ahtu_temp (:,:,:) = ahtu (:,:,:) … … 236 229 # endif 237 230 #endif 231 ! Variables reset in trc_sub_ssh 232 rotn_temp (:,:,:) = rotn (:,:,:) 233 hdivn_temp (:,:,:) = hdivn (:,:,:) 234 rotb_temp (:,:,:) = rotb (:,:,:) 235 hdivb_temp (:,:,:) = hdivb (:,:,:) 236 hu_temp (:,:) = hu (:,:) 237 hv_temp (:,:) = hv (:,:) 238 hur_temp (:,:) = hur (:,:) 239 hvr_temp (:,:) = hvr (:,:) 238 240 ! 239 241 DO jk = 1, jpk … … 254 256 255 257 ! 2. Create averages and reassign variables 258 un_tm (:,:,:) = un_tm (:,:,:) + un (:,:,:) * e3u_temp(:,:,:) 259 vn_tm (:,:,:) = vn_tm (:,:,:) + vn (:,:,:) * e3v_temp(:,:,:) 260 wn_tm (:,:,:) = wn_tm (:,:,:) + wn (:,:,:) * e3w_temp(:,:,:) 261 tsn_tm (:,:,:,jp_tem) = tsn_tm (:,:,:,jp_tem) + tsn (:,:,:,jp_tem) * e3t_temp(:,:,:) 262 tsn_tm (:,:,:,jp_sal) = tsn_tm (:,:,:,jp_sal) + tsn (:,:,:,jp_sal) * e3t_temp(:,:,:) 263 avt_tm (:,:,:) = avt_tm (:,:,:) + avt (:,:,:) * e3w_temp(:,:,:) 264 # if defined key_zdfddm 265 avs_tm (:,:,:) = avs_tm (:,:,:) + avs (:,:,:) * e3w_temp(:,:,:) 266 # endif 267 #if defined key_ldfslp 268 wslpi_tm (:,:,:) = wslpi_tm(:,:,:) + wslpi(:,:,:) * e3w_temp(:,:,:) 269 wslpj_tm (:,:,:) = wslpj_tm(:,:,:) + wslpj(:,:,:) * e3w_temp(:,:,:) 270 uslp_tm (:,:,:) = uslp_tm (:,:,:) + uslp (:,:,:) * e3u_temp(:,:,:) 271 vslp_tm (:,:,:) = vslp_tm (:,:,:) + vslp (:,:,:) * e3v_temp(:,:,:) 272 #endif 256 273 sshn_tm (:,:) = sshn_tm (:,:) + sshn (:,:) 257 274 sshu_n_tm(:,:) = sshu_n_tm (:,:) + sshu_n(:,:) … … 275 292 h_rnf (:,:) = h_rnf_tm (:,:) * r1_ndttrcp1 276 293 hmld (:,:) = hmld_tm (:,:) * r1_ndttrcp1 277 fr_i (:,:) = fr_i_tm (:,:) * r1_ndttrcp1278 294 ! variables that are initialized after averages initialized 279 295 emp_b (:,:) = emp_b_hold (:,:) … … 283 299 emp (:,:) = emp_tm (:,:) * r1_ndttrc 284 300 emps (:,:) = emps_tm (:,:) * r1_ndttrc 301 fr_i (:,:) = fr_i_tm (:,:) * r1_ndttrc 285 302 ELSE 286 303 wndm (:,:) = wndm_tm (:,:) * r1_ndttrcp1 … … 288 305 emp (:,:) = emp_tm (:,:) * r1_ndttrcp1 289 306 emps (:,:) = emps_tm (:,:) * r1_ndttrcp1 307 fr_i (:,:) = fr_i_tm (:,:) * r1_ndttrcp1 290 308 ENDIF 291 292 un_tm (:,:,:) = un_tm (:,:,:) + un (:,:,:) * e3u_temp(:,:,:)293 vn_tm (:,:,:) = vn_tm (:,:,:) + vn (:,:,:) * e3v_temp(:,:,:)294 wn_tm (:,:,:) = wn_tm (:,:,:) + wn (:,:,:) * e3w_temp(:,:,:)295 tsn_tm (:,:,:,jp_tem) = tsn_tm (:,:,:,jp_tem) + tsn (:,:,:,jp_tem) * e3t_temp(:,:,:)296 tsn_tm (:,:,:,jp_sal) = tsn_tm (:,:,:,jp_tem) + tsn (:,:,:,jp_sal) * e3t_temp(:,:,:)297 avt_tm (:,:,:) = avt_tm (:,:,:) + avt (:,:,:) * e3w_temp(:,:,:)298 # if defined key_zdfddm299 avs_tm (:,:,:) = avs_tm (:,:,:) + avs (:,:,:) * e3w_temp(:,:,:)300 # endif301 #if defined key_ldfslp302 wslpi_tm (:,:,:) = wslpi_tm(:,:,:) + wslpi(:,:,:) * e3w_temp(:,:,:)303 wslpj_tm (:,:,:) = wslpj_tm(:,:,:) + wslpj(:,:,:) * e3w_temp(:,:,:)304 uslp_tm (:,:,:) = uslp_tm (:,:,:) + uslp (:,:,:) * e3u_temp(:,:,:)305 vslp_tm (:,:,:) = vslp_tm (:,:,:) + vslp (:,:,:) * e3v_temp(:,:,:)306 #endif307 309 ! 308 310 DO jk = 1, jpk … … 411 413 #endif 412 414 415 CALL lbc_lnk( un (:,:,:) , 'U', 1. ) 416 CALL lbc_lnk( vn (:,:,:) , 'V', 1. ) 417 CALL lbc_lnk( wn (:,:,:) , 'V', 1. ) 418 CALL lbc_lnk( tsn (:,:,:,jp_tem), 'T', 1. ) 419 CALL lbc_lnk( tsn (:,:,:,jp_sal), 'T', 1. ) 420 CALL lbc_lnk( avt (:,:,:) , 'W', 1. ) 421 # if defined key_zdfddm 422 CALL lbc_lnk( avs (:,:,:) , 'W', 1. ) 423 # endif 424 #if defined key_ldfslp 425 CALL lbc_lnk( uslp (:,:,:) , 'U', 1. ) 426 CALL lbc_lnk( vslp (:,:,:) , 'V', 1. ) 427 CALL lbc_lnk( wslpi (:,:,:) , 'W', 1. ) 428 CALL lbc_lnk( wslpj (:,:,:) , 'W', 1. ) 429 #endif 413 430 CALL lbc_lnk( sshn (:,:) , 'T', 1. ) 414 431 CALL lbc_lnk( sshu_n(:,:) , 'U', 1. ) … … 423 440 CALL lbc_lnk( rnf (:,:) , 'T', 1. ) 424 441 CALL lbc_lnk( h_rnf (:,:) , 'T', 1. ) 425 CALL lbc_lnk( rotn (:,:,:) , 'F', 1. )426 CALL lbc_lnk( hdivn (:,:,:) , 'T', 1. )427 CALL lbc_lnk( rotb (:,:,:) , 'F', 1. )428 CALL lbc_lnk( hdivb (:,:,:) , 'T', 1. )429 CALL lbc_lnk( un (:,:,:) , 'U', 1. )430 CALL lbc_lnk( vn (:,:,:) , 'V', 1. )431 CALL lbc_lnk( wn (:,:,:) , 'V', 1. )432 CALL lbc_lnk( tsn (:,:,:,jp_tem), 'T', 1. )433 CALL lbc_lnk( tsn (:,:,:,jp_sal), 'T', 1. )434 CALL lbc_lnk( avt (:,:,:) , 'W', 1. )435 442 CALL lbc_lnk( hmld (:,:) , 'T', 1. ) 436 CALL lbc_lnk( qsr (:,:) , 'T', 1. ) 437 CALL lbc_lnk( wndm (:,:) , 'T', 1. ) 443 CALL lbc_lnk( fr_i (:,:) , 'T', 1. ) 438 444 CALL lbc_lnk( emp (:,:) , 'T', 1. ) 439 445 CALL lbc_lnk( emp_b (:,:) , 'T', 1. ) 440 446 CALL lbc_lnk( emps (:,:) , 'T', 1. ) 447 CALL lbc_lnk( qsr (:,:) , 'T', 1. ) 448 CALL lbc_lnk( wndm (:,:) , 'T', 1. ) 441 449 #if defined key_traldf_c3d 442 450 CALL lbc_lnk( ahtt (:,:,:) , 'T', 1. ) … … 450 458 CALL lbc_lnk( ahtw (:,:) , 'W', 1. ) 451 459 #endif 452 # if defined key_zdfddm453 CALL lbc_lnk( avs (:,:,:) , 'W', 1. )454 # endif455 460 #if defined key_traldf_eiv 456 461 #if defined key_traldf_c3d … … 464 469 #endif 465 470 #endif 466 #if defined key_ldfslp 467 CALL lbc_lnk( uslp (:,:,:) , 'U', 1. ) 468 CALL lbc_lnk( vslp (:,:,:) , 'V', 1. ) 469 CALL lbc_lnk( wslpi (:,:,:) , 'W', 1. ) 470 CALL lbc_lnk( wslpj (:,:,:) , 'W', 1. ) 471 #endif 471 ! 472 CALL trc_sub_ssh( kt ) ! after ssh & vertical velocity 473 ! 474 CALL lbc_lnk( rotn (:,:,:) , 'F', 1. ) 475 CALL lbc_lnk( hdivn (:,:,:) , 'T', 1. ) 476 CALL lbc_lnk( rotb (:,:,:) , 'F', 1. ) 477 CALL lbc_lnk( hdivb (:,:,:) , 'T', 1. ) 472 478 CALL lbc_lnk( hu (:,:) , 'U', 1. ) 473 479 CALL lbc_lnk( hv (:,:) , 'V', 1. ) 474 480 CALL lbc_lnk( hur (:,:) , 'U', 1. ) 475 481 CALL lbc_lnk( hvr (:,:) , 'V', 1. ) 476 !477 CALL trc_sub_ssh( kt ) ! after ssh & vertical velocity478 !479 482 ENDIF 480 483 … … 517 520 vslp_tm (:,:,:) = vslp (:,:,:) * fse3v(:,:,:) 518 521 #endif 519 520 ! Physics variables that are set after initialization:521 emp_tm (:,:) = 0.522 emps_tm(:,:) = 0.523 qsr_tm (:,:) = 0.524 wndm_tm(:,:) = 0.525 !526 522 sshn_tm (:,:) = sshn (:,:) 527 523 sshu_n_tm(:,:) = sshu_n(:,:) … … 530 526 h_rnf_tm (:,:) = h_rnf (:,:) 531 527 hmld_tm (:,:) = hmld (:,:) 532 fr_i_tm (:,:) = fr_i (:,:) 528 529 ! Physics variables that are set after initialization: 530 fr_i_tm(:,:) = 0. 531 emp_tm (:,:) = 0. 532 emps_tm(:,:) = 0. 533 qsr_tm (:,:) = 0. 534 wndm_tm(:,:) = 0. 533 535 ! 534 536 #if defined key_traldf_c3d … … 590 592 591 593 ! restore physics variables 592 avt (:,:,:) = avt_temp (:,:,:)593 594 un (:,:,:) = un_temp (:,:,:) 594 595 vn (:,:,:) = vn_temp (:,:,:) 595 596 wn (:,:,:) = wn_temp (:,:,:) 597 tsn (:,:,:,:) = tsn_temp (:,:,:,:) 598 avt (:,:,:) = avt_temp (:,:,:) 599 # if defined key_zdfddm 600 avs (:,:,:) = avs_temp (:,:,:) 601 # endif 602 #if defined key_ldfslp 603 wslpi (:,:,:) = wslpi_temp (:,:,:) 604 wslpj (:,:,:) = wslpj_temp (:,:,:) 605 uslp (:,:,:) = uslp_temp (:,:,:) 606 vslp (:,:,:) = vslp_temp (:,:,:) 607 #endif 596 608 sshn (:,:) = sshn_temp (:,:) 597 609 sshb (:,:) = sshb_temp (:,:) … … 604 616 sshv_a(:,:) = sshv_a_temp(:,:) 605 617 sshf_n(:,:) = sshf_n_temp(:,:) 606 #if defined key_ldfslp607 wslpi (:,:,:) = wslpi_temp (:,:,:)608 wslpj (:,:,:) = wslpj_temp (:,:,:)609 uslp (:,:,:) = uslp_temp (:,:,:)610 vslp (:,:,:) = vslp_temp (:,:,:)611 #endif612 618 rnf (:,:) = rnf_temp (:,:) 613 619 h_rnf (:,:) = h_rnf_temp (:,:) 614 hdivn (:,:,:) = hdivn_temp (:,:,:) 615 rotn (:,:,:) = rotn_temp (:,:,:) 616 hdivb (:,:,:) = hdivb_temp (:,:,:) 617 rotb (:,:,:) = rotb_temp (:,:,:) 618 hu (:,:) = hu_temp (:,:) 619 hv (:,:) = hv_temp (:,:) 620 hur (:,:) = hur_temp (:,:) 621 hvr (:,:) = hvr_temp (:,:) 622 ! 623 tsn (:,:,:,:) = tsn_temp (:,:,:,:) 624 # if defined key_zdfddm 625 avs (:,:,:) = avs_temp (:,:,:) 626 # endif 620 ! 627 621 hmld (:,:) = hmld_temp (:,:) 628 qsr (:,:) = qsr_temp (:,:)629 622 fr_i (:,:) = fr_i_temp (:,:) 630 wndm (:,:) = wndm_temp (:,:)631 623 emp (:,:) = emp_temp (:,:) 632 624 emps (:,:) = emps_temp (:,:) 633 625 emp_b (:,:) = emp_b_temp (:,:) 626 qsr (:,:) = qsr_temp (:,:) 627 wndm (:,:) = wndm_temp (:,:) 634 628 ! 635 629 #if defined key_traldf_c3d … … 674 668 #endif 675 669 #endif 670 hdivn (:,:,:) = hdivn_temp (:,:,:) 671 rotn (:,:,:) = rotn_temp (:,:,:) 672 hdivb (:,:,:) = hdivb_temp (:,:,:) 673 rotb (:,:,:) = rotb_temp (:,:,:) 674 hu (:,:) = hu_temp (:,:) 675 hv (:,:) = hv_temp (:,:) 676 hur (:,:) = hur_temp (:,:) 677 hvr (:,:) = hvr_temp (:,:) 676 678 ! 677 679 DO jk = 1, jpk … … 701 703 702 704 ! Start new averages 703 DO jk = 1, jpk704 un_tm (:,:, jk) = un (:,:,jk) * fse3u(:,:,jk)705 vn_tm (:,:, jk) = vn (:,:,jk) * fse3v(:,:,jk)706 wn_tm (:,:, jk) = wn (:,:,jk) * fse3w(:,:,jk)707 tsn_tm (:,:, jk,jp_tem) = tsn (:,:,jk,jp_tem) * fse3t(:,:,jk)708 tsn_tm (:,:, jk,jp_sal) = tsn (:,:,jk,jp_sal) * fse3t(:,:,jk)709 avt_tm (:,:, jk) = avt (:,:,jk) * fse3w(:,:,jk)705 ! DO jk = 1, jpk 706 un_tm (:,:,:) = un (:,:,:) * fse3u(:,:,:) 707 vn_tm (:,:,:) = vn (:,:,:) * fse3v(:,:,:) 708 wn_tm (:,:,:) = wn (:,:,:) * fse3w(:,:,:) 709 tsn_tm (:,:,:,jp_tem) = tsn (:,:,:,jp_tem) * fse3t(:,:,:) 710 tsn_tm (:,:,:,jp_sal) = tsn (:,:,:,jp_sal) * fse3t(:,:,:) 711 avt_tm (:,:,:) = avt (:,:,:) * fse3w(:,:,:) 710 712 # if defined key_zdfddm 711 avs_tm (:,:, jk) = avs (:,:,jk) * fse3w(:,:,jk)713 avs_tm (:,:,:) = avs (:,:,:) * fse3w(:,:,:) 712 714 # endif 713 715 #if defined key_ldfslp 714 wslpi_tm(:,:,jk) = wslpi(:,:,jk) * fse3w(:,:,jk) 715 wslpj_tm(:,:,jk) = wslpj(:,:,jk) * fse3w(:,:,jk) 716 uslp_tm (:,:,jk) = uslp (:,:,jk) * fse3u(:,:,jk) 717 vslp_tm (:,:,jk) = vslp (:,:,jk) * fse3v(:,:,jk) 718 #endif 719 END DO 720 ! 716 wslpi_tm(:,:,:) = wslpi(:,:,:) * fse3w(:,:,:) 717 wslpj_tm(:,:,:) = wslpj(:,:,:) * fse3w(:,:,:) 718 uslp_tm (:,:,:) = uslp (:,:,:) * fse3u(:,:,:) 719 vslp_tm (:,:,:) = vslp (:,:,:) * fse3v(:,:,:) 720 #endif 721 ! END DO 722 ! 723 sshb_hold (:,:) = sshn (:,:) 724 sshu_b_hold(:,:) = sshu_n(:,:) 725 sshv_b_hold(:,:) = sshv_n(:,:) 726 emp_b_hold (:,:) = emp (:,:) 721 727 sshn_tm (:,:) = sshn (:,:) 722 728 sshu_n_tm (:,:) = sshu_n(:,:) … … 726 732 hmld_tm (:,:) = hmld (:,:) 727 733 fr_i_tm (:,:) = fr_i (:,:) 728 sshb_hold (:,:) = sshn (:,:)729 sshu_b_hold(:,:) = sshu_n(:,:)730 sshv_b_hold(:,:) = sshv_n(:,:)731 emp_b_hold (:,:) = emp (:,:)732 734 emp_tm (:,:) = emp (:,:) 733 735 emps_tm (:,:) = emps (:,:) … … 936 938 & sshu_n_temp(jpi,jpj) , sshu_b_temp(jpi,jpj), & 937 939 & sshv_n_temp(jpi,jpj) , sshv_b_temp(jpi,jpj), & 938 & sshv_a_temp(jpi,jpj) , sshf_a_temp(jpi,jpj), & 939 & sshf_n_temp(jpi,jpj) , sshf_b_temp(jpi,jpj), & 940 & sshv_a_temp(jpi,jpj) , sshf_n_temp(jpi,jpj) , & 940 941 & e3t_temp(jpi,jpj,jpk) , e3u_temp(jpi,jpj,jpk), & 941 942 & e3v_temp(jpi,jpj,jpk) , e3w_temp(jpi,jpj,jpk), & … … 951 952 & wndm_temp(jpi,jpj) , wndm_tm(jpi,jpj) , & 952 953 # if defined key_zdfddm 953 & av t_tm(jpi,jpj,jpk) , avt_temp(jpi,jpj,jpk) , &954 & avs_tm(jpi,jpj,jpk) , avs_temp(jpi,jpj,jpk) , & 954 955 # endif 955 956 #if defined key_traldf_c3d
Note: See TracChangeset
for help on using the changeset viewer.
