Changeset 5067 for branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2015-02-06T19:12:57+01:00 (9 years ago)

Author:

clem

Message:

LIM3 change all namelist names to fit with NEMO convention

File:

• branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (10 diffs)

branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -236 +236 @@
          CALL lim_thd( kt )                         ! Ice thermodynamics 
          
-         CALL lim_update2( kt )                     ! Global variables update
+         CALL lim_update2( kt )                     ! Corrections
          !
          CALL lim_sbc_flx( kt )                     ! Update surface ocean mass, heat and salt fluxes
@@ -286 +286 @@
       IF(lwm) CALL ctl_opn( numoni, 'output.namelist.ice', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, 1 )
 
-      CALL ice_run                     ! set some ice run parameters including jpl, nlay_i and nlay_s
+      CALL ice_run                     ! set some ice run parameters
+      !
       !                                ! Allocate the ice arrays
       ierr =        ice_alloc        ()      ! ice variables
@@ -303 +304 @@
          &     'use more ocean levels or less ice/snow layers/categories.' )
       !
+      CALL lim_itd_init                ! ice thickness distribution initialization
       !
       CALL lim_thd_init                ! set ice thermodynics parameters
@@ -309 +311 @@
       !
       CALL lim_msh                     ! ice mesh initialization
-      !
-      CALL lim_itd_init                ! ice thickness distribution initialization
       !
       CALL lim_itd_me_init             ! ice thickness distribution initialization for mecanical deformation
@@ -352 +352 @@
       INTEGER  ::   ios                 ! Local integer output status for namelist read
       NAMELIST/namicerun/ jpl, nlay_i, nlay_s, cn_icerst_in, cn_icerst_out,   &
-         &                ln_limdyn, amax, ln_nicep, ln_limdiahsb, ln_limdiaout
+         &                ln_limdyn, rn_amax, ln_nicep, ln_limdiahsb, ln_limdiaout
       !!-------------------------------------------------------------------
       !                    
@@ -369 +369 @@
          WRITE(numout,*) 'ice_run : ice share parameters for dynamics/advection/thermo of sea-ice'
          WRITE(numout,*) ' ~~~~~~'
-         WRITE(numout,*) '   number of ice  categories                               = ', jpl
-         WRITE(numout,*) '   number of ice  layers                                   = ', nlay_i
-         WRITE(numout,*) '   number of snow layers                                   = ', nlay_s
+         WRITE(numout,*) '   number of ice  categories                                               = ', jpl
+         WRITE(numout,*) '   number of ice  layers                                                   = ', nlay_i
+         WRITE(numout,*) '   number of snow layers                                                   = ', nlay_s
          WRITE(numout,*) '   switch for ice dynamics (1) or not (0)      ln_limdyn   = ', ln_limdyn
-         WRITE(numout,*) '   maximum ice concentration                               = ', amax 
+         WRITE(numout,*) '   maximum ice concentration                               = ', rn_amax 
          WRITE(numout,*) '   Several ice points in the ice or not in ocean.output    = ', ln_nicep
          WRITE(numout,*) '   Diagnose heat/salt budget or not          ln_limdiahsb  = ', ln_limdiahsb
@@ -404 +404 @@
       !!-------------------------------------------------------------------
       INTEGER  ::   ios                 ! Local integer output status for namelist read
-      NAMELIST/namiceitd/ nn_itdshp, rn_itmean
+      NAMELIST/namiceitd/ nn_catbnd, rn_himean
       !
       INTEGER  ::   jl                   ! dummy loop index
@@ -425 +425 @@
          WRITE(numout,*) 'ice_itd : ice cat distribution'
          WRITE(numout,*) ' ~~~~~~'
-         WRITE(numout,*) '   shape of ice categories distribution                          nn_itdshp = ', nn_itdshp
-         WRITE(numout,*) '   mean ice thickness in the domain (only active if nn_itdshp=2) rn_itmean = ', rn_itmean
+         WRITE(numout,*) '   shape of ice categories distribution                          nn_catbnd = ', nn_catbnd
+         WRITE(numout,*) '   mean ice thickness in the domain (only active if nn_catbnd=2) rn_himean = ', rn_himean
       ENDIF
 
@@ -438 +438 @@
       hi_max(:) = 0._wp
 
-      SELECT CASE ( nn_itdshp  )       
+      SELECT CASE ( nn_catbnd  )       
                                    !----------------------
          CASE (1)                  ! tanh function (CICE)
@@ -456 +456 @@
          zalpha = 0.05             ! exponent of the transform function
 
-         zhmax  = 3.*rn_itmean
+         zhmax  = 3.*rn_himean
 
          DO jl = 1, jpl