Changeset 4154 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90

Timestamp:

2013-11-05T13:52:36+01:00 (11 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2013: minor corrections

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/CRS/crsini.F90

@@ -67 +67 @@
       INTEGER  :: ji,jj,jk      ! dummy indices
       INTEGER  :: ierr                                ! allocation error status
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
       REAL(wp), DIMENSION(:,:,:), POINTER :: zfse3t, zfse3u, zfse3v, zfse3w
 
       NAMELIST/namcrs/ nn_factx, nn_facty, nn_binref, nn_msh_crs, nn_crs_kz, ln_crs_wn
-
-
       !!----------------------------------------------------------------------
       !
@@ -85 +84 @@
      !---------------------------------------------------------
      !
-     REWIND( numnam )            ! Read Namelist namtra_qsr : ratio and length of penetration
-     READ  ( numnam, namcrs )        ! Namelist namcrs : Grid-coarsening utility namelist
+
+      REWIND( numnam_ref )              ! Namelist namrun in reference namelist : Parameters of the run
+      READ  ( numnam_ref, namcrs, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcrs in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namrun in configuration namelist : Parameters of the run
+      READ  ( numnam_cfg, namcrs, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcrs in configuration namelist', lwp )
+      WRITE ( numond, namcrs )
+
      IF(lwp) THEN
         WRITE(numout,*)