Changeset 1987 for LMDZ5/trunk/libf/dyn3d/leapfrog.F

Timestamp:

Feb 24, 2014, 4:05:47 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Add updating pressure, mass and Exner function (ie: all variables which depend on surface pressure) after adding physics tendencies (which include a surface pressure tendency).
Note that this change induces slight changes in GCM results with respect to previous svn version of the code, even if surface pressure tendency is zero (because of recomputation of polar values as an average over polar points on the dynamics grid).
EM

File:

• LMDZ5/trunk/libf/dyn3d/leapfrog.F (modified) (6 diffs)

LMDZ5/trunk/libf/dyn3d/leapfrog.F

@@ -12 +12 @@
       use IOIPSL
 #endif
-      USE infotrac
+      USE infotrac, ONLY: nqtot
       USE guide_mod, ONLY : guide_main
-      USE write_field
-      USE control_mod
+      USE write_field, ONLY: writefield
+      USE control_mod, ONLY: nday, day_step, planet_type, offline,
+     &                       iconser, iphysiq, iperiod, dissip_period,
+     &                       iecri, ip_ebil_dyn, ok_dynzon, ok_dyn_ins,
+     &                       periodav, ok_dyn_ave, output_grads_dyn
       IMPLICIT NONE
 
@@ -67 +70 @@
 ! #include "clesphys.h"
 
-      INTEGER         longcles
-      PARAMETER     ( longcles = 20 )
-      REAL  clesphy0( longcles )
+      INTEGER,PARAMETER :: longcles = 20
+      REAL,INTENT(IN) :: clesphy0( longcles ) ! not used
+      REAL,INTENT(IN) :: time_0 ! not used
+
+c   dynamical variables:
+      REAL,INTENT(INOUT) :: ucov(ip1jmp1,llm)    ! zonal covariant wind
+      REAL,INTENT(INOUT) :: vcov(ip1jm,llm)      ! meridional covariant wind
+      REAL,INTENT(INOUT) :: teta(ip1jmp1,llm)    ! potential temperature
+      REAL,INTENT(INOUT) :: ps(ip1jmp1)          ! surface pressure (Pa)
+      REAL,INTENT(INOUT) :: masse(ip1jmp1,llm)   ! air mass
+      REAL,INTENT(INOUT) :: phis(ip1jmp1)        ! geopotentiat at the surface
+      REAL,INTENT(INOUT) :: q(ip1jmp1,llm,nqtot) ! advected tracers
+
+      REAL p (ip1jmp1,llmp1  )               ! interlayer pressure
+      REAL pks(ip1jmp1)                      ! exner at the surface
+      REAL pk(ip1jmp1,llm)                   ! exner at mid-layer
+      REAL pkf(ip1jmp1,llm)                  ! filtered exner at mid-layer
+      REAL phi(ip1jmp1,llm)                  ! geopotential
+      REAL w(ip1jmp1,llm)                    ! vertical velocity
 
       real zqmin,zqmax
-
-c   variables dynamiques
-      REAL vcov(ip1jm,llm),ucov(ip1jmp1,llm) ! vents covariants
-      REAL teta(ip1jmp1,llm)                 ! temperature potentielle 
-      REAL q(ip1jmp1,llm,nqtot)               ! champs advectes
-      REAL ps(ip1jmp1)                       ! pression  au sol
-      REAL p (ip1jmp1,llmp1  )               ! pression aux interfac.des couches
-      REAL pks(ip1jmp1)                      ! exner au  sol
-      REAL pk(ip1jmp1,llm)                   ! exner au milieu des couches
-      REAL pkf(ip1jmp1,llm)                  ! exner filt.au milieu des couches
-      REAL masse(ip1jmp1,llm)                ! masse d'air
-      REAL phis(ip1jmp1)                     ! geopotentiel au sol
-      REAL phi(ip1jmp1,llm)                  ! geopotentiel
-      REAL w(ip1jmp1,llm)                    ! vitesse verticale
 
 c variables dynamiques intermediaire pour le transport
@@ -117 +122 @@
 
       REAL  SSUM
-      REAL time_0
 !     REAL finvmaold(ip1jmp1,llm)
 
@@ -319 +323 @@
 
       IF( forward. OR . leapf )  THEN
-! Ehouarn: NB: at this point p with ps are not synchronized
-!              (whereas mass and ps are...)
+! Ehouarn: NB: fields sent to advtrac are those at the beginning of the time step
          CALL caladvtrac(q,pbaru,pbarv,
      *        p, masse, dq,  teta,
@@ -441 +444 @@
      $                  ucov, vcov, teta , q   ,ps ,
      $                 dufi, dvfi, dtetafi , dqfi ,dpfi  )
+          ! since addfi updates ps(), also update p(), masse() and pk()
+          CALL pression (ip1jmp1,ap,bp,ps,p)
+          CALL massdair(p,masse)
+          if (pressure_exner) then
+            CALL exner_hyb(ip1jmp1,ps,p,alpha,beta,pks,pk,pkf)
+          else
+            CALL exner_milieu(ip1jmp1,ps,p,beta,pks,pk,pkf)
+          endif
 
          IF (ok_strato) THEN
@@ -499 +510 @@
           CALL exner_milieu( ip1jmp1, ps, p, beta, pks, pk, pkf )
         endif
+        CALL massdair(p,masse)