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

Timestamp:

2013-11-08T06:51:52+01:00 (10 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2013 : bugs corrections, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) (3 diffs)

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

@@ -36 +36 @@
    PUBLIC   lim_istate      ! routine called by lim_init.F90
 
-   !                       !!** 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       !
+
+   !! * Module variables
+   !                          !!** init namelist (namiceini) **
+   REAL(wp) ::   ttest   ! threshold water temperature for initial sea ice
+   REAL(wp) ::   hninn   ! initial snow thickness in the north
+   REAL(wp) ::   hnins   ! initial snow thickness in the south
+   REAL(wp) ::   hginn   ! initial ice thickness in the north
+   REAL(wp) ::   hgins   ! initial ice thickness in the south
+   REAL(wp) ::   aginn   ! initial leads area in the north
+   REAL(wp) ::   agins   ! initial leads area in the south
+   REAL(wp) ::   sinn    ! initial salinity 
+   REAL(wp) ::   sins  
 
    !!----------------------------------------------------------------------
@@ -483 +481 @@
       !!  8.5  ! 07-11 (M. Vancoppenolle) rewritten initialization
       !!-----------------------------------------------------------------------------
-<<<<<<< .courant
+      NAMELIST/namiceini/ ttest, hninn, hnins, hginn, hgins, aginn, agins, sinn, sins
+      !
       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
-=======
-      NAMELIST/namiceini/ ttest, hninn, hnins, hginn, hgins, aginn, agins, sinn, sins
->>>>>>> .fusion-droit.r4160
       !!-----------------------------------------------------------------------------
-<<<<<<< .courant
       !
       REWIND( numnam_ice_ref )              ! Namelist namiceini in reference namelist : Ice initial state
@@ -501 +494 @@
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namiceini in configuration namelist', lwp )
       WRITE ( numoni, namiceini )
-=======
 
       ! Define the initial parameters
       ! -------------------------
 
-      ! Read Namelist namiceini 
-      REWIND ( numnam_ice )
-      READ   ( numnam_ice , namiceini )
->>>>>>> .fusion-droit.r4160
       IF(lwp) THEN
          WRITE(numout,*)