Changeset 2528 for trunk/NEMOGCM/NEMO/OFF_SRC/stpctl.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OFF_SRC/stpctl.F90 (modified) (4 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OFF_SRC/stpctl.F90

@@ -1 +1 @@
 MODULE stpctl
-   !!==============================================================================
+   !!======================================================================
    !!                       ***  MODULE  stpctl  ***
-   !! Ocean run control :  gross check of the ocean time stepping
-   !!==============================================================================
+   !! Ocean run control :  Off-line case, only save the time step in numstp
+   !!======================================================================
+   !! History :  OPA  ! 1991-03  (G. Madec) Original code
+   !!            6.0  ! 1992-06  (M. Imbard)
+   !!            8.0  ! 1997-06  (A.M. Treguier)
+   !!   NEMO     1.0  ! 2002-06  (G. Madec)  F90: Free form and module
+   !!            2.0  ! 2009-07  (G. Madec)  Add statistic for time-spliting
+   !!----------------------------------------------------------------------
 
    !!----------------------------------------------------------------------
    !!   stp_ctl      : Control the run
    !!----------------------------------------------------------------------
-   !! * Modules used
    USE oce             ! ocean dynamics and tracers variables
    USE dom_oce         ! ocean space and time domain variables 
@@ -18 +23 @@
    PRIVATE
 
-   !! * Accessibility
-   PUBLIC stp_ctl           ! routine called by step.F90
+   PUBLIC   stp_ctl    ! routine called by opa.F90
+   
    !!----------------------------------------------------------------------
-
+   !! NEMO/OFF 3.3 , NEMO Consortium (2010)
+   !! $Id$
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
-   SUBROUTINE stp_ctl( kt )
+   SUBROUTINE stp_ctl( kt, kindic )
       !!----------------------------------------------------------------------
       !!                    ***  ROUTINE stp_ctl  ***
@@ -31 +39 @@
       !!
       !! ** Method  : - Save the time step in numstp
-      !!              - Print it each 50 time steps
-      !!              - Print solver statistics in numsol 
-      !!              - Stop the run IF problem for the solver ( indec < 0 )
       !!
-      !! History :
-      !!        !  91-03  ()
-      !!        !  91-11  (G. Madec)
-      !!        !  92-06  (M. Imbard)
-      !!        !  97-06  (A.M. Treguier)
-      !!   8.5  !  02-06  (G. Madec)  F90: Free form and module
+      !! ** Actions :   'time.step' file containing the last ocean time-step
       !!----------------------------------------------------------------------
-      !! * Arguments
-      INTEGER, INTENT( in ) ::   kt         ! ocean time-step index
-
+      INTEGER, INTENT(in   ) ::   kt      ! ocean time-step index
+      INTEGER, INTENT(inout) ::   kindic  ! indicator of solver convergence
       !!----------------------------------------------------------------------
-      !!   OPA 9.0 , LOCEAN-IPSL  (2005)
-      !!   $Id$
-      !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt
-      !!----------------------------------------------------------------------
-
+      !
       IF( kt == nit000 .AND. lwp ) THEN
          WRITE(numout,*)
@@ -56 +51 @@
          WRITE(numout,*) '~~~~~~~'
          ! open time.step file
-         CALL ctlopn( numstp, 'time.step', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', 1, numout, lwp, 1 )
+         CALL ctl_opn( numstp, 'time.step', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
       ENDIF
-
-      ! save the current time step in numstp
-      ! ------------------------------------
-      IF(lwp) WRITE(numstp,9100) kt
-      IF(lwp) REWIND(numstp)
-9100  FORMAT(1x, i8)
-
-
+      !
+      IF(lwp) WRITE ( numstp, '(1x, i8)' )   kt      !* save the current time step in numstp
+      IF(lwp) REWIND( numstp )                       !  --------------------------
+      !
    END SUBROUTINE stp_ctl