/[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 127 by guez, Fri Sep 19 17:36:20 2014 UTC revision 128 by guez, Thu Feb 12 16:23:33 2015 UTC
# Line 4  module leapfrog_m Line 4  module leapfrog_m
4    
5  contains  contains
6    
7    SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, q, time_0)    SUBROUTINE leapfrog(ucov, vcov, teta, ps, masse, phis, q)
8    
9      ! From dyn3d/leapfrog.F, version 1.6, 2005/04/13 08:58:34 revision 616      ! From dyn3d/leapfrog.F, version 1.6, 2005/04/13 08:58:34 revision 616
10      ! Authors: P. Le Van, L. Fairhead, F. Hourdin      ! Authors: P. Le Van, L. Fairhead, F. Hourdin
# Line 52  contains Line 52  contains
52      REAL, intent(inout):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx)      REAL, intent(inout):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx)
53      ! mass fractions of advected fields      ! mass fractions of advected fields
54    
     REAL, intent(in):: time_0  
   
55      ! Local:      ! Local:
56    
57      ! Variables dynamiques:      ! Variables dynamiques:
# Line 87  contains Line 85  contains
85      REAL dtetafi(iim + 1, jjm + 1, llm), dqfi(iim + 1, jjm + 1, llm, nqmx)      REAL dtetafi(iim + 1, jjm + 1, llm), dqfi(iim + 1, jjm + 1, llm, nqmx)
86    
87      ! Variables pour le fichier histoire      ! Variables pour le fichier histoire
   
88      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
89      INTEGER itaufin      INTEGER itaufin
90      REAL time ! time of day, as a fraction of day length      REAL time ! time of day, as a fraction of day length
91      real finvmaold(iim + 1, jjm + 1, llm)      real finvmaold(iim + 1, jjm + 1, llm)
92      INTEGER l      INTEGER l
     REAL rdayvrai, rdaym_ini  
93    
94      ! Variables test conservation \'energie      ! Variables test conservation \'energie
95      REAL ecin(iim + 1, jjm + 1, llm), ecin0(iim + 1, jjm + 1, llm)      REAL ecin(iim + 1, jjm + 1, llm), ecin0(iim + 1, jjm + 1, llm)
# Line 134  contains Line 130  contains
130         ! Calcul des tendances dynamiques:         ! Calcul des tendances dynamiques:
131         CALL geopot(teta, pk, pks, phis, phi)         CALL geopot(teta, pk, pks, phis, phi)
132         CALL caldyn(itau, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &         CALL caldyn(itau, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &
133              dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, &              dudyn, dv, dteta, dp, w, pbaru, pbarv, &
134              conser = MOD(itau, iconser) == 0)              conser = MOD(itau, iconser) == 0)
135    
136         CALL caladvtrac(q, pbaru, pbarv, p3d, masse, teta, pk)         CALL caladvtrac(q, pbaru, pbarv, p3d, masse, teta, pk)
# Line 156  contains Line 152  contains
152            ! Calcul des tendances dynamiques:            ! Calcul des tendances dynamiques:
153            CALL geopot(teta, pk, pks, phis, phi)            CALL geopot(teta, pk, pks, phis, phi)
154            CALL caldyn(itau + 1, ucov, vcov, teta, ps, masse, pk, pkf, phis, &            CALL caldyn(itau + 1, ucov, vcov, teta, ps, masse, pk, pkf, phis, &
155                 phi, dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, &                 phi, dudyn, dv, dteta, dp, w, pbaru, pbarv, conser = .false.)
                conser = .false.)  
156    
157            ! integrations dynamique et traceurs:            ! integrations dynamique et traceurs:
158            CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &            CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &
# Line 169  contains Line 164  contains
164         end if         end if
165    
166         IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN         IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN
167            ! Calcul des tendances physiques:            ! Calcul des tendances physiques :
168              time = REAL(mod(itau, day_step)) / day_step
           rdaym_ini = itau * dtvr / daysec  
           rdayvrai = rdaym_ini + day_ini  
           time = REAL(mod(itau, day_step)) / day_step + time_0  
169            IF (time > 1.) time = time - 1.            IF (time > 1.) time = time - 1.
170              CALL calfis(itau * dtvr / daysec + day_ini, time, ucov, vcov, teta, &
171                   q, pk, phis, phi, w, dufi, dvfi, dtetafi, dqfi, &
172                   lafin = itau + 1 == itaufin)
173    
           CALL calfis(rdayvrai, time, ucov, vcov, teta, q, pk, phis, phi, w, &  
                dufi, dvfi, dtetafi, dqfi, lafin = itau + 1 == itaufin)  
   
           ! Ajout des tendances physiques:  
174            CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi)            CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi)
175         ENDIF         ENDIF
176    
# Line 231  contains Line 222  contains
222      ! Calcul des tendances dynamiques:      ! Calcul des tendances dynamiques:
223      CALL geopot(teta, pk, pks, phis, phi)      CALL geopot(teta, pk, pks, phis, phi)
224      CALL caldyn(itaufin, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &      CALL caldyn(itaufin, ucov, vcov, teta, ps, masse, pk, pkf, phis, phi, &
225           dudyn, dv, dteta, dp, w, pbaru, pbarv, time_0, &           dudyn, dv, dteta, dp, w, pbaru, pbarv, &
226           conser = MOD(itaufin, iconser) == 0)           conser = MOD(itaufin, iconser) == 0)
227    
228    END SUBROUTINE leapfrog    END SUBROUTINE leapfrog
Legend:
Removed from v.127  
changed lines
  Added in v.128
  ViewVC Help
Powered by ViewVC 1.1.21