Changeset 1119 for trunk/NEMO/OFF_SRC/DOM/domain.F90

Timestamp:

2008-06-20T17:17:41+02:00 (16 years ago)

Author:

cetlod

Message:

style of all top namelist has been modified ; update modules to take it into account, see ticket:196

File:

• trunk/NEMO/OFF_SRC/DOM/domain.F90 (modified) (8 diffs)

trunk/NEMO/OFF_SRC/DOM/domain.F90

@@ -108 +108 @@
       INTEGER ::   ioptio = 0      ! temporary integer
 
-      NAMELIST/nam_run/ no    , cexper   , ln_rstart , nrstdt , nit000,          &
-         &             nitend, ndate0   , nleapy   , ninist , nstock,           &
-         &             nprint, nwrite   , ln_ctl , nictls, nictle,   &
+      NAMELIST/namrun/ no    , cexper   , ln_rstart , nrstdt , nit000,         &
+         &             nitend, ndate0   , nleapy    , ninist , nstock,         &
+         &             nwrite 
+
+      NAMELIST/namctl/ ln_ctl , nprint, nictls, nictle,   &
          &             njctls, njctle   , nbench   , isplt  , jsplt
 
-      NAMELIST/nam_zgr/ ln_zco, ln_zps, ln_sco
-
-      NAMELIST/nam_dom/ e3zps_min, e3zps_rat, nmsh  ,   &
+      NAMELIST/namzgr/ ln_zco, ln_zps, ln_sco
+
+      NAMELIST/namdom/ e3zps_min, e3zps_rat, nmsh  ,   &
          &             nacc  , atfp     , rdt      , rdtmin , rdtmax,   &
          &             rdth 
 
-      NAMELIST/nam_cla/ n_cla
+      NAMELIST/namcla/ n_cla
       !!----------------------------------------------------------------------
 
@@ -130 +132 @@
       ! Namelist namrun : parameters of the run
       REWIND( numnam )
-      READ  ( numnam, nam_run )
+      READ  ( numnam, namrun )
 
       IF(lwp) THEN
@@ -143 +145 @@
          WRITE(numout,*) '           leap year calendar (0/1)        nleapy    = ', nleapy
          WRITE(numout,*) '           initial state output            ninist    = ', ninist
-         WRITE(numout,*) '           level of print                  nprint    = ', nprint
          WRITE(numout,*) '           frequency of restart file       nstock    = ', nstock
          WRITE(numout,*) '           frequency of output file        nwrite    = ', nwrite
+      ENDIF
+
+      ndastp = ndate0                ! Assign initial date to current date
+
+     ! Namelist namctl : print control
+      REWIND( numnam )
+      READ  ( numnam, namctl )
+
+      IF(lwp) THEN
+         WRITE(numout,*) '        Namelist namctl'
          WRITE(numout,*) '           run control (for debugging)     ln_ctl    = ', ln_ctl
+         WRITE(numout,*) '           level of print                  nprint    = ', nprint
          WRITE(numout,*) '           Start i indice for SUM control  nictls    = ', nictls
          WRITE(numout,*) '           End i indice for SUM control    nictle    = ', nictle
@@ -157 +169 @@
 
       ndastp = ndate0                ! Assign initial date to current date
-
 ! ... Control the sub-domain area indices for the print control
       IF(ln_ctl)   THEN
@@ -267 +278 @@
       ENDIF
 
-      ! Read Namelist nam_zgr : vertical coordinate'
+      ! Read Namelist namzgr : vertical coordinate'
       ! ---------------------
       REWIND ( numnam )
-      READ   ( numnam, nam_zgr )
+      READ   ( numnam, namzgr )
 
       ! Parameter control and print
@@ -279 +290 @@
          WRITE(numout,*) 'Namelist namzgr : vertical coordinate'
          WRITE(numout,*) '~~~~~~~'
-         WRITE(numout,*) '          Namelist nam_zgr : set vertical coordinate'
+         WRITE(numout,*) '          Namelist namzgr : set vertical coordinate'
          WRITE(numout,*) '             z-coordinate - full steps      ln_zco = ', ln_zco
          WRITE(numout,*) '             z-coordinate - partial steps   ln_zps = ', ln_zps
@@ -300 +311 @@
       ! Namelist namdom : space/time domain (bathymetry, mesh, timestep)
       REWIND( numnam )
-      READ  ( numnam, nam_dom )
+      READ  ( numnam, namdom )
 
       IF(lwp) THEN
@@ -327 +338 @@
       ! Namelist cross land advection
       REWIND( numnam )
-      READ  ( numnam, nam_cla )
+      READ  ( numnam, namcla )
       IF(lwp) THEN
          WRITE(numout,*)