Changeset 1594 for trunk/LMDZ.MARS/libf

Timestamp:

Sep 13, 2016, 8:40:34 AM (9 years ago)

Author:

emillour

Message:

Mars and Generic "old" dynamics: to further harmonize with LMDZ.COMMON, replace "idissip" with "dissip_period".
EM

Location:

trunk/LMDZ.MARS/libf/dyn3d

Files:

• control_mod.F90 (modified) (1 diff)
• defrun_new.F (modified) (2 diffs)
• gcm.F (modified) (4 diffs)
• iniconst.F (modified) (2 diffs)
• inidissip.F (modified) (4 diffs)

trunk/LMDZ.MARS/libf/dyn3d/control_mod.F90

@@ -8 +8 @@
   integer,save :: iperiod  ! make a Matsuno step before avery iperiod-1 LF steps
   integer,save :: iconser !
-  integer,save :: idissip ! apply dissipation every idissip dynamical step
+  integer,save :: dissip_period ! apply dissipation every dissip_period dynamical step
   integer,save :: iphysiq ! call physics every iphysiq dynamical steps
   integer,save :: anneeref ! reference year # ! not used

trunk/LMDZ.MARS/libf/dyn3d/defrun_new.F

@@ -40 +40 @@
       use sponge_mod,only: callsponge,nsponge,mode_sponge,tetasponge
       use control_mod, only: ndynstep, day_step, iperiod, iconser,
-     &                       idissip, iphysiq, anneeref,
+     &                       dissip_period, iphysiq, anneeref,
      &                       ecritstart, timestart, nday_r
       USE logic_mod, ONLY: hybrid,purmats,fxyhypb,ysinus,iflag_phys
@@ -148 +148 @@
         WRITE(lunout,*) ""
         WRITE(lunout,*) "periode de la dissipation (en pas)"
-        idissip=5 ! default value
-        call getin("idissip",idissip)
-        WRITE(lunout,*)" idissip = ",idissip
+        dissip_period=5 ! default value
+        call getin("idissip",dissip_period)
+        ! if there is a "dissip_period" in run.def, it overrides "idissip"
+        CALL getin('dissip_period',dissip_period)
+        WRITE(lunout,*)" dissip_period = ",dissip_period
 
 ccc  ....   P. Le Van , modif le 29/04/97 .pour la dissipation  ...

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

@@ -4 +4 @@
       use infotrac, only: iniadvtrac, nqtot, iadv
       use control_mod, only: day_step, iperiod, iphysiq, ndynstep,
-     &                       nday_r, idissip, iconser, ecritstart
+     &                       nday_r, dissip_period, iconser, ecritstart
       use filtreg_mod, only: inifilr
 !      use comgeomphy, only: initcomgeomphy
@@ -283 +283 @@
       endif
       ! check that this is compatible with call sequence dyn/phys/dissip
-      ! i.e. that itaufin is a multiple of iphysiq and idissip
+      ! i.e. that itaufin is a multiple of iphysiq and dissip_period
       if ((modulo(itaufin,iphysiq).ne.0).or.
-     &    (modulo(itaufin,idissip).ne.0)) then
+     &    (modulo(itaufin,dissip_period).ne.0)) then
         if (ndynstep .gt. 0) then
        write(*,'(A,I5)') 
@@ -295 +295 @@
         endif
         write(*,'(2(A,I5))') 
-     &   "  whereas iphysiq=",iphysiq," and idissip=",
-     &  idissip
+     &   "  whereas iphysiq=",iphysiq," and dissip_period=",
+     &  dissip_period
         stop
       endif
@@ -390 +390 @@
       IF( purmats ) THEN
          IF( MOD(itau,iconser) .EQ.0.AND.  forward    ) conser = .TRUE.
