Changeset 389 for trunk/NEMO/OPA_SRC/stpctl.F90

Timestamp:

2006-03-09T18:22:04+01:00 (18 years ago)

Author:

opalod

Message:

RB:nemo_v1_update_038: first integration of Agrif :

• configuration parameters are just integer when agrif is used
• add call to agrif routines with key_agrif

File:

• trunk/NEMO/OPA_SRC/stpctl.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/stpctl.F90

@@ -56 +56 @@
       INTEGER, DIMENSION(3) ::   ilocu      ! 
       INTEGER, DIMENSION(2) ::   ilocs      ! 
+      CHARACTER(len=80) :: clname
       !!----------------------------------------------------------------------
       !!  OPA 9.0 , LOCEAN-IPSL (2005) 
@@ -67 +68 @@
          WRITE(numout,*) '~~~~~~~'
          ! open time.step file
-         CALL ctlopn( numstp, 'time.step', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', 1, numout, lwp, 1 )
+         clname = 'time.step'
+         CALL ctlopn( numstp, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', 1, numout, lwp, 1 )
       ENDIF
 
@@ -80 +82 @@
       ! --------------------------
       IF( lk_dynspg_flt .OR. lk_dynspg_rl ) THEN
-         ! Solver
-         IF(lwp) WRITE(numsol,9200) kt, niter, res, SQRT(epsr)/eps
+      ! Solver
+      IF(lwp) WRITE(numsol,9200) kt, niter, res, SQRT(epsr)/eps
 
-         ! Islands (if exist)
-         IF( lk_isl )   CALL isl_stp_ctl( kt, kindic )
+      ! Islands (if exist)
+      IF( lk_isl )   CALL isl_stp_ctl( kt, kindic )
 
 
-         ! Output in numwso and numwvo IF kindic<0
-         ! ---------------------------------------
-         !    (i.e. problem for the solver)
-         IF( kindic < 0 ) THEN
-            IF(lwp) THEN
-               WRITE(numout,*) ' stpctl: the elliptic solver DO not converge or explode'
-               WRITE(numout,*) ' ====== '
-               WRITE(numout,9200) kt, niter, res, sqrt(epsr)/eps
-               WRITE(numout,*)
-               WRITE(numout,*) ' stpctl: output of last fields in numwso'
-               WRITE(numout,*) '                                  numwvo'
-               WRITE(numout,*) ' ======  *******************************'
-            ENDIF
-            CALL dia_wri( kt, kindic )
+      ! Output in numwso and numwvo IF kindic<0
+      ! ---------------------------------------
+      !    (i.e. problem for the solver)
+      IF( kindic < 0 ) THEN
+         IF(lwp) THEN
+            WRITE(numout,*) ' stpctl: the elliptic solver DO not converge or explode'
+            WRITE(numout,*) ' ====== '
+            WRITE(numout,9200) kt, niter, res, sqrt(epsr)/eps
+            WRITE(numout,*)
+            WRITE(numout,*) ' stpctl: output of last fields in numwso'
+            WRITE(numout,*) '                                  numwvo'
+            WRITE(numout,*) ' ======  *******************************'
          ENDIF
+         CALL dia_wri( kt, kindic )
+      ENDIF
       ENDIF
 
@@ -140 +142 @@
          ENDIF
          kindic  = -3
+
          CALL dia_wri( kt, kindic )
       ENDIF