Changeset 1697 for LMDZ5/trunk/libf/dyn3d

Timestamp:

Dec 19, 2012, 5:57:23 PM (12 years ago)

Author:

lguez

Message:

Created new variable vert_prof_dissip to choose the vertical profile
of horizontal dissipation. vert_prof_dissip is an integer, allowed
values are 0 and 1. Did not make it a logical variable because we
expect to have the choice between more than 2 profiles later, when we
converge with extra-terrestrial versions of LMDZ. Replaced test on
ok_strato and llm in inidissip by test on vert_prof_dissip.

Merged some lines of dyn3d/conf_gcm.F and dyn3dpar/conf_gcm.F (we want
as little difference as possible between dyn3d and dyn3dpar).

Checked that the sequential configuration does not change results for
the bench of "install.sh".

Location:

LMDZ5/trunk/libf/dyn3d

Files:

• comdissnew.h (modified) (1 diff)
• conf_gcm.F (modified) (8 diffs)
• gcm.F (modified) (1 diff)
• inidissip.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3d/comdissnew.h

@@ -12 +12 @@
 
       COMMON/comdissnew/ lstardis,nitergdiv,nitergrot,niterh,tetagdiv,  &
-     &                   tetagrot,tetatemp,coefdis 
+     &                   tetagrot,tetatemp,coefdis, vert_prof_dissip
 
       LOGICAL lstardis
       INTEGER nitergdiv, nitergrot, niterh
+
+      integer vert_prof_dissip ! vertical profile of horizontal dissipation
+!     Allowed values:
+!     0: fractional function of pressure
+!     1: tanh of altitude
+
       REAL     tetagdiv, tetagrot,  tetatemp, coefdis
 

LMDZ5/trunk/libf/dyn3d/conf_gcm.F

@@ -14 +14 @@
 #endif
       USE infotrac, ONLY : type_trac
+      use assert_m, only: assert
+
       IMPLICIT NONE
 c-----------------------------------------------------------------------
@@ -93 +95 @@
       CALL getin('lunout', lunout)
       IF (lunout /= 5 .and. lunout /= 6) THEN
-        OPEN(lunout,FILE='lmdz.out')
+        OPEN(UNIT=lunout,FILE='lmdz.out',ACTION='write', 
+     &          STATUS='unknown',FORM='formatted')
       ENDIF
 
@@ -173 +176 @@
 
 !Config  Key  = nsplit_phys
-!Config  Desc = nombre de pas par jour
-!Config  Def  = 1 
-!Config  Help = nombre de pas par jour (multiple de iperiod) (
-!Config          ici pour  dt = 1 min ) 
        nsplit_phys = 1 
        CALL getin('nsplit_phys',nsplit_phys)
@@ -625 +624 @@
       CALL getin('ok_dyn_ave',ok_dyn_ave) 
 
-
       write(lunout,*)' #########################################'
       write(lunout,*)' Configuration des parametres du gcm: '
@@ -635 +633 @@
       write(lunout,*)' day_step = ', day_step
       write(lunout,*)' iperiod = ', iperiod
+      write(lunout,*)' nsplit_phys = ', nsplit_phys
       write(lunout,*)' iconser = ', iconser
       write(lunout,*)' iecri = ', iecri
@@ -805 +804 @@
 !Config  Desc = sortie des transports zonaux dans la dynamique
 !Config  Def  = n 
-!Config  Help =  
+!Config  Help = Permet de mettre en route le calcul des transports 
 !Config          
-       ok_dynzon = .FALSE.
-       CALL getin('ok_dynzon',ok_dynzon) 
+      ok_dynzon = .FALSE. 
+      CALL getin('ok_dynzon',ok_dynzon) 
 
 !Config  Key  = ok_dyn_ins
@@ -838 +837 @@
         write(lunout,*)'STOP !!!'
         write(lunout,*)'use_filtre_fft n est pas implemente dans dyn3d'
-        STOP
+        STOP 1
       ENDIF
       
@@ -848 +847 @@
       ok_strato=.FALSE.
       CALL getin('ok_strato',ok_strato)
+
+      vert_prof_dissip = merge(1, 0, ok_strato .and. llm==39)
+      CALL getin('vert_prof_dissip', vert_prof_dissip)
+      call assert(vert_prof_dissip == 0 .or. vert_prof_dissip ==  1,
+     $     "bad value for vert_prof_dissip")
 
 !Config  Key  = ok_gradsfile

LMDZ5/trunk/libf/dyn3d/gcm.F

@@ -405 +405 @@
 
       CALL inidissip( lstardis, nitergdiv, nitergrot, niterh   ,
-     *                tetagdiv, tetagrot , tetatemp              )
+     *                tetagdiv, tetagrot , tetatemp, vert_prof_dissip)
 
 c-----------------------------------------------------------------------

LMDZ5/trunk/libf/dyn3d/inidissip.F90

@@ -3 +3 @@
 !
 SUBROUTINE inidissip ( lstardis,nitergdiv,nitergrot,niterh  , &
-     tetagdiv,tetagrot,tetatemp             )
+     tetagdiv,tetagrot,tetatemp, vert_prof_dissip)
   !=======================================================================
   !   initialisation de la dissipation horizontale
@@ -25 +25 @@
   INTEGER,INTENT(in) :: nitergdiv,nitergrot,niterh
   REAL,INTENT(in) :: tetagdiv,tetagrot,tetatemp
+
+  integer, INTENT(in):: vert_prof_dissip
+  ! Vertical profile of horizontal dissipation
+  ! Allowed values:
+  ! 0: fractional function of pressure
+  ! 1: tanh of altitude
 
 ! Local variables:
@@ -167 +173 @@
   !   --------------------------------------------------
 
-  if (ok_strato .and. llm==39) then
+  if (vert_prof_dissip == 1) then
      do l=1,llm
         pseudoz=8.*log(preff/presnivs(l))