Changeset 1502 for LMDZ5/trunk/libf/dyn3d/leapfrog.F

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/dyn3d/leapfrog.F (modified) (2 diffs)

LMDZ5/trunk/libf/dyn3d/leapfrog.F

@@ -275 +275 @@
       ! 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.
@@ -281 +282 @@
       ! 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