Changeset 1017 for trunk/LMDZ.COMMON/libf/dyn3d

Timestamp:

Aug 22, 2013, 4:02:07 PM (11 years ago)

Author:

emillour

Message:

Common dynamics: (and collateral adaptations in Venus physics)
Improved cpdet routines in and additional sponge mode:

• Additionnal sponge mode (trigered with "callsponge" flag), in line with the one used in the Generic and Martian GCM. This sponge is called whenever there is a dissipation step.
• Improvement of the cpdet routines : created routines tpot2t_glo_p and t2tpot_glo_p which handle fields on the whole dynamics (scaler) grid, which are more efficient than calling tpot2t_p or t2tpot_p with slabs of data (generated use of intermediate copies of these chunks of data at every call)
• Turned cpdet.F into a module cpdet_mod.F90 (and correspondingly adapted all routines in the Venus physics).

EM

Location:

trunk/LMDZ.COMMON/libf/dyn3d

Files:

• bilan_dyn.F (modified) (1 diff)
• calfis.F (modified) (1 diff)
• conf_gcm.F (modified) (2 diffs)
• cpdet_mod.F90 (moved) (moved from trunk/LMDZ.COMMON/libf/dyn3d/cpdet.F) (9 diffs)
• gcm.F (modified) (1 diff)
• leapfrog.F (modified) (3 diffs)
• sponge_mod.F90 (added)
• vlspltqs.F (modified) (1 diff)

trunk/LMDZ.COMMON/libf/dyn3d/bilan_dyn.F

@@ -20 +20 @@
 
       USE control_mod, ONLY: planet_type 
+      USE cpdet_mod, only: tpot2t
 
       IMPLICIT NONE

trunk/LMDZ.COMMON/libf/dyn3d/calfis.F

@@ -31 +31 @@
       USE infotrac
       USE control_mod
- 
+      USE cpdet_mod, only: t2tpot,tpot2t
 
       IMPLICIT NONE

trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F

@@ -15 +15 @@
       USE infotrac, ONLY : type_trac
       use assert_m, only: assert
+      use sponge_mod, only: callsponge,mode_sponge,nsponge,tetasponge
 
       IMPLICIT NONE
@@ -361 +362 @@
        tau_top_bound=1.e-5
        CALL getin('tau_top_bound',tau_top_bound)
+
+! the other possible sponge layer (sponge_mod)
+       callsponge=.false. ! default value; don't use the sponge
+       call getin("callsponge",callsponge)
+       ! check that user is not trying to use both sponge models
+       if ((iflag_top_bound.ge.1).and.callsponge) then
+         write(lunout,*)'Bad choice of options:'
+         write(lunout,*)' iflag_top_bound=',iflag_top_bound
+         write(lunout,*)' and callsponge=.true.'
+         write(lunout,*)'But both sponge models should not be',
+     &                  ' used simultaneously!'
+         stop
+       endif
+       
+! nsponge: number of atmospheric layers over which the sponge extends
+       nsponge=3 ! default value
+       call getin("nsponge",nsponge)
+
+! mode_sponge: (quenching is towards ... over the upper nsponge layers)
+!      0: (h=hmean,u=v=0)
+!      1: (h=hmean,u=umean,v=0)
+!      2: (h=hmean,u=umean,v=vmean)"
+       mode_sponge=2 ! default value
+       call getin("mode_sponge",mode_sponge)
+
+! tetasponge: characteristic time scale (seconds) at topmost layer
+!            (time scale then doubles with decreasing layer index)."
+       tetasponge=50000.0
+       call getin("tetasponge",tetasponge)
 
 ! FOR TITAN: tidal forces

trunk/LMDZ.COMMON/libf/dyn3d/cpdet_mod.F90

@@ -1 @@
-! ADAPTATION GCM POUR CP(T)
-c======================================================================
-c S. Lebonnois, 10/2010
-c
-c Cp doit être calculé par cpdet(t) pour être valable partout
-c
-c La fonction d'Exner reste pk = RCPD*(play/pref)**RKAPPA
-c (RCPD=cpp, RKAPPA=kappa)
-c
-c On passe de T a teta (temperature potentielle) par t2tpot(t,teta,pk)
-c On passe de teta a T par tpot2t(teta,t,pk)
-c
-c======================================================================
+      module cpdet_mod
+
+      implicit none
+
+! ADAPTATION OF GCM TO CP(T)
+!======================================================================
+! S. Lebonnois, 10/2010
+!
+! Cp must be computed using cpdet(t) to be valid
+!
+! The Exner function is still pk = RCPD*(play/pref)**RKAPPA
+! (RCPD=cpp, RKAPPA=kappa)
+!
+! One goes from T to teta (potential temperature) using t2tpot(t,teta,pk)
+! One goes from teta to T using tpot2t(teta,t,pk)
+!
+!======================================================================
+
+      contains
 
       SUBROUTINE ini_cpdet
@@ -17 +23 @@
       USE control_mod, ONLY: planet_type 
       IMPLICIT none
