Changeset 267 for codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/dissip_gcm.f90

Timestamp:

08/05/14 16:00:09 (10 years ago)

Author:

ymipsl

Message:

Synchronize trunk and Saturn branch.
Merge modification from trunk branch to Saturn branch.

YM

File:

• codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/dissip_gcm.f90 (modified) (1 diff)

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/dissip_gcm.f90

@@ -427 +427 @@
     ENDDO
        
-    itau_dissip=INT(mintau/dt)
+    IF(mintau>0) THEN
+       itau_dissip=INT(mintau/dt)
+       dtdissip=itau_dissip*dt
+    ELSE
+       IF (is_mpi_root) PRINT *,"No dissipation time set, setting itau_dissip to 1000000000"
+       itau_dissip=100000000
+    END IF
     itau_dissip=MAX(1,itau_dissip)
-    dtdissip=itau_dissip*dt
     IF (is_mpi_root) PRINT *,"mintau ",mintau,"itau_dissip",itau_dissip," dtdissip ",dtdissip