Changeset 498 for trunk/NEMO/OFF_SRC

Timestamp:

2006-09-12T13:07:10+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_065:CE:change the name of namelist

Location:

trunk/NEMO/OFF_SRC

Files:

• TRA/trabbl.F90 (modified) (3 diffs)
• TRA/traqsr.F90 (modified) (4 diffs)
• ZDF/zdfddm.F90 (modified) (3 diffs)
• ZDF/zdfini.F90 (modified) (3 diffs)

trunk/NEMO/OFF_SRC/TRA/trabbl.F90

@@ -95 +95 @@
       !! ** Purpose :   Initialization for the bottom boundary layer scheme.
       !!
-      !! ** Method  :   Read the nambbl namelist and check the parameters
+      !! ** Method  :   Read the nam_bbl namelist and check the parameters
       !!      called by tra_bbl at the first timestep (nit000)
       !!
@@ -102 +102 @@
       !!----------------------------------------------------------------------
       !! * Local declarations
-      NAMELIST/nambbl/ atrbbl
+      NAMELIST/nam_bbl/ atrbbl
       !!----------------------------------------------------------------------
 
-      ! Read Namelist nambbl : bottom boundary layer scheme
+      ! Read Namelist nam_bbl : bottom boundary layer scheme
       ! --------------------
       REWIND ( numnam )
-      READ   ( numnam, nambbl )
+      READ   ( numnam, nam_bbl )
 
       ! Parameter control and print
@@ -117 +117 @@
          WRITE(numout,*) 'tra_bbl_init : * Diffusive Bottom Boundary Layer'
          WRITE(numout,*) '~~~~~~~~~~~~'
-         WRITE(numout,*) '          Namelist nambbl : set bbl parameters'
+         WRITE(numout,*) '          Namelist nam_bbl : set bbl parameters'
          WRITE(numout,*)
          WRITE(numout,*) '          bottom boundary layer coef.    atrbbl = ', atrbbl

trunk/NEMO/OFF_SRC/TRA/traqsr.F90

@@ -39 +39 @@
       !! ** Method  :   The profile of solar radiation within the ocean is set
       !!      from two length scale of penetration (xsr1,xsr2) and a ratio
-      !!      (rabs). These parameters are read in the namqsr namelist. The
+      !!      (rabs). These parameters are read in the nam_qsr namelist. The
       !!      default values correspond to clear water (type I in Jerlov' 
       !!      (1968) classification.
@@ -54 +54 @@
       !! * Local declarations
 
-      NAMELIST/namqsr/ ln_traqsr, xsi1
+      NAMELIST/nam_qsr/ ln_traqsr, xsi1
       !!----------------------------------------------------------------------
 
-      ! Read Namelist namqsr : ratio and length of penetration
+      ! Read Namelist nam_qsr : ratio and length of penetration
       ! --------------------
       REWIND ( numnam )
-      READ   ( numnam, namqsr )
+      READ   ( numnam, nam_qsr )
 
       ! Parameter control and print
@@ -69 +69 @@
          WRITE(numout,*) 'tra_qsr_init : penetration of the surface solar radiation'
          WRITE(numout,*) '~~~~~~~~~~~~'
-         WRITE(numout,*) '    Namelist namqsr : set the parameter of penetration'
+         WRITE(numout,*) '    Namelist nam_qsr : set the parameter of penetration'
          WRITE(numout,*) '        first depth of extinction        xsi1        = ',xsi1
          WRITE(numout,*) ' '
@@ -81 +81 @@
       ENDIF
 
-      IF( xsi1 < 0.e0 ) THEN
-         IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) '             0<xsi1 not satisfied'
-         nstop = nstop + 1
-      ENDIF
+      IF( xsi1 < 0.e0  ) &
+         CALL ctl_stop( '              0<xsi1 not satisfied' )
 
 

trunk/NEMO/OFF_SRC/ZDF/zdfddm.F90

@@ -98 +98 @@
       !! ** Purpose :   Initialization of double diffusion mixing scheme
       !!
-      !! ** Method  :   Read the nammbf namelist and check the parameter values
+      !! ** Method  :   Read the nam_ddm namelist and check the parameter values
       !!      called by zdf_ddm at the first timestep (nit000)
       !!
@@ -104 +104 @@
       !!   8.5  !  02-08  (G. Madec)  Original code
       !!----------------------------------------------------------------------
-      NAMELIST/namddm/ avts
+      NAMELIST/nam_ddm/ avts
       !!----------------------------------------------------------------------
 
-      ! Read Namelist namddm : double diffusion mixing scheme
+      ! Read Namelist nam_ddm : double diffusion mixing scheme
       ! --------------------
       REWIND ( numnam )
-      READ   ( numnam, namddm )
+      READ   ( numnam, nam_ddm )
 
 
@@ -119 +119 @@
          WRITE(numout,*) 'zdf_ddm : double diffusive mixing'
          WRITE(numout,*) '~~~~~~~'
-         WRITE(numout,*) '          Namelist namddm : set dd mixing parameter'
+         WRITE(numout,*) '          Namelist nam_ddm : set dd mixing parameter'
          WRITE(numout,*) '             maximum avs for dd mixing      avts   = ', avts
          WRITE(numout,*)

trunk/NEMO/OFF_SRC/ZDF/zdfini.F90

@@ -33 +33 @@
       !! ** Purpose :   initializations of the vertical ocean physics
       !!
-      !! ** Method  :   Read namelist namzdf, control cpp keys
+      !! ** Method  :   Read namelist nam_zdf, control cpp keys
       !!
       !! History :
@@ -42 +42 @@
 
       !! * Namelist
-      NAMELIST/namzdf/ avt0, ln_zdfnpc
+      NAMELIST/nam_zdf/ avt0, ln_zdfnpc
 
-      ! Read namzdf namelist : vertical mixing parameters
+      ! Read nam_zdf namelist : vertical mixing parameters
       ! --------------------
       REWIND( numnam )
-      READ  ( numnam, namzdf )
+      READ  ( numnam, nam_zdf )
 
       ! Parameter print
@@ -55 +55 @@
          WRITE(numout,*) 'zdf_init: vertical physics'
          WRITE(numout,*) '~~~~~~~~'
-         WRITE(numout,*) '          Namelist namzdf : set vertical mixing mixing parameters'
+         WRITE(numout,*) '          Namelist nam_zdf : set vertical mixing mixing parameters'
          WRITE(numout,*) '             non-penetrative convection       ln_zdfnpc = ', ln_zdfnpc
          WRITE(numout,*) '             vertical eddy diffusivity           avt0   = ', avt0