Changeset 497 for trunk/NEMO/OFF_SRC/DOM/domcfg.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/domcfg.F90 (modified) (6 diffs)

trunk/NEMO/OFF_SRC/DOM/domcfg.F90

@@ -14 +14 @@
    USE lib_mpp         ! distributed memory computing library
 
+
    IMPLICIT NONE
    PRIVATE
@@ -20 +21 @@
    PUBLIC dom_cfg        ! called by opa.F90
    !!----------------------------------------------------------------------
-   !!   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$ 
+   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    !!----------------------------------------------------------------------
 
@@ -64 +65 @@
                                                                   ' north fold with F-point pivot'
       ENDIF
-      IF( jperio <  0 .OR. jperio > 6 ) THEN
-          IF(lwp) WRITE(numout,cform_err)
-          IF(lwp) WRITE(numout,*) 'jperio is out of range'
-          nstop = nstop + 1
-      ENDIF
-
+      IF( jperio <  0 .OR. jperio > 6 ) CALL ctl_stop( 'jperio is out of range' )
 
       ! global domain versus zoom and/or local domain
@@ -144 +140 @@
          WRITE(numout,25)              (mi1(ji),ji = 1,jpidta)
          WRITE(numout,*)
-         WRITE(numout,*) '          conversion local  ==> data i-index domain'
+         WRITE(numout,*) '          conversion local  ==> data j-index domain'
          WRITE(numout,25)              (mjg(jj),jj = 1,jpj)
          WRITE(numout,*)
-         WRITE(numout,*) '          conversion data  ==> local i-index domain'
+         WRITE(numout,*) '          conversion data  ==> local j-index domain'
          WRITE(numout,*) '             starting index'
          WRITE(numout,25)              (mj0(jj),jj = 1,jpjdta)
@@ -160 +156 @@
       ! zoom control
       IF( jpiglo + jpizoom - 1  >  jpidta .OR.   &
-          jpjglo + jpjzoom - 1  >  jpjdta      ) THEN
-         IF(lwp)WRITE(numout,cform_err)
-         IF(lwp)WRITE(numout,*)' global or zoom domain exceed the data domain ! '
-         nstop = nstop + 1
-      ENDIF
+          jpjglo + jpjzoom - 1  >  jpjdta      ) &
+          &   CALL ctl_stop( ' global or zoom domain exceed the data domain ! ' )
 
       ! set zoom flag
@@ -184 +177 @@
          WRITE(numout,*) '             lzoom_n = ', lzoom_n, ' (T = forced closed North boundary)'
       ENDIF
-      IF(  ( lzoom_e .OR. lzoom_w )  .AND.  ( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 )  ) THEN
-         IF(lwp)WRITE(numout,cform_err)
-         IF(lwp)WRITE(numout,*)' Your zoom choice is inconsistent with east-west cyclic boundary condition'
-         nstop = nstop + 1
-      ENDIF
-      IF(  lzoom_n  .AND.  ( 3 <= jperio .AND. jperio <= 6 )  ) THEN
-         IF(lwp)WRITE(numout,cform_err)
-         IF(lwp)WRITE(numout,*)' Your zoom choice is inconsistent with North fold boundary condition'
-         nstop = nstop + 1
-      ENDIF
+      IF(  ( lzoom_e .OR. lzoom_w )  .AND.  ( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 )  )   &
+           &   CALL ctl_stop( ' Your zoom choice is inconsistent with east-west cyclic boundary condition' )
+      IF(  lzoom_n  .AND.  ( 3 <= jperio .AND. jperio <= 6 )  )   &
+           &   CALL ctl_stop( ' Your zoom choice is inconsistent with North fold boundary condition' )
+
 
       ! Pre-defined arctic/antarctic zoom of ORCA configuration flag