Changeset 1502 for LMDZ5/trunk/libf/dyn3dpar/inidissip.F90

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

File:

• LMDZ5/trunk/libf/dyn3dpar/inidissip.F90 (modified) (2 diffs)

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