- Timestamp:
- 2014-11-27T15:58:54+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90
r4333 r4896 269 269 zwnd_j(:,:) = 0.e0 270 270 #if defined key_cyclone 271 # if defined key_vectopt_loop 272 !CDIR COLLAPSE 273 # endif 274 CALL wnd_cyc( kt, zwnd_i, zwnd_j ) ! add Manu ! 271 CALL wnd_cyc( kt, zwnd_i, zwnd_j ) 275 272 DO jj = 2, jpjm1 276 273 DO ji = fs_2, fs_jpim1 ! vect. opt. … … 279 276 END DO 280 277 END DO 281 #endif282 #if defined key_vectopt_loop283 !CDIR COLLAPSE284 278 #endif 285 279 DO jj = 2, jpjm1 … … 292 286 CALL lbc_lnk( zwnd_j(:,:) , 'T', -1. ) 293 287 ! ... scalar wind ( = | U10m - U_oce | ) at T-point (masked) 294 !CDIR NOVERRCHK295 !CDIR COLLAPSE296 288 wndm(:,:) = SQRT( zwnd_i(:,:) * zwnd_i(:,:) & 297 289 & + zwnd_j(:,:) * zwnd_j(:,:) ) * tmask(:,:,1) … … 443 435 END SUBROUTINE blk_oce_core 444 436 437 445 438 SUBROUTINE blk_bio_meanqsr 446 439 !!--------------------------------------------------------------------- … … 453 446 !! 454 447 !!--------------------------------------------------------------------- 455 IF( nn_timing == 1 ) CALL timing_start('blk_bio_meanqsr')456 457 qsr_mean(:,:) = (1. - albo ) * 458 459 IF( nn_timing == 1 ) CALL timing_stop('blk_bio_meanqsr')460 448 IF( nn_timing == 1 ) CALL timing_start('blk_bio_meanqsr') 449 ! 450 qsr_mean(:,:) = (1. - albo ) * sf(jp_qsr)%fnow(:,:,1) 451 ! 452 IF( nn_timing == 1 ) CALL timing_stop('blk_bio_meanqsr') 453 ! 461 454 END SUBROUTINE blk_bio_meanqsr 462 455 … … 604 597 ! 605 598 CASE( 'C' ) ! C-grid ice dynamics : U & V-points (same as ocean) 606 #if defined key_vectopt_loop607 !CDIR COLLAPSE608 #endif609 599 DO jj = 2, jpj 610 600 DO ji = fs_2, jpi ! vect. opt. … … 614 604 END DO 615 605 END DO 616 #if defined key_vectopt_loop617 !CDIR COLLAPSE618 #endif619 606 DO jj = 2, jpjm1 620 607 DO ji = fs_2, fs_jpim1 ! vect. opt. … … 635 622 DO jl = 1, ijpl ! Loop over ice categories ! 636 623 ! ! ========================== ! 637 !CDIR NOVERRCHK638 !CDIR COLLAPSE639 624 DO jj = 1 , jpj 640 !CDIR NOVERRCHK641 625 DO ji = 1, jpi 642 626 ! ----------------------------! … … 700 684 p_spr(:,:) = sf(jp_snow)%fnow(:,:,1) * rn_pfac ! solid precipitation [kg/m2/s] 701 685 CALL iom_put( 'snowpre', p_spr * 86400. ) ! Snow precipitation 702 CALL iom_put( 'precip' , p_tpr * 86400. )! Total precipitation686 CALL iom_put( 'precip' , p_tpr * 86400. ) ! Total precipitation 703 687 ! 704 688 IF(ln_ctl) THEN … … 810 794 811 795 !! Estimate the Monin-Obukov length : 812 L = (U_star**2)/( kappa*grav*(T_star/T_vpot + q_star/(q_a + 1./0.608)) ) 796 L = U_star*U_star / ( kappa*grav*(T_star/T_vpot + q_star/(q_a + 1./0.608)) ) 797 !!gm !lolo suggestion ...... TO BE TAKEN ? 798 !! L = U_star*U_star / ( kappa*grav/T_vpot*(T_star*(1. + 0.608*q_a) + 0.608*T_a*q_star) ) 799 !!gm !lolo. 813 800 814 801 !! Stability parameters : … … 1034 1021 REAL(wp), DIMENSION(:,:), POINTER :: X2, X, stabit 1035 1022 !------------------------------------------------------------------------------- 1036 1023 ! 1037 1024 CALL wrk_alloc( jpi,jpj, X2, X, stabit ) 1038 1025 ! 1039 1026 X2 = sqrt(abs(1. - 16.*zta)) ; X2 = max(X2 , 1.) ; X = sqrt(X2) 1040 1027 stabit = 0.5 + sign(0.5,zta) 1041 psi_h = -5.*zta*stabit & ! Stable1028 psi_h = -5.*zta*stabit & ! Stable 1042 1029 & + (1. - stabit)*(2.*log( (1. + X2)/2. )) ! Unstable 1043 1030 ! 1044 1031 CALL wrk_dealloc( jpi,jpj, X2, X, stabit ) 1045 1032 !
Note: See TracChangeset
for help on using the changeset viewer.