Changeset 3875 for branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

Timestamp:

2013-04-18T16:38:06+02:00 (11 years ago)

Author:

clevy

Message:

Configuration Setting/Step? 1, see ticket:#1074

File:

• branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) (2 diffs)

branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

@@ -344 +344 @@
       !!----------------------------------------------------------------------
       INTEGER  ::   jn      ! dummy loop indices
+      INTEGER  ::   ios     ! Local integer output status for namelist read
       REAL(wp) ::   zfact   ! local scalar
       !
@@ -359 +360 @@
       sn_icb = FLD_N( 'calving' ,    -1     , 'calving'  ,  .TRUE.    , .TRUE. ,   'yearly'  , ''       , ''         )
 
-      REWIND( numnam )              ! Namelist namrun : iceberg parameters
-      READ  ( numnam, namberg )
+      REWIND( numnam_ref )              ! Namelist namberg in reference namelist : Iceberg parameters
+      READ  ( numnam_ref, namberg, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namberg in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namberg in configuration namelist : Iceberg parameters
+      READ  ( numnam_cfg, namberg, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namberg in configuration namelist', lwp )
+      WRITE ( numond, namberg )
       
       IF( .NOT. ln_icebergs ) THEN   ! no icebergs
          IF(lwp) THEN
             WRITE(numout,*)
-            WRITE(numout,*) 'icb_nam :   ln_icebergs = F , NO icebergs used'
+            WRITE(numout,*) 'icbini :   Namelist namberg ln_icebergs = F , NO icebergs used'
             WRITE(numout,*) '~~~~~~~~ '
          ENDIF