Changeset 1502 for LMDZ5/trunk/libf/dyn3dpar

Timestamp:

Mar 21, 2011, 5:07:54 PM (14 years ago)

Author:

jghattas

Message:

Modifications for variable idissip :

• Changed name of variable idissip to dissip_period everywhere to be compatible with old .def files.
• This variable was before read from physiq.def but the value was overwritten by a calculation in inidissip. Now, if dissip_period=0 calculation is done as before(default). Else the value from physiq.def is used directly.
• leapfrog : added "AND NOT forward" at line 284 (dyn3d) and line 363(dyn3dpar) necessare if dissip_period not a multiple by iperiod.
• iniconst : removed calculation of dtdiss (calculation done in inidissip)

FC, JG

Location:

LMDZ5/trunk/libf/dyn3dpar

Files:

• conf_gcm.F (modified) (3 diffs)
• control_mod.F90 (modified) (1 diff)
• defrun.F (modified) (1 diff)
• iniconst.F (modified) (1 diff)
• inidissip.F90 (modified) (2 diffs)
• leapfrog_p.F (modified) (2 diffs)

LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F

@@ -225 +225 @@
        CALL getin('output_grads_dyn',output_grads_dyn)
 
-!Config  Key  = idissip
+!Config  Key  = dissip_period
 !Config  Desc = periode de la dissipation 
-!Config  Def  = 10
+!Config  Def  = 0
 !Config  Help = periode de la dissipation 
-!Config         (en pas) ... a completer !
-       idissip = 10
-       CALL getin('idissip',idissip)
+!Config  dissip_period=0 => la valeur sera calcule dans inidissip       
+!Config  dissip_period>0 => on prend cette valeur
+       dissip_period = 0
+       CALL getin('dissip_period',dissip_period)
 
 ccc  ....   P. Le Van , modif le 29/04/97 .pour la dissipation  ...
@@ -635 +636 @@
       write(lunout,*)' periodav = ', periodav 
       write(lunout,*)' output_grads_dyn = ', output_grads_dyn
-      write(lunout,*)' idissip = ', idissip
+      write(lunout,*)' dissip_period = ', dissip_period
       write(lunout,*)' lstardis = ', lstardis
       write(lunout,*)' nitergdiv = ', nitergdiv
@@ -909 +910 @@
       write(lunout,*)' periodav = ', periodav 
       write(lunout,*)' output_grads_dyn = ', output_grads_dyn
-      write(lunout,*)' idissip = ', idissip
+      write(lunout,*)' dissip_period = ', dissip_period
       write(lunout,*)' lstardis = ', lstardis
       write(lunout,*)' nitergdiv = ', nitergdiv

LMDZ5/trunk/libf/dyn3dpar/control_mod.F90

@@ -12 +12 @@
   REAL    :: periodav
   INTEGER :: nday,day_step,iperiod,iapp_tracvl,nsplit_phys
-  INTEGER :: iconser,iecri,idissip,iphysiq,iecrimoy
+  INTEGER :: iconser,iecri,dissip_period,iphysiq,iecrimoy
   INTEGER :: dayref,anneeref, raz_date, ip_ebil_dyn
   LOGICAL :: offline

LMDZ5/trunk/libf/dyn3dpar/defrun.F

@@ -132 +132 @@
 
       READ (tapedef,9001) ch1,ch4
-      READ (tapedef,*)    idissip
-      WRITE(tapeout,9001) ch1,'idissip'
-      WRITE(tapeout,*)    idissip
+      READ (tapedef,*)    dissip_period
+      WRITE(tapeout,9001) ch1,'dissip_period'
+      WRITE(tapeout,*)    dissip_period
 
 ccc  ....   P. Le Van , modif le 29/04/97 .pour la dissipation  ...

LMDZ5/trunk/libf/dyn3dpar/iniconst.F

@@ -39 +39 @@
 c-----------------------------------------------------------------------
 
-      dtdiss  = idissip * dtvr
       dtphys  = iphysiq * dtvr
       unsim   = 1./iim

LMDZ5/trunk/libf/dyn3dpar/inidissip.F90

@@ -11 +11 @@
   !   -------------
 
-  USE control_mod, only : idissip,iperiod
+  USE control_mod, only : dissip_period,iperiod
 
   IMPLICIT NONE
@@ -215 +215 @@
   ENDDO
 
-  write(lunout,*)'inidissip: tetamin dtvr iperiod ',tetamin,dtvr,iperiod
-  idissip = INT( tetamin/( 2.*dtvr*iperiod) ) * iperiod
-  write(lunout,*)'inidissip: tetamin idissip ',tetamin,idissip
-  idissip = MAX(iperiod,idissip)
-  dtdiss  = idissip * dtvr
-  write(lunout,*)'inidissip: idissip dtdiss ',idissip,dtdiss
+  ! If dissip_period=0 calculate value for dissipation period, else keep value read from gcm.def
+  IF (dissip_period == 0) THEN
+     dissip_period = INT( tetamin/( 2.*dtvr*iperiod) ) * iperiod
+     write(lunout,*)'inidissip: tetamin dtvr iperiod dissip_period(intermed) ',tetamin,dtvr,iperiod,dissip_period
+     dissip_period = MAX(iperiod,dissip_period)
+  END IF
+
+  dtdiss  = dissip_period * dtvr
+  write(lunout,*)'inidissip: dissip_period=',dissip_period,' dtdiss=',dtdiss,' dtvr=',dtvr
 
   DO l = 1,llm

LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -350 +350 @@
       conser = .FALSE.
       apdiss = .FALSE.
-c      idissip=1
+
       IF( purmats ) THEN
       ! Purely Matsuno time stepping
          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 ) 
+     s        apdiss = .TRUE.
          IF( MOD(itau,iphysiq ).EQ.0.AND..NOT.forward 
      s          .and. iflag_phys.EQ.1                 ) apphys = .TRUE.
@@ -360 +361 @@
       ! Leapfrog/Matsuno time stepping 
          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 .AND. .NOT. forward )
+     s        apdiss = .TRUE.
          IF( MOD(itau+1,iphysiq).EQ.0.AND.iflag_phys.EQ.1) apphys=.TRUE.
       END IF