Changeset 497 for trunk/NEMO/OFF_SRC/DOM/domstp.F90

Timestamp:

2006-09-12T13:03:53+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_064:CE:re-organization of coordinate definition and scale factors

File:

• trunk/NEMO/OFF_SRC/DOM/domstp.F90 (modified) (5 diffs)

trunk/NEMO/OFF_SRC/DOM/domstp.F90

@@ -7 +7 @@
    !!----------------------------------------------------------------------
    !!   dom_stp        : ocean time domain initialization
+   !!----------------------------------------------------------------------
+   !! History :
+   !!        !  90-10  (O. Marti)  Original code
+   !!        !  96-01  (G. Madec)  terrain following coordinates
+   !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
    !!----------------------------------------------------------------------
    !! * Modules used
@@ -22 +27 @@
 #  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL  (2005)
-   !!   $Header$
-   !!   This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt
+   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! $Header$ 
+   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -56 +61 @@
       !! References :
       !!      Bryan, K., 1984, J. Phys. Oceanogr., 14, 666-673.
-      !!
-      !! History :
-      !!        !  90-10  (O. Marti)  Original code
-      !!        !  96-01  (G. Madec)  terrain following coordinates
-      !!   8.5  !  02-08  (G. Madec)  F90: Free form and module
       !!----------------------------------------------------------------------
-      !! * Local declarations
       INTEGER ::   jk              ! dummy loop indice
       !!----------------------------------------------------------------------
@@ -77 +76 @@
       atfp1 = 1. - 2. * atfp
 
-
       SELECT CASE ( nacc )
 
@@ -90 +88 @@
             IF(lwp) WRITE(numout,*)'               accelerating the convergence'
             IF(lwp) WRITE(numout,*)'               dynamics time step = ', rdt/3600., ' hours'
-#if defined key_s_coord
-            IF( rdtmin /= rdtmax ) THEN
-               IF(lwp) WRITE(numout,cform_err)
-               IF(lwp) WRITE(numout,*)' depth dependent acceleration of &
-                                      &convergence not implemented in s-coordinates'
-               nstop = nstop + 1
-            ENDIF
-#endif
-#if defined key_partial_steps
-            IF( rdtmin /= rdtmax ) THEN
-               IF(lwp) WRITE(numout,cform_err)
-               IF(lwp) WRITE(numout,*)' depth dependent acceleration of &
-                                      &convergence not implemented for partial steps case'
-               nstop = nstop + 1
-            ENDIF
-#endif
+            IF( ln_sco .AND. rdtmin /= rdtmax )   &
+                 & CALL ctl_stop ( ' depth dependent acceleration of convergence not implemented in s-coordinates' )
             IF(lwp) WRITE(numout,*)'         tracers   time step :  dt (hours)  level'
 
             DO jk = 1, jpk
-               IF( fsdept(1,1,jk) <= rdth ) rdttra(jk) = rdtmin
-               IF( fsdept(1,1,jk) >  rdth ) THEN
+               IF( gdept_0(jk) <= rdth ) rdttra(jk) = rdtmin
+               IF( gdept_0(jk) >  rdth ) THEN
                   rdttra(jk) = rdtmin + ( rdtmax - rdtmin )   &
-                                      * ( EXP( ( fsdept(1,1,jk ) - rdth ) / rdth ) - 1. )   &
-                                      / ( EXP( ( fsdept(1,1,jpk) - rdth ) / rdth ) - 1. )
+                                      * ( EXP( ( gdept_0(jk ) - rdth ) / rdth ) - 1. )   &
+                                      / ( EXP( ( gdept_0(jpk) - rdth ) / rdth ) - 1. )
                ENDIF
-               IF(lwp) WRITE(numout,9200) rdttra(jk)/3600., jk
+               IF(lwp) WRITE(numout,"(36x,f5.2,5x,i3)") rdttra(jk)/3600., jk
             END DO  
- 9200       FORMAT(36x,f5.2,'     ',i3)
 
          CASE DEFAULT              ! E R R O R 
 
-            IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' nacc value e r r o r, nacc= ',nacc
-            IF(lwp) WRITE(numout,*) ' we stop'
-            nstop = nstop + 1
+            WRITE(ctmp1,*) ' nacc value e r r o r, nacc= ',nacc
+            CALL ctl_stop( ctmp1 )
 
       END SELECT