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

Timestamp:

2005-12-21T11:46:45+01:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_033 : RB + CT : Add new surface pressure gradient algorithms

File:

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

trunk/NEMO/OPA_SRC/stpctl.F90

@@ -17 +17 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp         ! distributed memory computing
+   USE dynspg          ! pressure gradient schemes 
 
    IMPLICIT NONE
@@ -76 +77 @@
 
 
-      ! elliptic solver statistics
-      ! -----------------------------
-      ! Solver
-      IF(lwp) WRITE(numsol,9200) kt, niter, res, SQRT(epsr)/eps
-9200  FORMAT(' it :', i8, ' niter :', i4, ' res :',e20.10,' b :',e20.10)
+      ! elliptic solver statistics (if required)
+      ! --------------------------
+      IF( lk_dynspg_flt .OR. lk_dynspg_rl ) THEN
+         ! 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,*) ' ======  *******************************'
+         ! 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
-         CALL dia_wri( kt, kindic )
       ENDIF
+
+9200  FORMAT(' it :', i8, ' niter :', i4, ' res :',e20.10,' b :',e20.10)
 
       ! Test maximum of velocity (zonal only)