--- trunk/dyn3d/advtrac.f 2014/03/26 17:18:58 91 +++ trunk/dyn3d/advtrac.f 2014/09/16 14:00:41 108 @@ -13,9 +13,11 @@ USE conf_gcm_m, ONLY : iapp_tracvl USE dimens_m, ONLY : iim, jjm, llm, nqmx USE iniadvtrac_m, ONLY : iadv + use interpre_m, only: interpre use massbar_m, only: massbar USE paramet_m, ONLY : iip1, iip2, ijmllm, ijp1llm, ip1jm, ip1jmp1, jjp1, & llmp1 + use vlspltqs_m, only: vlspltqs REAL, intent(in):: pbaru(ip1jmp1, llm), pbarv(ip1jm, llm) REAL, intent(in):: p(ip1jmp1, llmp1) @@ -32,7 +34,6 @@ REAL, save:: massem(ip1jmp1, llm) real zdp(ip1jmp1) REAL pbarug(ip1jmp1, llm), pbarvg(ip1jm, llm), wg(ip1jmp1, llm) - REAL cpuadv(nqmx) INTEGER:: iadvtr = 0 INTEGER ij, l, iq @@ -124,7 +125,7 @@ ! Schema de Frederic Hourdin ELSE IF (iadv(iq)==12) THEN ! Pas de temps adaptatif - CALL adaptdt(iadv(iq), dtbon, n, pbarug, massem) + CALL adaptdt(dtbon, n, pbarug, massem) IF (n>1) THEN WRITE (*, *) 'WARNING horizontal dt=', dtbon, 'dtvr=', dtvr, & 'n=', n @@ -134,7 +135,7 @@ END DO ELSE IF (iadv(iq)==13) THEN ! Pas de temps adaptatif - CALL adaptdt(iadv(iq), dtbon, n, pbarug, massem) + CALL adaptdt(dtbon, n, pbarug, massem) IF (n>1) THEN WRITE (*, *) 'WARNING horizontal dt=', dtbon, 'dtvr=', dtvr, & 'n=', n @@ -148,7 +149,7 @@ ! Schema de Prather ELSE IF (iadv(iq)==30) THEN ! Pas de temps adaptatif - CALL adaptdt(iadv(iq), dtbon, n, pbarug, massem) + CALL adaptdt(dtbon, n, pbarug, massem) IF (n>1) THEN WRITE (*, *) 'WARNING horizontal dt=', dtbon, 'dtvr=', dtvr, & 'n=', n @@ -158,7 +159,7 @@ ELSE IF (iadv(iq)==11 .OR. (iadv(iq)>=16 .AND. iadv(iq)<=18)) THEN ! Test sur le flux horizontal ! Pas de temps adaptatif - CALL adaptdt(iadv(iq), dtbon, n, pbarug, massem) + CALL adaptdt(dtbon, n, pbarug, massem) IF (n>1) THEN WRITE (*, *) 'WARNING horizontal dt=', dtbon, 'dtvr=', dtvr, & 'n=', n