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

Diff of /trunk/dyn3d/leapfrog.f

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

revision 157 by guez, Mon Jul 20 16:01:49 2015 UTC revision 161 by guez, Fri Jul 24 14:27:59 2015 UTC
# Line 18  contains Line 18  contains
18      USE calfis_m, ONLY: calfis      USE calfis_m, ONLY: calfis
19      USE comconst, ONLY: daysec, dtvr      USE comconst, ONLY: daysec, dtvr
20      USE comgeom, ONLY: aire_2d, apoln, apols      USE comgeom, ONLY: aire_2d, apoln, apols
21        use covcont_m, only: covcont
22      USE disvert_m, ONLY: ap, bp      USE disvert_m, ONLY: ap, bp
23      USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, &      USE conf_gcm_m, ONLY: day_step, iconser, iperiod, iphysiq, nday, offline, &
24           iflag_phys, iecri           iflag_phys, iecri
# Line 88  contains Line 89  contains
89      ! Variables pour le fichier histoire      ! Variables pour le fichier histoire
90      INTEGER itau ! index of the time step of the dynamics, starts at 0      INTEGER itau ! index of the time step of the dynamics, starts at 0
91      INTEGER itaufin      INTEGER itaufin
     real finvmaold(iim + 1, jjm + 1, llm)  
92      INTEGER l      INTEGER l
93    
94      ! Variables test conservation \'energie      ! Variables test conservation \'energie
# Line 125  contains Line 125  contains
125            tetam1 = teta            tetam1 = teta
126            massem1 = masse            massem1 = masse
127            psm1 = ps            psm1 = ps
           finvmaold = masse  
           CALL filtreg_scal(finvmaold, direct = .false., intensive = .false.)  
128         end if         end if
129    
130         ! Calcul des tendances dynamiques:         ! Calcul des tendances dynamiques:
# Line 143  contains Line 141  contains
141    
142         ! Int\'egrations dynamique et traceurs:         ! Int\'egrations dynamique et traceurs:
143         CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, &         CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, &
144              dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, &              dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, dt, leapf)
             leapf)  
145    
146         forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps         forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
147         CALL exner_hyb(ps, p3d, pks, pk)         CALL exner_hyb(ps, p3d, pks, pk)
# Line 160  contains Line 157  contains
157    
158            ! integrations dynamique et traceurs:            ! integrations dynamique et traceurs:
159            CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &            CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &
160                 dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, &                 dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, dtvr, &
161                 finvmaold, dtvr, leapf=.false.)                 leapf=.false.)
162    
163            forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps            forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
164            CALL exner_hyb(ps, p3d, pks, pk)            CALL exner_hyb(ps, p3d, pks, pk)
Legend:
Removed from v.157  
changed lines
  Added in v.161
  ViewVC Help
Powered by ViewVC 1.1.21