--- trunk/libf/phylmd/physiq.f90	2011/10/07 13:11:58	53
+++ trunk/libf/phylmd/physiq.f90	2012/01/30 12:54:02	57
@@ -12,6 +12,7 @@
 
     ! This is the main procedure for the "physics" part of the program.
 
+    use aaam_bud_m, only: aaam_bud
     USE abort_gcm_m, ONLY: abort_gcm
     use ajsec_m, only: ajsec
     USE calendar, ONLY: ymds2ju
@@ -50,6 +51,7 @@
     USE phytrac_m, ONLY: phytrac
     USE qcheck_m, ONLY: qcheck
     use radlwsw_m, only: radlwsw
+    use sugwd_m, only: sugwd
     USE suphec_m, ONLY: ra, rcpd, retv, rg, rlvtt, romega, rsigma, rtt
     USE temps, ONLY: annee_ref, day_ref, itau_phy
     USE yoethf_m, ONLY: r2es, rvtmp2
@@ -776,7 +778,7 @@
 
        IF (ok_orodr) THEN
           rugoro = MAX(1e-5, zstd * zsig / 2)
-          CALL SUGWD(klon, llm, paprs, play)
+          CALL SUGWD(paprs, play)
        else
           rugoro = 0.
        ENDIF
@@ -903,11 +905,7 @@
     ! Mettre en action les conditions aux limites (albedo, sst, etc.).
 
     ! Prescrire l'ozone et calculer l'albedo sur l'ocean.
-    if (nqmx >= 5) then
-       wo = qx(:, :, 5) * zmasse / dobson_u / 1e3
-    else IF (MOD(itap - 1, lmt_pas) == 0) THEN
-       wo = ozonecm(REAL(julien), paprs)
-    ENDIF
+    wo = ozonecm(REAL(julien), paprs)
 
     ! Évaporation de l'eau liquide nuageuse :
     DO k = 1, llm
@@ -1657,11 +1655,8 @@
        ENDDO
     ENDDO
 
-    !IM calcul composantes axiales du moment angulaire et couple des montagnes
-
-    CALL aaam_bud(27, klon, llm, time, ra, rg, romega, rlat, rlon, pphis, &
-         zustrdr, zustrli, zustrph, zvstrdr, zvstrli, zvstrph, paprs, u, v, &
-         aam, torsfc)
+    CALL aaam_bud(ra, rg, romega, rlat, rlon, pphis, zustrdr, zustrli, &
+         zustrph, zvstrdr, zvstrli, zvstrph, paprs, u, v, aam, torsfc)
 
     IF (if_ebil >= 2) THEN 
        ztit = 'after orography'