Changeset 2477 for trunk/NEMO/LIM_SRC_3/iceini.F90

Timestamp:

2010-12-17T14:42:51+01:00 (13 years ago)

Author:

cetlod

Message:

v3.2:remove hardcoded value of num_sal in limrst.F90, see ticket #633

File:

• trunk/NEMO/LIM_SRC_3/iceini.F90 (modified) (3 diffs)

trunk/NEMO/LIM_SRC_3/iceini.F90

@@ -18 +18 @@
    USE limmsh
    USE limistate
+   USE limthd         ! LIM: ice thermodynamics 
+   USE limthd_sal     ! LIM: ice thermodynamics: salinity 
    USE limrst
    USE par_ice
@@ -26 +28 @@
    PRIVATE
 
-   !! * Routine accessibility
    PUBLIC ice_init                 ! called by opa.F90
-   PUBLIC lim_itd_ini
-
-   !! * Share Module variables
-   INTEGER , PUBLIC  ::   &  !:
-      nstart ,            &  !: iteration number of the begining of the run 
-      nlast  ,            &  !: iteration number of the end of the run 
-      nitrun ,            &  !: number of iteration
-      numit                  !: iteration number
-   REAL(wp), PUBLIC  ::   &  !:
-      tpstot                 !: time of the run in seconds
    !!----------------------------------------------------------------------
    !!   LIM 3.0,  UCL-ASTR-LOCEAN-IPSL (2008) 
@@ -61 +52 @@
 
       CALL ice_run                    !  read in namelist some run parameters
-
-      ! Louvain la Neuve Ice model
-      IF( nacc == 1 ) THEN
-         rdt_ice = nn_fsbc * rdtmin
-      ELSE
-         rdt_ice = nn_fsbc * rdt
-      ENDIF
-
-      CALL lim_msh                    ! ice mesh initialization
-
-      CALL lim_itd_ini                ! initialize the ice thickness
-      ! distribution
-      ! Initial sea-ice state
-      IF( .NOT.ln_rstart ) THEN
+      !
+      CALL lim_thd_init                ! namelist read ice thermodynics parameters
+      !
+      CALL lim_thd_sal_init            ! namelist read ice salinity parameters
+      !
+      rdt_ice = nn_fsbc * rdttra(1)    ! sea-ice timestep
+      !
+      CALL lim_msh                     ! ice mesh initialization
+      !
+      CALL lim_itd_ini                 ! initialize the ice thickness distribution
+
+     !                                ! Initial sea-ice state
+      IF( .NOT.ln_rstart ) THEN              ! start from rest
          numit = 0
          numit = nit000 - 1
-         CALL lim_istate              ! start from rest: sea-ice deduced from sst
-         CALL lim_var_agg(1)          ! aggregate category variables in
-         ! bulk variables
-         CALL lim_var_glo2eqv         ! convert global variables in equivalent
-         ! variables
-      ELSE
-         CALL lim_rst_read            ! start from a restart file
-
+         CALL lim_istate                        ! start from rest: sea-ice deduced from sst
+         CALL lim_var_agg(1)                    ! aggregate category variables in bulk variables
+         CALL lim_var_glo2eqv                   ! convert global variables in equivalent variables
+      ELSE                                   ! start from a restart file
+         CALL lim_rst_read                      ! read the restart file
          numit = nit000 - 1
-         CALL lim_var_agg(1)          ! aggregate ice variables
-         CALL lim_var_glo2eqv         ! convert global var in equivalent variables
-      ENDIF
-
+         CALL lim_var_agg(1)                    ! aggregate ice variables
+         CALL lim_var_glo2eqv                   ! convert global var in equivalent variables
+      ENDIF
+      !
       fr_i(:,:) = at_i(:,:)           ! initialisation of sea-ice fraction
-
-      nstart = numit  + nn_fsbc      
-      nitrun = nitend - nit000 + 1 
-      nlast  = numit  + nitrun 
-
-      IF( nstock == 0  )  nstock = nlast + 1
+      !
+      nstart = numit  + nn_fsbc
+      nitrun = nitend - nit000 + 1
+      nlast  = numit  + nitrun
+      !
+      IF( nstock == 0  )   nstock = nlast + 1
 
    END SUBROUTINE ice_init