Changeset 2707 for LMDZ5/trunk/libf/phylmd/physiq_mod.F90
- Timestamp:
- Nov 21, 2016, 5:44:17 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/phylmd/physiq_mod.F90
r2705 r2707 775 775 REAL s_trmb1(klon), s_trmb2(klon) 776 776 REAL s_trmb3(klon) 777 778 ! La convection n'est pas calculee tous les pas, il faut donc 779 ! sauvegarder les sorties de la convection 780 !ym SAVE 781 !ym SAVE 782 !ym SAVE 783 ! 784 INTEGER itapcv 785 SAVE itapcv 786 !$OMP THREADPRIVATE(itapcv) 787 777 788 !KE43 778 789 ! Variables locales pour la convection de K. Emanuel (sb): … … 1273 1284 itap = 0 1274 1285 itaprad = 0 1286 itapcv = 0 1275 1287 1276 1288 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 1299 1311 // 'de nbapp_rad' 1300 1312 CALL abort_physic(modname,abort_message,1) 1313 ENDIF 1314 IF (nbapp_cv .EQ. 0) nbapp_cv=86400./dtime 1315 print *,'physiq, nbapp_cv ',nbapp_cv 1316 IF (MOD(INT(86400./dtime),nbapp_cv).EQ.0) THEN 1317 cvpas = NINT( 86400./dtime/nbapp_cv) 1318 print *,'physiq, cvpas ',cvpas 1319 ELSE 1320 WRITE(lunout,*) 'le nombre de pas de temps physique doit etre un ', & 1321 'multiple de nbapp_cv' 1322 WRITE(lunout,*) 'changer nbapp_cv ou alors commenter ce test ', & 1323 'mais 1+1<>2' 1324 abort_message='nbre de pas de temps physique n est pas multiple ' & 1325 // 'de nbapp_cv' 1326 call abort_physic(modname,abort_message,1) 1301 1327 ENDIF 1302 1328 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 2335 2361 omega(igout, :) 2336 2362 2363 ! 2364 ! Appel de la convection tous les "cvpas" 2365 ! 2366 IF (MOD(itapcv,cvpas).EQ.0) THEN 2367 2337 2368 IF (iflag_con.EQ.1) THEN 2338 2369 abort_message ='reactiver le call conlmd dans physiq.F' … … 2586 2617 ! . d_u_con, d_v_con) 2587 2618 2619 itapcv = 0 2620 ENDIF ! (MOD(itapcv,cvpas).EQ.0) 2621 itapcv = itapcv+1 2622 2588 2623 CALL add_phys_tend(d_u_con, d_v_con, d_t_con, d_q_con, dql0, dqi0, paprs, & 2589 2624 'convection',abortphy,flag_inhib_tend) … … 2660 2695 ! 2661 2696 IF (iflag_wake>=1) THEN 2697 ! 2698 ! Call wakes only when convection has been called 2699 IF (itapcv .EQ. 1) THEN 2700 ! 2662 2701 DO k=1,klev 2663 2702 DO i=1,klon … … 2713 2752 wake_spread, wake_Cstar, d_deltat_wk_gw, & 2714 2753 d_deltat_wk, d_deltaq_wk, d_s_wk, d_dens_wk) 2754 ! 2755 ENDIF ! (mod(itapcv,cvpas) .EQ. 1) 2715 2756 ! 2716 2757 !-----------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.