/[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 161 by guez, Fri Jul 24 14:27:59 2015 UTC revision 212 by guez, Thu Jan 12 12:31:31 2017 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      use covcont_m, only: covcont
22      USE disvert_m, ONLY: ap, bp      USE disvert_m, ONLY: ap, bp
# Line 27  contains Line 27  contains
27      use dissip_m, only: dissip      use dissip_m, only: dissip
28      USE dynetat0_m, ONLY: day_ini      USE dynetat0_m, ONLY: day_ini
29      use dynredem1_m, only: dynredem1      use dynredem1_m, only: dynredem1
30        use enercin_m, only: enercin
31      USE exner_hyb_m, ONLY: exner_hyb      USE exner_hyb_m, ONLY: exner_hyb
32      use filtreg_scal_m, only: filtreg_scal      use filtreg_scal_m, only: filtreg_scal
33      use fluxstokenc_m, only: fluxstokenc      use fluxstokenc_m, only: fluxstokenc
# Line 35  contains Line 36  contains
36      use inidissip_m, only: idissip      use inidissip_m, only: idissip
37      use integrd_m, only: integrd      use integrd_m, only: integrd
38      use nr_util, only: assert      use nr_util, only: assert
     USE pressure_var, ONLY: p3d  
39      USE temps, ONLY: itau_dyn      USE temps, ONLY: itau_dyn
40      use writedynav_m, only: writedynav      use writedynav_m, only: writedynav
41      use writehist_m, only: writehist      use writehist_m, only: writehist
# Line 98  contains Line 98  contains
98      logical leapf      logical leapf
99      real dt ! time step, in s      real dt ! time step, in s
100    
101        REAL p3d(iim + 1, jjm + 1, llm + 1) ! pressure at layer interfaces, in Pa
102        ! ("p3d(i, j, l)" is at longitude "rlonv(i)", latitude "rlatu(j)",
103        ! for interface "l")
104    
105      !---------------------------------------------------      !---------------------------------------------------
106    
107      print *, "Call sequence information: leapfrog"      print *, "Call sequence information: leapfrog"
# Line 166  contains Line 170  contains
170            CALL filtreg_scal(pkf, direct = .true., intensive = .true.)            CALL filtreg_scal(pkf, direct = .true., intensive = .true.)
171         end if         end if
172    
173         IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN         IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys) THEN
174            CALL calfis(ucov, vcov, teta, q, pk, phis, phi, w, dufi, dvfi, &            CALL calfis(ucov, vcov, teta, q, p3d, pk, phis, phi, w, dufi, dvfi, &
175                 dtetafi, dqfi, dayvrai = itau / day_step + day_ini, &                 dtetafi, dqfi, dayvrai = itau / day_step + day_ini, &
176                 time = REAL(mod(itau, day_step)) / day_step, &                 time = REAL(mod(itau, day_step)) / day_step, &
177                 lafin = itau + 1 == itaufin)                 lafin = itau + 1 == itaufin)
# Line 198  contains Line 202  contains
202            forall (l = 1: llm)            forall (l = 1: llm)
203               teta(:, 1, l) = SUM(aire_2d(:iim, 1) * teta(:iim, 1, l)) &               teta(:, 1, l) = SUM(aire_2d(:iim, 1) * teta(:iim, 1, l)) &
204                    / apoln                    / apoln
205               teta(:, jjm + 1, l) = SUM(aire_2d(:iim, jjm+1) &               teta(:, jjm + 1, l) = SUM(aire_2d(:iim, jjm + 1) &
206                    * teta(:iim, jjm + 1, l)) / apols                    * teta(:iim, jjm + 1, l)) / apols
207            END forall            END forall
208         END IF         END IF
Legend:
Removed from v.161  
changed lines
  Added in v.212
  ViewVC Help
Powered by ViewVC 1.1.21