-         IF( MOD(itau,idissip ).EQ.0.AND..NOT.forward ) apdiss = .TRUE.
+         IF( MOD(itau,dissip_period ).EQ.0
+     &                              .AND..NOT.forward ) apdiss = .TRUE.
          IF( MOD(itau,iphysiq ).EQ.0.AND..NOT.forward 
      $                   .AND.   (iflag_phys.eq.1)    ) apphys = .TRUE.
       ELSE
          IF( MOD(itau   ,iconser) .EQ. 0              ) conser = .TRUE.
-         IF( MOD(itau+1,idissip)  .EQ. 0              ) apdiss = .TRUE.
+         IF( MOD(itau+1,dissip_period)  .EQ. 0        ) apdiss = .TRUE.
          IF( MOD(itau+1,iphysiq).EQ.0  
      &                     .AND. (iflag_phys.eq.1)    ) apphys = .TRUE.

trunk/LMDZ.MARS/libf/dyn3d/iniconst.F

@@ -1 +1 @@
       SUBROUTINE iniconst
 
-      use control_mod, only: iphysiq, idissip
+      use control_mod, only: iphysiq, dissip_period
       USE comconst_mod, ONLY: im,jm,lllm,imp1,jmp1,lllmm1,lllmp1,
      .                  dtdiss,dtvr,dtphys,unsim,r,cpp,kappa,pi
@@ -36 +36 @@
 c-----------------------------------------------------------------------
 
-      dtdiss  = idissip * dtvr
+      dtdiss  = dissip_period * dtvr
       dtphys  = iphysiq * dtvr
       unsim   = 1./iim

trunk/LMDZ.MARS/libf/dyn3d/inidissip.F

@@ -8 +8 @@
 c   -------------
 
-      use control_mod, only: idissip, iperiod
+      use control_mod, only: dissip_period, iperiod
       USE comvert_mod, ONLY: aps,bps,preff,pseudoalt
       USE comconst_mod, ONLY: dtdiss,dtvr
@@ -71 +71 @@
          !!!! avec dans run.def
          !!- mode_sponge=3
-         !!- idissip/tetagdiv/tetagrot/tetagtemp = 1/2000/3000/3000
+         !!- dissip_period/tetagdiv/tetagrot/tetagtemp = 1/2000/3000/3000
 
          middle=startalt+delta/2
@@ -265 +265 @@
       ENDDO
 
-c     Calcul automatique de idissip
+c     Calcul automatique de dissip_period
 c     -----------------------------
 c    :::::::::::::::::::::
 c     A Commenter pour garder la valeur de run.def :
-c     idissip = INT( tetamin/( 2.*dtvr*iperiod) ) * iperiod
-c     idissip = MAX(iperiod,idissip)
+c     dissip_period = INT( tetamin/( 2.*dtvr*iperiod) ) * iperiod
+c     dissip_period = MAX(iperiod,dissip_period)
 c    :::::::::::::::::::::
-      dtdiss  = idissip * dtvr
+      dtdiss  = dissip_period * dtvr
  
       PRINT *,' INIDI tetamin dtvr ',tetamin,dtvr,iperiod
-      PRINT *,' INIDI tetamin idissip ',tetamin,idissip
-      PRINT *,' INIDI idissip dtdiss ',idissip,dtdiss
+      PRINT *,' INIDI tetamin dissip_period ',tetamin,dissip_period
+      PRINT *,' INIDI dissip_period dtdiss ',dissip_period,dtdiss
 
       PRINT*,'pseudoZ(km)  zvert  dt(tetagdiv) dt(tetagrot) dt(divgrad)'
@@ -289 +289 @@
           PRINT *,'in run.def, you must increase tetagdiv,' 
           PRINT *,'(or tetagrot and tetatemp if they are smaller than'
-          PRINT *,'tetagdiv) OR decrease idissip OR increase day_step)' 
+          PRINT *,'tetagdiv) OR decrease dissip_period'
+          PRINT *,'OR increase day_step)' 
           stop
          end if