Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

Timestamp:

2013-11-04T12:51:55+01:00 (11 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 (modified) (3 diffs)

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

@@ -35 +35 @@
    PUBLIC   icb_init  ! routine called in nemogcm.F90 module
 
-   CHARACTER(len=100) ::   cn_dir = './'   ! Root directory for location of icb files
+   CHARACTER(len=100) ::   cn_dir          ! Root directory for location of icb files
    TYPE(FLD_N)        ::   sn_icb          ! information about the calving file to be read
 
@@ -344 +344 @@
       !!----------------------------------------------------------------------
       INTEGER  ::   jn      ! dummy loop indices
+      INTEGER  ::   ios     ! Local integer output status for namelist read
       REAL(wp) ::   zfact   ! local scalar
       !
@@ -354 +355 @@
       !!----------------------------------------------------------------------
 
-      ! (NB: frequency positive => hours, negative => months)
-      !            !   file     ! frequency !  variable  ! time intep !  clim  ! 'yearly' or ! weights  ! rotation   !
-      !            !   name     !  (hours)  !   name     !   (T/F)    !  (T/F) !  'monthly'  ! filename ! pairs      !
-      sn_icb = FLD_N( 'calving' ,    -1     , 'calving'  ,  .TRUE.    , .TRUE. ,   'yearly'  , ''       , ''         )
-
-      REWIND( numnam )              ! Namelist namrun : iceberg parameters
-      READ  ( numnam, namberg )
-      
+#if !defined key_agrif
+      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 )
+#else
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'icbini :   AGRIF is not compatible with namelist namberg :  '
+         WRITE(numout,*) '         definition of rn_initial_mass(nclasses) with nclasses as PARAMETER '
+         WRITE(numout,*) ' namelist namberg not read'
+      ENDIF
+      ln_icebergs = .false.      
+#endif   
       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