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

Diff of /trunk/dyn3d/leapfrog.f90

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

revision 138 by guez, Fri May 22 23:13:19 2015 UTC revision 178 by guez, Fri Mar 11 18:47:26 2016 UTC
# Line 16  contains Line 16  contains
16      use caladvtrac_m, only: caladvtrac      use caladvtrac_m, only: caladvtrac
17      use caldyn_m, only: caldyn      use caldyn_m, only: caldyn
18      USE calfis_m, ONLY: calfis      USE calfis_m, ONLY: calfis
19      USE comconst, ONLY: daysec, dtvr      USE comconst, ONLY: 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 34  contains Line 35  contains
35      use inidissip_m, only: idissip      use inidissip_m, only: idissip
36      use integrd_m, only: integrd      use integrd_m, only: integrd
37      use nr_util, only: assert      use nr_util, only: assert
     USE pressure_var, ONLY: p3d  
38      USE temps, ONLY: itau_dyn      USE temps, ONLY: itau_dyn
39      use writedynav_m, only: writedynav      use writedynav_m, only: writedynav
40      use writehist_m, only: writehist      use writehist_m, only: writehist
# Line 88  contains Line 88  contains
88      ! Variables pour le fichier histoire      ! Variables pour le fichier histoire
89      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
90      INTEGER itaufin      INTEGER itaufin
     real finvmaold(iim + 1, jjm + 1, llm)  
91      INTEGER l      INTEGER l
92    
93      ! Variables test conservation \'energie      ! Variables test conservation \'energie
# Line 98  contains Line 97  contains
97      logical leapf      logical leapf
98      real dt ! time step, in s      real dt ! time step, in s
99    
100        REAL p3d(iim + 1, jjm + 1, llm+1) ! pressure at layer interfaces, in Pa
101        ! ("p3d(i, j, l)" is at longitude "rlonv(i)", latitude "rlatu(j)",
102        ! for interface "l")
103    
104      !---------------------------------------------------      !---------------------------------------------------
105    
106      print *, "Call sequence information: leapfrog"      print *, "Call sequence information: leapfrog"
# Line 125  contains Line 128  contains
128            tetam1 = teta            tetam1 = teta
129            massem1 = masse            massem1 = masse
130            psm1 = ps            psm1 = ps
           finvmaold = masse  
           CALL filtreg_scal(finvmaold, direct = .false., intensive = .false.)  
131         end if         end if
132    
133         ! Calcul des tendances dynamiques:         ! Calcul des tendances dynamiques:
# Line 143  contains Line 144  contains
144    
145         ! Int\'egrations dynamique et traceurs:         ! Int\'egrations dynamique et traceurs:
146         CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, &         CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, dteta, &
147              dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, finvmaold, dt, &              dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, dt, leapf)
             leapf)  
148    
149         forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps         forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
150         CALL exner_hyb(ps, p3d, pks, pk)         CALL exner_hyb(ps, p3d, pks, pk)
# Line 160  contains Line 160  contains
160    
161            ! integrations dynamique et traceurs:            ! integrations dynamique et traceurs:
162            CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &            CALL integrd(vcovm1, ucovm1, tetam1, psm1, massem1, dv, dudyn, &
163                 dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, &                 dteta, dp, vcov, ucov, teta, q(:, :, :, :2), ps, masse, dtvr, &
164                 finvmaold, dtvr, leapf=.false.)                 leapf=.false.)
165    
166            forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps            forall (l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps
167            CALL exner_hyb(ps, p3d, pks, pk)            CALL exner_hyb(ps, p3d, pks, pk)
# Line 170  contains Line 170  contains
170         end if         end if
171    
172         IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN         IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN
173            CALL calfis(itau / day_step + day_ini, &            CALL calfis(ucov, vcov, teta, q, p3d, pk, phis, phi, w, dufi, dvfi, &
174                 REAL(mod(itau, day_step)) / day_step, ucov, vcov, teta, q, pk, &                 dtetafi, dqfi, dayvrai = itau / day_step + day_ini, &
175                 phis, phi, w, dufi, dvfi, dtetafi, dqfi, &                 time = REAL(mod(itau, day_step)) / day_step, &
176                 lafin = itau + 1 == itaufin)                 lafin = itau + 1 == itaufin)
177    
178            CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi)            CALL addfi(ucov, vcov, teta, q, dufi, dvfi, dtetafi, dqfi)
# Line 220  contains Line 220  contains
220         END IF         END IF
221      end do time_integration      end do time_integration
222    
223      CALL dynredem1("restart.nc", vcov, ucov, teta, q, masse, ps, &      CALL dynredem1(vcov, ucov, teta, q, masse, ps, itau = itau_dyn + itaufin)
          itau = itau_dyn + itaufin)  
224    
225      ! Calcul des tendances dynamiques:      ! Calcul des tendances dynamiques:
226      CALL geopot(teta, pk, pks, phis, phi)      CALL geopot(teta, pk, pks, phis, phi)
Legend:
Removed from v.138  
changed lines
  Added in v.178
  ViewVC Help
Powered by ViewVC 1.1.21