/[lmdze]/trunk/Sources/dyn3d/leapfrog.f
ViewVC logotype

Diff of /trunk/Sources/dyn3d/leapfrog.f

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 95 by guez, Wed Apr 2 12:59:54 2014 UTC revision 103 by guez, Fri Aug 29 13:00:05 2014 UTC
# Line 15  contains Line 15  contains
15      use caladvtrac_m, only: caladvtrac      use caladvtrac_m, only: caladvtrac
16      use caldyn_m, only: caldyn      use caldyn_m, only: caldyn
17      USE calfis_m, ONLY: calfis      USE calfis_m, ONLY: calfis
18      USE comconst, ONLY: daysec, dtphys, dtvr      USE comconst, ONLY: daysec, dtvr
19      USE comgeom, ONLY: aire_2d, apoln, apols      USE comgeom, ONLY: aire_2d, apoln, apols
20      USE disvert_m, ONLY: ap, bp      USE disvert_m, ONLY: ap, bp
21      USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, &      USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, &
# Line 120  contains Line 120  contains
120         else         else
121            ! Matsuno            ! Matsuno
122            dt = dtvr            dt = dtvr
123            if (ok_guide .and. (itaufin - itau - 1) * dtvr > 21600.) &            if (ok_guide .and. itaufin - itau - 1 > day_step / 4) &
124                 call guide(itau, ucov, vcov, teta, q, masse, ps)                 call guide(itau, ucov, vcov, teta, q, ps)
125            vcovm1 = vcov            vcovm1 = vcov
126            ucovm1 = ucov            ucovm1 = ucov
127            tetam1 = teta            tetam1 = teta
# Line 148  contains Line 148  contains
148              dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, &              dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, &
149              leapf)              leapf)
150    
151           forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
152           CALL exner_hyb(ps, p3d, pks, pk, pkf)
153    
154         if (.not. leapf) then         if (.not. leapf) then
155            ! Matsuno backward            ! Matsuno backward
           forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps  
           CALL exner_hyb(ps, p3d, pks, pk, pkf)  
   
156            ! Calcul des tendances dynamiques:            ! Calcul des tendances dynamiques:
157            CALL geopot(teta, pk, pks, phis, phi)            CALL geopot(teta, pk, pks, phis, phi)
158            CALL caldyn(itau + 1, ucov, vcov, teta, ps, masse, pk, pkf, phis, &            CALL caldyn(itau + 1, ucov, vcov, teta, ps, masse, pk, pkf, phis, &
# Line 163  contains Line 163  contains
163            CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &            CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &
164                 dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, &                 dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, &
165                 finvmaold, dtvr, leapf=.false.)                 finvmaold, dtvr, leapf=.false.)
166    
167              forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
168              CALL exner_hyb(ps, p3d, pks, pk, pkf)
169         end if         end if
170    
171         IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN         IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN
172            ! Calcul des tendances physiques:            ! Calcul des tendances physiques:
173    
           forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps  
           CALL exner_hyb(ps, p3d, pks, pk)  
   
174            rdaym_ini = itau * dtvr / daysec            rdaym_ini = itau * dtvr / daysec
175            rdayvrai = rdaym_ini + day_ini            rdayvrai = rdaym_ini + day_ini
176            time = REAL(mod(itau, day_step)) / day_step + time_0            time = REAL(mod(itau, day_step)) / day_step + time_0
# Line 183  contains Line 183  contains
183            CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi)            CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi)
184         ENDIF         ENDIF
185    
        forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps  
        CALL exner_hyb(ps, p3d, pks, pk, pkf)  
   
186         IF (MOD(itau + 1, idissip) == 0) THEN         IF (MOD(itau + 1, idissip) == 0) THEN
187            ! Dissipation horizontale et verticale des petites \'echelles            ! Dissipation horizontale et verticale des petites \'echelles
188    
Legend:
Removed from v.95  
changed lines
  Added in v.103
  ViewVC Help
Powered by ViewVC 1.1.21