Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 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/LIM_SRC_3/limistate.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -33 +33 @@
    PUBLIC   lim_istate      ! routine called by lim_init.F90
 
-   !                                  !!** init namelist (namiceini) **
-   REAL(wp) ::   ttest    = 2.0_wp     ! threshold water temperature for initial sea ice
-   REAL(wp) ::   hninn    = 0.5_wp     ! initial snow thickness in the north
-   REAL(wp) ::   hginn_u  = 2.5_wp     ! initial ice thickness in the north
-   REAL(wp) ::   aginn_u  = 0.7_wp     ! initial leads area in the north
-   REAL(wp) ::   hginn_d  = 5.0_wp     ! initial ice thickness in the north
-   REAL(wp) ::   aginn_d  = 0.25_wp    ! initial leads area in the north
-   REAL(wp) ::   hnins    = 0.1_wp     ! initial snow thickness in the south
-   REAL(wp) ::   hgins_u  = 1.0_wp     ! initial ice thickness in the south
-   REAL(wp) ::   agins_u  = 0.7_wp     ! initial leads area in the south
-   REAL(wp) ::   hgins_d  = 2.0_wp     ! initial ice thickness in the south
-   REAL(wp) ::   agins_d  = 0.2_wp     ! initial leads area in the south
-   REAL(wp) ::   sinn     = 6.301_wp   ! initial salinity 
-   REAL(wp) ::   sins     = 6.301_wp   !
+   !                       !!** init namelist (namiceini) **
+   REAL(wp) ::   ttest      ! threshold water temperature for initial sea ice
+   REAL(wp) ::   hninn      ! initial snow thickness in the north
+   REAL(wp) ::   hginn_u    ! initial ice thickness in the north
+   REAL(wp) ::   aginn_u    ! initial leads area in the north
+   REAL(wp) ::   hginn_d    ! initial ice thickness in the north
+   REAL(wp) ::   aginn_d    ! initial leads area in the north
+   REAL(wp) ::   hnins      ! initial snow thickness in the south
+   REAL(wp) ::   hgins_u    ! initial ice thickness in the south
+   REAL(wp) ::   agins_u    ! initial leads area in the south
+   REAL(wp) ::   hgins_d    ! initial ice thickness in the south
+   REAL(wp) ::   agins_d    ! initial leads area in the south
+   REAL(wp) ::   sinn       ! initial salinity 
+   REAL(wp) ::   sins       !
 
    !!----------------------------------------------------------------------
@@ -536 +536 @@
       !! ** input  :   namelist namiceini
       !!-----------------------------------------------------------------------------
+      INTEGER :: ios                 ! Local integer output status for namelist read
       NAMELIST/namiceini/ ttest, hninn, hginn_u, aginn_u, hginn_d, aginn_d, hnins,   &
          &                hgins_u, agins_u, hgins_d, agins_d, sinn, sins
       !!-----------------------------------------------------------------------------
       !
-      REWIND ( numnam_ice )               ! Read Namelist namiceini 
-      READ   ( numnam_ice , namiceini )
+      REWIND( numnam_ice_ref )              ! Namelist namiceini in reference namelist : Ice initial state
+      READ  ( numnam_ice_ref, namiceini, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in reference namelist', lwp )
+
+      REWIND( numnam_ice_cfg )              ! Namelist namiceini in configuration namelist : Ice initial state
+      READ  ( numnam_ice_cfg, namiceini, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in configuration namelist', lwp )
+      WRITE ( numoni, namiceini )
       !
       IF(lwp) THEN                        ! control print