Changeset 811 for branches/dev_001_SBC/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2008-02-07T17:00:12+01:00 (16 years ago)

Author:

ctlod

Message:

dev_001_SBC: merge with the trunk last changesets: #780, 782, 783, 784, 785, 788, 789, 793, 794

File:

• branches/dev_001_SBC/NEMO/OPA_SRC/DOM/domain.F90 (modified) (1 diff)

branches/dev_001_SBC/NEMO/OPA_SRC/DOM/domain.F90

@@ -179 +179 @@
       ndastp = ndate0                ! Assign initial date to current date
 
-! ... Control of output frequency
-      IF ( nstock == 0 ) THEN
-          IF(lwp)WRITE(numout,cform_war)
-          IF(lwp)WRITE(numout,*) '           nstock = ', nstock, ' it is forced to ', nitend
-          nstock = nitend
-          nwarn = nwarn + 1
+      ! ... Control of output frequency
+      IF ( nstock == 0 .OR. nstock > nitend - nit000 + 1 ) THEN
+         WRITE(ctmp1,*) '           nstock = ', nstock, ' it is forced to ', nitend - nit000 + 1
+         CALL ctl_warn( ctmp1 )
+         nstock = nitend - nit000 + 1
       ENDIF
       IF ( nwrite == 0 ) THEN
-          IF(lwp)WRITE(numout,cform_war)
-          IF(lwp)WRITE(numout,*) '           nwrite = ', nwrite, ' it is forced to ', nitend
-          nwrite = nitend
-          nwarn = nwarn + 1
+         WRITE(ctmp1,*) '           nwrite = ', nwrite, ' it is forced to ', nitend
+         CALL ctl_warn( ctmp1 )
+         nwrite = nitend
       ENDIF