-c======================================================================
-c Initialisation de nu_venus et t0_venus
-c======================================================================
+!======================================================================
+! Initialization of nu_venus and t0_venus
+!======================================================================
 
 ! for cpp, nu_venus and t0_venus:
@@ -33 +39 @@
 
       return
-      end
+      end subroutine ini_cpdet
 
-c======================================================================
-c======================================================================
+!======================================================================
+!======================================================================
 
       FUNCTION cpdet(t)
@@ -46 +52 @@
 #include "comconst.h"
 
-      real cpdet,t
+      real,intent(in) :: t
+      real cpdet
 
       if (planet_type.eq."venus") then
@@ -55 +62 @@
 
       return
-      end
+      end function cpdet
       
-c======================================================================
-c======================================================================
+!======================================================================
+!======================================================================
 
       SUBROUTINE t2tpot(npoints, yt, yteta, ypk)
-c======================================================================
-c Arguments:
-c
-c yt   --------input-R- Temperature
-c yteta-------output-R- Temperature potentielle
-c ypk  --------input-R- Fonction d'Exner: RCPD*(pplay/pref)**RKAPPA
-c
-c======================================================================
+!======================================================================
+! Arguments:
+!
+! yt   --------input-R- Temperature
+! yteta-------output-R- Temperature potentielle
+! ypk  --------input-R- Fonction d'Exner: RCPD*(pplay/pref)**RKAPPA
+!
+!======================================================================
 
       USE control_mod, ONLY: planet_type 
@@ -76 +83 @@
 #include "comconst.h"
 
-      integer npoints
-      REAL    yt(npoints), yteta(npoints), ypk(npoints)
+      integer,intent(in) :: npoints
+      REAL,intent(in) :: yt(npoints), ypk(npoints)
+      REAL,intent(out) :: yteta(npoints)
       
       if (planet_type.eq."venus") then
@@ -88 +96 @@
 
       return
-      end
+      end subroutine t2tpot
 
-c======================================================================
-c======================================================================
+!======================================================================
+!======================================================================
 
       SUBROUTINE tpot2t(npoints,yteta, yt, ypk)
-c======================================================================
-c Arguments:
-c
-c yteta--------input-R- Temperature potentielle
-c yt   -------output-R- Temperature
-c ypk  --------input-R- Fonction d'Exner: RCPD*(pplay/pref)**RKAPPA
-c
-c======================================================================
+!======================================================================
+! Arguments:
+!
+! yteta--------input-R- Temperature potentielle
+! yt   -------output-R- Temperature
+! ypk  --------input-R- Fonction d'Exner: RCPD*(pplay/pref)**RKAPPA
+!
+!======================================================================
 
       USE control_mod, ONLY: planet_type 
@@ -109 +117 @@
 #include "comconst.h"
 
-      integer npoints
-      REAL    yt(npoints), yteta(npoints), ypk(npoints)
+      integer,intent(in) :: npoints
+      REAL,intent(in) :: yteta(npoints), ypk(npoints)
+      REAL,intent(out) :: yt(npoints)
       
       if (planet_type.eq."venus") then
@@ -121 +130 @@
   
       return
-      end
+      end subroutine tpot2t
 
-c======================================================================
-c======================================================================
-c
-c ATTENTION
-c
-c Si un jour on a besoin, il faudra coder les routines 
-c    dt2dtpot / dtpto2dt 
-c
-c======================================================================
-c======================================================================
+!======================================================================
+!======================================================================
+!
+! ATTENTION
+!
+! Si un jour on a besoin, il faudra coder les routines 
+!    dt2dtpot / dtpto2dt 
+!
+!======================================================================
+!======================================================================
+      end module cpdet_mod

trunk/LMDZ.COMMON/libf/dyn3d/gcm.F

@@ -16 +16 @@
       USE infotrac
       USE control_mod
+      use cpdet_mod, only: ini_cpdet
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

@@ -16 +16 @@
       USE write_field
       USE control_mod
+      use cpdet_mod, only: cpdet,tpot2t,t2tpot
+      use sponge_mod, only: callsponge,mode_sponge,sponge
       IMPLICIT NONE
 
@@ -197 +199 @@
       ! for CP(T)
       real :: dtec
-      real,external :: cpdet
       real :: ztetaec(ip1jmp1,llm)
 
 c dummy: sinon cette routine n'est jamais compilee...
       if(1.eq.0) then
+#ifdef CPP_PHYS
         CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
+#endif
       endif
 
@@ -562 +565 @@
       IF(apdiss) THEN
 
+        ! sponge layer
+        if (callsponge) then
+          CALL sponge(ucov,vcov,teta,ps,dtdiss,mode_sponge)
+        endif
 
 c   calcul de l'energie cinetique avant dissipation

trunk/LMDZ.COMMON/libf/dyn3d/vlspltqs.F

@@ -22 +22 @@
 c     pk exner au milieu des couches necessaire pour calculer Qsat
 c   --------------------------------------------------------------------
+      use cpdet_mod, only: tpot2t
       IMPLICIT NONE
 c